13160 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Tobias Diekershoff	39d149bf7c	regenerated master messages.po file	2016-08-01 07:46:21 +02:00
Tobias Diekershoff	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
Tobias Diekershoff	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
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
Tobias Diekershoff	c9dee2947f	quickfix for worker delivery problems	2016-07-28 15:41:25 +02:00
Tobias Diekershoff	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
rabuzarus	f09cd57165	notifications.php - move duplicated code in an own function	2016-07-28 11:39:09 +02:00
Tobias Diekershoff	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
Tobias Diekershoff	3e8da763ba	IS update to the translations THX Sveinn í Felli	2016-07-26 11:18:38 +02:00
Tobias Diekershoff	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
Michael Vogel	5e81c105e0	We now work with the "priority" field - that's better	2016-07-24 20:25:11 +02:00
Michael Vogel	747dc934f7	Avoid warning because $a isn't called by reference	2016-07-24 13:53:26 +02:00
Michael Vogel	4be7e5a581	"Fast lane" mechanism to reserve one queue for priority processes	2016-07-24 11:22:44 +02:00
Michael Vogel	7580c8ed11	Processing of high priority processes	2016-07-23 22:57:22 +02:00
Michael Vogel	0b0b29dc97	Reverted some strange stuff	2016-07-22 18:13:06 +02:00
Michael Vogel	fb447e84ee	Some more information about the current queue status of the worker	2016-07-22 18:07:04 +02:00
Michael Vogel	4c5fb5947d	Merge remote-tracking branch 'upstream/develop' into develop	2016-07-21 22:49:06 +02:00
Michael Vogel	2e9d233367	Merge remote-tracking branch 'upstream/master' into develop ... Conflicts: boot.php	2016-07-21 22:48:34 +02:00
fabrixxm	2594ad3bb9	Merge pull request #2683 from tobiasd/20160721-demessages ... Update DE translation	2016-07-21 09:59:33 +02:00
Tobias Diekershoff	cb7de01efe	new contributor tu DE translations for the credits.txt	2016-07-21 09:21:51 +02:00
Tobias Diekershoff	0cbc102c93	DE update to the strings	2016-07-21 09:20:21 +02:00
Michael Vogel	0e7ff6b4db	Removed (now) unused templates	2016-07-19 08:46:41 +02:00
Michael Vogel	8bf7db06db	New indexes for the API	2016-07-19 08:43:57 +02:00
Michael Vogel	4f07dfb35a	Optimized queries	2016-07-18 15:25:42 +02:00
Michael Vogel	838f976715	Some more improvements to xml.php, code cleanup	2016-07-17 23:59:35 +02:00
Michael Vogel	d7f093cb2e	Enhanced XML creation, and so on.	2016-07-17 19:42:30 +02:00
Michael Vogel	bc2c565060	Work in progress: API XML output without templates	2016-07-16 12:32:08 +02:00
Michael Vogel	de6f48365b	Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml	2016-07-15 20:12:46 +02:00
Tobias Diekershoff	0a49b7dc77	Merge pull request #2681 from annando/bugfix-diaspora ... Bugfix: There was an SQL error when adding new entries in the fcontac…	2016-07-15 17:35:50 +02:00
Michael Vogel	1603aa41ef	Bugfix: There was an SQL error when adding new entries in the fcontact table	2016-07-15 17:25:30 +02:00
Michael Vogel	a64b7704d8	Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml	2016-07-15 17:19:16 +02:00
Michael Vogel	1130f11037	Merge pull request #2680 from fabrixxm/feature-api-update ... API: fix plaintext of reshared attachment	2016-07-15 16:58:59 +02:00