Commit graph

14845 commits

Author SHA1 Message Date
Michael 5c75fe4c14 Avoid possible problems with numeric nicknames and GNU Social 2017-04-09 04:29:02 +00: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 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 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
Michael c94525938d Merge remote-tracking branch 'upstream/develop' into 1704-duplicate-feed 2017-04-08 10:05:01 +00:00
rebeka-catalina 291906de5f Merge branch 'develop' of http://github.com/rebeka-catalina/friendica into develop 2017-04-08 11:42:20 +02:00
Michael 8786bcdf0a Avoid duplicates with feeds and "remote self" 2017-04-08 08:12:14 +00:00
rabuzarus 366ccdb09a Merge pull request #3301 from annando/issue-3300
The temp path creation couldn't create a subdirectory with the hostname
2017-04-07 23:48:32 +02:00
Michael 47a6f6b726 Issue 3300: The temp path creation couldn't create a subdirectory with the hostname 2017-04-07 21:34:06 +00:00
Michael Vogel 56c0675fba Merge pull request #3295 from Hypolite/issue/#3274
Friendica code blocks aren't rendered in Diaspora
2017-04-07 22:59:44 +02:00
fabrixxm 07f93b9636 Merge pull request #3298 from tobiasd/20170407-quattroadin
the Quattro admin_user template was missing the users note for the admin
2017-04-07 14:31:28 +02:00
Tobias Diekershoff fb94a0add7 the Quattro admin_user template was missing the users note for the admin 2017-04-07 12:59:22 +02:00
Tobias Diekershoff b5a42c5b31 Merge pull request #3297 from rabuzarus/20170407_-_fix_bulk_deletion_button
Bugfix: bulk deletion button was not available anymore
2017-04-07 11:45:00 +02:00
rabuzarus 39ccbe2e45 Merge pull request #3296 from tobiasd/20170407-isresult
small fix for #3254
2017-04-07 11:41:38 +02:00
rabuzarus a9b3696560 Bugfix: bulk deletion button was not available anymore 2017-04-07 11:35:45 +02:00
Tobias Diekershoff 6060f311e9 small fix for #3254 2017-04-07 11:26:11 +02:00
Hypolite Petovan cfb99aa323 Merge pull request #3266 from rabuzarus/20170321_-_frio-fbbrowser
frio: fbrowser styling
2017-04-07 00:01:46 -04:00
Hypolite Petovan b0accf4d4c Fix code blocks to Diaspora
- Extracts code blocks before BBCode conversion to prevent code
highlighting and whitespace meddling
- Use the improved HTLM To Markdown library
- Use <code>  instead of <key> for Diaspora inline code blocks
2017-04-06 23:49:56 -04:00
Hypolite Petovan 8149e21add Enforce standards 2017-04-06 23:43:55 -04:00
Hypolite Petovan c9dafe3b4e Move HTML to Markdown library to Composer 2017-04-06 23:33:12 -04:00
Hypolite Petovan 4d27ac04bd Merge pull request #3294 from strk/openid-input-type-text
Add type="text" attribute for openid input field
2017-04-06 21:58:01 -04:00
Sandro Santilli 27cce1e6dc Add type="text" attribute for openid input field 2017-04-06 21:48:20 +02:00
Michael Vogel 98a7bdf791 Merge pull request #3290 from Hypolite/issue/#3274
Add Text_highlighter to Composer
2017-04-05 21:39:10 +02:00
rabuzarus c3b975e516 change fbrowser image margin and box-shadow 2017-04-05 12:46:09 +02:00
rabuzarus 190b03e706 add aria attributes for filebrowser 2017-04-05 12:34:00 +02:00
rabuzarus 0542cd6a14 add aria attributes + restructure some js to change the aria attributes 2017-04-05 11:46:42 +02:00
Hypolite Petovan 1ab28bbe03 Add Text_Highlighter to Composer
- Fixes critical mistake in boot.php regarding set_include_path
- Fixes minor mistake in text.php regarding strpos order of arguments

Note: This change significantly increases Composer running time because
Text_Highlither is a PEAR package. I'm already planning to replace it
with scrivo/highlight.php.
2017-04-05 00:31:49 -04:00
Michael Vogel 3c6d976d31 Merge pull request #3289 from Hypolite/improvement/add-composer
Add Composer FAQ
2017-04-05 05:21:15 +02:00
Hypolite Petovan 6494d05dde Merge branch 'develop' of https://github.com/Hypolite/friendica into develop 2017-04-04 21:48:36 -04:00
Hypolite Petovan b09553a71b Add Composer FAQ 2017-04-04 20:34:06 -04:00
Tobias Diekershoff bebff8ebbb Merge pull request #3286 from annando/issue-1720
Issue 1720: Group filter and new tab don't like each other
2017-04-04 07:50:33 +02:00
Michael 407e25e7d6 Some little standard stuff 2017-04-04 05:39:43 +00:00
Michael a0216af4bb Issue 1720: Group filter and new tab don't like each other 2017-04-04 05:35:04 +00:00
Hypolite Petovan 500f0985f8 Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop 2017-04-03 22:06:09 -04:00
rabuzarus dd919b7f80 small css fix 2017-04-03 15:04:54 +02:00
rabuzarus 0bb1466723 use buttons for mobile jot nav 2017-04-03 14:32:54 +02:00
rabuzarus 0b280219c6 use box-shadow instead of border 2017-04-03 14:20:34 +02:00
rabuzarus 9f37acc6d4 add href attribute to jot links 2017-04-03 14:00:27 +02:00