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

Commit Graph

  • 60a28a37e1 Merge pull request #2738 from tobiasd/20160814-credits Michael Vogel 2016-08-16 14:18:47 +02:00
  • abc301aad8 regenerated credits Tobias Diekershoff 2016-08-14 22:19:49 +02:00
  • 789e9577c6 Merge pull request #2737 from annando/1608-worker-again Tobias Diekershoff 2016-08-14 22:10:13 +02:00
  • bd99eedd9b Merge branch '3.5rc' of https://github.com/friendica/friendica into 3.5rc Tobias Diekershoff 2016-08-14 22:05:54 +02:00
  • 728fb76f3d adapted documentation gerhard6380 2016-08-13 16:14:12 +02:00
  • 7daaaf0ab8 updated api documentation to reflect changes on direct_messages gerhard6380 2016-08-13 13:19:53 +02:00
  • 078767630c improved sql statements for direct_messages calls gerhard6380 2016-08-13 13:08:16 +02:00
  • 01a2eb3555 Implement api/direct_messages/destroy gerhard6380 2016-08-12 18:15:03 +02:00
  • ef0cc850d4 remove api_friendica_direct_messages_all gerhard6380 2016-08-12 15:40:22 +02:00
  • f9f1825e33 Removing api_friendica_direct_messages_conversations gerhard6380 2016-08-11 23:53:00 +02:00
  • f99a646328 remove api_format_messages_win and include new fields in api_format_messages gerhard6380 2016-08-11 17:34:33 +02:00
  • fe5182559f new API calls for private messsages in Win10 app gerhard6380 2016-08-10 23:56:17 +02:00
  • 5432acca20 Merge pull request #2736 from tobiasd/20160814-doc Michael Vogel 2016-08-14 21:23:19 +02:00
  • dfac110887 Merge pull request #2729 from gerhard6380/develop Michael Vogel 2016-08-14 21:21:58 +02:00
  • 67b16507f1 Performance improvements for the poller Michael Vogel 2016-08-14 21:02:29 +02:00
  • f79a9f67f1 DOCs we have a new developer forum Tobias Diekershoff 2016-08-14 09:34:50 +02:00
  • 2d7c8c79cf Merge pull request #2735 from rabuzarus/1308-frio-event-strings Tobias Diekershoff 2016-08-14 09:18:48 +02:00
  • efdb98de6d frio: fix - add string to template rabuzarus 2016-08-13 18:59:59 +02:00
  • 2d0c503bf1 frio: fix - permissions string was missing rabuzarus 2016-08-13 18:58:49 +02:00
  • 30ecd7cf38 adapted documentation gerhard6380 2016-08-13 16:14:12 +02:00
  • 5069d5f94e Merge pull request #2734 from rabuzarus/1308-cal-export-perms Michael Vogel 2016-08-13 15:20:59 +02:00
  • 826a13eb23 fix: own calendar is now always exportable for local_user() rabuzarus 2016-08-13 13:59:55 +02:00
  • e5874aa34c updated api documentation to reflect changes on direct_messages gerhard6380 2016-08-13 13:19:53 +02:00
  • 23393c05ee improved sql statements for direct_messages calls gerhard6380 2016-08-13 13:08:16 +02:00
  • 21ce7cff3b Merge pull request #2733 from tobiasd/20160819-doc rabuzarus 2016-08-13 12:26:06 +02:00
  • 11e3c3bfad DOCS: clarify Settings also discusses the Admin Panel Tobias Diekershoff 2016-08-13 12:11:27 +02:00
  • 3b8db28a43 Implement api/direct_messages/destroy gerhard6380 2016-08-12 18:15:03 +02:00
  • 41c1f71d4d remove api_friendica_direct_messages_all gerhard6380 2016-08-12 15:40:22 +02:00
  • fb087ce89e Removing api_friendica_direct_messages_conversations gerhard6380 2016-08-11 23:53:00 +02:00
  • 9988a5b7c4 Merge pull request #2731 from annando/1608-notifications-format Tobias Diekershoff 2016-08-11 21:08:07 +02:00
  • 1c31526d6e HTML entities in Notifications aren't a problem anymore Michael Vogel 2016-08-11 19:59:07 +02:00
  • db6fb8efe2 remove api_format_messages_win and include new fields in api_format_messages gerhard6380 2016-08-11 17:34:33 +02:00
  • 2b062214dc Merge pull request #2730 from annando/1608-missing-parameter-ping Tobias Diekershoff 2016-08-11 08:52:18 +02:00
  • b6dec53ec1 Bugfix: A parameter in xml::from_array was missing. Michael Vogel 2016-08-11 08:44:03 +02:00
  • 103f70215a Merge pull request #2728 from annando/1608-ping Tobias Diekershoff 2016-08-11 07:53:51 +02:00
  • d7d698bef4 new API calls for private messsages in Win10 app gerhard6380 2016-08-10 23:56:17 +02:00
  • b8af78d877 Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop gerhard6380 2016-08-10 23:54:54 +02:00
  • 0ea9af3d7d Ping is now using a standard routine to generate the xml. Michael Vogel 2016-08-10 22:51:03 +02:00
  • dbab4db754 Merge pull request #2727 from rabuzarus/1008-item-highlight Tobias Diekershoff 2016-08-10 14:49:27 +02:00
  • 83e95a5841 frio: highlight - test if the item is available in the dom rabuzarus 2016-08-10 14:42:57 +02:00
  • 2a79b8c235 Merge pull request #2726 from rabuzarus/1008-item-highlight Tobias Diekershoff 2016-08-10 14:42:11 +02:00
  • 31deaaf0a8 Merge pull request #2725 from tobiasd/20160810-de rabuzarus 2016-08-10 14:27:28 +02:00
  • 5e440e5359 frio: highlight - wait until the whole page is loaded rabuzarus 2016-08-10 14:26:16 +02:00
  • cf23a81c33 frio: highlight - use offset() instead of postion() rabuzarus 2016-08-10 14:14:58 +02:00
  • 531cba5ce5 frio: fix - I used the wrong variable rabuzarus 2016-08-10 13:33:49 +02:00
  • 7e65d84577 frio: fix for display auto position scroll + some cleanup rabuzarus 2016-08-10 13:07:13 +02:00
  • 42b7c9cd74 DE translation Tobias Diekershoff 2016-08-10 12:31:54 +02:00
  • c7eb7ba73f Merge pull request #2724 from tobiasd/20160809-msgs rabuzarus 2016-08-09 18:42:10 +02:00
  • afdb8af5a4 regenerated messages.po file for new strings in Frio theme Tobias Diekershoff 2016-08-09 18:18:09 +02:00
  • 0e007679e1 Merge pull request #2723 from rabuzarus/0908-Frio_Guest_Nav Tobias Diekershoff 2016-08-09 18:08:59 +02:00
  • 0f2e5a4684 Merge pull request #1 from friendica/develop gerhard6380 2016-08-09 16:48:18 +02:00
  • 40b0a8e30c frio: Remote is now called Guest rabuzarus 2016-08-09 14:39:18 +02:00
  • 35a8f641a8 Merge pull request #2722 from rabuzarus/0808-frio-backgrounds Tobias Diekershoff 2016-08-09 07:54:56 +02:00
  • 5e4eaa433b Merge pull request #2720 from annando/1608-kill-stale-worker rabuzarus 2016-08-08 22:34:45 +02:00
  • f52a06d013 frio: correct spelling rabuzarus 2016-08-08 22:25:54 +02:00
  • 4adc758adb frio: add some missing page background rabuzarus 2016-08-08 22:16:32 +02:00
  • 5dff8db751 Redefined the priority constants (to have space for future expansions) Michael Vogel 2016-08-08 22:11:24 +02:00
  • 62b23b0631 frio: background for people search rabuzarus 2016-08-08 21:54:34 +02:00
  • fe5e775b00 Merge pull request #2718 from rabuzarus/0808-frio_notifications_css Michael Vogel 2016-08-08 21:31:00 +02:00
  • d138b11868 Use a 10 minute timeout for high priority processes. This may be better. Michael Vogel 2016-08-08 21:28:44 +02:00
  • 0bcd3b972c Merge pull request #2719 from rabuzarus/0808-frio_toggle_aside Michael Vogel 2016-08-08 21:26:57 +02:00
  • 29168de677 Process timeouts are now priority depending Michael Vogel 2016-08-08 19:20:40 +02:00
  • 6b979e5ad8 frio: fix duplicated ID's in aside section rabuzarus 2016-08-08 17:15:35 +02:00
  • 27f04100c8 frio: unify size of notif-images + background color for unseen notifs rabuzarus 2016-08-08 14:05:33 +02:00
  • 61e3a8ca3a Merge pull request #2702 from rabuzarus/0308-Notifications-restructure Michael Vogel 2016-08-08 07:41:48 +02:00
  • cdc5b609ce Merge pull request #2717 from annando/1608-bugfix-procrun Tobias Diekershoff 2016-08-08 07:28:22 +02:00
  • 65a09c67a0 Bugfix: proc_run hadn't worked anymore due to the priority changes Michael Vogel 2016-08-08 07:14:40 +02:00
  • 0532dc6a61 notifications - correct boolean variable checking rabuzarus 2016-08-07 12:26:49 +02:00
  • 5a2ba1029e Merge pull request #2714 from tobiasd/20160806-installercheckiconv Michael Vogel 2016-08-07 07:27:50 +02:00
  • de02154a1b notifications - set default values for some varibles rabuzarus 2016-08-06 18:59:39 +02:00
  • 6eecc8dbd1 Merge pull request #2715 from tobiasd/20160806-vier rabuzarus 2016-08-06 18:11:30 +02:00
  • 991914d563 vier Tobias Diekershoff 2016-08-06 10:54:54 +02:00
  • 78514db6e8 now the installer checks for iconv module as well #2506 Tobias Diekershoff 2016-08-06 08:54:41 +02:00
  • a9196dc0f8 Merge pull request #2712 from rabuzarus/0508-frio_mobile_login Tobias Diekershoff 2016-08-06 06:52:42 +02:00
  • 37c8984af3 Merge pull request #2713 from rabuzarus/frio-update-version Tobias Diekershoff 2016-08-06 06:52:17 +02:00
  • f9ccdce4d4 Raise frio version number to 0.7 rabuzarus 2016-08-05 20:37:51 +02:00
  • 8cc4d7a128 Update README.md rabuzarus 2016-08-05 20:31:14 +02:00
  • a5a28d11fc frio - provide mobile login/register buttons for mobile view rabuzarus 2016-08-05 20:17:06 +02:00
  • 6abeff10c0 Merge pull request #2711 from rabuzarus/0408-frio-photo-tpl-fix Michael Vogel 2016-08-04 23:59:43 +02:00
  • 3921113e5c photos - include paginate into the templates - provide a photo_album.tpl for frio rabuzarus 2016-08-04 21:53:22 +02:00
  • b7ec844429 Merge pull request #2709 from annando/1608-push-splitted Tobias Diekershoff 2016-08-04 21:31:36 +02:00
  • 701f47a1b2 Merge pull request #2710 from rabuzarus/0408-jquery_color Tobias Diekershoff 2016-08-04 21:30:25 +02:00
  • 94d297155c frio:implement comment highlighting with jquery.color rabuzarus 2016-08-04 19:59:45 +02:00
  • 0411eb289e Lower the priority for stale processes Michael Vogel 2016-08-04 15:41:32 +02:00
  • 074ae59f49 Reschedule killed processes at the beginning of the queue. Michael Vogel 2016-08-04 15:33:15 +02:00
  • dad74e9650 pubsubpublish is now split into separate calls per entry. Michael Vogel 2016-08-04 15:15:43 +02:00
  • d698534027 Merge pull request #2707 from tobiasd/20160804-de Michael Vogel 2016-08-04 14:58:24 +02:00
  • 3432268e80 Merge pull request #2708 from rabuzarus/0407-frio-picture-wall-fix Tobias Diekershoff 2016-08-04 14:57:15 +02:00
  • e374ec2bc8 frio:fix jot - posts with images were not available on wall rabuzarus 2016-08-04 14:33:08 +02:00
  • c46a7ddd4a DE translations THX Andreas Tobias Diekershoff 2016-08-04 12:12:52 +02:00
  • 30b93b74db Merge pull request #2706 from rabuzarus/0308-frio_accept_requests_mobile Tobias Diekershoff 2016-08-04 12:08:40 +02:00
  • 8ad345c434 notifications - remove TAB (clean up) rabuzarus 2016-08-04 11:46:57 +02:00
  • e34e1f7c2b frio: add intro action buttons for mobile devices rabuzarus 2016-08-04 11:36:31 +02:00
  • 2a282a9555 Merge pull request #2705 from tobiasd/20160804-msg Michael Vogel 2016-08-04 09:54:00 +02:00
  • 497fd34026 regenerated master messages.po for new strings in the admin panel Tobias Diekershoff 2016-08-04 09:09:43 +02:00
  • 416de8de66 Merge pull request #2704 from annando/1608-fastlane-admin Tobias Diekershoff 2016-08-04 09:02:36 +02:00
  • 2d63f9deb6 Worker fastlane can now be activated from the admin interface Michael Vogel 2016-08-04 08:51:34 +02:00
  • f3ec28bd73 Merge pull request #2703 from annando/1608-worker-priority rabuzarus 2016-08-03 20:37:44 +02:00
  • 0cba02a805 Added priority to some forgotten proc_run calls Michael Vogel 2016-08-03 18:24:22 +02:00
  • 7157ca3809 Fastlane is now working with any priority level Michael Vogel 2016-08-03 15:59:25 +02:00