1
0
Fork 0
Commit graph

12894 commits

Author SHA1 Message Date
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
48c216b048 Merge pull request #2747 from rabuzarus/2308-frio_autosize
frio: resize textareas on typing.
2016-08-23 17:23:38 +02:00
rabuzarus
9653ae98ae frio: resize textareas on typing. 2016-08-23 16:48:13 +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
Michael Vogel
f9bd6894de Merge pull request #2744 from tobiasd/20160820-cal
events with no finish should not export it to ical
2016-08-23 06:31:49 +02:00
Michael Vogel
7092bfed0c Merge pull request #2743 from tobiasd/20160819-credits
updated the credits
2016-08-23 06:30:17 +02:00
f344813054 events with no finish should not export it to ical 2016-08-20 16:16:19 +02:00
24197c30bc updated the credits 2016-08-19 12:38:45 +02:00
9fa4a3bac6 Merge pull request #2742 from annando/1608-priority-rearranges
New priority level for stale processes
2016-08-19 07:19:32 +02:00
Michael Vogel
108a1c4ac6 New priority level for stale processes. 2016-08-18 12:33:17 +02:00
834e6dfb7f Merge pull request #2741 from rabuzarus/1708-frio_fix_contact_edit_delete
fix contact dropping on contact edit page also for other themes
2016-08-17 16:58:00 +02:00
rabuzarus
37ae63e120 fix contact dropping on contact edit page also for other themes 2016-08-17 16:51:04 +02:00
03062866f9 Merge pull request #2740 from rabuzarus/1708-frio_fix_contact_edit_delete
frio: fix contact dropping on contact edit page
2016-08-17 15:29:37 +02:00
rabuzarus
212aa99f28 frio: fix contact dropping on contact edit page 2016-08-17 14:32:43 +02:00
1519ac3bf4 Merge pull request #2739 from annando/1608-session-close
Only close the session if it had been opened.
2016-08-17 07:37:33 +02:00
Michael Vogel
1bfdc216d0 Only close the session if it had been opened. 2016-08-16 21:35:12 +02:00
Michael Vogel
60a28a37e1 Merge pull request #2738 from tobiasd/20160814-credits
regenerated credits
2016-08-16 14:18:47 +02:00
abc301aad8 regenerated credits 2016-08-14 22:19:49 +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
bd99eedd9b Merge branch '3.5rc' of https://github.com/friendica/friendica into 3.5rc 2016-08-14 22:05:54 +02:00
gerhard6380
728fb76f3d adapted documentation
removed reference to Windows 10 app
2016-08-14 22:04:25 +02:00
gerhard6380
7daaaf0ab8 updated api documentation to reflect changes on direct_messages
added direct_messages/destroy, friendica/direct_messages_setseen
2016-08-14 22:04:11 +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
5432acca20 Merge pull request #2736 from tobiasd/20160814-doc
DOCs we have a new developer forum
2016-08-14 21:23:19 +02:00
Michael Vogel
dfac110887 Merge pull request #2729 from gerhard6380/develop
new API calls for private messages in Win10 App
2016-08-14 21:21:58 +02:00
Michael Vogel
67b16507f1 Performance improvements for the poller 2016-08-14 21:02:29 +02:00
f79a9f67f1 DOCs we have a new developer forum 2016-08-14 09:34:50 +02:00
2d7c8c79cf Merge pull request #2735 from rabuzarus/1308-frio-event-strings
frio: fix missing events string
2016-08-14 09:18:48 +02:00
rabuzarus
efdb98de6d frio: fix - add string to template 2016-08-13 18:59:59 +02:00
rabuzarus
2d0c503bf1 frio: fix - permissions string was missing 2016-08-13 18:58:49 +02:00
gerhard6380
30ecd7cf38 adapted documentation
removed reference to Windows 10 app
2016-08-13 16:14:12 +02:00
Michael Vogel
5069d5f94e Merge pull request #2734 from rabuzarus/1308-cal-export-perms
fix: own calendar is now always exportable for local_user()
2016-08-13 15:20:59 +02:00
rabuzarus
826a13eb23 fix: own calendar is now always exportable for local_user() 2016-08-13 13:59:55 +02:00
gerhard6380
e5874aa34c updated api documentation to reflect changes on direct_messages
added direct_messages/destroy, friendica/direct_messages_setseen
2016-08-13 13:19:53 +02:00
gerhard6380
23393c05ee improved sql statements for direct_messages calls 2016-08-13 13:08:16 +02:00
rabuzarus
21ce7cff3b Merge pull request #2733 from tobiasd/20160819-doc
DOCS: clarify Settings also discusses the Admin Panel
2016-08-13 12:26:06 +02:00
11e3c3bfad DOCS: clarify Settings also discusses the Admin Panel 2016-08-13 12:11:27 +02:00
gerhard6380
3b8db28a43 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-12 18:15:03 +02:00
gerhard6380
41c1f71d4d remove api_friendica_direct_messages_all
instead included 'friendica_verbose' parameter into standard function
api_direct_messages_box()
2016-08-12 15:40:22 +02:00
gerhard6380
fb087ce89e 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-11 23:53:00 +02:00
9988a5b7c4 Merge pull request #2731 from annando/1608-notifications-format
HTML entities in notifications aren't a problem anymore
2016-08-11 21:08:07 +02:00