friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
39,157 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

39157 Commits

Author SHA1 Message Date
Tobias Diekershoff 147bfb0576 some simplification 2017-08-09 19:19:42 +02:00
Tobias Diekershoff a0ecd5ab2e add more space 2017-08-09 19:18:38 +02:00
Tobias Diekershoff 29a66c8336 it is hardwrap for consistency 2017-08-09 16:10:09 +02:00
Tobias Diekershoff 6504156508 add a switch to the Markdown parser for using hard line breaks (issue 3592) 2017-08-09 16:04:53 +02:00
Michael a5e7f7bf70 We don't need an order. 2017-08-09 07:57:33 +00:00
Michael 64718b53d1 Works now 2017-08-09 06:16:19 +00:00
Tobias Diekershoff 95679c470c Merge pull request #3619 from annando/dba-connect 
DBA: Do a fallback to other db functions on problems
 2017-08-09 08:13:57 +02:00
Michael b01ab3e64c DBA: Do a fallback to other db functions on problems 2017-08-09 06:02:48 +00:00
Michael ae8098eaf2 Config now works with the new database routines 2017-08-09 05:53:07 +00:00
Tobias Diekershoff 4d77c8a90a Merge pull request #3618 from annando/mysqli-fix 
Quickfix for MYSQLi (prepared statement problem)
 2017-08-08 09:32:26 +02:00
Michael c3e1f88d4b Quickfix for MYSQLi (prepared statement problem) 2017-08-08 06:07:04 +00:00
Michael Vogel 56de36574b Merge pull request #3617 from ddorian1/develop 
Catch exceptions in PDO constructor
 2017-08-05 15:42:29 +02:00
Johannes Schwab 37262c24d9 Catch exceptions in PDO constructor 2017-08-04 11:01:29 +02:00
Tobias Diekershoff 93fb98959a Merge pull request #3613 from annando/some-ostatus 
Speed up of OStatus transmission/Ignoring "created" with remote self
 2017-08-03 08:01:04 +02:00
Tobias Diekershoff b7fb43484e Merge pull request #3614 from annando/avoid-warnings 
Avoid some PHP warnings, no functional changes
 2017-08-03 07:58:16 +02:00
Michael Vogel c0d2e73d0a Merge pull request #3612 from tobiasd/20170802-issue2121 
invitations
 2017-08-03 07:54:35 +02:00
Michael 1bd85971a4 Avoid some PHP warnings, no functional changes 2017-08-03 05:50:44 +00:00
Michael a80329b416 Speed up of OStatus transmission/Ignoring "created" with remote self 2017-08-03 05:42:44 +00:00
Tobias Diekershoff ee6956a91a else is sufficient here 2017-08-03 07:23:05 +02:00
Tobias Diekershoff 0c8c69371c no global directory URL defined? 2017-08-03 07:22:29 +02:00
Michael Vogel f94a360d9a Merge pull request #3609 from rabuzarus/20170802_-_probe_camelcase 
fix some method names (camelcase) in Probe.php and Lock.php
 2017-08-02 19:45:37 +02:00
Tobias Diekershoff 5da5ab5c74 Merge pull request #3610 from rabuzarus/20170802_-_frio_subthread 
Add subthread to frio (needs reanabling the frio theme)
 2017-08-02 17:24:35 +02:00
rabuzarus ccb3f6b655 Add subthread to frio (needs reanabling the frio theme) 2017-08-02 15:52:11 +02:00
rabuzarus 28eb5d57a7 fix some method names (camelcase) in Probe.php and Lock.php 2017-08-02 13:09:42 +02:00
Tobias Diekershoff 6cf951c930 use /servers instead of /siteinfo for the directory link in invitations 2017-08-02 08:48:01 +02:00
Tobias Diekershoff 7034d6efbd use /servers instead of /siteinfo for the directory link in invitations 2017-08-02 08:47:09 +02:00
Michael Vogel e38340dc5f Merge pull request #3608 from tobiasd/20170801-issue2998 
Show contacts personal message in local profile
 2017-08-01 22:18:00 +02:00
Tobias Diekershoff 016e4a0efc Show contacts personal message in local profile 2017-08-01 17:47:13 +02:00
Tobias Diekershoff 8a93725d77 Merge pull request #3607 from annando/issue-3536 
Issue 3536. Now likes aren't show anymore on the community page
 2017-08-01 06:51:41 +02:00
Michael 55569f9df3 This is a fix for issue 3536. Now likes aren't show anymore on the community page. 2017-07-31 19:29:43 +00:00
Tobias Diekershoff 088837e1d1 Merge pull request #3606 from AndyHee/20170731-en_USGB_translations 
Update US and GB Translations
 2017-07-31 19:35:04 +02:00
Andy H fc3bb1ec70 Update US and GB Translations 2017-07-31 21:18:22 +07:00
Tobias Diekershoff 390e34d587 Merge pull request #3605 from annando/better-endless-scroll 
Endless scroll now avoids showing the same items
 2017-07-31 11:09:45 +02:00
Michael c98ae304c0 Endless scroll now avoids showing the same items 2017-07-31 06:04:37 +00:00
Tobias Diekershoff 8cb4a8d0c4 Merge pull request #3604 from annando/bugfix-acl 
Bugfix: The ACL lookup had its problems after the last changes
 2017-07-27 17:03:46 +02:00
Michael 57b4ea4759 Bugfix: The ACL lookup had its problems after the last changes 2017-07-27 14:02:25 +00:00
Tobias Diekershoff 83425a784b Merge pull request #3603 from annando/fix-ostatus 
Fix incomplete webfinger data for OStatus
 2017-07-26 07:27:37 +02:00
Michael 955229e131 Fix incomplete webfinger data for OStatus 2017-07-25 21:46:14 +00:00
Tobias Diekershoff f3f42ae3a2 Merge pull request #3602 from annando/1707-expiration 
Bugfix: the expiration check in item_store now works again
 2017-07-23 22:21:30 +02:00
Michael Vogel 95301fd58c Merge pull request #3600 from tobiasd/20170723-doc 
include the delete item page in the docs for the admin panel
 2017-07-23 22:07:05 +02:00
Michael Vogel 11aa314f1b Merge pull request #3601 from tobiasd/20170723-credits 
regen credits
 2017-07-23 22:06:39 +02:00
Michael b266d7d6ff Bugfix: the expiration check in item_store now works again 2017-07-23 19:59:29 +00:00
Tobias Diekershoff b81499a7fc regen credits 2017-07-23 19:54:08 +02:00
Tobias Diekershoff 7d97171eec include the delete item page in the docs for the admin panel 2017-07-23 19:51:03 +02:00
Tobias Diekershoff 152eec4f2f Merge pull request #3597 from annando/1707-acl-separator 
In the acl there is now a separation between groups, forums and contacts
 2017-07-23 10:27:40 +02:00
Tobias Diekershoff 2148a2bdb0 Merge pull request #3598 from annando/1707-expiration 
Check general expiration time at item storing as well
 2017-07-23 10:26:58 +02:00
Michael 2e704d79eb In the acl there is now a separation between groups, forums and contacts 2017-07-23 06:49:31 +00:00
Michael 8d66909ba5 Check general expiration time at item storing as well 2017-07-23 05:51:55 +00:00
Tobias Diekershoff dd0a1cf586 Merge pull request #3595 from annando/1707-realpath 
Better use a wrapper
 2017-07-22 09:32:29 +02:00
Michael 79fe249c54 Better use a wrapper 2017-07-22 06:43:04 +00:00