clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,753 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

12753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Diekershoff cb0c8335fa changes since 3.4.2 2016-09-06 08:36:47 +02:00
rabuzarus 4f1f7c73ca Merge pull request #2765 from annando/1609-attachments 
Attachments are now displayed again.
 2016-09-05 12:50:31 +02:00
Michael Vogel e6c5be18cc Merge pull request #2766 from ben-utzer/patch-1 
Update htconfig.md
 2016-09-05 05:18:21 +02:00
ben-utzer 2040cb4473 Update htconfig.md 
typo, siehe auch https://github.com/friendica/friendica/pull/2754
 2016-09-05 00:22:39 +02: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
rabuzarus eec626f6bf Merge pull request #2762 from annando/1609-tagged 
The "tagged with" message now works again.
 2016-09-03 13:06:43 +02: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
Tobias Diekershoff 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 35813ab377 Set the PHP requirements to php 5.4 2016-09-01 06:47:36 +00: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
Tobias Diekershoff 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
Tobias Diekershoff 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
rabuzarus 1bfe7b432a Merge pull request #2753 from annando/1608-sql-errors 
Bugfix: Fixed two bad sql queries
 2016-08-29 22:24:37 +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
rabuzarus fde0665d6d Merge pull request #2749 from annando/1608-dbstructure 
dbstructure: Set the version when updating manually
 2016-08-28 00:39:15 +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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff f344813054 events with no finish should not export it to ical 2016-08-20 16:16:19 +02:00
Tobias Diekershoff 24197c30bc updated the credits 2016-08-19 12:38:45 +02:00
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff abc301aad8 regenerated credits 2016-08-14 22:19:49 +02:00
Tobias Diekershoff 789e9577c6 Merge pull request #2737 from annando/1608-worker-again 
Performance improvements for the poller
 2016-08-14 22:10:13 +02:00
Tobias Diekershoff 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