Commit Graph

14879 Commits

Author SHA1 Message Date
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 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
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 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
Tobias Diekershoff dad89a125a RU translations THX pztrn 2017-04-09 07:35:12 +02:00
Hypolite Petovan ffbf330585 Merge pull request #3310 from annando/1704-probing
Avoid possible problems with numeric nicknames and GNU Social
2017-04-09 01:08:12 -04:00
Michael 5c75fe4c14 Avoid possible problems with numeric nicknames and GNU Social 2017-04-09 04:29:02 +00:00
Hypolite Petovan c627780600 Merge pull request #3307 from rebeka-catalina/space_before_t
Space before t
2017-04-08 23:18:26 -04:00
Hypolite Petovan 472345d740 Merge branch 'develop' into space_before_t 2017-04-08 23:17:31 -04:00
Michael Vogel 1a05efb026 Merge pull request #3308 from rabuzarus/20170408_-_fix_desktop_notifs
Desktop-Notifs: include the user id into the storage key for local browser storage
2017-04-08 21:15:04 +02:00
rabuzarus 8bd41592ef Desktop-Notifs: include the user id into the storage key for local browser storage 2017-04-08 20:25:10 +02:00
Hypolite Petovan 29eac5ca49 Merge pull request #3304 from rebeka-catalina/local_dir_warning
Local dir warning
2017-04-08 13:11:27 -04:00
rebeka-catalina 050675a629 The other lone comma in 1177 2017-04-08 18:07:30 +02:00
rebeka-catalina 554704e6b9 Added a whitespace between comma and t() 2017-04-08 16:57:24 +02:00
rebeka-catalina d8a8fa9baa Modified the warning message 2017-04-08 16:48:11 +02:00
rebeka-catalina 7320327fa1 Deleted the lone comma between paratheses 2017-04-08 16:37:18 +02:00
rebeka-catalina 895a6254a0 Correction of 1177 and added modification to 1171 2017-04-08 15:48:15 +02:00
Tobias Diekershoff 42cc8d729b Merge pull request #3306 from Hypolite/issue/#3274
Fix path to default Text_Highlighter CSS
2017-04-08 15:24:16 +02:00
Hypolite Petovan 318166a381 Fix path to default Text_Highlighter CSS 2017-04-08 08:59:41 -04:00
rebeka-catalina fa76ec4e33 Merge branch 'develop' of git://github.com/friendica/friendica into develop 2017-04-08 14:50:45 +02:00
rebeka-catalina bcfbfeeba4 adding space for readability 2017-04-08 13:52:37 +02:00
Hypolite Petovan 5592837f71 Merge pull request #3305 from rabuzarus/20170408_-_fix_frio_css_nav_account_button
Bugfix: there was a gui issue on the navbar account dropdown button
2017-04-08 07:49:12 -04:00
rabuzarus c65fc6f8de Bugfix: there was a gui issue on the navbar account dropdown button 2017-04-08 13:30:16 +02:00
rebeka-catalina 4c9c83e8e8 Warning, that profile published in local directory may be visible in public 2017-04-08 13:21:35 +02:00
rabuzarus c58d7715ef Merge pull request #3303 from annando/1704-duplicate-feed
Avoid duplicates with feeds and "remote self"
2017-04-08 13:20:46 +02:00
rebeka-catalina 892ef45474 Warning, that profile published in local directory may be visible in public 2017-04-08 13:13:38 +02:00