nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
17912 commits 4 branches 0 tags 121 MiB
Commit graph

17912 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steffen van Bergerem
5f3e4fc358
Merge pull request #6926 from jhass/timeago_plurals 
Properly support pluralization in timeago strings
 2016-08-08 17:38:30 +02:00
Steffen van Bergerem
c065e19d5b
Merge pull request #6864 from cmrd-senya/6120-aspects-creation-ui 
Refactor  aspects membership dropdown to use handlebars template
 2016-08-08 17:26:11 +02:00
cmrd Senya
e7d8de298b
Client-side aspect dropdown for the people/:guid/contacts page 2016-08-08 17:23:12 +03:00
cmrd Senya
d7fd735ee0
Fix mobile getting_started use wrong person object 2016-08-08 17:22:50 +03:00
cmrd Senya
71ecd7b866
Notifications and search page frontend updates 
Updates introduce usage of client-side aspect dropdown rendering
 2016-08-08 17:22:37 +03:00
cmrd Senya
94ce383498
Introduce NotificationSerializer 
And remove the note_html property from the model.
 2016-08-08 17:22:30 +03:00
cmrd Senya
a3f208c380
Notifications and search page backend updates 
Updates introduce support for preloading contacts to Gon in order
to support client-side rendering of aspect membership dropdown box.
 2016-08-08 17:21:38 +03:00
cmrd Senya
82ac611396
Client-side rendering of aspect dropdown for hovercards 2016-08-08 17:21:30 +03:00
cmrd Senya
923fb8a763
Refactor app.views.AspectMembership 
in order to support adding new aspect to a dropdown without full
page reload
 2016-08-08 17:21:14 +03:00
cmrd Senya
15e0f88758
Rename photos[:count] to photos_count in gon 2016-08-08 17:19:26 +03:00
cmrd Senya
d8687ccb3a
Rename contacts[:count] to contacts_count in gon 2016-08-08 17:19:19 +03:00
cmrd Senya
ed7fc10043
Clear gon after each rspec test 2016-08-08 17:19:08 +03:00
cmrd Senya
838e5ca432
Use the factory in the publisher_view_spec.js 2016-08-08 17:18:53 +03:00
cmrd Senya
f0bd1f9f06
AspectSelections spec corrections 2016-08-08 17:18:45 +03:00
cmrd Senya
06352b7809
AspectSelections style fixes 2016-08-08 17:18:37 +03:00
cmrd Senya
d50ab83157
Rename app.collections.Aspect{,Selection}s 2016-08-08 17:18:31 +03:00
cmrd Senya
ac2f161271
Fix views.js corner case 2016-08-08 17:18:20 +03:00
Jonne Haß
2f80ab8f3d Merge pull request #6945 from svbergerem/change-eslint-indentation-rule 
Change eslint indentation rule for var, let and const
 2016-08-08 01:43:00 +02:00
Steffen van Bergerem
f45e5922ee
Change eslint indentation rule for var, let and const 2016-08-08 01:33:13 +02:00
Jonne Haß
77059f11c4
Bump pronto to 0.7.0 2016-08-07 19:24:05 +02:00
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
Flaburgan
3ff1c3748a Recommend Ruby 2.3, keep Ruby 2.1 as supported 2016-08-05 12:08:13 +02:00
Jonne Haß
734f332333
Properly support pluralization in timeago strings 2016-08-01 13:27:30 +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