Augier
2e175c4be5
Bump to jQuery 2
2016-08-07 16:14:52 +02:00
Jonne Haß
d835cc4b1b
Merge pull request #6943 from svbergerem/fix-duplicate-activity-stream-posts
...
Fix duplicate activity stream posts
2016-08-07 09:25:04 +02:00
Steffen van Bergerem
ba26175421
Fix duplicate activity stream posts
2016-08-07 02:07:05 +02:00
Jonne Haß
f91734028c
Merge pull request #6934 from SuperTux88/fetch-error-handling
...
better error message if we webfinger a person with invalid guid
2016-08-01 13:20:56 +02:00
Jonne Haß
48e5db8235
Stabilize social_relay_presenter_spec.rb
2016-08-01 13:19:07 +02:00
Jonne Haß
dc0258f8a6
bump rspec-rails, guard-rspec
2016-08-01 12:55:27 +02:00
Benjamin Neff
5aa52b36af
better error message if we webfinger a person with invalid guid
...
this happens if a remote person changed the diaspora-id manually (renamed
domain or something) in their database.
2016-07-31 23:05:53 +02:00
Jonne Haß
c5849b4724
Correct default value explanation in diaspora.yml.example [ci skip]
2016-07-20 21:51:44 +02:00
Jonne Haß
58a355ed01
Expose Sidekiq dead job queue configuration options
...
Set the default limit of dead jobs to 5k, which should equal to about 50M memory
usage in the worst case. Sidekiq's default is 10k. Set the expiration
timeout to 6 weeks, matching our minor release schedule. Sidekiq's
default is 6 months.
Given the new federation code stores the XML payload in the job
parameters, fine-tuning here can give more significant memory savings.
2016-07-20 15:21:17 +02:00
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
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
