Steffen van Bergerem
75161b6556
Display: fixed for search results
2015-06-21 21:13:56 +02:00
Jonne Haß
188e554b7b
Merge branch 'stable' into develop
2015-06-21 20:48:57 +02:00
fap
1061e101fd
Adds welcome message on registration Welcome message is only send out if podmin account is defined and welcome message is enabled in the config.
...
This also enables the podmin account to send messages
to any local user.
closes #6128
2015-06-21 20:48:48 +02:00
fap
073f028f88
Adds welcome message options to config
2015-06-21 20:48:20 +02:00
Jonne Haß
79c5202a5b
Merge pull request #6109 from svbergerem/bootstrap-header-rewrite
...
Bootstrap header rewrite
2015-06-21 19:46:07 +02:00
Steffen van Bergerem
f57c94ff0c
Merge pull request #6123 from SansPseudoFix/6119-Fix-avatar-broken-inviation
...
Fix broken avatar getting start page
2015-06-21 17:02:06 +02:00
SansPseudoFix
57ac37cd2d
Fix broken avatar getting start page
...
Update add contact page
BS3
Fix syntax
2015-06-21 16:38:12 +02:00
Dennis Schubert
afd91b60fa
Merge pull request #6129 from svbergerem/comment-box-resize
...
Fix autoresize default height for comment box
2015-06-21 06:19:29 +02:00
Steffen van Bergerem
8d5794a2a4
Fix autoresize default height for comment box
2015-06-21 04:40:56 +02:00
Steffen van Bergerem
d6d1e38ba1
Stabilize mobile close account cukes
2015-06-20 00:38:40 +02:00
Steffen van Bergerem
b3c535bab4
Add color theme support for new header
2015-06-20 00:38:40 +02:00
Steffen van Bergerem
049c8eb384
Bootstrap header rewrite
2015-06-20 00:38:40 +02:00
Steffen van Bergerem
e890ffa698
Merge branch 'stable' into develop
2015-06-19 22:20:57 +02:00
Faldrian
12678bde53
Added cucumber step to add multiple posts in one step
...
closes #6118
2015-06-19 22:19:29 +02:00
Faldrian
0fa571d5e4
Fixed more-button wording when there are <15 posts
2015-06-19 22:17:21 +02:00
Steffen van Bergerem
078e7a722f
Merge branch 'stable' into develop
2015-06-19 21:30:15 +02:00
SansPseudoFix
cce5a98537
Add link to pod statistics in right navigation
...
closes #6117
2015-06-19 21:29:25 +02:00
Flaburgan
e3d77cece2
Add a ToS design change mention in the changelog, close 6121
2015-06-19 10:22:20 +02:00
Steffen van Bergerem
5ab09f0659
Merge pull request #6086 from Flaburgan/add-services-mobile
...
Add Services and Privacy settings page to mobile
2015-06-18 22:52:44 +02:00
fla
a7d88adde1
Improve services setting translation
2015-06-18 20:36:18 +02:00
Flaburgan
3e4b8500a4
Refactor Account settings page with bootstrap grid
2015-06-18 17:26:31 +02:00
fla
5537e8687b
Extract privacy_settings content in a partial
2015-06-18 17:26:31 +02:00
fla
264f41a09d
Add Services and Privacy settings page to mobile
2015-06-18 17:26:31 +02:00
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
