Jonne Haß
|
15d7b019f1
|
Merge branch 'stable' into develop
|
2015-05-17 13:58:00 +02:00 |
|
Steffen van Bergerem
|
6bec3d67ed
|
Update markdown-it-sanitizer and markdown-it-for-inline
closes #5965
|
2015-05-17 13:57:54 +02:00 |
|
Jonne Haß
|
13b69f81d1
|
Merge branch 'stable' into develop
|
2015-05-16 13:54:05 +02:00 |
|
Benjamin Neff
|
d74e20a790
|
fetch public posts when someone starts sharing with you
closes #5960
|
2015-05-16 13:54:01 +02:00 |
|
Jonne Haß
|
ca33e984d3
|
Merge branch 'stable' into develop
|
2015-05-16 12:48:41 +02:00 |
|
Benjamin Neff
|
30cc330747
|
fix empty searchable in hcard, parse empty as false
closes #5962
|
2015-05-16 12:48:33 +02:00 |
|
Dennis Schubert
|
42a408045e
|
Merge branch 'stable' into develop
|
2015-05-16 03:44:35 +02:00 |
|
Benjamin Neff
|
c01fdb6e1c
|
fix the url for the public-posts json
closes #5958
|
2015-05-16 03:44:31 +02:00 |
|
Dennis Schubert
|
3ae370780c
|
Merge branch 'stable' into develop
|
2015-05-16 03:42:18 +02:00 |
|
Steffen van Bergerem
|
716952dc0d
|
Put 'email not visible' text into popover/tooltip
closes #5956
|
2015-05-16 03:42:14 +02:00 |
|
Akash Agrawall
|
8c7aa38aba
|
Indicates in the setting that the email is not visibile to the other users #5315
|
2015-05-16 03:41:52 +02:00 |
|
Dennis Schubert
|
1f084c28a8
|
Merge branch 'stable' into develop
|
2015-05-16 03:40:24 +02:00 |
|
Jason Robinson
|
ce16a122fc
|
Fix missing localization of inactive user removal warning emails.
Fixes #5950
|
2015-05-16 03:40:06 +02:00 |
|
Dennis Schubert
|
84dc40326a
|
Merge branch 'stable' into develop
|
2015-05-16 03:36:30 +02:00 |
|
Jason Robinson
|
aec2467e98
|
Fix inactive user removal not respecting configuration for daily limits
It seems ActiveRecord ignores .limit() if .find_each() is used to iterate the query (http://stackoverflow.com/a/6680541/1489738). Using .each() instead. Added a test.
closes #5953
|
2015-05-16 03:36:25 +02:00 |
|
Jonne Haß
|
b6cbb17d83
|
Merge branch 'stable' into develop
|
2015-05-12 14:20:09 +02:00 |
|
goobertron
|
2668c487e7
|
Remove dupe line from en.yml [ci skip]
closes #5951
|
2015-05-12 14:20:03 +02:00 |
|
Dennis Schubert
|
aac0a2582e
|
Merge branch 'stable' into develop
|
2015-05-12 04:00:12 +02:00 |
|
Steffen van Bergerem
|
40bb44eb96
|
Mobile: manage followed tags
closes #5945
|
2015-05-12 04:00:07 +02:00 |
|
Jonne Haß
|
890029b19e
|
Merge branch 'stable' into develop
|
2015-05-10 14:26:26 +02:00 |
|
Dennis Schubert
|
1a4e3cef48
|
Mute ActiveRecord::RecordInvalid due to ignores
closes #5943
|
2015-05-10 14:26:21 +02:00 |
|
Dennis Schubert
|
32f95a860c
|
We don't always have invalid record messages ... so log the exception message instead.
|
2015-05-10 14:25:50 +02:00 |
|
Dennis Schubert
|
3f3148af2c
|
Merge branch 'stable' into develop
|
2015-05-10 02:00:41 +02:00 |
|
Steffen van Bergerem
|
0c5443d543
|
Make js-routes use compact and camelcase function names
closes #5941
|
2015-05-10 02:00:30 +02:00 |
|
Steffen van Bergerem
|
1428369849
|
Mobile: Add button to follow/unfollow tags
|
2015-05-10 01:59:50 +02:00 |
|
Dennis Schubert
|
5477c7df96
|
Merge branch 'stable' into develop
|
2015-05-10 01:59:21 +02:00 |
|
Steffen van Bergerem
|
59e57c013b
|
Update jasmine-ajax
closes #5937
|
2015-05-10 01:59:17 +02:00 |
|
Jonne Haß
|
59e77675ce
|
Merge branch 'stable' into develop
|
2015-05-10 00:10:19 +02:00 |
|
Dennis Schubert
|
6273c2959a
|
Rescue from private objects sent to the public api
closes #5938
|
2015-05-10 00:10:12 +02:00 |
|
Dennis Schubert
|
915dee3c4b
|
Mute some ActiveRecord::RecordNotUnique exceptions
|
2015-05-10 00:09:25 +02:00 |
|
Dennis Schubert
|
300376a854
|
Merge branch 'stable' into develop
|
2015-05-09 23:49:05 +02:00 |
|
Steffen van Bergerem
|
05ec235ea3
|
Pass along current_user in ContactPresenter#full_hash_with_person
closes #5936
|
2015-05-09 23:48:59 +02:00 |
|
Dennis Schubert
|
bd9bce2a5f
|
Merge branch 'stable' into develop
|
2015-05-07 22:56:05 +02:00 |
|
Jonne Haß
|
60fb680572
|
bump hashie
closes #5925
|
2015-05-07 22:55:56 +02:00 |
|
Jonne Haß
|
729fc1a6bf
|
bump sprockets-rails
|
2015-05-07 22:55:37 +02:00 |
|
Jonne Haß
|
2240599f59
|
bump rack
|
2015-05-07 22:55:37 +02:00 |
|
Jonne Haß
|
5d9822056b
|
bump websocket
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
b702c80fb8
|
bump listen
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
e0116e268f
|
bump domain_name
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
11f4561ae5
|
bump childprocess
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
4cf681a538
|
bump rspec
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
1024b3b1f1
|
bump byebug
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
2634ea07a9
|
bump js-routes
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
487afed53e
|
bump webmock
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
70189f05f4
|
bump unicorn
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
a9519ede3d
|
bump twitter-text
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
147ea4e399
|
bump spring
|
2015-05-07 22:55:36 +02:00 |
|
Jonne Haß
|
fa24333ca1
|
bump rubocop
|
2015-05-07 22:55:35 +02:00 |
|
Jonne Haß
|
5a6f6c68cc
|
bump rack-cors
|
2015-05-07 22:55:35 +02:00 |
|
Jonne Haß
|
ac405dddeb
|
bump mini_magick
|
2015-05-07 22:55:35 +02:00 |
|