harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 3f4f3e244a that was not intended to be merged with master yet. Put it under a define friendica 2015-01-11 15:22:58 -08:00
  • 381f8a1b42 optionally use openssl encryption functions (higher performance over mcrypt, but potentially more likely to have been compromised) friendica 2015-01-11 15:13:45 -08:00
  • 6f7b1960af allow the use of openssl crypto friendica 2015-01-11 14:58:47 -08:00
  • 0259051a87 basic backend work for creating consensus items friendica 2015-01-11 14:41:33 -08:00
  • b018b39e64 Merge branch 'master' into trinidad friendica 2015-01-11 14:02:27 -08:00
  • 6599ae052b Merge https://github.com/friendica/red into pending_merge friendica 2015-01-11 14:02:26 -08:00
  • 152f250d2b revup friendica 2015-01-11 14:02:07 -08:00
  • ff01505b36 Merge pull request #840 from cvogeley/master RedMatrix 2015-01-12 09:01:51 +11:00
  • 1e6fd90795 Correction Christian Vogeley 2015-01-11 22:59:50 +01:00
  • f6ec519686 Correction Christian Vogeley 2015-01-11 22:54:16 +01:00
  • f245a09023 Correction Christian Vogeley 2015-01-11 22:36:30 +01:00
  • 4e7e555a75 corrcetion Christian Vogeley 2015-01-11 22:30:59 +01:00
  • 63f189b453 Correct Christian Vogeley 2015-01-11 22:23:30 +01:00
  • f2ef89e697 Revert "put back in" Christian Vogeley 2015-01-11 19:47:05 +01:00
  • 1f02700618 Revert "put back in" Christian Vogeley 2015-01-11 19:44:18 +01:00
  • ab07857d9c put back in Christian Vogeley 2015-01-11 19:41:22 +01:00
  • 5beec923b4 put back in Christian Vogeley 2015-01-11 19:38:43 +01:00
  • c89db830eb . Christian Vogeley 2015-01-11 19:31:20 +01:00
  • 487d201ea8 . Christian Vogeley 2015-01-11 19:23:15 +01:00
  • f957208600 fix accidentally removed file Christian Vogeley 2015-01-11 19:19:18 +01:00
  • f0c7612bcd Merge remote-tracking branch 'upstream/master' Christian Vogeley 2015-01-11 16:22:59 +01:00
  • 43f143a211 Fix for issue #763 Error creating new channel within the limits of the subscription plan Christian Vogeley 2015-01-11 16:12:36 +01:00
  • 4c31598555 Merge branch 'master' into trinidad friendica 2015-01-10 14:59:24 -08:00
  • 10102ac2ac connection clone issues friendica 2015-01-10 14:59:10 -08:00
  • df0f67843e Merge branch 'master' into trinidad friendica 2015-01-10 13:05:04 -08:00
  • 8c4eb839f9 Merge https://github.com/friendica/red into pending_merge friendica 2015-01-10 13:05:02 -08:00
  • c75cdbd304 doc updates friendica 2015-01-10 13:04:43 -08:00
  • 50bc43733f Merge pull request #839 from einervonvielen/dev_beginning_fix1 RedMatrix 2015-01-11 08:03:54 +11:00
  • bd7aebe272 Changed step-by-step manual for beginning developers. Einer von Vielen 2015-01-10 20:45:09 +01:00
  • 52236c8677 Changed step-by-step manual for beginning devolopers. Einer von Vielen 2015-01-10 20:39:05 +01:00
  • 0368fe49f3 Fix unescaped image data Habeas Codice 2015-01-10 11:08:37 -08:00
  • 72c0bc1169 Merge pull request #838 from f03el/master git-marijus 2015-01-10 13:02:32 +01:00
  • 884fa8bf9f Merge pull request #837 from git-marijus/master git-marijus 2015-01-10 13:01:02 +01:00
  • 3877f4ffd4 Fix typo and rephrase Swedish translation Erik Lundin 2015-01-10 11:46:03 +01:00
  • 27046aeb7a Update Swedish strings from Transifex Erik Lundin 2015-01-10 11:38:09 +01:00
  • 978d78b953 basic changes for file activity marijus 2015-01-09 15:18:45 +01:00
  • e1c5cc46f6 Merge pull request #836 from tuscanhobbit/dev Paolo T 2015-01-09 08:59:26 +01:00
  • 39cfd77583 Updated Italian translation Paolo Tacconi 2015-01-09 08:57:08 +01:00
  • 072dc6e820 Merge branch 'master' into trinidad friendica 2015-01-08 19:21:27 -08:00
  • 1b535ff8a5 clean up some url anomalies in dir_sort_links after security fix friendica 2015-01-08 19:20:50 -08:00
  • 623a5b7c6c Merge branch 'master' into trinidad friendica 2015-01-08 19:13:32 -08:00
  • af943f4569 double q argument could also cause issues friendica 2015-01-08 19:13:13 -08:00
  • 1159ffaf7a Merge branch 'master' into trinidad friendica 2015-01-08 19:10:39 -08:00
  • 1e4e7ce2d3 SECURITY: dir_sort_links() exposes session cookie friendica 2015-01-08 19:09:52 -08:00
  • fab09ef1bc Merge branch 'master' into trinidad friendica 2015-01-08 16:03:30 -08:00
  • 836223bf5b Merge https://github.com/friendica/red into pending_merge friendica 2015-01-08 16:03:29 -08:00
  • aa490a39bb include channel clones in PM deliveries (also some whitespace edits) friendica 2015-01-08 16:02:15 -08:00
  • 80c77b7f92 Merge pull request #833 from pafcu/oneautocompleter pafcu 2015-01-08 18:25:38 +02:00
  • 32c6eab01c Fix saved searches on network page, fix caching mith multiple autocompleters Stefan Parviainen 2015-01-08 17:16:08 +01:00
  • a2e43ae172 Merge pull request #832 from zzottel/master zzottel 2015-01-08 16:11:02 +01:00
  • 6992717b37 updated German translation of features.bb help file to match current English one zottel 2015-01-08 16:07:48 +01:00
  • 4beb782014 Fix issue with case sensitive filtering in autocomplete, put autocomplete dropdown on top of navbar, show entry to leave the text unchanged Stefan Parviainen 2015-01-08 16:06:37 +01:00
  • 833d51527b Honor requested count in navbar search Stefan Parviainen 2015-01-08 16:05:00 +01:00
  • 4165be2c4c Merge pull request #831 from zzottel/master zzottel 2015-01-08 11:47:19 +01:00
  • 1e8019c806 remove extra blank line zottel 2015-01-08 11:46:14 +01:00
  • 9467208f78 update German main help file zottel 2015-01-08 11:44:04 +01:00
  • 1a67c55f28 the yearly license update friendica 2015-01-07 18:03:36 -08:00
  • 0657195125 Merge branch 'master' into trinidad friendica 2015-01-07 14:39:09 -08:00
  • 087d6744fc Merge https://github.com/friendica/red into pending_merge friendica 2015-01-07 14:39:07 -08:00
  • 8771dee9cf Merge pull request #829 from pafcu/oneautocompleter RedMatrix 2015-01-08 09:38:45 +11:00
  • ce953e2f41 syncing connections issue, incorrect return_url after deleting connection friendica 2015-01-07 14:35:03 -08:00
  • 7176eb8845 Merge autocomplete caching, show more results in navbar search Stefan Parviainen 2015-01-07 22:07:11 +01:00
  • f3cd29f829 Typo + comment Stefan Parviainen 2015-01-07 21:38:12 +01:00
  • 885bcb4b2a Remove out-of-date mod_message.js Stefan Parviainen 2015-01-07 21:33:22 +01:00
  • d7a3d9f606 Add autosubmit feature to textcomplete based autocompleter Stefan Parviainen 2015-01-07 21:32:17 +01:00
  • fcc9131fb9 Make mod_sources autocomplete use textcomplete Stefan Parviainen 2015-01-07 21:01:36 +01:00
  • b098d5d901 Make photos tag autocomplete use textcomplete Stefan Parviainen 2015-01-07 20:57:30 +01:00
  • 8e4d66dd7b Make mod_connections search use textcomplete Stefan Parviainen 2015-01-07 20:57:10 +01:00
  • f2e648308c Return results from acl.php in standard form Stefan Parviainen 2015-01-07 20:45:00 +01:00
  • c9b15bbab5 Allow passing autocomplete type to contact_autocomplete Stefan Parviainen 2015-01-07 20:38:56 +01:00
  • 9f8ce331f3 Disable browser-based autocomplete when using the textcomplete based one Stefan Parviainen 2015-01-07 20:29:38 +01:00
  • f157122c35 Make searchbox use textcomplete Stefan Parviainen 2015-01-07 20:25:29 +01:00
  • e025fd9de2 Make mail use textcomplete Stefan Parviainen 2015-01-07 20:06:06 +01:00
  • 0cf016b0b0 Make mod_poke use textcomplete Stefan Parviainen 2015-01-07 20:03:05 +01:00
  • 34ecbcceea Make nav search use textcomplete Stefan Parviainen 2015-01-07 19:39:50 +01:00
  • 4e3aadc38a Rename some stuff related to autocomplete Stefan Parviainen 2015-01-07 18:57:16 +01:00
  • e3d064ff22 Allow textcomplete to work on inputs (PR also filed upstream) Stefan Parviainen 2015-01-07 18:42:57 +01:00
  • a373b9f1d4 also style the collapse link marijus 2015-01-07 13:04:50 +01:00
  • 3ef487418d don't allow admin to delete the sys channel from the channel manage page friendica 2015-01-06 20:12:34 -08:00
  • a1e5a661fa Merge branch 'master' into trinidad friendica 2015-01-06 15:45:00 -08:00
  • fbe0610ce9 don't update locally deleted items friendica 2015-01-06 15:44:23 -08:00
  • f8151a33e2 Merge branch 'master' into trinidad friendica 2015-01-06 15:31:39 -08:00
  • bb67ab1fbf this brings us up to date friendica 2015-01-06 15:30:54 -08:00
  • 400a2cd912 Merge branch 'master' into trinidad friendica 2015-01-06 14:51:13 -08:00
  • 4b9ed48a54 don't let dns_get_record() "write to screen" if it errors. friendica 2015-01-06 14:50:29 -08:00
  • aaceb71e86 Merge branch 'master' into trinidad friendica 2015-01-06 13:45:55 -08:00
  • 2417125c89 Merge pull request #826 from pafcu/cache_autocomplete RedMatrix 2015-01-07 08:45:47 +11:00
  • c9839d38a5 Merge branch 'master' into trinidad friendica 2015-01-06 13:43:19 -08:00
  • 1cfff44535 lines reversed in handle_tag() friendica 2015-01-06 13:42:55 -08:00
  • 3e41b8137c Cache autocomplete results locally (the one in the editor) Stefan Parviainen 2015-01-06 21:01:30 +01:00
  • c05586fbe7 begin the grand unification for 3.0. Start by splitting DAV into a web accessible component and a DAV accessible component so that we can eliminate the http-auth prompts for web-accessed resources. friendica 2015-01-06 11:55:42 -08:00
  • 7ee5567421 Merge branch 'master' into trinidad friendica 2015-01-06 11:40:31 -08:00
  • 8c5e5c3449 Merge pull request #825 from einervonvielen/dev_beginning_fix RedMatrix 2015-01-07 06:40:20 +11:00
  • 911d7105a0 Merge branch 'pafcu-mainjsoptimize' friendica 2015-01-06 11:38:21 -08:00
  • 11ec8d865c Merge branch 'mainjsoptimize' of git://github.com/pafcu/red into pafcu-mainjsoptimize friendica 2015-01-06 11:37:48 -08:00
  • e20d82ab0b Merge branch 'master' into trinidad friendica 2015-01-06 11:26:54 -08:00
  • b8d3936e47 Merge https://github.com/friendica/red into pending_merge friendica 2015-01-06 11:26:53 -08:00
  • 01e65ffbb4 revup friendica 2015-01-06 11:26:35 -08:00
  • 1064be3a76 add some style to divgrowmore marijus 2015-01-06 20:06:41 +01:00
  • 88d26f1f87 Corrected errors in chapter 'Contribute your changes via github' - changed commit statement - changed push statement (it pointed to the orign) Einer von Vielen 2015-01-06 19:07:59 +01:00