theworldbright
3ac66128ad
Restyle button and adjust position of back up arrow
...
Squashed commits:
[47c4a02] Remove styling for return to top of post button
2015-06-17 22:23:25 +09:00
theworldbright
5fa4519e93
Fix #5757 (+2 squashed commits)
...
Squashed commits:
[e10acde] Open reactions after commenting
[aceea75] Fix hound remarks and reactions tests
The ".comment_action" should be active when the
user clicks on "a.show comments"
[d1deae5] Fix hound remarks
[f5db5dd] Keep current instead of scrolling to first comment
[be63092] Remove unused evt parameter
2015-06-17 22:23:25 +09:00
theworldbright
7dc70c7311
Fix #5483
...
Please see https://github.com/diaspora/diaspora/issues/5483#issuecomment-109277476 (+5 squashed commits)
Squashed commits:
[62f38a6] Wrap all handlers with document.ready()
Also add the copyright at the top of the file.
[e861587] Split up show_comments handling
Currently there are two classes that have the
class show_comments. I renamed one to
"back_to_stream_element_top" as it is responsible
for scrolling the user all the way up to the top
when clicked. The other which toggles the
reactions will remain as "show_comments".
[a8dbc4e] Remove unused "cancel new comment" action
[db575cc] Move comment related js to mobile_comments.js
[de44f81] Move add comment container to new comment partial
2015-06-17 22:23:25 +09:00
Jonne Haß
93281d283f
Merge branch 'stable' into develop
2015-06-17 12:40:27 +02:00
Pablo Cuadrado
c050c606c2
this was causing an empty element to be created
...
closes #6111
2015-06-17 12:40:22 +02:00
Steffen van Bergerem
ae0209b49b
Merge branch 'stable' into develop
2015-06-16 23:43:32 +02:00
Jonne Haß
3a527d01da
Remove top margin for first heading in a post
...
That is, if it's the first element in the post
closes #6110
2015-06-16 23:43:14 +02:00
Steffen van Bergerem
b3a5e92eca
Remove all faceboxes
2015-06-15 14:09:24 +02:00
Steffen van Bergerem
ab60644aa0
Merge pull request #6087 from Flaburgan/improve-mobile-conversation-design
...
Improve mobile conversation design
2015-06-15 13:26:49 +02:00
fla
44a12e74b1
Improve mobile conversation design
2015-06-15 12:32:03 +02:00
Jonne Haß
50dbe0db80
Merge pull request #6102 from svbergerem/close-account-regression
...
Fix Bootstrap 3 regression: close account
2015-06-14 22:21:11 +02:00
Steffen van Bergerem
92a3dd53f0
Replace jquery.autoresize with autosize
2015-06-14 20:03:15 +02:00
Steffen van Bergerem
4534ba5de8
Fix Bootstrap3 regression: close account
2015-06-14 13:22:39 +02:00
fla
7f6609d17b
Remove old service keys in statistics.json
2015-06-13 11:03:47 +02:00
Steffen van Bergerem
18a8211cc3
Add img-responsive to image class
2015-06-12 00:01:56 +02:00
Jonne Haß
72bb85eeba
Merge branch 'stable' into develop
2015-06-08 16:59:31 +02:00
Steffen van Bergerem
5516926b74
Update perfect-scrollbar
...
closes #6085
2015-06-08 16:59:27 +02:00
Dennis Schubert
8a4ec1d4c6
Merge branch 'stable' into develop
2015-06-08 04:18:38 +02:00
Benjamin Neff
ed10bea21f
don't dispatch photos twice ...
2015-06-08 04:15:17 +02:00
Dennis Schubert
ad52eaf6d7
Merge branch 'stable' into develop
2015-06-08 04:09:57 +02:00
Jan Berdajs
ec4e7b4a69
upgrade Twitter gem - fixes Faraday deprecation warning
2015-06-08 04:08:02 +02:00
Jonne Haß
67de83f325
Merge pull request #6080 from svbergerem/user-edit-remove-cancel-button
...
Remove cancel button from user edit
2015-06-08 01:07:51 +02:00
Jonne Haß
3975f02f2c
Merge pull request #6081 from svbergerem/email-visibility
...
Fix Bootstrap 3 regression: add email visibility icon to settings page
2015-06-08 01:07:35 +02:00
Dennis Schubert
e0420d733a
Merge branch 'stable' into develop
2015-06-08 00:49:55 +02:00
Benjamin Neff
010afa1019
refactor: iterate over visiblities
...
closes #6060
2015-06-08 00:45:16 +02:00
Benjamin Neff
0ffb83d351
load conversations and visibilities in one query with correct order
2015-06-08 00:44:41 +02:00
Steffen van Bergerem
6c32fa7845
Fix Bootstrap 3 regression: add email visibility icon to settings page
2015-06-07 22:31:58 +02:00
Steffen van Bergerem
9ad58c94a1
Remove cancel button from user edit
2015-06-07 21:49:11 +02:00
Jonne Haß
1c834d49d8
Merge branch 'stable' into develop
2015-06-07 21:14:51 +02:00
Benjamin Neff
735d692ac0
fix selected week on weekly stats page
...
closes #6079
2015-06-07 21:14:47 +02:00
efstrian
69c3a4100d
Issue #4297 : Color themes can override bootstrap variables
2015-06-07 19:58:54 +03:00
efstrian
d64ea15891
Issue #4297 : Style fixes - Default theme is configurable
2015-06-07 19:58:14 +03:00
dimana
31d760867c
Issue #4297 : Updated color themes and testing
2015-06-07 19:57:37 +03:00
efstrian
57d766346c
Issue #4297 : Enable color theme setup
2015-06-07 19:57:16 +03:00
Jonne Haß
c054d17bbb
Merge pull request #6074 from svbergerem/mobile-notification-padding
...
Fix some Bootstrap 3 regressions
2015-06-07 17:23:08 +02:00
Jonne Haß
fe8b06bb36
Merge pull request #6073 from svbergerem/mobile-contacts
...
Bootstrap 3 regression: Fix mobile contacts view
2015-06-07 15:08:25 +02:00
Steffen van Bergerem
4f9ac8dd96
Fix Bootstrap 3 regressions
...
* mobile notification padding
* width of mobile notifications and stream page
2015-06-07 12:48:12 +02:00
Steffen van Bergerem
fcb9b001a2
Bootstrap 3 regression: Fix mobile contacts view
2015-06-07 12:13:21 +02:00
Steffen van Bergerem
06a1a1c978
Fix Bootstrap3 regression: reshares in SPV
2015-06-07 12:01:13 +02:00
Jonne Haß
4ae032e61d
Merge pull request #6071 from svbergerem/upload-images-style
...
Fix progress bar in publisher when uploading images
2015-06-07 11:26:39 +02:00
Augier
0d0d5d6aa1
Fixing infinite scroll and notif dropodown loaders
2015-06-07 10:28:22 +02:00
Steffen van Bergerem
a7446dd5cd
Fix progress bar in publisher when uploading images
2015-06-07 03:43:57 +02:00
Steffen van Bergerem
7b7700b317
Bootstrap3 regression fixes: avatars for likes, aspect dropdown on notification page, tag input
2015-06-05 12:09:42 +02:00
Steffen van Bergerem
fd3da0f0b3
Profile padding fixes
2015-06-05 02:37:43 +02:00
Steffen van Bergerem
0a0c3f48f2
Merge pull request #6057 from AugierLe42e/drawer-fix
...
Fixed variable drawer width
2015-06-05 00:21:36 +02:00
Steffen van Bergerem
39fe6bfff2
Set max-width to 100% for images in post-content
2015-06-05 00:12:05 +02:00
Steffen van Bergerem
2da262a262
Bootstrap3: fix likes avatars and conversation participants
2015-06-04 22:49:42 +02:00
Augier
7d1bba4e44
Fixed variable drawer width
2015-06-04 22:35:19 +02:00
SansPseudoFix
f3938a173e
Fix pagination issue for mobile view
2015-06-04 18:08:00 +02:00
Steffen van Bergerem
3fdb8a2052
Fix mobile drawer
2015-06-04 18:05:45 +02:00
