rebeka-catalina
554704e6b9
Added a whitespace between comma and t()
2017-04-08 16:57:24 +02:00
rebeka-catalina
fa76ec4e33
Merge branch 'develop' of git://github.com/friendica/friendica into develop
2017-04-08 14:50:45 +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
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
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
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
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
fb94a0add7
the Quattro admin_user template was missing the users note for the admin
2017-04-07 12:59:22 +02:00
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
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
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
407e25e7d6
Some little standard stuff
2017-04-04 05:39:43 +00:00
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
rabuzarus
036c18be7b
use height: 0 instead of display: none to hide jot sections
2017-04-03 13:38:07 +02:00
rabuzarus
68659c7740
add missing overflow to css
2017-04-03 12:55:06 +02:00
rabuzarus
4dfdbeba54
fix max-height for screens bigger than 768px
2017-04-03 12:46:31 +02:00
Hypolite Petovan
48dde02e75
Merge pull request #3254 from Quix0r/rewrites/coding-convention-split2
...
Rewrites/coding convention split2
2017-04-03 06:38:10 -04:00
Hypolite Petovan
9237b2611a
Merge branch 'develop' into rewrites/coding-convention-split2
2017-04-03 06:35:27 -04:00
Hypolite Petovan
e4917503da
Merge pull request #3284 from annando/issue-3278
...
Issue 3278: Attachments in Reshares should now work
2017-04-02 22:49:07 -04:00
rabuzarus
80f5a026be
re-enabel browser for small screens
2017-04-03 02:04:13 +02:00
rabuzarus
ee293f2ce2
Merge develop into 20170321_-_frio-fbbrowser
...
Conflicts:
view/theme/frio/js/filebrowser.js
view/theme/frio/js/theme.js
view/theme/frio/templates/filebrowser.tpl
view/theme/frio/templates/jot.tpl
2017-04-03 00:51:34 +02:00
rabuzarus
1ce5cc1b49
Merge pull request #3204 from Hypolite/improvement/frio-action-links-to-buttons
...
Frio: Turn action links into buttons
2017-04-02 23:15:57 +02:00
c574c317ef
Removed unneeded comment
2017-04-02 20:43:54 +00:00
884c75a350
Issue 3278: Attachments in Reshares should now work
2017-04-02 19:18:11 +00:00
