Commit graph

17824 commits

Author SHA1 Message Date
Benjamin Neff
b067c33779 handle photo updates 2016-06-26 06:20:59 +02:00
Benjamin Neff
d55be67df1 handle existing guids on receive 2016-06-26 06:20:59 +02:00
Benjamin Neff
f3466bcfd6 update profile 2016-06-26 06:20:59 +02:00
Benjamin Neff
4fb34139b0 cleanup notifications and fix tests 2016-06-26 06:20:59 +02:00
Benjamin Neff
ebfb0aa884 create NotificationService: send notifications after receive 2016-06-26 06:20:59 +02:00
Benjamin Neff
97f4b0c2e4 handle ignored author on receive 2016-06-26 06:20:59 +02:00
Benjamin Neff
53e14dd2d6 add ReceiveLocal worker 2016-06-26 06:20:59 +02:00
Benjamin Neff
481431ea0a handle nested entities 2016-06-26 06:20:59 +02:00
Benjamin Neff
87666eeb35 handle receive contact 2016-06-26 06:20:59 +02:00
Benjamin Neff
e0da6708f4 save entities on receive
first implementation of receive_entity callback
2016-06-26 06:20:59 +02:00
Benjamin Neff
e9f53265c9 create new receive workers 2016-06-26 06:20:59 +02:00
Benjamin Neff
9021268e7a add related entity to relayables and retractions 2016-06-26 06:20:59 +02:00
Benjamin Neff
dfe32a5e4b fix federation tests 2016-06-26 06:20:59 +02:00
Benjamin Neff
3a5990c552 create fetch_related_entity callback and cleanup unused callbacks 2016-06-26 06:20:58 +02:00
Benjamin Neff
800fa1786c fix author join for federation callbacks with Poll 2016-06-26 06:20:58 +02:00
Benjamin Neff
374915b45f refactor fetch_person_url_to callback 2016-06-26 06:20:58 +02:00
Benjamin Neff
1790efad08 implement :update_pod callback 2016-06-26 06:20:58 +02:00
Benjamin Neff
4408efdff3 fetch public key for unknown person
and do some refactorings
2016-06-26 06:20:58 +02:00
Benjamin Neff
7596a49b46 add new send workers 2016-06-26 06:20:58 +02:00
Benjamin Neff
b1d30aa9cc add more "diaspora to federation entity" methods
move it to Diaspora::Federation::Entities and use it in some tests, but most of the tests can be removed later.
2016-06-26 06:20:58 +02:00
Benjamin Neff
88d91233d3 bump diaspora_federation to v0.1.0 2016-06-26 06:20:58 +02:00
Dennis Schubert
1bbe49230c Merge pull request #6881 from svbergerem/devise-translation
Change 'Sign up' to 'Create account'
2016-06-21 01:08:47 +02:00
Dennis Schubert
028351eb25 Merge pull request #6880 from svbergerem/update-eslintrb
Bump eslintrb
2016-06-21 01:06:32 +02:00
Steffen van Bergerem
d98574a351
Change 'Sign up' to 'Create account' 2016-06-20 23:27:38 +02:00
Steffen van Bergerem
21476e4ea7
Bump eslintrb 2016-06-20 22:57:02 +02:00
Dennis Schubert
68086fbf0b Merge branch 'stable' into develop 2016-06-20 05:24:49 +02:00
Dennis Schubert
962af9e2dd Start 0.5.11.0 cycle 2016-06-20 05:23:32 +02:00
Dennis Schubert
f1f7c41eda Remove unused Changelog headlines for 0.5.10.0
[ci skip]
2016-06-20 05:22:37 +02:00
Dennis Schubert
fb25718839 Merge pull request #6268 from svbergerem/redesign-default-haml
Redesign default.haml
2016-06-20 05:17:42 +02:00
Steffen van Bergerem
b1943f1e46
Redesign default.haml and add a podmin welcome page 2016-06-20 02:03:53 +02:00
Jonne Haß
03f6420ffd
Merge branch 'stable' into develop 2016-06-19 19:46:26 +02:00
Steffen van Bergerem
0d1d490e43
Update Contributor Covenant to v1.4.0
closes #6878
2016-06-19 19:46:19 +02:00
Jonne Haß
11d99d48b6
Merge branch 'stable' into develop 2016-06-19 18:08:46 +02:00
Jonne Haß
8ba0cb0c16
Revert "Fix flaky mentioning cukes"
This reverts commit 1811028835.
2016-06-19 18:05:46 +02:00
Jonne Haß
1ef3c1387b
Merge pull request #6872 from denschub/autolink-with-rel-noopener
Add rel="noopener noreferrer" to autolinks
2016-06-19 16:21:04 +02:00
Jonne Haß
0f8806c5f2
Merge branch 'stable' into develop 2016-06-19 16:20:37 +02:00
Steffen van Bergerem
1811028835
Fix flaky mentioning cukes
closes #6876
2016-06-19 16:20:02 +02:00
Jonne Haß
35a4998707
Merge branch 'stable' into develop 2016-06-19 16:14:13 +02:00
Dennis Schubert
898c3d404f
Throw exception if no templateName gets provided but allow setting templateName to false explicitly
closes #6877
2016-06-19 16:14:00 +02:00
Dennis Schubert
652050a87e Add rel="noopener noreferrer" to autolinks 2016-06-19 13:43:43 +02:00
Dennis Schubert
13684216f2 Download PhantomJS over http
since Travis' wget has no clue what SNI is
who needs security anyway, right?
2016-06-19 13:42:04 +02:00
Dennis Schubert
192699f051 Download phantomjs from our own mirrir
the Amazon S3 connection at Travis seems to be a bit flaky...
2016-06-19 12:41:29 +02:00
Jonne Haß
2cab7f02eb
Merge branch 'stable' into develop 2016-06-19 11:56:58 +02:00
Dennis Schubert
3ae3bfe520
Don't require guard-* gems 2016-06-19 11:53:02 +02:00
Dennis Schubert
eb1e1e1263 Merge pull request #6768 from svbergerem/poltergeist
Use Poltergeist instead of Selenium
2016-06-19 11:43:50 +02:00
Dennis Schubert
2b1942a9b3
Remove deprecated guard-cucumber arguments 2016-06-19 11:38:12 +02:00
Dennis Schubert
e0f31fb350
Remove jshint guard config 2016-06-19 11:38:12 +02:00
Dennis Schubert
76369f33c5
Remove pry-debundle 2016-06-19 11:38:12 +02:00
Dennis Schubert
d41711a383
Merge branch 'stable' into develop 2016-06-19 05:38:59 +02:00
Dennis Schubert
7fb6ffbb4d
Don't require guard-rspec
since it causes an ugly warning in the console!
2016-06-19 05:37:41 +02:00