apsc92
fdb3ae5cb8
Fix_notifications_timestamp_issue #4826
...
closes #6573
2015-12-08 17:30:27 +01:00
Jonne Haß
22711ff7f0
Merge branch 'stable' into develop
2015-12-04 06:55:41 +01:00
Stéphane Guillou
2f4b817c46
Fix missing word in locked account message
...
closes #6577
2015-12-04 06:55:10 +01:00
Lukas Matt
b9729db0d6
bump jsxc to v0.1.5.develop
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-11-30 15:06:15 +01:00
augier
fd468b873a
Use BS variable to stick chat to header
2015-11-28 20:09:13 +01:00
Steffen van Bergerem
75e3085ca9
Merge branch 'stable' into develop
2015-11-27 12:46:46 +01:00
Manoj Mishra
ab21e6b134
Fix: Adding mention through paste user name from clipboard is not successfull
...
Input buffer wasn't getting updated with the user input when user did a
paste from clipboard, it caused search for the available contacts
to not trigger
closes #6510
2015-11-27 12:46:02 +01:00
Jonne Haß
578f196a7b
Merge branch 'stable' into develop
2015-11-24 00:43:37 +01:00
Jonne Haß
91127ce95f
Merge branch 'release/0.5.5.0' into stable
2015-11-24 00:43:22 +01:00
Jonne Haß
e195651592
bump nokogiri
2015-11-24 00:43:12 +01:00
Jonne Haß
086931d745
Merge branch 'stable' into develop
2015-11-23 03:13:13 +01:00
Jonne Haß
29d10a42f8
start 0.5.6.0 cycle
2015-11-23 03:12:00 +01:00
Jonne Haß
5f2e0907b7
freeze 0.5.5.0
2015-11-23 03:10:46 +01:00
Jonne Haß
c4b96d97ef
Merge pull request #6560 from svbergerem/update-rails-assets-gems-develop
...
Update autosize
2015-11-22 22:47:00 +01:00
Steffen van Bergerem
92802a7949
Merge pull request #6491 from AugierLe42e/flash-messages-use-BS-variable
...
[Quickfix] Use BS variable $navbar-height for flash messages animation
2015-11-22 18:25:06 +01:00
Steffen van Bergerem
24301084fe
Update autosize
2015-11-22 18:17:38 +01:00
Jonne Haß
d9c4f6fe07
Merge branch 'stable' into develop
2015-11-22 18:02:47 +01:00
Jonne Haß
bbb348ea5b
updated 32 locale files [ci skip]
2015-11-22 16:02:28 +01:00
Jonne Haß
c109a6f6b0
Merge branch 'stable' into develop
2015-11-22 15:50:13 +01:00
Steffen van Bergerem
98eb103446
Update highlight.js
...
closes #6558
2015-11-22 15:47:56 +01:00
Steffen van Bergerem
b8756cb16f
Update markdown-it-sanitizer
2015-11-22 15:44:32 +01:00
Steffen van Bergerem
c3a44dcce1
Update markdown-it
2015-11-22 15:44:32 +01:00
Steffen van Bergerem
3cf2e90e5c
Merge pull request #6536 from AugierLe42e/close-gallery-outside-click
...
Close gallery on outside click
2015-11-22 14:10:34 +01:00
Dennis Schubert
5081d69847
Merge branch 'stable' into develop
2015-11-22 02:52:37 +01:00
Jason Robinson
9a35a0d8dd
Add participation to root.author on receiving reshare
...
When author of the root post receives a reshare to it, no participation is added to the root author on the reshare. This causes any comments on the reshare on remote pods not to be sent to the author. Adding a participation should subscribe to the reshare and thus bring added comments back to the author.
closes #6481
2015-11-22 02:50:38 +01:00
Jason Robinson
66925918b1
Send comment to reshare author when commenting on reshare
...
As posts are always delivered also to reshare root, comments should also be delivered to reshare root, for concistency.
2015-11-22 02:45:27 +01:00
Jonne Haß
17d0ddab41
Merge branch 'stable' into develop
2015-11-18 03:37:34 +01:00
Manuel Vögele
0925a26506
Do not add participation for comment if comment validation failed The same fix is also done for the other social actions
...
closes #6552
2015-11-18 03:16:54 +01:00
Steffen van Bergerem
09a26fbf57
Merge pull request #6448 from AugierLe42e/replace-entypo-mail
...
[Quickfix] Use entypo-mail on mobile view
2015-11-16 01:41:50 +01:00
augier
02e82029c3
Use entypo-mail on mobile view
2015-11-15 14:11:29 +01:00
Jonne Haß
a7ff246d8e
Merge branch 'stable' into develop
2015-11-14 16:13:52 +01:00
Jonne Haß
acb9547978
Update Rails to 4.2.5
2015-11-14 16:12:15 +01:00
Jonne Haß
c6939361ee
Revert "Revert "Force flash message width to 80% of screen on small devices""
...
This reverts commit 53a7d36e44
2015-11-13 16:04:32 +01:00
Jonne Haß
f2091f3b73
Merge branch 'stable' into develop
2015-11-13 16:03:44 +01:00
Jonne Haß
53a7d36e44
Revert "Force flash message width to 80% of screen on small devices"
...
This reverts commit e731bb86c5
2015-11-13 15:59:18 +01:00
Jonne Haß
5de0655e54
Merge branch 'stable' into develop
2015-11-13 14:31:10 +01:00
Augier
e731bb86c5
Force flash message width to 80% of screen on small devices
...
closes #6529
2015-11-13 14:31:06 +01:00
Jonne Haß
910e9e815c
Merge pull request #6543 from manuelVo/5485-mobile-empty-comment-handling
...
Do not disable submit button if comment is empty in mobile view
2015-11-13 03:56:36 +01:00
Manuel Vögele
1680c0c924
Do not disable submit button if comment is empty in mobile view
...
Fixes #5485
2015-11-13 02:46:22 +01:00
augier
49836e267b
Close gallery on outside click
2015-11-07 18:19:58 +01:00
Jonne Haß
7fca5cf93a
Merge branch 'stable' into develop
2015-11-04 22:10:07 +01:00
theworldbright
a054a35863
Catch Diaspora::NotMine on post controller
...
closes #6533
2015-11-04 22:10:00 +01:00
Jonne Haß
c815ed4d7c
Cache bookmarklet code in public/assets/bookmarklet.js
...
tmp/cache is not something you would include in a packaging situation.
2015-11-03 18:06:55 +01:00
Jonne Haß
65e466f1e2
Merge pull request #6527 from Zauberstuhl/bump_jsxc
...
bump diaspora_jsxc to v0.1.4.develop.4
2015-10-30 19:40:38 +01:00
augier
d6391afb36
Use BS variable -height for flash messages animation
2015-10-30 12:40:45 +01:00
Lukas Matt
d91907cfe1
bump diaspora_jsxc to v0.1.4.develop.4
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-10-29 15:32:28 +01:00
Jonne Haß
4f72377171
bump pronto-rubocop
2015-10-29 04:33:07 +01:00
Dennis Schubert
92c2a2e527
Merge branch 'stable' into develop
2015-10-29 04:31:47 +01:00
Jonne Haß
bf42cc17f1
bump http
...
closes #6514
2015-10-29 04:25:11 +01:00
Jonne Haß
a189155773
bump valid
2015-10-29 04:21:07 +01:00
