Michael Vogel
|
6abeff10c0
|
Merge pull request #2711 from rabuzarus/0408-frio-photo-tpl-fix
photos - include paginate into the templates - provide a photo_album.…
|
2016-08-04 23:59:43 +02:00 |
|
rabuzarus
|
3921113e5c
|
photos - include paginate into the templates - provide a photo_album.tpl for frio
|
2016-08-04 21:53:22 +02:00 |
|
|
b7ec844429
|
Merge pull request #2709 from annando/1608-push-splitted
pubsubpublish is now split into separate calls per entry
|
2016-08-04 21:31:36 +02:00 |
|
|
701f47a1b2
|
Merge pull request #2710 from rabuzarus/0408-jquery_color
frio:implement comment highlighting with jquery.color
|
2016-08-04 21:30:25 +02:00 |
|
rabuzarus
|
94d297155c
|
frio:implement comment highlighting with jquery.color
|
2016-08-04 19:59:45 +02:00 |
|
Michael Vogel
|
0411eb289e
|
Lower the priority for stale processes
|
2016-08-04 15:41:32 +02:00 |
|
Michael Vogel
|
074ae59f49
|
Reschedule killed processes at the beginning of the queue.
|
2016-08-04 15:33:15 +02:00 |
|
Michael Vogel
|
dad74e9650
|
pubsubpublish is now split into separate calls per entry.
|
2016-08-04 15:15:43 +02:00 |
|
Michael Vogel
|
d698534027
|
Merge pull request #2707 from tobiasd/20160804-de
DE translations THX Andreas
|
2016-08-04 14:58:24 +02:00 |
|
|
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 |
|
|
c46a7ddd4a
|
DE translations THX Andreas
|
2016-08-04 12:12:52 +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
|
8ad345c434
|
notifications - remove TAB (clean up)
|
2016-08-04 11:46:57 +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 |
|
rabuzarus
|
178b89711a
|
restore gitignore
|
2016-08-03 12:55:37 +02:00 |
|
rabuzarus
|
ae905cbd1b
|
Merge develop into 0308-Notifications-restructure
Conflicts:
mod/notifications.php
|
2016-08-03 12:53:38 +02:00 |
|
rabuzarus
|
ce3188d5c6
|
notifications - move intros to NotificationsManager & make json output work
|
2016-08-03 12:44:04 +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 |
|
rabuzarus
|
6d3c15fe91
|
notifications - add attendance notifications
|
2016-08-02 00:01:43 +02:00 |
|
rabuzarus
|
bcee356f66
|
notifications - add docu & pagination
|
2016-08-01 23:04:41 +02:00 |
|
rabuzarus
|
7a4be1cead
|
notifications.php: move more code to NotificationsManager
|
2016-08-01 18:18:11 +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 |
|
trebor
|
52f641904b
|
notifications.php: reduce code duplication
|
2016-07-30 10:51:21 +02:00 |
|