Dennis Schubert
|
2ca0a17ee0
|
Merge branch 'stable' into develop
|
2015-05-24 02:30:08 +02:00 |
|
Benjamin Neff
|
8531b160a6
|
gracefully handle when a like is already deleted again
closes #5983
|
2015-05-24 02:30:02 +02:00 |
|
Dennis Schubert
|
ba9b947173
|
Merge branch 'stable' into develop
|
2015-05-23 01:24:14 +02:00 |
|
Benjamin Neff
|
68f7208ff5
|
use id from preloaded gon.post to fix broken liking with guid
closes #5978
|
2015-05-23 01:24:09 +02:00 |
|
Dennis Schubert
|
4093a1bdd3
|
Add Changelog entry for #5974
|
2015-05-22 03:11:55 +02:00 |
|
Dennis Schubert
|
70dc4fcab1
|
Merge branch 'stable' into develop
|
2015-05-22 02:53:55 +02:00 |
|
Benjamin Neff
|
be3b2852be
|
use logging-logger for sidekiq
closes #5975
|
2015-05-22 02:53:50 +02:00 |
|
Benjamin Neff
|
ac96232d85
|
use logging gem for better logging with class name and log-level
|
2015-05-22 02:53:19 +02:00 |
|
Benjamin Neff
|
49f0fb6dcd
|
replace silence_assets.rb with quiet_assets gem
|
2015-05-22 02:53:19 +02:00 |
|
Dennis Schubert
|
fc6de28ee1
|
Merge pull request #5974 from jhass/port_setting
Update listen configuration
|
2015-05-22 02:47:07 +02:00 |
|
Jonne Haß
|
e2671f7b05
|
Merge branch 'stable' into develop
|
2015-05-21 17:26:39 +02:00 |
|
Jonne Haß
|
47672dcd6b
|
ensure tmp/pids exists [ci skip]
|
2015-05-21 17:25:47 +02:00 |
|
Jonne Haß
|
ebe0c76040
|
Listen to unix socket in production by default
|
2015-05-21 17:23:36 +02:00 |
|
Jonne Haß
|
9b7a3c86e6
|
Merge branch 'stable' into develop
|
2015-05-21 00:46:59 +02:00 |
|
Benjamin Neff
|
9cc0faa4e6
|
fixes reshares with no text but with photo
regression from 1da1c53f203e6eb9dad50872e573a4965219ef92
closes #5976
|
2015-05-21 00:46:50 +02:00 |
|
Jonne Haß
|
898e8d5912
|
Remove deprecated port setting
|
2015-05-19 11:07:03 +02:00 |
|
Jonne Haß
|
5a3b62d801
|
Merge branch 'stable' into develop
|
2015-05-19 10:42:44 +02:00 |
|
Benjamin Neff
|
9a4a7255e7
|
remove unused older and newer methods for posts
last renamed in 8386179f16
closes #5970
|
2015-05-19 10:42:39 +02:00 |
|
Dennis Schubert
|
2549f44b7c
|
Merge branch 'stable' into develop
|
2015-05-19 03:00:56 +02:00 |
|
Benjamin Neff
|
289753e068
|
add "original post deleted" message on single post view
closes #5968
|
2015-05-19 03:00:51 +02:00 |
|
Benjamin Neff
|
cde9b24476
|
fix margin/padding for "original post deleted"-message
|
2015-05-19 02:59:31 +02:00 |
|
Benjamin Neff
|
267a1df3c4
|
fix root_diaspora_id when root was deleted
|
2015-05-19 02:59:31 +02:00 |
|
Dennis Schubert
|
6a1ec27b3c
|
Merge branch 'stable' into develop
|
2015-05-19 02:58:41 +02:00 |
|
Steffen van Bergerem
|
ceec5084af
|
Use case insensitive unconfirmed email
closes #5967
|
2015-05-19 02:58:37 +02:00 |
|
Dennis Schubert
|
00cb87ce11
|
Merge branch 'stable' into develop
|
2015-05-19 02:55:36 +02:00 |
|
Jonne Haß
|
4bde00177c
|
replace foreman with eye
closes #5966
|
2015-05-19 02:55:31 +02:00 |
|
Jonne Haß
|
a21de8b190
|
Make listen directive for Unicorn configurable
|
2015-05-19 02:55:01 +02:00 |
|
Dennis Schubert
|
3446cb2f3f
|
Merge branch 'stable' into develop
|
2015-05-18 03:31:17 +02:00 |
|
Benjamin Neff
|
a396a246ee
|
remove unused hasPhotos and hasText functions
- added in a836b06d3e
- removed in 49ea8c8563
closes #5969
|
2015-05-18 03:31:11 +02:00 |
|
Dennis Schubert
|
944c57f874
|
Merge branch 'stable' into develop
|
2015-05-18 03:23:43 +02:00 |
|
Benjamin Neff
|
85087123f0
|
remove travis hax ... works on here ... I hope on travis too
closes #5964
|
2015-05-18 03:23:39 +02:00 |
|
Benjamin Neff
|
494c03a3fd
|
re add user atom feed on profile-page
|
2015-05-18 03:23:15 +02:00 |
|
Benjamin Neff
|
7cccb6594f
|
remove security hax comment
|
2015-05-18 03:23:15 +02:00 |
|
Benjamin Neff
|
196e438286
|
remove some hardcoded diasporahq hax
|
2015-05-18 03:23:14 +02:00 |
|
Jonne Haß
|
b5e277384b
|
Merge branch 'stable' into develop
|
2015-05-17 20:44:53 +02:00 |
|
Jonne Haß
|
d2467319ed
|
Bump open_graph_reader
|
2015-05-17 20:44:37 +02:00 |
|
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 |
|