Steffen van Bergerem
|
806de7e9d8
|
Exclude closed accounts from search
closes #7042
|
2016-09-04 03:22:58 +02:00 |
|
Dennis Schubert
|
cc8eff9efb
|
Merge branch 'next-minor' into develop
|
2016-09-04 03:17:53 +02:00 |
|
Steffen van Bergerem
|
9a2cb1517a
|
Set participations client side when changing post interactions
closes #7040
|
2016-09-04 03:17:48 +02:00 |
|
Steffen van Bergerem
|
02742a4a8f
|
Use post controls view for single post moderation
|
2016-09-04 03:16:24 +02:00 |
|
Steffen van Bergerem
|
8faedd574d
|
Move post controls to a separate view
|
2016-09-04 03:16:24 +02:00 |
|
Steffen van Bergerem
|
68045cec8c
|
Remove unused feedback actions view
|
2016-09-04 03:16:24 +02:00 |
|
Dennis Schubert
|
684d7d8312
|
Merge branch 'next-minor' into develop
|
2016-09-04 03:15:39 +02:00 |
|
Steffen van Bergerem
|
ffdd5a14ac
|
Remove deleted comments when loading more comments
closes #7045
|
2016-09-04 03:15:35 +02:00 |
|
Steffen van Bergerem
|
e3e9510e6a
|
Refactor appending comments to the comment stream
|
2016-09-04 03:14:17 +02:00 |
|
Dennis Schubert
|
0a5df214f2
|
Merge branch 'next-minor' into develop
|
2016-09-04 03:06:20 +02:00 |
|
Benjamin Neff
|
b3453c494e
|
make session-cookie HttpOnly
closes #7041
|
2016-09-04 03:06:15 +02:00 |
|
Dennis Schubert
|
a7d030e1df
|
Merge branch 'next-minor' into develop
|
2016-09-04 03:02:36 +02:00 |
|
Steffen van Bergerem
|
28dd88543e
|
Add cuke for changing the preferred language
closes #7053
|
2016-09-04 03:02:31 +02:00 |
|
Steffen van Bergerem
|
ce7d008e09
|
Set grammatical gender in tags controller
|
2016-09-04 03:02:27 +02:00 |
|
Steffen van Bergerem
|
89b51dddf9
|
Add application controller specs for grammatical gender
|
2016-09-04 03:02:27 +02:00 |
|
Dennis Schubert
|
d2a0528b56
|
Merge branch 'next-minor' into develop
|
2016-09-04 03:01:55 +02:00 |
|
Steffen van Bergerem
|
08794bc47b
|
Remove user_photo method from users controller
closes #7049
|
2016-09-04 03:01:51 +02:00 |
|
Benjamin Neff
|
25928864e9
|
Merge branch 'next-minor' into develop
|
2016-09-04 02:25:14 +02:00 |
|
Steffen van Bergerem
|
18fbb2a885
|
Remove useless notifier spec
closes #7056
|
2016-09-04 02:24:58 +02:00 |
|
Steffen van Bergerem
|
c7c9bb9628
|
Merge branch 'next-minor' into develop
|
2016-09-04 01:44:31 +02:00 |
|
Benjamin Neff
|
5017bd9541
|
rewrite notifier template with haml
closes #7054
|
2016-09-04 01:44:15 +02:00 |
|
Benjamin Neff
|
b0611ce270
|
remove logo from mails
|
2016-09-04 01:43:24 +02:00 |
|
Benjamin Neff
|
364502a134
|
bring back sender avatar
|
2016-09-04 01:43:24 +02:00 |
|
Benjamin Neff
|
575748169e
|
remove text color from notification mails
|
2016-09-04 01:43:24 +02:00 |
|
Benjamin Neff
|
dcbdf54511
|
Merge branch 'next-minor' into develop
|
2016-09-01 22:50:14 +02:00 |
|
Lukas Matt
|
cf5a9d7e04
|
Delete all null entries before removing the column
related to #7032
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
closes #7038
|
2016-09-01 22:49:07 +02:00 |
|
Steffen van Bergerem
|
175d061032
|
Merge branch 'next-minor' into develop
|
2016-09-01 21:51:36 +02:00 |
|
Steffen van Bergerem
|
33b064b8dc
|
Add changelog for #7039 [ci skip]
|
2016-09-01 21:50:19 +02:00 |
|
Steffen van Bergerem
|
4a3d3b273e
|
Merge branch 'next-minor' into develop
|
2016-09-01 21:35:29 +02:00 |
|
lislis
|
bc64bca9df
|
update the bug link in the sidebar to the report bug wiki page
|
2016-09-01 21:34:44 +02:00 |
|
Steffen van Bergerem
|
5c9978a72a
|
Merge pull request #7039 from lislis/4779-indicate-proper-way-to-report-bugs-in-sidebar
Indicate proper way to report bugs in sidebar, close #4779
|
2016-09-01 13:49:21 +02:00 |
|
lislis
|
395751ee1f
|
update the bug link in the sidebar to the report bug wiki page
|
2016-09-01 11:17:50 +02:00 |
|
Dennis Schubert
|
e3b9816ccf
|
Merge branch 'next-minor' into develop
|
2016-08-27 00:28:51 +02:00 |
|
Dennis Schubert
|
2fa13b2d0e
|
Merge branch 'master' into next-minor
|
2016-08-27 00:28:36 +02:00 |
|
Dennis Schubert
|
deeabb26af
|
Merge branch 'release/0.6.0.0'
|
2016-08-27 00:26:55 +02:00 |
|
Dennis Schubert
|
25f6e852dd
|
Merge branch 'next-minor' into develop
|
2016-08-23 01:53:40 +02:00 |
|
Dennis Schubert
|
bcaf99c806
|
Merge branch 'release/0.6.0.0' into next-minor
|
2016-08-23 01:53:31 +02:00 |
|
Benjamin Neff
|
6d8b7b49cb
|
Remove started sharing notifications where the contact doesn't exist
The same as #7009 but now all of them ;)
|
2016-08-23 01:52:35 +02:00 |
|
Steffen van Bergerem
|
5b5e3e2c29
|
Display images inline in profile bio
|
2016-08-23 01:52:27 +02:00 |
|
Steffen van Bergerem
|
7f0ffb8b0a
|
Fix invitation link on people search page
|
2016-08-23 01:52:25 +02:00 |
|
Dennis Schubert
|
cb2a00fbeb
|
Merge branch 'next-minor' into develop
|
2016-08-22 02:30:04 +02:00 |
|
Dennis Schubert
|
2adbd40b9d
|
Merge branch 'release/0.6.0.0' into next-minor
|
2016-08-22 02:29:51 +02:00 |
|
Dennis Schubert
|
ae2cecefae
|
Merge pull request #7018 from SuperTux88/fix-reshare-metadata
Fix regressions from #6998
|
2016-08-22 02:29:44 +02:00 |
|
Dennis Schubert
|
cd4f284146
|
Merge pull request #7017 from SuperTux88/bump-diaspora_federation
bump diaspora_federation
|
2016-08-22 02:28:52 +02:00 |
|
Dennis Schubert
|
275a4f665c
|
Merge branch 'next-minor' into develop
|
2016-08-22 01:07:06 +02:00 |
|
Dennis Schubert
|
09344bc71c
|
Merge branch 'release/0.6.0.0' into next-minor
|
2016-08-22 01:06:55 +02:00 |
|
Dennis Schubert
|
8445321aa1
|
Rename 'stable' to 'next-minor'
|
2016-08-22 01:04:05 +02:00 |
|
Benjamin Neff
|
4b020b8d61
|
Fix regressions from #6998
* fixed old reshares of reshares
* fixed deleted root of a reshare
|
2016-08-22 00:43:43 +02:00 |
|
Benjamin Neff
|
b3013c8152
|
bump diaspora_federation
|
2016-08-22 00:21:25 +02:00 |
|
Dennis Schubert
|
1f9e261231
|
Merge branch 'stable' into develop
|
2016-08-22 00:16:27 +02:00 |
|