friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-19 22:16:42 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity
14941 commits 2 branches 63 tags 241 MiB
Commit graph

14941 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roland Häder 9423db628f
Merge branch 'develop' into rewrites/coding-convention-split2-1-2 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 17:56:51 +02:00
Roland Häder fcf095cc6e
always surround operators like +,-,. with spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 17:43:01 +02:00
Roland Häder 851c0284ee
added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 17:40:49 +02:00
Roland Häder ccbe7dd353
opps, missed this space ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 17:36:59 +02:00
Roland Häder a8136898b4
Opps, fixed parser errors 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 17:04:09 +02:00
Roland Häder 03d23838f5
Continued: 
- added curly braces/spaces
- added TODOs (type-hints, old-lost code)
- more usage of dbm::is_result()
- combined some if() return stuff into a simple return statement

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 17:00:51 +02:00
Roland Häder 629fcd48bd
tpzo fixed ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 16:27:21 +02:00
Roland Häder f2f20c85d5
added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 16:27:06 +02:00
Roland Häder be59fe86e5
added space + type-hinted $a (App) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 15:29:50 +02:00
Roland Häder 3a197833cd
added space 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 15:28:30 +02:00
Roland Häder 753b432ab2
fixed intending 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 15:27:45 +02:00
Roland Häder 83d6d68efd
removed some parentheses, but left them in where a string was concated 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 15:25:12 +02:00
Roland Häder 3feece56dc
Continued a bit: 
- rewrote 2 multi-line single comments to one multi-line comment
- added TODO for rewriting function to closure (CR request)

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 15:14:39 +02:00
Roland Häder cf4bacdbd6
fixed spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 15:12:11 +02:00
Roland Häder 8e1b6186f1
CR: added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 15:11:10 +02:00
Tobias Diekershoff a0a0885527 Merge pull request #3339 from Hypolite/issue/#2803-icons 
Change icon of contact page links
 2017-04-14 07:35:16 +02:00
Tobias Diekershoff b8fd48dddc Merge pull request #3335 from annando/issue-3331 
Issue 3331: Remove unneeded table "deliverq"
 2017-04-14 07:32:30 +02:00
Michael Vogel 79e827417c Merge pull request #3319 from Hypolite/issue/#3316 
Use get_contact_by_url for unknown contacts in acl_lookup
 2017-04-14 07:24:27 +02:00
Hypolite Petovan 440fd29c1e Change icon of contact page links 2017-04-13 23:00:02 -04:00
Hypolite Petovan bffd3f2304 Add htmlentities to protect nick/addr in acl_lookup 2017-04-13 18:33:40 -04:00
Hypolite Petovan ad53764832 Merge pull request #3338 from annando/issue-3336 
Issue 3336: The date format should now be okay
 2017-04-13 15:48:25 -04:00
Michael 319284c665 Issue 3336: The date format should now be okay 2017-04-13 19:25:00 +00:00
Michael d5c6f67a4a Changed documentation 2017-04-13 19:10:53 +00:00
Hypolite Petovan 879ebb1d7f Merge pull request #3330 from Rudloff/feature/keypress 
Scroll to next/previous thread when pressing j/k (fixes #3327)
 2017-04-13 11:42:45 -04:00
Hypolite Petovan 615295c3fe Merge pull request #3332 from Rudloff/feature/manifest 
Web app manifest (fixes #3317)
 2017-04-13 11:42:03 -04:00
Pierre Rudloff 8567113f0f Doc about j/k keyboard shortcuts 2017-04-13 17:20:05 +02:00
Pierre Rudloff ead9cbe534 Web app manifest (fixes #3317) 2017-04-13 16:46:36 +02:00
Pierre Rudloff 31f9b418ba Scroll to next/previous thread when pressing j/k (fixes #3327) 2017-04-13 15:16:49 +02:00
Michael 2b3a129480 Removed it here as well 2017-04-13 05:08:42 +00:00
Michael f399a1914f Removed documentation 2017-04-13 05:08:12 +00:00
Michael d82684219a Issue 3331: Removed unneeded table "deliverq" 2017-04-13 04:51:16 +00:00
Michael Vogel 93fe0188a7 Merge pull request #3329 from Alkarex/sql-type-contact.contact-type 
Allow negative contact.contat-type
 2017-04-13 06:44:41 +02:00
Hypolite Petovan 96b1a00e91 Fiddling with the unknown contact array values 2017-04-12 21:32:06 -04:00
Alexandre Alapetite 92361a0209 Bump update version 2017-04-12 23:20:10 +02:00
Alexandre Alapetite 325d3afe18 Bump DB version 2017-04-12 23:14:33 +02:00
Alexandre Alapetite b8e4094e7b Allow negative contact.contat-type 
https://github.com/friendica/friendica/issues/3328
 2017-04-12 23:09:22 +02:00
Hypolite Petovan 6b8ad57399 Add error handling for missing contacts 2017-04-11 21:18:34 -04:00
Michael Vogel 0d2bf557de Merge pull request #3315 from Hypolite/issue/#3285 
Add spoiler tags for Mastodon Content Warning
 2017-04-11 18:28:43 +02:00
Hypolite Petovan 762e8eda7a Use get_contact_details_by_url for unknown contacts 
- Fix typo
- Fix comment
- Fix closure
 2017-04-11 02:41:19 -04:00
Hypolite Petovan 21bb47a2e5 Added "braces" for @annando 2017-04-11 02:12:14 -04:00
Michael Vogel 8398270cee Merge pull request #3320 from Hypolite/issue/#3292 
Ignore Activity Streams `delete` messages from Mastodon
 2017-04-11 07:39:05 +02:00
Hypolite Petovan ca7c2bfa00 Ignore Activity Streams delete messages from Mastodon 2017-04-10 22:20:03 -04:00
Hypolite Petovan 7f2fddea69 Add network for unknown contacts in ACL 2017-04-10 22:10:05 -04:00
Hypolite Petovan 05a5e1792d Left trim at sign from nicks in ACL 2017-04-10 22:09:49 -04:00
Hypolite Petovan e45da5bcd3 Rewrote code according to @annando feedback 
- Normalize boolean operators
 2017-04-10 21:11:28 -04:00
Hypolite Petovan ada5c4cc6a Add Content Warning support for comments too 
Doh!
 2017-04-10 00:57:36 -04:00
Hypolite Petovan 69d157c319 Add spoiler tags for Mastodon Content Warning 2017-04-10 00:08:14 -04:00
Hypolite Petovan b9c0c114fb Merge pull request #3312 from rabuzarus/20170409_-_fix_desktop_notifs 
Bugfix: Desktop-notifs - show notifs which have seen = false or seen = 0
 2017-04-09 09:22:20 -04:00
rabuzarus 836e0b2799 Bugfix: Desktop-notifs - show notifs which have seen = false or seen = 0 2017-04-09 14:24:26 +02:00
rabuzarus 0e177e6d5e Merge pull request #3311 from tobiasd/20170409-ru 
RU translations THX pztrn
 2017-04-09 12:50:33 +02:00