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 |
|
Dennis Schubert
|
1d61f9aaa8
|
Merge branch 'release/0.6.0.0' into stable
|
2016-08-22 00:16:07 +02:00 |
|
Dennis Schubert
|
af9ab2355b
|
updated 116 locale files [ci skip]
|
2016-08-22 00:15:54 +02:00 |
|
Dennis Schubert
|
3f157bec35
|
Prepare 0.7.0.0 cycle
[ci skip]
|
2016-08-21 23:53:42 +02:00 |
|
Dennis Schubert
|
0921cfb43e
|
Prepare 0.6.1.0 cycle
[ci skip]
|
2016-08-21 23:52:30 +02:00 |
|
Dennis Schubert
|
615782877f
|
Merge pull request #7009 from SuperTux88/fix-started-sharing-notifications-without-contact
Remove started sharing notifications where the contact doesn't exist
|
2016-08-21 14:37:06 +02:00 |
|
Dennis Schubert
|
3be0d52bc9
|
Merge pull request #7016 from svbergerem/fix-7015
Fix misplaced publisher prefill on tags page
|
2016-08-21 14:27:16 +02:00 |
|
Dennis Schubert
|
93037098ce
|
Merge pull request #7014 from svbergerem/remove-stream-title
Remove stream title from main stream
|
2016-08-21 14:27:04 +02:00 |
|
Dennis Schubert
|
c4485a72af
|
Merge pull request #7013 from svbergerem/fix-header-badges-small-screens
Move notifications and conversations links in collapsed header on small devices
|
2016-08-21 14:26:54 +02:00 |
|
Dennis Schubert
|
6e25189a3b
|
Merge pull request #7012 from svbergerem/fix-stream-shortcuts-small-screens
Fix stream shortcuts on small screens
|
2016-08-21 14:26:38 +02:00 |
|
Dennis Schubert
|
003672f0b1
|
Merge pull request #7011 from SuperTux88/fix-author-not-lowercase
Use Person.by_account_identifier to find the author
|
2016-08-21 14:26:20 +02:00 |
|
Dennis Schubert
|
c124869dee
|
Merge pull request #7010 from SuperTux88/refactor-pod-uri-parse
Use https for the pod_uri if require_ssl is true
|
2016-08-21 14:25:49 +02:00 |
|
Steffen van Bergerem
|
3179b492f7
|
Fix misplaced publisher prefill on tags page
|
2016-08-21 14:22:41 +02:00 |
|
Steffen van Bergerem
|
fa06eba840
|
Remove stream title from main stream
|
2016-08-21 13:26:58 +02:00 |
|
Steffen van Bergerem
|
4b801a0ba9
|
Move notifications and conversations links in collapsed header on small devices
|
2016-08-21 12:56:16 +02:00 |
|
Steffen van Bergerem
|
002a7ff984
|
Fix stream shortcuts on small screens
|
2016-08-21 10:31:24 +02:00 |
|
Benjamin Neff
|
1d5080888f
|
Use Person.by_account_identifier to find the author
|
2016-08-21 04:01:42 +02:00 |
|