Commit graph

3926 commits

Author SHA1 Message Date
Steffen van Bergerem
b98af83c9d Sort tag search result by name
closes #6734
2016-03-03 17:57:58 +01:00
Steffen van Bergerem
98d76af318 Remove empty test file, move i18n spec
closes #6720
2016-02-26 11:27:17 +01:00
Steffen van Bergerem
374679c093 Add rspec test for reset_authentication_token without current_user
closes #6707
2016-02-21 04:26:12 +01:00
Steffen van Bergerem
02b330de70 Add jasmine test for aspect name form on contacts page
closes #6706
2016-02-21 04:19:33 +01:00
Steffen van Bergerem
ac5a7746e2 Remove contacts_title method and translations
closes #6687
2016-02-09 12:42:21 +01:00
Dennis Schubert
87ef4446e1 Remove uma.jpg and wolf.jpg
closes #6673
2016-02-06 15:39:38 +01:00
Faldrian
8e3816e64e let mention-regex only match usable strings
closes #6658
2016-01-28 18:47:13 +01:00
Benjamin Neff
44ab0df02b fix suppress_annoying_errors
closes #6653
2016-01-24 07:14:58 +01:00
tamatsyk
960e651764 internationalize controller rescue_from text
Fix typos

change forbitten to forbidden

fix styling issue and copypaste

improve code style for aspec_memberships_controller.rb with rubocop

fix styling issues

aligned elements of hash literals

fix typo

fix locale name and styling of its usage

fix failing tests

closes #6554
2016-01-20 21:37:02 +01:00
Benjamin Neff
812510b44a refactoring tests again
closes #6595
2016-01-06 00:47:55 +01:00
cmrd Senya
b6c7f004e4 Further receive tests development 2016-01-06 00:47:42 +01:00
cmrd Senya
e54f87b7a6 Add rspec persistance file 2016-01-06 00:46:14 +01:00
Jonne Haß
9aa7b2bd78 bump ruby-oembed 2015-12-31 16:05:57 +01:00
Benjamin Neff
5392c6e6a9 refactoring for federation tests 2015-12-30 14:50:34 +01:00
Benjamin Neff
9f8e018422 add subscribe url to webfinger 2015-12-30 14:50:34 +01:00
Benjamin Neff
0e7bb6d756 define federation entity factories 2015-12-30 14:50:34 +01:00
Benjamin Neff
082e300a40 remove PublicsController completely 2015-12-30 14:50:34 +01:00
Benjamin Neff
05e4c8dc51 improve key specs in federation_callbacks_spec.rb 2015-12-30 14:50:34 +01:00
Benjamin Neff
5c8f0c1671 create queue callbacks and remove receive routes 2015-12-30 14:50:34 +01:00
Steffen van Bergerem
f3e897ab43 Activate hovercards for logged out users
closes #6603
2015-12-29 13:07:03 +01:00
Steffen van Bergerem
78df0f5158 Update highlightjs 2015-12-28 17:25:45 +01:00
Dennis Schubert
c238329cd8 Merge branch 'master' into stable 2015-12-20 00:41:49 +01:00
Steffen van Bergerem
e20f2ae566 Fix XSS in sharing message 2015-12-20 00:15:32 +01:00
Steffen van Bergerem
2025fae420 Disable hovercards for logged out users and prevent redirect to sign in page
closes #6587
2015-12-17 01:20:24 +01:00
cmrd Senya
f0fc62e94d Fix a security issue that author_signature is not checked on the to-downstream receive of a federated relayable entity, allowing to forge relayables if you are an owner of the pod where a parent object is stored.
closes #6539
2015-12-13 12:26:59 +01:00
cmrd Senya
922d26f976 Implement integration tests for the federation messages receive feature
These are some initial tests, more to come.

It tests some features of Request, StatusMessage, Comment, Like,
Participation, Retraction, SignedRetraction, RelayableRetraction entities
receive process.
2015-12-13 12:24:52 +01:00
apsc92
fdb3ae5cb8 Fix_notifications_timestamp_issue #4826
closes #6573
2015-12-08 17:30:27 +01:00
Jason Robinson
9a35a0d8dd Add participation to root.author on receiving reshare
When author of the root post receives a reshare to it, no participation is added to the root author on the reshare. This causes any comments on the reshare on remote pods not to be sent to the author. Adding a participation should subscribe to the reshare and thus bring added comments back to the author.

