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
Dennis Schubert
aabe6951e5
Do not reload Streams asynchronously
...
Fixes #6494 and #6473
Partly reverts 517cd56f21
2015-10-19 18:46:09 -07:00
Jonne Haß
810f24db74
Merge branch 'stable' into develop
2015-10-15 12:20:46 +02:00
Steffen van Bergerem
06c1d2e9e3
Compare person id in people show view
...
closes #6505
2015-10-15 12:20:13 +02:00
Dennis Schubert
228f3852b2
Merge branch 'stable' into develop
2015-10-15 05:58:44 +02:00
Steffen van Bergerem
995ce18c37
Display publisher on user profile path
...
closes #6503
2015-10-15 05:58:38 +02:00
Jonne Haß
7bc2c92b77
Merge pull request #6502 from svbergerem/fix-6452-regressions
...
Fix #6452 regressions
2015-10-15 01:59:16 +02:00
Steffen van Bergerem
829d4db213
Fix #6452 regressions
2015-10-15 00:45:37 +02:00
Jonne Haß
99d4e0b332
Merge branch 'stable' into develop
2015-10-14 22:33:14 +02:00
cmrd Senya
69b46df3d6
Notifications for comments on local posts by non-contacts
2015-10-14 22:32:19 +02:00
Marien Fressinaud
461e4cfd8c
Cleanup the code
...
- Extract JS from HTML
- Remove search link on message
- Remove duplicated invitation modal
2015-10-14 22:31:39 +02:00
Giniouxe
1ae838b596
Open invite link in modal
2015-10-14 22:31:22 +02:00
fla
da1b0b5666
Add links to add or invite contacts
2015-10-14 22:31:22 +02:00
cmrd Senya
dc02c5384b
Notify a remote user when a non-contact user likes or comment her public post
2015-10-14 22:30:35 +02:00
Jonne Haß
d9572ec337
Merge branch 'stable' into develop
2015-10-14 11:00:47 +02:00
Lincoln Stoll
6ac6dc1059
Don't set key for logfile on Heroku
...
This fixes the issue reported in #5947 . Sidekiq will only log to stdout when this key evals to false, so this can't be forced with an empty string. This change eliminates the key altogether when running on Heroku.
closes #6500
2015-10-14 11:00:42 +02:00
Jonne Haß
403ef73d39
Merge branch 'stable' into develop
2015-10-14 01:14:59 +02:00
cmrd Senya
70b5d86386
Remove the lines from inlined_jobs.rb which never get called.
...
closes #6499
2015-10-14 01:14:54 +02:00
Jonne Haß
06f46541a7
Merge branch 'stable' into develop [ci skip]
2015-10-13 12:07:01 +02:00
Jonne Haß
6e845eb22a
Do not enforce lambda { } for multiline [ci skip]
2015-10-13 12:06:53 +02:00
Jonne Haß
09f4eeac2a
Merge branch 'stable' into develop
2015-10-12 16:12:36 +02:00
