gerhard6380
5e1726184a
correct some spaces/tabs
2016-09-25 18:45:00 +02:00
gerhard6380
01ff105a43
correct tab indents and CRLF
2016-09-25 18:22:42 +02:00
gerhard6380
528a492282
Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop
2016-09-23 19:38:57 +02:00
gerhard6380
afc7d316a7
Change API documentation to contain new API call /api/friendica/profile/show
2016-09-23 19:26:44 +02:00
gerhard6380
4de12dacc7
New API /api/friendica/profile/show to return data of all profiles a user has to a client
2016-09-23 19:06:41 +02:00
Michael Vogel
5f9a392fc4
At the search we should do it as well.
2016-09-23 06:36:48 +00:00
Michael Vogel
6fd54df940
Some additional beautification
2016-09-22 18:18:26 +00:00
Michael Vogel
abbf501602
The string is an array ...
2016-09-22 18:07:32 +00:00
Michael Vogel
c6f50d0468
Reworked ejabberd authentification
2016-09-22 02:57:40 +00:00
Michael Vogel
4f5997f30a
XMPP authentification for multi domain systems
2016-09-13 20:29:47 +00:00
Michael Vogel
1caa87dce6
Restructured the way, processes are inserted and removed
2016-09-09 20:55:49 +00:00
Michael Vogel
22f32d9721
New process table for a better detection of running workers
2016-09-09 20:33:54 +00:00
Michael Vogel
ac1787d1e5
Merge remote-tracking branch 'upstream/3.5rc' into sql-default-value
2016-09-05 11:52:41 +00:00
Michael Vogel
1cb6043aea
Attachments are now displayed again.
2016-09-04 18:06:07 +02:00
Michael Vogel
6e25077893
Merge pull request #2760 from gerhard6380/3.5rc
...
API: change friendica_activities to include arrays of users
2016-09-03 20:47:52 +02:00
Michael Vogel
6df40b1161
sQL: No "NOT NULL" on text fields.
2016-09-03 15:06:42 +00:00
Michael Vogel
c02b1c3f36
The "tagged with" message now works again.
2016-09-03 12:48:51 +02:00
gerhard6380
3a31619509
API: change friendica_activities to include arrays of users
2016-09-02 17:01:52 +02:00
014fc5dccb
Merge pull request #2758 from annando/1609-sql-charset
...
Set the charset for the SQL connection for new installations
2016-09-01 09:22:07 +02:00
Michael Vogel
59ff309ee5
Add the new charset parameter to the database creation
2016-09-01 04:44:29 +00:00
Michael Vogel
9209d88c4a
Set the charset for the SQL connection for new installations
2016-09-01 03:50:41 +00:00
02c29f1313
Merge pull request #2748 from rabuzarus/rabuzarus-pending
...
best_link_url: don't use redirect for pending contacts
2016-08-31 15:55:26 +02:00
c62a28d95e
Merge pull request #2755 from rabuzarus/theme-init-identity
...
fix theme loading
2016-08-31 15:53:42 +02:00
rabuzarus
aedd2cfa60
Update identity.php
2016-08-31 13:49:24 +02:00
Michael Vogel
41613ec55d
Bugfix: Fixed two bad sql queries
2016-08-29 18:40:40 +00:00
rabuzarus
e0d329ece9
Merge pull request #2750 from annando/1608-worker-priority-again
...
Prevent lowest priority calls from never being called
2016-08-28 00:39:58 +02:00
Michael Vogel
6a167cf8b1
Prevent lowest priority calls from never being called
2016-08-27 21:05:38 +00:00
Michael Vogel
e46dae3937
Removed some accidentally written code
2016-08-27 19:53:09 +02:00
Michael Vogel
a156d59e2a
dbstructure: Set the version when updating manually
2016-08-27 19:50:19 +02:00
rabuzarus
c1555b623a
best_link_url: don't use redirect for pending contacts
2016-08-26 15:47:45 +02:00
dc6cce4080
Merge pull request #2746 from annando/1608-diaspora-handle-lowercase
...
The handle for Diaspora contacts must always be low…
2016-08-23 07:52:35 +02:00
Michael Vogel
80bfcc7694
The handle (user@domain.tld) for Diaspora contacts must always be lowercase
2016-08-23 07:48:48 +02:00
be4ce36a97
Merge pull request #2745 from annando/1608-atachments
...
Bugfix: Handle attachments with bbcode inside/handle the [p] bbcode
2016-08-23 07:48:18 +02:00
Michael Vogel
50dc7a6047
Bugfix: Handle attachments with bbcode inside/handle the [p] bbcode
2016-08-23 07:40:16 +02:00
f344813054
events with no finish should not export it to ical
2016-08-20 16:16:19 +02:00
Michael Vogel
108a1c4ac6
New priority level for stale processes.
2016-08-18 12:33:17 +02:00
789e9577c6
Merge pull request #2737 from annando/1608-worker-again
...
Performance improvements for the poller
2016-08-14 22:10:13 +02:00
gerhard6380
078767630c
improved sql statements for direct_messages calls
2016-08-14 22:03:59 +02:00
gerhard6380
01a2eb3555
Implement api/direct_messages/destroy
...
Twitter compliant call replaces api/friendica/direct_messages_delete;
JSON return expected by Twitter API and parameter include_entities not
yet implemented
2016-08-14 22:03:40 +02:00
gerhard6380
ef0cc850d4
remove api_friendica_direct_messages_all
...
instead included 'friendica_verbose' parameter into standard function
api_direct_messages_box()
2016-08-14 22:03:27 +02:00
gerhard6380
f9f1825e33
Removing api_friendica_direct_messages_conversations
...
due to implementing 'seen' and 'parent-uri' into standard
api_format_messages() this call is not needed anymore. Adapting comment
blocks.
2016-08-14 22:03:08 +02:00
gerhard6380
f99a646328
remove api_format_messages_win and include new fields in api_format_messages
2016-08-14 22:02:56 +02:00
gerhard6380
fe5182559f
new API calls for private messsages in Win10 app
...
new API calls used for Windows 10 app (similar calls to existing but
extended to include seen id and parent-uri)
2016-08-14 22:02:43 +02:00
Michael Vogel
67b16507f1
Performance improvements for the poller
2016-08-14 21:02:29 +02:00
Michael Vogel
0ea9af3d7d
Ping is now using a standard routine to generate the xml.
2016-08-10 22:51:03 +02:00
rabuzarus
5e4eaa433b
Merge pull request #2720 from annando/1608-kill-stale-worker
...
Process timeouts are now priority depending
2016-08-08 22:34:45 +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
29168de677
Process timeouts are now priority depending
2016-08-08 19:20:40 +02:00
Michael Vogel
61e3a8ca3a
Merge pull request #2702 from rabuzarus/0308-Notifications-restructure
...
notifications restructure
2016-08-08 07:41:48 +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
