Commit graph

12627 commits

Author SHA1 Message Date
3432268e80 Merge pull request #2708 from rabuzarus/0407-frio-picture-wall-fix
frio:fix jot - posts with images were not available on wall
2016-08-04 14:57:15 +02:00
rabuzarus
e374ec2bc8 frio:fix jot - posts with images were not available on wall 2016-08-04 14:33:08 +02:00
30b93b74db Merge pull request #2706 from rabuzarus/0308-frio_accept_requests_mobile
frio: add intro action buttons for mobile devices
2016-08-04 12:08:40 +02:00
rabuzarus
e34e1f7c2b frio: add intro action buttons for mobile devices 2016-08-04 11:36:31 +02:00
Michael Vogel
2a282a9555 Merge pull request #2705 from tobiasd/20160804-msg
regenerated master messages.po for new strings in the admin panel
2016-08-04 09:54:00 +02:00
497fd34026 regenerated master messages.po for new strings in the admin panel 2016-08-04 09:09:43 +02:00
416de8de66 Merge pull request #2704 from annando/1608-fastlane-admin
Worker fastlane can now be activated from the admin interface
2016-08-04 09:02:36 +02:00
Michael Vogel
2d63f9deb6 Worker fastlane can now be activated from the admin interface 2016-08-04 08:51:34 +02:00
rabuzarus
f3ec28bd73 Merge pull request #2703 from annando/1608-worker-priority
Improvements for the fastlane and forgotten priority
2016-08-03 20:37:44 +02:00
Michael Vogel
0cba02a805 Added priority to some forgotten proc_run calls 2016-08-03 18:24:22 +02:00
Michael Vogel
7157ca3809 Fastlane is now working with any priority level 2016-08-03 15:59:25 +02:00
626340146b Merge pull request #2701 from annando/1608-cronjobs-fastlane
Split cron jobs in cronjobs, introduce fastlane for high priority tasks
2016-08-03 11:12:29 +02:00
Michael Vogel
ff430640c0 Small variable type fixed, removed unused includes 2016-08-03 10:19:46 +02:00
Michael Vogel
d673f44c5b Split cron jobs in cronjobs, introduce fastlane for high priority tasks 2016-08-03 10:03:05 +02:00
Michael Vogel
ba3bde5fb5 Merge pull request #2700 from tobiasd/20160802-de
DE update to the strings
2016-08-02 12:52:29 +02:00
Michael Vogel
2faf35f5c2 Merge pull request #2699 from fabrixxm/fix_pr_2682
Quick fix to PR #2682
2016-08-02 12:51:39 +02:00
35bbc3948f DE update to the strings 2016-08-02 12:30:04 +02:00
fabrixxm
87fb0b7b26 Quick fix to PR #2682 2016-08-02 12:24:07 +02:00
0f4e57fb95 Merge pull request #2698 from annando/1608-split-cronhook
Split cronhook call to several single calls
2016-08-02 11:31:09 +02:00
Michael Vogel
9559ecb5f3 Merge pull request #2697 from tobiasd/20160801-messages
regenerated master messages.po file
2016-08-02 10:20:52 +02:00
Michael Vogel
13c285d61d Updated documentation 2016-08-02 10:19:10 +02:00
Michael Vogel
b9dbb0ace1 Split cronhook call to several single calls 2016-08-02 06:28:34 +02:00
c6f7952f37 Merge pull request #2696 from annando/1608-performance
Small performance improvements
2016-08-01 08:21:36 +02:00
5a8be4057e Merge pull request #2695 from annando/develop
"proc_run" is now called with priority.
2016-08-01 08:20:38 +02:00
Michael Vogel
d8c4fceef8 Merge remote-tracking branch 'upstream/develop' into 1608-performance 2016-08-01 08:04:11 +02:00
Michael Vogel
02b5f6a34d Merge remote-tracking branch 'upstream/develop' into develop 2016-08-01 08:02:26 +02:00
Michael Vogel
668da905e2 "proc_run" is now called with priority. 2016-08-01 07:48:43 +02:00
39d149bf7c regenerated master messages.po file 2016-08-01 07:46:21 +02:00
75be187216 Merge pull request #2682 from annando/1607-api-generic-xml
API: XML is now generated without templates
2016-08-01 07:25:24 +02:00
Michael Vogel
84e84a0689 Small performance improvements 2016-08-01 07:22:54 +02:00
a684a1c519 Merge pull request #2691 from rabuzarus/2607-contact_confirm
frio: intro templates + some restructure of core notifications.php
2016-08-01 07:15:24 +02:00
rabuzarus
f7fa5f166b notifications.php: unify label strings 2016-07-30 11:03:21 +02:00
Michael Vogel
313bc5b0d2 Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-30 10:02:39 +02:00
Michael Vogel
89227813fc Merge pull request #2694 from tobiasd/20160728-quickfix
quickfix for worker delivery problems
2016-07-28 16:03:49 +02:00
fabrixxm
067d2c8937 Merge pull request #2692 from tobiasd/20160728-libraryasn1
PHP7 needs an integer value for the length
2016-07-28 15:59:23 +02:00
c9dee2947f quickfix for worker delivery problems 2016-07-28 15:41:25 +02:00
3034edca70 Merge pull request #2693 from rabuzarus/2107-contact_edit
frio: contact_edit.tpl was missing a bracket
2016-07-28 15:34:34 +02:00
rabuzarus
e74da01276 frio: contac_edit.tpl was missing a bracket 2016-07-28 11:45:41 +02:00
867ebeb661 PHP7 needs an integer value for the length 2016-07-28 08:59:16 +02:00
rabuzarus
819b374401 notifications.php - move some template creation to the end of the file 2016-07-27 21:07:54 +02:00
rabuzarus
320751660d frio: intro notifications + some restructuring in core for notifications 2016-07-27 19:53:22 +02:00
Michael Vogel
287c9cfbdd Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-26 22:15:49 +02:00
Michael Vogel
e390e8f027 Merge pull request #2689 from tobiasd/20160726-IS
IS update to the translations THX Sveinn í Felli
2016-07-26 16:58:14 +02:00
3e8da763ba IS update to the translations THX Sveinn í Felli 2016-07-26 11:18:38 +02:00
18a35e9ceb Merge pull request #2688 from rabuzarus/2607-drop
frio: provide confirm modal
2016-07-26 10:45:52 +02:00
rabuzarus
694637f9c3 frio: provide confirm modal 2016-07-26 10:36:34 +02:00
Michael Vogel
0deea97cf2 Merge pull request #2686 from rabuzarus/2107-contact_edit
frio: templates for contact_edit and crepair
2016-07-26 09:33:37 +02:00
rabuzarus
768d10536f frio: templates for contact_edit and crepair 2016-07-26 09:09:40 +02:00
rabuzarus
e4bef09717 dbm.php - is_result should be a static function
there was a notice in php.out - `Non-static method dbm::is_result() should not be called statically`
This should fix it.
2016-07-25 11:46:14 +02:00
fabrixxm
18cbe9f6ff Merge pull request #2685 from annando/1607-poller-information
Some more logging information for the poller
2016-07-25 08:53:50 +02:00