Commit graph

7912 commits

Author SHA1 Message Date
Steffen van Bergerem
749016a7b4 Fix keyboard shortcuts on profile pages
closes #6647
2016-01-21 21:00:26 +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
082e300a40 remove PublicsController completely 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
Benjamin Neff
24f5244f76 move glue code back to the initializer 2015-12-30 14:48:38 +01:00
Steffen van Bergerem
f3e897ab43 Activate hovercards for logged out users
closes #6603
2015-12-29 13:07:03 +01:00
Lukas Matt
cf49276aa8 bump jsxc to v0.1.4
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>

closes #6569
2015-12-21 17:29:42 +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
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
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
Jonne Haß
53a7d36e44 Revert "Force flash message width to 80% of screen on small devices"
This reverts commit e731bb86c5.
2015-11-13 15:59:18 +01:00
Augier
e731bb86c5 Force flash message width to 80% of screen on small devices
closes #6529
2015-11-13 14:31:06 +01:00
theworldbright
a054a35863 Catch Diaspora::NotMine on post controller
closes #6533
2015-11-04 22:10:00 +01:00
cmrd Senya
00588e1ef8 Disable self-notification possibility
closes #6512
2015-10-20 16:27:39 +02:00
Dennis Schubert
1f4ad4019f Merge branch 'release/0.5.4.0' into stable 2015-10-19 18:49:08 -07:00
Dennis Schubert
aabe6951e5 Do not reload Streams asynchronously
Fixes #6494 and #6473
Partly reverts 517cd56f21
[ci skip]
2015-10-19 18:46:09 -07:00
Steffen van Bergerem
06c1d2e9e3 Compare person id in people show view
closes #6505
2015-10-15 12:20:13 +02:00
Steffen van Bergerem
995ce18c37 Display publisher on user profile path
closes #6503
2015-10-15 05:58:38 +02:00
cmrd Senya
69b46df3d6 Notifications for comments on local posts by non-contacts 2015-10-14 22:32:19 +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
2fc7caf0bd Fix infinite scroll console error
closes #6478
2015-10-09 23:10:58 +02:00
Steffen van Bergerem
4e5d09e6c5 Fix 'post to single aspect' cukes 2015-10-09 23:10:53 +02:00
Steffen van Bergerem
f7bd0bbb24 DRY app/router.js 2015-10-09 17:45:51 +02:00
Steffen van Bergerem
dccad3f7e1 Remove old stream instance when reloading the stream
closes #6472
2015-10-09 11:00:27 +02:00
Steffen van Bergerem
da9cb52007 Scroll to top when reloading the stream
closes #6470
2015-10-08 14:44:02 +02:00
Steffen van Bergerem
0c214cd4ca Make click on active stream link reload the stream
closes #6466
2015-10-08 10:52:18 +02:00
Steffen van Bergerem
e0be1b49f1 Add public stream
closes #6465
2015-10-07 22:29:39 +02:00
Faldrian
058bcb43f8 Added avatar image fallback for notifications
closes #6463
2015-10-07 21:58:56 +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
517cd56f21 Don't reload stream pages
closes #6462
2015-10-06 22:46:58 +02:00
Steffen van Bergerem
25e4d8c365 Fix shortcuts after changing streams 2015-10-06 22:34:36 +02:00
augier
22882aa24d Infinite scroll triggered relative to last element top rather than window bottom
closes #6451
2015-10-02 23:42:26 +02:00
Jonne Haß
92113749c0 highlight-white is still referenced on stable 2015-09-15 10:44:23 +02:00
Steffen van Bergerem
8bb3d4d8a8 Remove unused color variables
closes  #6404
2015-09-15 09:51:06 +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
Lukas Matt
e57bdeed19 Set onlineHelp link in jsxc options
related to diaspora/jsxc#125

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>

closes #6388
2015-09-07 13:35:51 +02:00
Lukas Matt
a40a34ee8c autoLang default value is true
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-09-07 13:35:49 +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
zaziemo
c2c6ed5dea refactor moderator role and add specs
#5324
2015-09-07 12:32:09 +02:00