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 |
|
Hypolite Petovan
|
7606ac5e32
|
frio: Fix help pages inline code display
|
2017-04-01 17:58:35 -04:00 |
|
Hypolite Petovan
|
909439e59f
|
Fix contacts "View" link color
- Fixed whitespaces in `event.tpl`
|
2017-03-26 19:22:19 -04:00 |
|
rabuzarus
|
5e54fb3a5f
|
css: border for images, min-with for folders list
|
2017-03-26 14:00:00 +02:00 |
|
Hypolite Petovan
|
9375438216
|
Restore separator margins
|
2017-03-25 22:58:17 -04:00 |
|
Hypolite Petovan
|
8db4437ed7
|
Restores bold text for text dropdown button
|
2017-03-25 21:33:34 -04:00 |
|
Hypolite Petovan
|
fa9ce4721a
|
Fix superfluous comment box top margin
|
2017-03-25 21:29:13 -04:00 |
|
Hypolite Petovan
|
c01c7ad746
|
Fix .btn-link hover/focus color
|
2017-03-25 21:28:53 -04:00 |
|
Hypolite Petovan
|
5b7c8d8631
|
Fix indent in search_item.tpl
|
2017-03-25 20:45:03 -04:00 |
|
Hypolite Petovan
|
359c246ef9
|
Various fixes
- Removed superfluous CSS rule
- Fixed whitespace
- Restored separators in search_item.tpl
|
2017-03-25 20:43:33 -04:00 |
|
Hypolite Petovan
|
d7f80bf7e7
|
Merge branch 'develop' into improvement/frio-action-links-to-buttons
# Conflicts:
# view/theme/frio/js/filebrowser.js
# view/theme/frio/templates/filebrowser.tpl
|
2017-03-25 20:27:26 -04:00 |
|
rabuzarus
|
aeb999c4d9
|
enable fbrowser for mobile view
|
2017-03-25 23:33:53 +01:00 |
|
Hypolite Petovan
|
632d77cfb1
|
Merge pull request #3251 from rabuzarus/20170320_-_fix_fbrowser
Bugfix: fbrowser did insert 2 Pictures instead of only 1
|
2017-03-25 16:13:31 -04:00 |
|
rabuzarus
|
8bbf43b9dd
|
Remove the AjaxUpload element when jot modal is closed
|
2017-03-25 21:10:57 +01:00 |
|
Hypolite Petovan
|
d78acd5408
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons
|
2017-03-25 16:09:46 -04:00 |
|
|
|
18a2b48d1d
|
Remove unneeded linefeeds
|
2017-03-25 19:31:32 +00:00 |
|
rabuzarus
|
a2ad013830
|
some work on code standards compliance
|
2017-03-25 19:12:16 +01:00 |
|
|
|
0d49143a63
|
"no_utf" wasn't in use anymore - it is now removed completely
|
2017-03-25 10:51:00 +00:00 |
|
Hypolite Petovan
|
85144908fa
|
Improve display feedback on like actions
- Move rotator in sight
- Preventively change display class before next item update
|
2017-03-23 22:47:56 -04:00 |
|
Hypolite Petovan
|
87bf6d39dd
|
More display fixes
See
https://github.com/friendica/friendica/pull/3204#issuecomment-288908490
|
2017-03-23 22:45:40 -04:00 |
|
Hypolite Petovan
|
991b62784a
|
Remove spaces confusing jSmart in contact_template
- Fix two missing button closing tags
|
2017-03-21 22:39:29 -04:00 |
|
rabuzarus
|
835e54dfc3
|
upload images to the selected album
|
2017-03-21 23:08:37 +01:00 |
|
rabuzarus
|
2633e820ab
|
remove upload file from jot because it's now in the browser included
|
2017-03-21 21:18:27 +01:00 |
|
rabuzarus
|
9acfbae6ea
|
add justified-gallery to fbrowser
|
2017-03-21 20:39:31 +01:00 |
|
Hypolite Petovan
|
7b352f3f74
|
Revert "Coding convention applied - part 1"
|
2017-03-21 12:02:59 -04:00 |
|
rabuzarus
|
af8bd4b45f
|
frio: gui work for fbrowser + switch between image and file mode
|
2017-03-21 03:35:25 +01:00 |
|
rabuzarus
|
c8a427804e
|
Bugfix: fbrowser did insert 2 Pictures instead of only 1
|
2017-03-20 22:45:24 +01:00 |
|
|
|
09851331a9
|
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2017-03-20 20:51:32 +01:00 |
|
Hypolite Petovan
|
8a0b057dc7
|
Merge branch 'develop' into improvement/frio-action-links-to-buttons
|
2017-03-20 14:43:37 -04:00 |
|
|
|
d9c22c7f3e
|
Continued a bit:
- converted some else if to elseif (only PHP)
- converted some space -> tab (intending)
Signed-off-by: Roland Häder <roland@mxchange.org>
|
2017-03-19 00:52:02 +01:00 |
|
|
|
c2d8738285
|
added spaces (coding convention)
Signed-off-by: Roland Häder <roland@mxchange.org>
|
2017-03-19 00:51:54 +01:00 |
|
Hypolite Petovan
|
8d6d008d28
|
Fix frio style.css indentation
|
2017-03-17 20:46:31 -04:00 |
|
Hypolite Petovan
|
20406aacec
|
All-around CSS display fixes
|
2017-03-17 20:28:31 -04:00 |
|
Hypolite Petovan
|
2e17885eb3
|
Fix jot display
|
2017-03-17 20:28:09 -04:00 |
|
Hypolite Petovan
|
80510ef4ca
|
Fix group_side display
|
2017-03-17 20:28:00 -04:00 |
|
Hypolite Petovan
|
d1a1dfe879
|
Fix profile display
|
2017-03-17 20:27:43 -04:00 |
|
Hypolite Petovan
|
03700d4ae5
|
Fix contact display
|
2017-03-17 20:27:31 -04:00 |
|
Hypolite Petovan
|
92a755f688
|
Fix event display
|
2017-03-17 20:27:17 -04:00 |
|
Hypolite Petovan
|
29936060cf
|
Fix filebrowser display
|
2017-03-17 20:26:40 -04:00 |
|
Hypolite Petovan
|
8ac8d779f6
|
Fix bulk drop button
|
2017-03-16 22:19:45 -04:00 |
|
Hypolite Petovan
|
67c40bf030
|
Fix "Mark all as seen" button display
|
2017-03-16 22:19:27 -04:00 |
|
rabuzarus
|
8ae8465d48
|
add dop event & fix event edit
|
2017-03-16 20:15:25 +01:00 |
|
Hypolite Petovan
|
802897c0ab
|
Restored tabs display until a more complete CSS solution is worked out
|
2017-03-15 22:00:37 -04:00 |
|
Hypolite Petovan
|
214c76fec7
|
Reverted original display for item action links + jot bbcode buttons
- Cleaned useless CSS
|
2017-03-15 22:00:07 -04:00 |
|
Hypolite Petovan
|
077c4cadf1
|
Merge branch 'develop' into improvement/frio-action-links-to-buttons
|
2017-03-15 21:10:11 -04:00 |
|
rabuzarus
|
b4bad92657
|
Merge pull request #3239 from Hypolite/issue/#3194-2
Fix wrong deferred function name
|
2017-03-15 19:53:16 +01:00 |
|
Hypolite Petovan
|
35ba3cce70
|
Fix wrong deferred function name
|
2017-03-15 14:42:34 -04:00 |
|
Hypolite Petovan
|
82ce1a449b
|
Revert jot tabs to links due to Bootstrap not supporting button styling
|
2017-03-15 07:24:14 -04:00 |
|
