jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12816 commits 10 branches 58 tags 216 MiB
Commit graph

12816 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel
fe5e775b00 Merge pull request #2718 from rabuzarus/0808-frio_notifications_css 
frio: unify size of notif-images + background color for unseen notifs
 2016-08-08 21:31:00 +02:00
Michael Vogel
d138b11868 Use a 10 minute timeout for high priority processes. This may be better. 2016-08-08 21:28:44 +02:00
Michael Vogel
0bcd3b972c Merge pull request #2719 from rabuzarus/0808-frio_toggle_aside 
frio: fix duplicated ID's in aside section
 2016-08-08 21:26:57 +02:00
Michael Vogel
29168de677 Process timeouts are now priority depending 2016-08-08 19:20:40 +02:00
rabuzarus
6b979e5ad8 frio: fix duplicated ID's in aside section 2016-08-08 17:15:35 +02:00
rabuzarus
27f04100c8 frio: unify size of notif-images + background color for unseen notifs 2016-08-08 14:05:33 +02:00
Michael Vogel
61e3a8ca3a Merge pull request #2702 from rabuzarus/0308-Notifications-restructure 
notifications restructure
 2016-08-08 07:41:48 +02:00
Tobias Diekershoff
cdc5b609ce Merge pull request #2717 from annando/1608-bugfix-procrun 
Bugfix: proc_run hadn't worked anymore due to the priority changes
 2016-08-08 07:28:22 +02:00
Michael Vogel
65a09c67a0 Bugfix: proc_run hadn't worked anymore due to the priority changes 2016-08-08 07:14:40 +02:00
rabuzarus
0532dc6a61 notifications - correct boolean variable checking 2016-08-07 12:26:49 +02:00
Michael Vogel
5a2ba1029e Merge pull request #2714 from tobiasd/20160806-installercheckiconv 
now the installer checks for iconv module as well #2506
 2016-08-07 07:27:50 +02:00
rabuzarus
de02154a1b notifications - set default values for some varibles 2016-08-06 18:59:39 +02:00
rabuzarus
6eecc8dbd1 Merge pull request #2715 from tobiasd/20160806-vier 
vier
 2016-08-06 18:11:30 +02:00
Tobias Diekershoff
991914d563 vier 2016-08-06 10:54:54 +02:00
Tobias Diekershoff
78514db6e8 now the installer checks for iconv module as well #2506 2016-08-06 08:54:41 +02:00
Tobias Diekershoff
a9196dc0f8 Merge pull request #2712 from rabuzarus/0508-frio_mobile_login 
frio - provide mobile login/register buttons for mobile view
 2016-08-06 06:52:42 +02:00
Tobias Diekershoff
37c8984af3 Merge pull request #2713 from rabuzarus/frio-update-version 
Frio update version and Readme
 2016-08-06 06:52:17 +02:00
rabuzarus
f9ccdce4d4 Raise frio version number to 0.7 
Since I never raised the version number since starting this theme I raise the version of frio to 0.7 and removed the alpha. It is still much stuff to do for a 1.0 version but frio has done the last half year big steps forward.
 2016-08-05 20:37:51 +02:00
rabuzarus
8cc4d7a128 Update README.md 2016-08-05 20:31:14 +02:00
rabuzarus
a5a28d11fc frio - provide mobile login/register buttons for mobile view 2016-08-05 20:17:06 +02:00
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
c46a7ddd4a DE translations THX Andreas 2016-08-04 12:12:52 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
497fd34026 regenerated master messages.po for new strings in the admin panel 2016-08-04 09:09:43 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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