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 |
|
Jonne Haß
|
c7a5010b37
|
bump sass
|
2015-10-29 04:21:07 +01:00 |
|
Jonne Haß
|
c79a3fa4bf
|
bump fog
|
2015-10-29 04:20:37 +01:00 |
|
Jonne Haß
|
ada2913cd7
|
bump webmock
|
2015-10-29 04:20:37 +01:00 |
|
Jonne Haß
|
c0c4b7277b
|
bump shoulda-matchers
|
2015-10-29 04:20:37 +01:00 |
|
Jonne Haß
|
6404f5df2b
|
bump rubocop
|
2015-10-29 04:20:37 +01:00 |
|
Jonne Haß
|
e0e2ab01af
|
bump redcarpet
|
2015-10-29 04:19:18 +01:00 |
|
Jonne Haß
|
19875a59e0
|
bump rails-assets-jquery-placeholder
|
2015-10-29 04:19:18 +01:00 |
|
Jonne Haß
|
bd427ea2db
|
bump pry
|
2015-10-29 04:18:53 +01:00 |
|
Jonne Haß
|
b1318779a6
|
bump mini_magick
|
2015-10-29 04:18:12 +01:00 |
|
Jonne Haß
|
6bc1314b43
|
bump handlebars_assets
|
2015-10-29 04:18:12 +01:00 |
|
Jonne Haß
|
fb923a188e
|
bump faraday
|
2015-10-29 04:17:42 +01:00 |
|
Jonne Haß
|
3eb32a6c60
|
bump database_cleaner
|
2015-10-29 04:17:07 +01:00 |
|
Jonne Haß
|
7f04e42608
|
Add missing article to password reset form steps
|
2015-10-28 16:41:58 +01:00 |
|
Jonne Haß
|
907514b43c
|
Merge pull request #6525 from sarithats/change_password_feature_spec
Feature spec for change password on mobile website
|
2015-10-28 16:34:28 +01:00 |
|
Saritha
|
f27c0483ca
|
Feature spec for change password on mobile website
Fix #6372
|
2015-10-28 15:05:34 +05:30 |
|
Steffen van Bergerem
|
3c43819bce
|
Merge pull request #6504 from sarithats/fix/login_button
Change login button color
|
2015-10-21 08:16:54 +02:00 |
|
Dennis Schubert
|
1338725308
|
Merge pull request #6492 from marienfressinaud/6062-add-search-and-invte-links-when-no-contacts
Add invite links when no contacts
|
2015-10-21 01:20:59 +02:00 |
|
Jonne Haß
|
800be9b2cf
|
Merge branch 'stable' into develop
|
2015-10-20 16:27:43 +02:00 |
|
cmrd Senya
|
00588e1ef8
|
Disable self-notification possibility
closes #6512
|
2015-10-20 16:27:39 +02:00 |
|
Saritha
|
7b08cdd488
|
Change button color to blue
Fix #6449
Fix: SyntaxError in 'app/views/devise/passwords/edit.mobile.haml'
|
2015-10-20 12:53:59 +05:30 |
|
Dennis Schubert
|
9de2f99729
|
Merge branch 'stable' into develop
|
2015-10-19 18:57:08 -07:00 |
|
Dennis Schubert
|
d8ed529f92
|
Merge branch 'master' into stable
|
2015-10-19 18:56:56 -07:00 |
|
Dennis Schubert
|
bdc55f05f7
|
Release 0.5.4.0
|
2015-10-19 18:55:33 -07:00 |
|
Dennis Schubert
|
00ebe4963e
|
Merge branch 'stable' into develop
|
2015-10-19 18:50:36 -07:00 |
|
Dennis Schubert
|
1f4ad4019f
|
Merge branch 'release/0.5.4.0' into stable
|
2015-10-19 18:49:08 -07:00 |
|