clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 178b89711a restore gitignore rabuzarus 2016-08-03 12:55:37 +02:00
  • ae905cbd1b Merge develop into 0308-Notifications-restructure rabuzarus 2016-08-03 12:53:38 +02:00
  • ce3188d5c6 notifications - move intros to NotificationsManager & make json output work rabuzarus 2016-08-03 12:44:04 +02:00
  • 626340146b Merge pull request #2701 from annando/1608-cronjobs-fastlane Tobias Diekershoff 2016-08-03 11:12:29 +02:00
  • ff430640c0 Small variable type fixed, removed unused includes Michael Vogel 2016-08-03 10:19:46 +02:00
  • d673f44c5b Split cron jobs in cronjobs, introduce fastlane for high priority tasks Michael Vogel 2016-08-03 10:03:05 +02:00
  • ba3bde5fb5 Merge pull request #2700 from tobiasd/20160802-de Michael Vogel 2016-08-02 12:52:29 +02:00
  • 2faf35f5c2 Merge pull request #2699 from fabrixxm/fix_pr_2682 Michael Vogel 2016-08-02 12:51:39 +02:00
  • 35bbc3948f DE update to the strings Tobias Diekershoff 2016-08-02 12:30:04 +02:00
  • 87fb0b7b26 Quick fix to PR #2682 fabrixxm 2016-08-02 12:24:07 +02:00
  • 0f4e57fb95 Merge pull request #2698 from annando/1608-split-cronhook Tobias Diekershoff 2016-08-02 11:31:09 +02:00
  • 9559ecb5f3 Merge pull request #2697 from tobiasd/20160801-messages Michael Vogel 2016-08-02 10:20:52 +02:00
  • 13c285d61d Updated documentation Michael Vogel 2016-08-02 10:19:10 +02:00
  • b9dbb0ace1 Split cronhook call to several single calls Michael Vogel 2016-08-02 06:28:34 +02:00
  • 6d3c15fe91 notifications - add attendance notifications rabuzarus 2016-08-02 00:01:43 +02:00
  • bcee356f66 notifications - add docu & pagination rabuzarus 2016-08-01 23:04:41 +02:00
  • 7a4be1cead notifications.php: move more code to NotificationsManager rabuzarus 2016-08-01 18:18:11 +02:00
  • c6f7952f37 Merge pull request #2696 from annando/1608-performance Tobias Diekershoff 2016-08-01 08:21:36 +02:00
  • 5a8be4057e Merge pull request #2695 from annando/develop Tobias Diekershoff 2016-08-01 08:20:38 +02:00
  • d8c4fceef8 Merge remote-tracking branch 'upstream/develop' into 1608-performance Michael Vogel 2016-08-01 08:04:11 +02:00
  • 02b5f6a34d Merge remote-tracking branch 'upstream/develop' into develop Michael Vogel 2016-08-01 08:02:26 +02:00
  • 668da905e2 "proc_run" is now called with priority. Michael Vogel 2016-08-01 07:48:43 +02:00
  • 39d149bf7c regenerated master messages.po file Tobias Diekershoff 2016-08-01 07:46:21 +02:00
  • 75be187216 Merge pull request #2682 from annando/1607-api-generic-xml Tobias Diekershoff 2016-08-01 07:25:24 +02:00
  • 84e84a0689 Small performance improvements Michael Vogel 2016-08-01 07:22:54 +02:00
  • a684a1c519 Merge pull request #2691 from rabuzarus/2607-contact_confirm Tobias Diekershoff 2016-08-01 07:15:24 +02:00
  • f7fa5f166b notifications.php: unify label strings rabuzarus 2016-07-30 11:03:21 +02:00
  • 52f641904b notifications.php: reduce code duplication trebor 2016-07-30 10:51:21 +02:00
  • 313bc5b0d2 Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml Michael Vogel 2016-07-30 10:02:39 +02:00
  • 89227813fc Merge pull request #2694 from tobiasd/20160728-quickfix Michael Vogel 2016-07-28 16:03:49 +02:00
  • 067d2c8937 Merge pull request #2692 from tobiasd/20160728-libraryasn1 fabrixxm 2016-07-28 15:59:23 +02:00
  • c9dee2947f quickfix for worker delivery problems Tobias Diekershoff 2016-07-28 15:41:25 +02:00
  • 3034edca70 Merge pull request #2693 from rabuzarus/2107-contact_edit Tobias Diekershoff 2016-07-28 15:34:34 +02:00
  • e74da01276 frio: contac_edit.tpl was missing a bracket rabuzarus 2016-07-28 11:45:41 +02:00
  • f09cd57165 notifications.php - move duplicated code in an own function rabuzarus 2016-07-28 11:39:09 +02:00
  • 867ebeb661 PHP7 needs an integer value for the length Tobias Diekershoff 2016-07-28 08:59:16 +02:00
  • 819b374401 notifications.php - move some template creation to the end of the file rabuzarus 2016-07-27 21:07:54 +02:00
  • 320751660d frio: intro notifications + some restructuring in core for notifications rabuzarus 2016-07-27 19:53:22 +02:00
  • 4e02b80868 Merge remote-tracking branch 'upstream/develop' into 1607-performance Michael Vogel 2016-07-26 22:16:37 +02:00
  • 287c9cfbdd Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml Michael Vogel 2016-07-26 22:15:49 +02:00
  • 4961fb3a45 Unused indexes removed, queries changed Michael Vogel 2016-07-26 22:10:13 +02:00
  • e390e8f027 Merge pull request #2689 from tobiasd/20160726-IS Michael Vogel 2016-07-26 16:58:14 +02:00
  • 3e8da763ba IS update to the translations THX Sveinn í Felli Tobias Diekershoff 2016-07-26 11:18:38 +02:00
  • 18a35e9ceb Merge pull request #2688 from rabuzarus/2607-drop Tobias Diekershoff 2016-07-26 10:45:52 +02:00
  • 694637f9c3 frio: provide confirm modal rabuzarus 2016-07-26 10:36:34 +02:00
  • 0deea97cf2 Merge pull request #2686 from rabuzarus/2107-contact_edit Michael Vogel 2016-07-26 09:33:37 +02:00
  • 768d10536f frio: templates for contact_edit and crepair rabuzarus 2016-07-26 09:09:40 +02:00
  • e4bef09717 dbm.php - is_result should be a static function rabuzarus 2016-07-25 11:46:14 +02:00
  • 18cbe9f6ff Merge pull request #2685 from annando/1607-poller-information fabrixxm 2016-07-25 08:53:50 +02:00
  • 5e81c105e0 We now work with the "priority" field - that's better Michael Vogel 2016-07-24 20:25:11 +02:00
  • 747dc934f7 Avoid warning because $a isn't called by reference Michael Vogel 2016-07-24 13:53:26 +02:00
  • 4be7e5a581 "Fast lane" mechanism to reserve one queue for priority processes Michael Vogel 2016-07-24 11:22:44 +02:00
  • 7580c8ed11 Processing of high priority processes Michael Vogel 2016-07-23 22:57:22 +02:00
  • 0b0b29dc97 Reverted some strange stuff Michael Vogel 2016-07-22 18:13:06 +02:00
  • fb447e84ee Some more information about the current queue status of the worker Michael Vogel 2016-07-22 18:07:04 +02:00
  • 4c5fb5947d Merge remote-tracking branch 'upstream/develop' into develop Michael Vogel 2016-07-21 22:49:06 +02:00
  • 2e9d233367 Merge remote-tracking branch 'upstream/master' into develop Michael Vogel 2016-07-21 22:48:34 +02:00
  • 2594ad3bb9 Merge pull request #2683 from tobiasd/20160721-demessages fabrixxm 2016-07-21 09:59:33 +02:00
  • cb7de01efe new contributor tu DE translations for the credits.txt Tobias Diekershoff 2016-07-21 09:21:51 +02:00
  • 0cbc102c93 DE update to the strings Tobias Diekershoff 2016-07-21 09:20:21 +02:00
  • 0e7ff6b4db Removed (now) unused templates Michael Vogel 2016-07-19 08:46:41 +02:00
  • 8bf7db06db New indexes for the API Michael Vogel 2016-07-19 08:43:57 +02:00
  • 4f07dfb35a Optimized queries Michael Vogel 2016-07-18 15:25:42 +02:00
  • 838f976715 Some more improvements to xml.php, code cleanup Michael Vogel 2016-07-17 23:59:35 +02:00
  • d7f093cb2e Enhanced XML creation, and so on. Michael Vogel 2016-07-17 19:42:30 +02:00
  • bc2c565060 Work in progress: API XML output without templates Michael Vogel 2016-07-16 12:32:08 +02:00
  • de6f48365b Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml Michael Vogel 2016-07-15 20:12:46 +02:00
  • 0a49b7dc77 Merge pull request #2681 from annando/bugfix-diaspora Tobias Diekershoff 2016-07-15 17:35:50 +02:00
  • 1603aa41ef Bugfix: There was an SQL error when adding new entries in the fcontact table Michael Vogel 2016-07-15 17:25:30 +02:00
  • a64b7704d8 Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml Michael Vogel 2016-07-15 17:19:16 +02:00
  • 1130f11037 Merge pull request #2680 from fabrixxm/feature-api-update Michael Vogel 2016-07-15 16:58:59 +02:00
  • ec22b6086a API: fix plaintext of reshared attachment fabrixxm 2016-07-15 16:53:30 +02:00
  • 4e25d08a77 Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml Michael Vogel 2016-07-15 16:15:20 +02:00
  • 6ebfbc5993 API: Use a generic function to create the XML Michael Vogel 2016-07-15 15:37:51 +02:00
  • 334db69d5d Merge pull request #2678 from fabrixxm/feature-api-update Tobias Diekershoff 2016-07-15 15:08:55 +02:00
  • d68c09e428 API: use diaspora::is_reshare() fabrixxm 2016-07-15 12:22:35 +02:00
  • 43699646d6 API: use doxygen todo style fabrixxm 2016-07-15 11:46:19 +02:00
  • 66199c9861 API: rework retweeted_status fabrixxm 2016-07-14 16:39:40 +02:00
  • c7876d0c38 API: add docs to api_item_get_user() fabrixxm 2016-07-14 13:35:36 +02:00
  • 18bd7f5eb7 API: use regex instead of SimpleXMLElement fabrixxm 2016-07-14 13:32:31 +02:00
  • 896d8e9af8 Merge pull request #2679 from annando/1607-diaspora Tobias Diekershoff 2016-07-14 09:00:07 +02:00
  • 2c5fb55725 Diaspora: Link to protocol description added. Support for creation date of comments Michael Vogel 2016-07-14 07:20:20 +02:00
  • 0ff8b555fd Merge pull request #2677 from annando/1607-worker-cooldown Tobias Diekershoff 2016-07-14 00:26:26 +02:00
  • ce2f765d28 API: rework share as retweet fabrixxm 2016-07-13 22:11:10 +02:00
  • d98ab84d76 API: update template for friendica:owner data fabrixxm 2016-07-13 20:11:18 +02:00
  • 3cd2ed54eb api: item owner and activities details fabrixxm 2016-07-13 19:47:15 +02:00
  • 4b29937a74 Worker: New value for cooldown time after each function call Michael Vogel 2016-07-13 19:43:16 +02:00
  • 95b7de6313 API: Fix api_array_to_xml() fabrixxm 2016-07-13 18:35:55 +02:00
  • eb1ba8934c Merge pull request #2676 from tobiasd/20160713-lighttpdconfig fabrixxm 2016-07-13 10:17:19 +02:00
  • 263c9f30a1 added configuration reg. curl and lighttpd with error code 417 Tobias Diekershoff 2016-07-13 09:33:28 +02:00
  • 57762a8038 Merge pull request #2674 from annando/1607-warning-theme-info Tobias Diekershoff 2016-07-12 16:16:19 +02:00
  • fdd679636b Bugfix: Avoid a warning if "theme_info" isn't an array Michael Vogel 2016-07-12 12:59:34 +02:00
  • 4e4580f326 Merge pull request #2669 from annando/1607-new-probe rabuzarus 2016-07-11 21:42:48 +02:00
  • 566f237f4a Merge pull request #2673 from annando/1607-mail-avatar rabuzarus 2016-07-11 21:41:23 +02:00
  • a64db18731 Merge remote-tracking branch 'upstream/develop' into 1607-new-probe Michael Vogel 2016-07-11 20:45:56 +02:00
  • 0a46a3d10e Bugfix: Avatar pictures of mail contacts weren't displayed correctly Michael Vogel 2016-07-11 20:42:18 +02:00
  • ee7f10f130 Some more little documentation Michael Vogel 2016-07-11 19:48:37 +02:00
  • 2a088d27d0 Merge pull request #2672 from rabuzarus/1007-page_template Michael Vogel 2016-07-11 15:20:10 +02:00
  • 15471f3835 add possibility to load custom page templates + none.php pagetemplate is part of core now rabuzarus 2016-07-11 10:33:39 +02:00
  • aad3fb2d32 Some more documentation Michael Vogel 2016-07-10 18:44:48 +02:00