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
Jonne Haß
bf69cb6d19
Merge branch 'stable' into develop
2015-06-16 22:37:40 +02:00
Jonne Haß
bff18523ef
Update BUNDLED WITH to 1.10.4
2015-06-16 22:37:08 +02:00
Jonne Haß
e57609a4d6
Merge branch 'stable' into develop
2015-06-16 21:41:13 +02:00
Jonne Haß
4b2a43b005
Merge branch 'master' into stable
2015-06-16 21:40:18 +02:00
Jonne Haß
56df5978af
bump to 0.5.1.1
2015-06-16 21:38:01 +02:00
Jonne Haß
532f78b5a1
Update rails to 4.2.2, rack to 1.6.2 and jquery-rails to 4.0.4
...
This fixes CVE-2015-3226, CVE-2015-3227, CVE-2015-1840 and CVE-2015-3225
2015-06-16 21:33:16 +02:00
Jonne Haß
f4eb411c45
Merge pull request #6106 from svbergerem/remove-faceboxes
...
Remove all faceboxes
2015-06-15 16:37:45 +02:00
Steffen van Bergerem
b3a5e92eca
Remove all faceboxes
2015-06-15 14:09:24 +02:00
Jonne Haß
8a6706337a
Merge branch 'stable' into develop
2015-06-15 13:47:01 +02:00
Benjamin Neff
beb06bc42d
precompile images from facebox gem
...
regression from #6005
closes #6105
2015-06-15 13:46:07 +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
Jonne Haß
15aa40631e
Merge pull request #6104 from svbergerem/jquery-autosize
...
Replace jquery.autoresize with autosize
2015-06-14 22:20:35 +02:00
Steffen van Bergerem
92a3dd53f0
Replace jquery.autoresize with autosize
2015-06-14 20:03:15 +02:00
Jonne Haß
77854cd355
Merge branch 'stable' into develop
2015-06-14 18:00:25 +02:00
Jonne Haß
a247984685
Merge branch 'master' into stable
2015-06-14 18:00:01 +02:00
Jonne Haß
9b36ec6797
release 0.5.1
2015-06-14 17:57:41 +02:00
Jonne Haß
1dee08843b
Merge branch 'stable' into develop
2015-06-14 17:42:00 +02:00
Jonne Haß
5a63d201a3
Merge branch 'release/0.5.1.0-RC' into stable
2015-06-14 17:41:42 +02:00
Jonne Haß
7052f2a63b
updated 12 locale files [ci skip]
2015-06-14 17:40:55 +02:00
Jason Robinson
e8f5173856
Merge pull request #6097 from Flaburgan/remove-old-service-stats
...
Remove old service keys in statistics.json
2015-06-14 16:26:08 +03: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
Jonne Haß
b0de3925aa
Merge pull request #6092 from svbergerem/text-renderer-img-responsive
...
Add img-responsive to image class for user input
2015-06-12 12:48:16 +02:00
Steffen van Bergerem
18a8211cc3
Add img-responsive to image class
2015-06-12 00:01:56 +02:00
Jonne Haß
c83650f023
Merge branch 'stable' into develop
2015-06-10 13:33:37 +02:00
Steffen van Bergerem
034fc5b183
Update markdown-it
...
closes #6091
2015-06-10 13:33:33 +02:00
Jonne Haß
1be1bec9c9
Merge branch 'stable' into develop
2015-06-09 22:55:23 +02:00
Benjamin Neff
ce380d78c9
make sql and federation debug-logging configurable
...
by default both are disabled now, you can enable them in the
diaspora.yml if you need them.
closes #6090
2015-06-09 22:55:16 +02:00
Dennis Schubert
1c7f86b290
Merge branch 'stable' into develop
2015-06-09 05:51:52 +02:00
Dennis Schubert
ea4eebd2e1
Merge branch 'release/0.5.1.0-RC' into stable
2015-06-09 05:51:36 +02:00
Jonne Haß
38b32ca2c4
updated 73 locale files [ci skip]
2015-06-09 05:51:16 +02:00
Dennis Schubert
828ae5994d
Merge branch 'stable' into develop
2015-06-09 05:49:34 +02:00
Dennis Schubert
1aa802c07c
Merge branch 'release/0.5.1.0-RC' into stable
2015-06-09 05:48:53 +02:00
Dennis Schubert
2837e58903
Remove listen note from the readme
...
this is not included in 0.5.1.0.
[ci skip]
2015-06-09 05:48:29 +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
Jonne Haß
aeeb6570d3
Merge branch 'stable' into develop
2015-06-08 13:52:53 +02:00
Jonne Haß
dd1cea9665
Merge branch 'release/0.5.0.0-RC' into stable
2015-06-08 13:52:42 +02:00
Jonne Haß
baafa9c51b
updated 73 locale files [ci skip]
2015-06-08 13:51:17 +02:00
Jonne Haß
40913f000a
make assets:generate_error_pages depend on environment [ci skip]
2015-06-08 10:37:37 +02:00
Dennis Schubert
a5eb7d5d1e
Merge branch 'stable' into develop
2015-06-08 04:33:30 +02:00
