Jonne Haß
|
66bc049f9b
|
Merge pull request #6922 from cmrd-senya/6547-adoption
Refactored photo extraction
|
2016-07-18 14:35:00 +02:00 |
|
Sam Davarnia
|
2a2b604a60
|
move photo extraction to a class
style improvements
new line
applied changes
applied changes
|
2016-07-18 15:05:44 +03:00 |
|
cmrd Senya
|
035a483a7a
|
Fix randomly failing profile federation spec
same as #6913
|
2016-07-17 13:02:46 +03:00 |
|
Steffen van Bergerem
|
59fb227d95
|
Merge pull request #6914 from denschub/be-excellent
Add 'Be excellent to each other!' to the sidebar
|
2016-07-17 11:00:16 +02:00 |
|
Dennis Schubert
|
2d8c62fae3
|
Add 'Be excellent to each other!' to the sidebar
|
2016-07-17 10:47:08 +02:00 |
|
Jonne Haß
|
8fcb66a425
|
Merge pull request #6910 from SaiVardhan/Issue#6850_private_message
[Fix] #6850 Don't include subjects of private message
|
2016-07-17 09:32:19 +02:00 |
|
Jonne Haß
|
3281f2a72d
|
Merge pull request #6921 from SuperTux88/cleanup-status_message
Cleanup StatusMessage
|
2016-07-17 09:28:34 +02:00 |
|
Benjamin Neff
|
d72727f4ac
|
remove unused absence_of_content check
this didn't do anything
|
2016-07-17 01:40:00 +02:00 |
|
Benjamin Neff
|
2cd831f94e
|
also validate remote posts
all data is included in the federated status_message, so we can validate
on receive. add the photos to the status_message before save.
|
2016-07-17 01:40:00 +02:00 |
|
Benjamin Neff
|
df9874b73a
|
remove raw_message
This was only an alias for "text", and "raw_message" is also not used
for federation anymore, so we can drop it.
|
2016-07-17 01:40:00 +02:00 |
|
Jonne Haß
|
8cffc5cfbe
|
bump rails to 4.2.7
|
2016-07-15 13:48:09 +02:00 |
|
Jonne Haß
|
a8b26c779e
|
Merge pull request #6918 from SuperTux88/bump-federation-gem
bump diaspora_federation gem
|
2016-07-15 10:44:06 +02:00 |
|
Benjamin Neff
|
32cc0951bb
|
bump diaspora_federation
|
2016-07-15 02:02:55 +02:00 |
|
SaiVardhan
|
274104aac6
|
issue-6850 Don't include subjects of private messages in email notifications
|
2016-07-12 16:33:15 +05:30 |
|
Jonne Haß
|
b3a06c1c58
|
Merge pull request #6913 from svbergerem/fix-randomly-failing-federation-spec
Fix randomly failing profile federation spec
|
2016-07-11 11:23:13 +02:00 |
|
Jonne Haß
|
70166fc16a
|
updated 150 locale files [ci skip]
|
2016-07-11 11:16:11 +02:00 |
|
Jonne Haß
|
e7657b7f9b
|
Merge pull request #6912 from svbergerem/improve-coverage
Improve coverage
|
2016-07-11 11:00:47 +02:00 |
|
Jonne Haß
|
73a49ec78d
|
Merge pull request #6909 from svbergerem/remove-messagebus
Remove messagebus_ruby_api gem
|
2016-07-11 10:56:16 +02:00 |
|
Steffen van Bergerem
|
d6fbde3b7f
|
Fix randomly failing profile federation spec
|
2016-07-09 19:22:22 +02:00 |
|
Steffen van Bergerem
|
f8d8089cb6
|
Add more specs for the admins controller
|
2016-07-09 12:30:19 +02:00 |
|
Steffen van Bergerem
|
b01ca5d3bc
|
Add basic help controller spec
|
2016-07-09 10:55:59 +02:00 |
|
Steffen van Bergerem
|
be90b4fef3
|
Remove unused helper functions
|
2016-07-09 10:55:59 +02:00 |
|
Steffen van Bergerem
|
b296e73c36
|
Add basic terms controller spec
|
2016-07-09 10:55:59 +02:00 |
|
Steffen van Bergerem
|
d0f6a7fe89
|
Merge pull request #6911 from cmrd-senya/unused-methods-cleanup
Remove unused methods
|
2016-07-08 23:15:34 +02:00 |
|
cmrd Senya
|
026f577bfd
|
Remove unused methods
|
2016-07-08 21:30:41 +03:00 |
|
Steffen van Bergerem
|
58c7478133
|
Remove messagebus_ruby_api gem
Messagebus closed in 2015. See https://web.archive.org/web/20150623093956/https://www.messagebus.com/ for more information.
|
2016-07-07 18:48:31 +02:00 |
|
Jonne Haß
|
053f69b67c
|
Merge pull request #6902 from svbergerem/status-message-filter-mentions
Filter mentions on status message creation
|
2016-07-06 22:27:13 +02:00 |
|
Jonne Haß
|
5775647180
|
update changelog for #6905 [ci skip]
|
2016-07-06 01:58:32 +02:00 |
|
aoh0x7DE
|
d75f795cad
|
Fix issue #6847 (#6905)
* Fix issue #6847
|
2016-07-06 01:57:23 +02:00 |
|
Steffen van Bergerem
|
5778e7b386
|
Remove .hound.yml [ci skip]
|
2016-07-06 01:31:13 +02:00 |
|
Jonne Haß
|
d460678c9a
|
add CodeClimate config
|
2016-07-06 00:59:16 +02:00 |
|
Jonne Haß
|
751654cdad
|
Merge pull request #6907 from svbergerem/translations
Remove unused translations from diaspora.yml, add missing ones
|
2016-07-06 00:36:35 +02:00 |
|
Jonne Haß
|
29d071679b
|
use svg badges [ci skip]
|
2016-07-05 23:43:00 +02:00 |
|
Jonne Haß
|
bcd7894e59
|
add code coverage reporting
|
2016-07-05 23:35:53 +02:00 |
|
Steffen van Bergerem
|
bef5241512
|
Remove unused translations from diaspora.yml, add missing ones
|
2016-07-05 23:34:31 +02:00 |
|
Steffen van Bergerem
|
46cbc6e52a
|
Filter mentions on status message creation
|
2016-07-04 10:26:45 +02:00 |
|
Jonne Haß
|
9aaf58de12
|
Merge pull request #6901 from svbergerem/remove-unused-translations
Remove unused translations
|
2016-07-03 20:59:06 +02:00 |
|
Steffen van Bergerem
|
e0226f9322
|
Raise on missing translations
|
2016-07-03 20:15:57 +02:00 |
|
Steffen van Bergerem
|
715cb1bb87
|
Remove unused translations
|
2016-07-03 18:14:23 +02:00 |
|
Jakob Kramer
|
8d16270fcb
|
Remove unused strings from translation files
|
2016-07-03 10:18:08 +02:00 |
|
Dennis Schubert
|
cb1bfc2b3b
|
Merge pull request #6899 from svbergerem/cuke-notification-hidden-conversation
Add cuke for deleting conversations
|
2016-06-30 04:51:36 +02:00 |
|
Steffen van Bergerem
|
e67c3ace74
|
Add cuke for deleting conversations
|
2016-06-29 21:37:26 +02:00 |
|
Steffen van Bergerem
|
b2d26257d4
|
Use the correct flash message for new conversations
|
2016-06-29 21:37:00 +02:00 |
|
Dennis Schubert
|
7c6e7dbf0b
|
Merge branch 'stable' into develop
|
2016-06-28 22:06:35 +02:00 |
|
Dennis Schubert
|
8cd3f31da6
|
Merge branch 'master' into stable
|
2016-06-28 22:06:00 +02:00 |
|
Dennis Schubert
|
91bf63ec8a
|
Release 0.5.10.1
|
2016-06-28 22:05:21 +02:00 |
|
Dennis Schubert
|
8421289e3b
|
Re-add mysql2 to the Gemfile.lock
|
2016-06-28 22:05:17 +02:00 |
|
Dennis Schubert
|
eea8d6c6f4
|
Merge branch 'stable' into develop
|
2016-06-28 21:42:02 +02:00 |
|
Dennis Schubert
|
bb50744e47
|
Merge branch 'master' into stable
|
2016-06-28 21:41:46 +02:00 |
|
Dennis Schubert
|
f09827311a
|
Merge branch 'release/0.5.10.0'
|
2016-06-28 21:39:54 +02:00 |
|