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
rabuzarus
f09cd57165
notifications.php - move duplicated code in an own function
2016-07-28 11:39:09 +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
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
cb7de01efe
new contributor tu DE translations for the credits.txt
2016-07-21 09:21:51 +02:00
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
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
fabrixxm
ec22b6086a
API: fix plaintext of reshared attachment
...
When replacing `[attachment]` element, text after it wasn't restored.
`[share]` element can contain `[attachment]`, the closing `[/share]` was elided,
then the `[share]` element was shown in plaintext instead of recycle symbol
2016-07-15 16:53:30 +02:00
Michael Vogel
4e25d08a77
Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml
2016-07-15 16:15:20 +02:00
Michael Vogel
6ebfbc5993
API: Use a generic function to create the XML
2016-07-15 15:37:51 +02:00
334db69d5d
Merge pull request #2678 from fabrixxm/feature-api-update
...
api updates
2016-07-15 15:08:55 +02:00
fabrixxm
d68c09e428
API: use diaspora::is_reshare()
2016-07-15 12:22:35 +02:00
fabrixxm
43699646d6
API: use doxygen todo style
2016-07-15 11:46:19 +02:00
fabrixxm
66199c9861
API: rework retweeted_status
...
`api_share_as_retweet()` now returns a copy of the item with
fields updated to shared content, instead of modify the item itself.
The new item array is used to build 'retweeted_status'.
2016-07-14 16:39:40 +02:00
fabrixxm
c7876d0c38
API: add docs to api_item_get_user()
...
and remove commented out lines
2016-07-14 13:36:15 +02:00
fabrixxm
18bd7f5eb7
API: use regex instead of SimpleXMLElement
...
It's easier with exotic chars.
And the editor replaced all leading spaces with tabs.
2016-07-14 13:32:31 +02:00
896d8e9af8
Merge pull request #2679 from annando/1607-diaspora
...
Diaspora: Link to protocol description added.
2016-07-14 09:00:07 +02:00
Michael Vogel
2c5fb55725
Diaspora: Link to protocol description added. Support for creation date of comments
2016-07-14 07:20:20 +02:00
0ff8b555fd
Merge pull request #2677 from annando/1607-worker-cooldown
...
Worker: New value for cooldown time after each function call
2016-07-14 00:26:26 +02:00
