Commit graph

1220 commits

Author SHA1 Message Date
Ralin Chimev
1773e3e35d Do not change notification timestamp when making it read or unread.
Marking a notification as unread resets the timeago stamp causing
the times to look wrong. It can be reproduced by marking an old
notification as unread. Using the update_column instead of
update_attribute will not touch the updated_at attribute, and
thus will not affect the updated time ago in the view.

Fixes #6798.

closes #6821
2016-05-07 18:52:27 +02: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
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
Jonne Haß
9aa7b2bd78 bump ruby-oembed 2015-12-31 16:05:57 +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
apsc92
fdb3ae5cb8 Fix_notifications_timestamp_issue #4826
closes #6573
2015-12-08 17:30:27 +01:00
theworldbright
a054a35863 Catch Diaspora::NotMine on post controller
closes #6533
2015-11-04 22:10:00 +01: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
e0be1b49f1 Add public stream
closes #6465
2015-10-07 22:29:39 +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
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
realtin
15b186518c add moderators to report email recievers
and refactor coding style according to pull request comments

(#5324)
2015-09-07 12:31:25 +02:00
realtin
098c30c2b7 adapt report spec for the moderator 2015-09-07 12:29:46 +02:00
zaziemo
b2dc77e1e6 change method name for a better understanding of what the befor_filter does
and correct test syntax
#5324
2015-09-07 12:24:12 +02:00
realtin
bc75371b7a report controller renders index for the moderator
(#5324)
2015-09-07 12:24:12 +02:00
Benjamin Neff
663835ed3a remove old webfinger/hcard code
closes #6310
2015-08-21 14:23:08 +02:00
Benjamin Neff
d28e03f053 use discovery from diaspora_federation gem 2015-08-21 14:21:43 +02:00
theworldbright
d7c92431ae Extract service from comments controller
closes #6307
2015-08-09 18:35:11 +02:00
Steffen van Bergerem
dc576fb0d6 Check if person is nil in person_image_tag
closes #6286
2015-08-06 22:55:41 +02:00
Steffen van Bergerem
6fea450777 Fix mobile photos index page
closes #6243
2015-07-27 01:59:26 +02:00
theworldbright
2a3dde1ae5 Refactor PostService and extract its tests
Squashed commits:

[ada0f09] Remove favorites from Posts table

closes #6208
2015-07-26 13:10:24 +02:00
theworldbright
d724397168 Refactor posts controller 2015-07-26 12:58:42 +02:00
Jonne Haß
b7064677ff Collapse StatisticsController into NodeInfoController 2015-07-24 03:51:31 +02:00
Jonne Haß
487b0d90ca Implement NodeInfo 2015-07-24 03:50:02 +02:00
Benjamin Neff
8bf54e32ae create temporary fixture tests and remove old tests 2015-07-14 05:50:26 +02:00
Benjamin Neff
010afa1019 refactor: iterate over visiblities
closes #6060
2015-06-08 00:45:16 +02:00
Steffen van Bergerem
40bb44eb96 Mobile: manage followed tags
closes #5945
2015-05-12 04:00:07 +02:00
Steffen van Bergerem
399fdb2c7d Check request.format :mobile in home controller 2015-05-05 01:39:48 +02:00
Jonne Haß
2c7848e3cb Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations"
This reverts commit 096fa2ddbb, reversing
changes made to f7d1105148.
2015-05-04 00:36:27 +02:00
Benjamin Neff
3c09756417 refactoring javascript and controller
- move to contacts.js
- use json
- move to aspects_controller
- add route
- rewrite test
- fix css in chrome
2015-04-28 01:57:43 +02:00
Simon Wörner
cee4f1c3cd fixed aspect sorting, added minimal jquery ui, added test 2015-04-26 01:57:00 +02:00
Jonne Haß
0bad6dba88 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-22 20:58:54 +02:00
Jonne Haß
6e546ff2bf Trigger exports through a POST request
GET requests don't get any CSRF protection by Rails,
thus these sensitive actions should be better protected.

Thanks to @tomekr for the report.
2015-04-22 20:20:10 +02:00
Jonne Haß
0a70e51f74 Add a token the filename for exported user data
Also redirect to it for download, for Amazon S3
compatibility.

Prior to this patch an attacker could obtain an
users export by guessing the filename with a high
chance of success. Fully authenticating the
download request is a lot harder due to our diverse
deployment scenarios.

This brings the used method in line with the photo
export feature.

Thanks to @tomekr for the report.
2015-04-22 20:19:17 +02:00
Jonne Haß
d959dd725b Merge pull request #5850 from svbergerem/modal-for-new-aspect
Use Bootstrap modal for new aspect form
2015-04-20 22:34:51 +02:00
Marcelo Briones
6636a89118 Add participation counter 2015-04-11 14:41:17 -03:00
Steffen van Bergerem
75ef9f47d0 Use Bootstrap modal for new aspect form 2015-04-07 10:45:09 +02:00
Steffen van Bergerem
a6b9c6c057 Return 406 on people/guid/contacts, format json 2015-04-04 03:48:44 +02:00
Steffen van Bergerem
07a344d051 Disable auto follow back on aspect deletion 2015-04-03 14:10:14 +02:00
Steffen van Bergerem
d9bf4a2fa6 Remove layout 'centered_with_header_with_footer' 2015-03-18 21:59:56 +01:00
Steffen van Bergerem
2328f64d56 Merge pull request #5580 from MothOnMars/5549-password-reset-error
display specific error messages for password change (issue #5549)
2015-03-14 03:25:08 +01:00
Martha
985141c0e8 display specific error messages for password change (issue #5549) 2015-03-13 11:35:21 -07:00
Steffen van Bergerem
1ff644c13e Fix mobile notifications 2015-03-12 22:45:04 +01:00
Steffen van Bergerem
d2222a97e5 Fix photo count in the profile view 2015-03-10 11:38:49 +01:00
Marcelo Briones
b154d87070 Exports user photos as zip file 2015-03-03 19:45:57 -03:00
Jonne Haß
dd45b79a98 Drop Youtube oembed HTTPS hack
upstream ships it now that way
2015-03-02 02:34:51 +01:00
Steffen van Bergerem
e188782a9a Remove blueprint code 2015-03-02 00:04:57 +01:00