closes #6481
2015-11-22 02:50:38 +01:00
Jason Robinson
66925918b1 Send comment to reshare author when commenting on reshare
As posts are always delivered also to reshare root, comments should also be delivered to reshare root, for concistency.
2015-11-22 02:45:27 +01:00
Manuel Vögele
0925a26506 Do not add participation for comment if comment validation failed The same fix is also done for the other social actions
closes #6552
2015-11-18 03:16:54 +01:00
theworldbright
a054a35863 Catch Diaspora::NotMine on post controller
closes #6533
2015-11-04 22:10:00 +01:00
Jonne Haß
c0c4b7277b bump shoulda-matchers 2015-10-29 04:20:37 +01:00
cmrd Senya
00588e1ef8 Disable self-notification possibility
closes #6512
2015-10-20 16:27:39 +02:00
Steffen van Bergerem
995ce18c37 Display publisher on user profile path
closes #6503
2015-10-15 05:58:38 +02:00
cmrd Senya
70b5d86386 Remove the lines from inlined_jobs.rb which never get called.
closes #6499
2015-10-14 01:14:54 +02:00
Steffen van Bergerem
b68daaece3 Redirect to sign in on 401 ajax response
closes #6496
2015-10-12 16:12:30 +02:00
Steffen van Bergerem
b9e6f749e2 Clean up view.js 2015-10-12 11:36:09 +02:00
Steffen van Bergerem
123e6d1dd4 Redirect logged out users to sign up page for limited posts
closes #6490
2015-10-11 17:29:01 +02:00
Steffen van Bergerem
230f6d6d62 Fix hovercard view console error
closes #6480
2015-10-10 06:45:09 +02:00
Steffen van Bergerem
f7bd0bbb24 DRY app/router.js 2015-10-09 17:45:51 +02:00
Steffen van Bergerem
e0be1b49f1 Add public stream
closes #6465
2015-10-07 22:29:39 +02:00
Faldrian
d486e37487 following tags now normalized and sorted in ui
closes #6454
2015-10-07 21:38:12 +02:00
Faldrian
a946251a9e Show getting_started only if user has made no profile changes on the page
closes #6456
2015-10-07 10:58:06 +02:00
Steffen van Bergerem
25e4d8c365 Fix shortcuts after changing streams 2015-10-06 22:34:36 +02:00
Steffen van Bergerem
05a6d95811 Always show public photos
closes #6398
2015-09-14 22:04:53 +02:00
Jonne Haß
6fb5e88ead Merge branch 'master' into stable 2015-09-13 12:23:41 +02:00
Steffen van Bergerem
ebad0961a9 Show private profile info if contact is sharing 2015-09-13 12:16:25 +02:00
Jonne Haß
0dd5447e63 Fix tumblr service deletion spec to actually test deletion 2015-09-07 13:31:45 +02:00
Jonne Haß
0e64d8de2a Refactor tumblr service spec
closes #6386
2015-09-07 13:24:53 +02:00
Vinothan Shankar
2ace9b47b1 * app/models/services/tumblr.rb (Services::Tumblr#post): Post only to primary blog
Hardly a total fix, but it's a start.  Based on meitar/diaspora:b5c01598.

* app/models/services/tumblr.rb: style: double-quote string

Line 22.  Change from single-quotes.

* app/models/services/tumblr.rb: parse URL only for blogs we care about

...which in this case is just the primary.

This also fixes the failed test in 7079fda (and by extension, 7a1d3a9).

* spec/models/services/tumblr_spec.rb: Add "primary" flag to test user-info

* spec/models/services/tumblr_spec.rb: Add a secondary blog to test user-info

This should not cause a request to be issued, so we can continue to
expect the request for the primary blog only.  Any request for the
secondary indicates a bug in the service implementation.

* spec/models/services/tumblr_spec.rb: Make the second blog returned the primary

Just to catch if it's picking the first one

* app/models/services/tumblr.rb: use blogs.find instead of blogs.each

Since we're only handling the primary blog, this should be easy enough

* app/models/services/tumblr.rb: Remove redundant if block

The condition it would have caught is dealt with by the ifnone on the find

* app/models/services/tumblr.rb: Style: remove space between { and |
2015-09-07 12:45:16 +02:00