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

4636 commits

Author SHA1 Message Date
theworldbright
82600003b3 Flash error messages when redirect_uri is invalid 2016-01-04 16:49:56 +09:00
theworldbright
adcf2ab7ab Fix test for prompt == "none" 2016-01-04 16:49:56 +09:00
augier
d351db1982 Filter for prompt handling 2016-01-04 16:49:56 +09:00
augier
7b2be0d3c6 Support displaying TOS and policy 2016-01-04 16:49:56 +09:00
augier
6fcb9a9d3a Add XSS spec for application's name 2016-01-04 16:49:56 +09:00
theworldbright
9c9880d880 Move JWKs files to database 2016-01-04 16:49:56 +09:00
augier
2c7d102019 Design for authorization page when client_name not providen + XSS spec 2016-01-04 16:49:55 +09:00
theworldbright
da766d8e8b Revoke previously issued tokens on duplicate request 2016-01-04 16:49:55 +09:00
theworldbright
fd467cd42b Add private_key_jwt support 
See

- http://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication
- https://openid.net/specs/openid-connect-registration-1_0.html#ClientMetadata
 2016-01-04 16:49:55 +09:00
theworldbright
1dcefdb998 Validate sector identifier uri and redirect uri 2016-01-04 16:49:55 +09:00
theworldbright
a76f51a6a5 Use redirect_uri if no sector identifier for ppid 
As according to http://openid.net/specs/openid-connect-core-1_0.html#PairwiseAlg:

"If the Client has not provided a value for
sector_identifier_uri in Dynamic Client Registration
[OpenID.Registration], the Sector Identifier used
for pairwise identifier calculation is the host
component of the registered redirect_uri."
 2016-01-04 16:49:55 +09:00
theworldbright
4be9f4d558 Make client name optional 2016-01-04 16:49:54 +09:00
augier
c33cce0953 Styling user consent form 2016-01-04 16:49:54 +09:00
theworldbright
1a7f2edc01 Perform major refactoring 
- Add foreign_keys
- Remove unused classes/methods
- Fix pronto errors
- Add method to retrieve client id from name
- Remove TODO comments
- Fix unnecessary private key generation
 2016-01-04 16:49:54 +09:00
theworldbright
e55a0b0d0b Replace scopes with constants in Authorization 2016-01-04 16:49:54 +09:00
theworldbright
bb8fe6aa83 Adjust id token config to save private key to file 2016-01-04 16:49:53 +09:00
theworldbright
24fd70676c Fix webfinger discovery route 2016-01-04 16:49:53 +09:00
theworldbright
ab65617958 Add support for max_age parameter 
Additionally add support for prompt's login option

Signed-off-by: theworldbright <kent@kentshikama.com>
 2016-01-04 16:49:53 +09:00
theworldbright
25f51c606a Add support for prompt parameter 2016-01-04 16:49:53 +09:00
theworldbright
8be3be3e10 Refactor authorizations controller destroy action 2016-01-04 16:49:53 +09:00
augier
07c12ba057 Using Camo for the application logo 2016-01-04 16:49:53 +09:00
theworldbright
98fd18077a Add test for expired access token 2016-01-04 16:49:52 +09:00
theworldbright
6e1a673459 Replace let!() with factory girl 2016-01-04 16:49:52 +09:00
theworldbright
dd337d4163 Remove JSON root from client controller 
Signed-off-by: theworldbright <kent@kentshikama.com>
 2016-01-04 16:49:52 +09:00
theworldbright
65c40f236e Load scopes from seeds 
Signed-off-by: theworldbright <kent@kentshikama.com>
 2016-01-04 16:49:51 +09:00
theworldbright
99d6d7b3e7 Add pairwise pseudonymous identifier support 
Squashed commits:

[a182de7] Fix pronto/travis errors
 2016-01-04 16:49:51 +09:00
theworldbright
d834a1d4d0 Replace user info endpoint with supported claims 
The route /api/v0/user/ will now be used as a
non-OIDC route. In other words, the /api/v0/user/
will require the "read" scope while
/api/openid_connect/user_info/ will require the
"openid" scope
 2016-01-04 16:49:51 +09:00
theworldbright
2be932ceff Delete password flow 2016-01-04 16:49:51 +09:00
theworldbright
e5932968fd Add support for authorization code flow 2016-01-04 16:49:51 +09:00
theworldbright
bc5e5c7420 Fix pronto errors 2016-01-04 16:49:51 +09:00
theworldbright
cd2f1215e8 Adjust protect resource endpoint spec 2016-01-04 16:49:51 +09:00
theworldbright
3cbe75469b Add support for scopes 
Remove scopes from tokens

Squashed commits:

[83db38f] Add redirect uris to supported metadata
 2016-01-04 16:49:51 +09:00
augier
de4f68c289 Support for more metadata 2016-01-04 16:49:50 +09:00
augier
b173283692 Test for refresh token flow 2016-01-04 16:49:50 +09:00
augier
cc28199555 Fixing hounds remarks 2016-01-04 16:49:50 +09:00
theworldbright
7b80a7408d Add integration tests for implicit flow 
Squashed commits:
[d5001fe] Refactor
[8d8a23f] Add test for when authorization is denied
[659fc56] Adjust password flow integration test
 2016-01-04 16:49:50 +09:00
theworldbright
ee9ac06e1a Add support for access tokens in implicit flow 
Squashed commits:
[7dbf618] Use Rail's find_or_create_by method
 2016-01-04 16:49:50 +09:00
theworldbright
2d762da072 Adjust tokens to fit revised Authorization 2016-01-04 16:49:50 +09:00
theworldbright
17fde49d61 Implement ID Token for the implicit flow 2016-01-04 16:49:50 +09:00
theworldbright
1475672d72 Fix authorization and related models 
Squashed commits:
[a844d37] Remove unnecessary class_name's from models
[529a30c] Further adjust authorization and related models
 2016-01-04 16:49:50 +09:00
augier
031679762a Redesign the models 2016-01-04 16:49:49 +09:00
theworldbright
9d9dc13272 Adjust discovery controller to current values 2016-01-04 16:49:49 +09:00
Augier
73cc55940d Fix travis errors and refactor 2016-01-04 16:49:49 +09:00
theworldbright
3d26cbf657 Allow POST requests at authentication endpoint 2016-01-04 16:49:49 +09:00
theworldbright
3cfbcbce8f Implement authorization endpoint (part 1) 
The user can now authenticate with the authorization
server's authorization endpoint and receive a fake
id token.
 2016-01-04 16:49:49 +09:00
theworldbright
88d02ea35b Add client registration 
Client must now be registered prior to imitating a
call to the token endpoint with the password flow.

Squashed commits:

[fdcef62] Rename authorization endpoint to protected resource endpoint
 2016-01-04 16:49:48 +09:00
theworldbright
52e10a91fe Add tests for invalid token to password flow 2016-01-04 16:49:16 +09:00
theworldbright
9de2837a63 Move new API from /api/v2 to /api/v0 2016-01-04 16:49:16 +09:00
theworldbright
beae77102d Allow current user to be obtained from access token 2016-01-04 16:49:16 +09:00
theworldbright
68d96a3189 Add versionist gem 2016-01-04 16:49:16 +09:00
theworldbright
efdfe318fd Add ability to get user info from access tokens 2016-01-04 16:48:42 +09:00
Augier
a1f3d5f5f9 Getting token from user credential flow 2016-01-04 16:45:21 +09:00
Dennis Schubert
9dca1785c2 Merge branch 'stable' into develop 2015-12-31 16:17:35 +01:00
Jonne Haß
9aa7b2bd78 bump ruby-oembed 2015-12-31 16:05:57 +01:00
Steffen van Bergerem
99289491ef Merge pull request #6607 from jhass/link_profile_in_user_menu 
Link user menu button to the users profile
 2015-12-30 18:37:16 +01:00
Jonne Haß
f70cefb983 Link user menu button to the users profile 2015-12-30 15:14:29 +01:00
Dennis Schubert
d4fbbd86b3 Merge branch 'stable' into develop 2015-12-30 14:51:05 +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
Jonne Haß
434deaa75a Merge branch 'stable' into develop 2015-12-29 13:07:08 +01:00
Steffen van Bergerem
f3e897ab43 Activate hovercards for logged out users 
closes #6603
 2015-12-29 13:07:03 +01:00
Jonne Haß
20ba097918 Merge branch 'stable' into develop 2015-12-28 17:31:38 +01:00
Steffen van Bergerem
78df0f5158 Update highlightjs 2015-12-28 17:25:45 +01:00
Dennis Schubert
86fead30a4 Merge branch 'stable' into develop 2015-12-20 00:47: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
Jonne Haß
179964fd15 Merge branch 'stable' into develop 2015-12-17 01:20:31 +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
a2ce47fae5 Remove parent author signature for relayables from the DB 
since it is considered redundant
 2015-12-16 22:00:35 +03:00
cmrd Senya
3d5aacda4c Add rspec persistance file 2015-12-13 16:53:48 +03:00
Jonne Haß
13029235d0 Merge branch 'stable' into develop 2015-12-13 12:28:04 +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
Jonne Haß
21cb1f44cd Merge branch 'stable' into develop 2015-12-08 17:30:32 +01:00
apsc92
fdb3ae5cb8 Fix_notifications_timestamp_issue #4826 
closes #6573
 2015-12-08 17:30:27 +01:00
Dennis Schubert
5081d69847 Merge branch 'stable' into develop 2015-11-22 02:52:37 +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
Jonne Haß
17d0ddab41 Merge branch 'stable' into develop 2015-11-18 03:37:34 +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
Manuel Vögele
1680c0c924 Do not disable submit button if comment is empty in mobile view 
Fixes #5485
 2015-11-13 02:46:22 +01:00
Jonne Haß
7fca5cf93a Merge branch 'stable' into develop 2015-11-04 22:10:07 +01:00
theworldbright
a054a35863 Catch Diaspora::NotMine on post controller 
closes #6533
 2015-11-04 22:10:00 +01:00
Dennis Schubert
92c2a2e527 Merge branch 'stable' into develop 2015-10-29 04:31:47 +01:00
Jonne Haß
c0c4b7277b bump shoulda-matchers 2015-10-29 04:20:37 +01:00
Jonne Haß
800be9b2cf Merge branch 'stable' into develop 2015-10-20 16:27:43 +02:00
cmrd Senya
00588e1ef8 Disable self-notification possibility 
closes #6512
 2015-10-20 16:27:39 +02:00
Dennis Schubert
228f3852b2 Merge branch 'stable' into develop 2015-10-15 05:58:44 +02:00
Steffen van Bergerem
995ce18c37 Display publisher on user profile path 
closes #6503
 2015-10-15 05:58:38 +02:00
Jonne Haß
403ef73d39 Merge branch 'stable' into develop 2015-10-14 01:14:59 +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
Jonne Haß
09f4eeac2a Merge branch 'stable' into develop 2015-10-12 16:12:36 +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
4a55fc5fb6 Clean up view.js 2015-10-11 20:50:22 +02:00
Jonne Haß
2aed793d19 Merge branch 'stable' into develop 2015-10-11 17:30:47 +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
Jonne Haß
77295ffcfb Merge pull request #6487 from svbergerem/move-reshare-count 
Move reshare count
 2015-10-10 20:51:27 +02:00
Steffen van Bergerem
74a3a9719c Display reshares under the post 2015-10-10 14:22:59 +02:00
augier
aefd7273d9 Drop ID 2015-10-10 12:34:59 +02:00
augier
c62927bf00 Use backbone for flash messages 2015-10-10 12:15:41 +02:00
Dennis Schubert
aab21be09d Merge branch 'stable' into develop 2015-10-10 06:45:15 +02:00
Steffen van Bergerem
230f6d6d62 Fix hovercard view console error 
closes #6480
 2015-10-10 06:45:09 +02:00
Jonne Haß
c27b629515 Merge branch 'stable' into develop 2015-10-09 17:47:39 +02:00
Steffen van Bergerem
f7bd0bbb24 DRY app/router.js 2015-10-09 17:45:51 +02:00
Jonne Haß
92b5ea29ed Merge branch 'stable' into develop 2015-10-07 22:29:45 +02:00
Steffen van Bergerem
e0be1b49f1 Add public stream 
closes #6465
 2015-10-07 22:29:39 +02:00
Steffen van Bergerem
fc9d7396cc Merge branch 'stable' into develop 2015-10-07 21:38:26 +02:00
Faldrian
d486e37487 following tags now normalized and sorted in ui 
closes #6454
 2015-10-07 21:38:12 +02:00
Jonne Haß
8c5534a850 Merge pull request #6464 from Zauberstuhl/fix_report_translation 
Uncapitalize type if trying to find translation-string
 2015-10-07 17:52:10 +02:00
Lukas Matt
74fbd122a1 Uncapitalize type if trying to find translation-string 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-10-07 16:51:17 +02:00
Jonne Haß
1df5c7f7bf Merge branch 'stable' into develop 2015-10-07 10:58:10 +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
Jonne Haß
7b4d7dc737 Merge branch 'stable' into develop 2015-10-06 22:50:42 +02:00
Steffen van Bergerem
25e4d8c365 Fix shortcuts after changing streams 2015-10-06 22:34:36 +02:00
Steffen van Bergerem
e4a850ff9a Fix console error for map in SPV 2015-10-05 11:38:43 +02:00
Lukas Matt
78f9b39e55 Use polymorphic association for the report item 
* Adopt pronto suggestions

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-10-03 17:18:03 +02:00
Lukas Matt
6bf47c7ff0 Fix spec files and report model 
* Adopt pronto suggestions
 2015-10-03 17:17:45 +02:00
Lukas Matt
95072d6010 Add get_reported_guid spec for report helper 
* two new methods in report model reported_author and item
* merge deletion methods in report model

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-10-03 17:17:06 +02:00
Steffen van Bergerem
b40d5362cf Merge pull request #6256 from TeamDeltaQuadrant/5813-show-geolocation-on-osm 
5813 show geolocation on osm
 2015-09-23 01:43:49 +02:00
Jonne Haß
0508c1b8d4 Merge branch 'stable' into develop 2015-09-14 22:06:52 +02:00
Steffen van Bergerem
05a6d95811 Always show public photos 
closes #6398
 2015-09-14 22:04:53 +02:00
Jonne Haß
0f1295718f Merge branch 'stable' into develop 2015-09-13 12:25:18 +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
Steffen van Bergerem
7bcccde9f4 Merge pull request #6383 from AugierLe42e/improve-mobile-conversations-design 
[Quickfix] Improve mobile conversations design
 2015-09-12 12:20:59 +02:00
augier
44d71c3905 Improve mobile conversations design 2015-09-11 23:17:02 +02:00
realtin
1cdcc50c63 fix all the pronto remarks finally 
- fix map controls in stream
 2015-09-11 10:24:39 +02:00
realtin
52fac5740e fix indentation & jshint predefines 
according to svbergerem's annotations
 2015-09-10 14:48:25 +02:00
zaziemo
263dc6f119 refactor code that choses the tile server based on podmin's choice 
and remove the possibility to disable the map feature.
By default the application uses the itles of Heidelberg University that
don't need any credentials. If podmins enable the mapbox option in the
diaspora.yml and enter their credentials the mapbox tiles are used for the map
rendering.
 2015-09-09 17:03:46 +02:00
zaziemo
0f3eff8f88 add correct attributions for map tiles of Heidelberg University 
remove personal credentials from mapbox and refactored some code
#5813

Signed-off-by: zaziemo <maren.heltsche@gmail.com>
 2015-09-09 15:24:00 +02:00
realtin
57b7c05c4f set maptile default to OpenMapSurfer 
- refactor code for toggle map function
- adjust jasmine tests for maps and add tests for SPV
- change name of access token in defaults.yml according to naming conventions
- add explanation of map use for podmins
- add location to post_presenter
- fix opening multiple maps inside the stream when clicking on a reshare location
(#5813)
 2015-09-09 12:26:47 +02:00
realtin
6716b4c175 rename location_view to locator 
because it is confusing with the other location files
 2015-09-09 12:25:45 +02:00
Julia
c0f909d228 add map to header 
and add toggle map function
to show and load map only when user is clicking on address

(#5813)
 2015-09-09 12:23:38 +02:00
zaziemo
f92a2ee0dd merge address & coordinates in one location object 
to provide a clear arrangement of all location data
- add 'L' to predefs for pronto because it is part of the leaflet library
- fix: show address template only with an address present
with merging the location objects into one, only the objects within
the location object can be empty
(#5813)
 2015-09-09 12:22:48 +02:00
zaziemo
298e195a8f add a map subview 
- add coordinates in post_presenter
- add map to the SPV if location is provided
- add leaflet.js to render map and marker of position
- make coordinates available in frontend
- add map scss
- make stream post location clickable and redirect to the SPV
- prevent render map if no location data is provided
- add tests for coordinates
- use the leaflet gem instead of the JS assets
(#5813)
 2015-09-09 12:19:38 +02:00
Jonne Haß
6528f1479c Merge branch 'stable' into develop 2015-09-07 13:32:19 +02:00
Jonne Haß
0dd5447e63 Fix tumblr service deletion spec to actually test deletion 2015-09-07 13:31:45 +02:00
Jonne Haß
ba61ca4bdf Merge branch 'stable' into develop 2015-09-07 13:25:14 +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
Jonne Haß
176b32c815 Merge branch 'stable' into develop 2015-09-07 12:41:36 +02:00
zaziemo
d38741d5eb add more specs to test moderator role 
fixes #5324

closes #6351
 2015-09-07 12:38:12 +02:00
zaziemo
c2c6ed5dea refactor moderator role and add specs 
#5324
 2015-09-07 12:32:09 +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
zaziemo
3a3c881735 add new role moderator analogue to admin role 
#5324
 2015-09-07 12:24:12 +02:00
Florian Staudacher
738413c65f fix some issues with pod-checking 
add tooltips in the frontend
fix a JS problem with empty hostname
use `find_in_batches` correctly
add a migration to clean up the pods table + unique index on hostname
 2015-08-30 18:50:34 +02:00
Dennis Schubert
4f2f3cca59 Merge branch 'stable' into develop 2015-08-29 21:44:31 +02:00
Steffen van Bergerem
1874c37706 Fix back-to-top backbone view 
closes #6360
 2015-08-29 21:44:24 +02:00
Steffen van Bergerem
696eebbe5d Add mobile comment box only once 2015-08-29 15:21:44 +02:00
Steffen van Bergerem
cd602c19fd Fix i18n spec 2015-08-29 14:46:20 +02:00
Steffen van Bergerem
3bc5b673c6 Refactor mobile comment js code and add tests 2015-08-29 14:46:20 +02:00
Steffen van Bergerem
9446a3ae21 Merge pull request #6301 from AugierLe42e/image-gallery 
Using Blueimp image gallery
 2015-08-27 23:59:46 +02:00
augier
63bfcb7c98 Using Blueimp image gallery 2015-08-27 23:50:20 +02:00
Steffen van Bergerem
7e9a88573b Merge pull request #6325 from AugierLe42e/add-toggle-mobile-menu 
Add 'Toggle mobile' item to menu + minor styling
 2015-08-27 22:58:00 +02:00
augier
4364a80330 Keeping badges on the header 2015-08-27 22:00:43 +02:00
Jonne Haß
a30ba5697e Merge pull request #6290 from Raven24/pod_test 
test pods for connectivity
 2015-08-27 11:38:18 +02:00
Dennis Schubert
6b863defa3 Merge branch 'stable' into develop 2015-08-27 05:25:51 +02:00
Steffen van Bergerem
0df0926739 Convert BackToTop to a backbone view 2015-08-25 04:17:24 +02:00
Florian Staudacher
ea397ffdfb Add connection test for pods in the network 
* add a class for checking pod connectivity
* extend pod model to handle new functionality
* add an admin frontend to list pods and re-trigger checks manually
* add a daily worker to run through all the pods
* add unit tests for most of the new code
 2015-08-24 22:04:53 +02:00
Jonne Haß
2bf6c87964 Merge branch 'stable' into develop 2015-08-23 22:49:51 +02:00
theworldbright
335b1c32aa Refactor post presenter 2015-08-23 22:49:12 +02:00
Steffen van Bergerem
89a3ea6d20 Merge branch 'stable' into develop 2015-08-23 14:45:33 +02:00
Jonne Haß
a1ca45b201 Update NodeInfo to final 1.0 schema 
closes #6340
 2015-08-23 14:45:20 +02:00
Steffen van Bergerem
eddfa7cb5c Merge pull request #6309 from AugierLe42e/left-navbar-polishing 
Left and right navbar polishing
 2015-08-23 11:29:51 +02:00
augier
450bf4f4ba Refactor and minor styling 2015-08-23 09:59:12 +02:00
Steffen van Bergerem
40ef382a6e Merge branch 'stable' into develop 2015-08-22 01:35:32 +02:00
Anton Tkachov
ef6c8a5448 Issue #6180: Update stream faces block if somebody was blocked 
closes #6320
 2015-08-22 01:35:23 +02:00
Jonne Haß
d396d5555f Merge branch 'stable' into develop 2015-08-21 14:23:46 +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
Benjamin Neff
21e5bd8697 add save callback for webfinger 2015-08-21 14:21:43 +02:00
Benjamin Neff
65b056341c update federation gem 2015-08-21 14:21:42 +02:00
augier
281d1a9161 Rebasing and fixing tests 2015-08-11 18:12:02 +02:00
Steffen van Bergerem
8bc86eb98b Replace jquery.autocomplete with typeahead.js 2015-08-10 22:55:05 +02:00
Jonne Haß
25be9ecfd2 Merge branch 'stable' into develop 2015-08-09 18:35:44 +02:00
theworldbright
d7c92431ae Extract service from comments controller 
closes #6307
 2015-08-09 18:35:11 +02:00
Jason Robinson
cb909c0d70 Strip leading/trailing whitespace from pod tags list in social relay well known 
Closes #6303
 2015-08-09 00:33:35 +03:00
Jonne Haß
480384a077 Merge branch 'stable' into develop 2015-08-06 22:56:30 +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
augier
f917757b5b Use entypo icons on mobile posts 2015-08-06 15:56:58 +02:00
Jonne Haß
4442616b0d Merge branch 'stable' into develop 2015-07-30 12:01:35 +02:00
Steffen van Bergerem
536d1fe0e7 Move nsfw-shield to status-message 
closes #6270
 2015-07-30 12:00:48 +02:00
Steffen van Bergerem
e402bbdd3d Merge pull request #6245 from AugierLe42e/fix-nsfw-author 
Fix nsfw author
 2015-07-30 00:28:15 +02:00
augier
9a23c92f8e Show author of NSFW post 2015-07-29 21:13:41 +02:00
Jonne Haß
4abc0c5988 Merge branch 'stable' into develop 2015-07-29 10:06:04 +02:00
Steffen van Bergerem
67653cf465 Update backbone.js 
closes #6262
 2015-07-29 10:04:18 +02:00
Dennis Schubert
04135d7b28 Merge branch 'stable' into develop 2015-07-27 02:05:14 +02:00
Steffen van Bergerem
6fea450777 Fix mobile photos index page 
closes #6243
 2015-07-27 01:59:26 +02:00
Jonne Haß
6ee3843449 Merge branch 'stable' into develop 2015-07-26 13:11:49 +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
Dennis Schubert
e8297f8d6b Merge pull request #6207 from jaywink/social-relay 
Implement social relay requirements
 2015-07-25 23:01:45 +02:00
Steffen van Bergerem
9ca8005b27 Fix percentage on mobile polls 2015-07-25 04:34:52 +02:00
Jonne Haß
11a8ac614c Merge pull request #6240 from svbergerem/contact-page-update-counts 
Update number of contacts on contact page when adding/removing contacts
 2015-07-24 22:02:39 +02:00
Steffen van Bergerem
04191996a5 Add updates for 'only sharing' and 'all contacts' 2015-07-24 14:18:43 +02:00
Jonne Haß
d68b3f02bd Expose whether chat is enabled as NodeInfo metadata 
related to #6211
 2015-07-24 04:16:54 +02:00
Dennis Schubert
be8f920c29 Merge branch 'stable' into develop 2015-07-24 04:05:32 +02:00
Jonne Haß
b7064677ff Collapse StatisticsController into NodeInfoController 2015-07-24 03:51:31 +02:00
Jonne Haß
c928d6c117 Expose whether chat is enabled as NodeInfo metadata 
related to #6211
 2015-07-24 03:51:31 +02:00
Jonne Haß
487b0d90ca Implement NodeInfo 2015-07-24 03:50:02 +02:00
Steffen van Bergerem
4a178e20e5 Update number of contacts on contact page when adding/removing contacts 2015-07-24 02:38:49 +02:00
Jonne Haß
5a5d595339 Merge pull request #6238 from svbergerem/mobile-location-polls 
Add location and polls to mobile website
 2015-07-23 20:02:11 +02:00
Steffen van Bergerem
79dfdfa224 Add integration tests for mobile polls and locations 2015-07-23 17:30:53 +02:00
Jonne Haß
f4e0785e96 Merge branch 'stable' into develop 2015-07-23 17:02:55 +02:00
cmrd Senya
e30293b9c1 Enable the jasmine testsuite to work across LAN by setting its Host variable to "0.0.0.0" (instead of default 127.0.0.1) so you could test it with a foreign web browser. 
closes #6234
 2015-07-23 17:02:52 +02:00
Steffen van Bergerem
44c370513e Refactor publisher_view.js 2015-07-22 17:36:25 +02:00
Jonne Haß
0cbe7ec9a8 Merge branch 'stable' into develop 2015-07-22 10:05:46 +02:00
Steffen van Bergerem
f8bbe71f54 Remove correlations 
closes #6223
 2015-07-22 09:46:52 +02:00
Steffen van Bergerem
c8f482064c Remove rake_helpers 2015-07-22 09:41:53 +02:00
Steffen van Bergerem
8f27e8fae8 Improve wording for admin dashboard 2015-07-21 20:43:18 +02:00
Steffen van Bergerem
484e70a68f Add dashboard to admin page 2015-07-21 14:36:41 +02:00
Jason Robinson
bdf6c71772 Implement social relay functionality 
* .well-known/social-relay - to serve subscription preferences to relays
* Workers.deferred_dispatch relay carbon copy functionality for outbound sending

See discussion here: https://www.loomio.org/d/9vpoe0UR/public-post-federation#comment-730911 and spec here: https://wiki.diasporafoundation.org/Relay_servers_for_public_posts
 2015-07-18 21:29:31 +03:00
Jonne Haß
0e439f6c1c Merge branch 'stable' into develop 2015-07-16 11:12:16 +02:00
JoeBew42
e21dad780d Refactoring tests on photo saved with and without EXIF data 
closes #6183
 2015-07-16 11:12:12 +02:00
Dennis Schubert
201a3ec1cf Merge branch 'stable' into develop 2015-07-16 03:11:25 +02:00
realtin
d0b290ea4d refactor hash indentation and add double quotes 
this is the suggested styling according to hound/pronto/rubocop
(#6192)
 2015-07-16 03:08:34 +02:00
zaziemo
c5a2334fbe refactor tests to use let 
instead of before blocks creating instance variables
pronto checked

#6192
 2015-07-16 03:05:21 +02:00
realtin
8823bb01a2 refactor test to use let and better indentation 
(#6192)
 2015-07-16 03:05:20 +02:00
zaziemo
56e0d3d57d Remove one comment and change hash syntax 
#6192
 2015-07-16 03:05:20 +02:00
zaziemo
f52260ec68 Delete test because it didn't have an expectation 
and dipatch is also called in the following test
#6192
 2015-07-16 03:05:20 +02:00
realtin
62b375bb8e refactor test to use let 
instead of instance variables
(#6192)
 2015-07-16 03:05:20 +02:00
realtin
1503376fa6 refactor test to not use send method 
since dispatch method is not private
(#6192)
 2015-07-16 03:05:20 +02:00
realtin
880886bbad refactor test to use let instead of instance variables 2015-07-16 03:05:20 +02:00
zaziemo
5fba53a105 refactor even more tests 2015-07-16 03:05:20 +02:00
realtin
3ff33d355f refactor test to use let 2015-07-16 03:05:20 +02:00
zaziemo
e1e8856e8d refactor more specs 2015-07-16 03:05:20 +02:00
zaziemo
e3fe375849 correct indentation and use new hash syntax 2015-07-16 03:05:20 +02:00
zaziemo
fccb5dae23 refactor test: replacing instance variables in before blocks, renaming variables for easier understanding, simplify test set up with less different comments, correct two tests 2015-07-16 03:04:41 +02:00
realtin
a9919fabd1 refactor test to use let and rm unused variables 2015-07-16 03:00:08 +02:00
zaziemo
d86a768590 refactor test using let and subject instead of before 2015-07-16 03:00:08 +02:00
realtin
7f3737b13f refactor test to use let rather then instance variables 2015-07-16 03:00:08 +02:00
zaziemo
abf87889a0 refactor test by using let instead of before block when creating instance variables 2015-07-16 03:00:08 +02:00
Benjamin Neff
e4ca9f01e2 fix jsxc_helper_spec and use new url_to in jsxc_helper 
closes #6151
 2015-07-13 23:52:13 +02:00
Benjamin Neff
edc3ac6908 write tests for federation callbacks 2015-07-14 05:50:26 +02:00
Benjamin Neff
804784ed3f fix @pod_uri/@pod_url and add url_to to AppConfig 2015-07-14 05:50:26 +02:00
Benjamin Neff
8bf54e32ae create temporary fixture tests and remove old tests 2015-07-14 05:50:26 +02:00
Benjamin Neff
f875be8d5b use federation-gem for webfinger/hcard generation 
remove old webfinger/hcard generation code

this fixes #5143
 2015-07-14 05:50:26 +02:00
Dennis Schubert
6b6bf84598 Merge pull request #6151 from SuperTux88/federation-gem 
Federation Gem Step 1: Webfinger/HCard generation
 2015-07-12 17:02:23 +02:00
Benjamin Neff
0ffe513b40 fix jsxc_helper_spec and use new url_to in jsxc_helper 2015-07-11 11:19:42 +02:00
Benjamin Neff
1bf328d294 write tests for federation callbacks 2015-07-11 11:19:42 +02:00
Benjamin Neff
94fc378eb7 fix @pod_uri/@pod_url and add url_to to AppConfig 2015-07-11 11:19:42 +02:00
Jonne Haß
397845161f Merge pull request #6162 from cmrd-senya/5684-public-additional-profile 
Allow additional profile fields (previously private profile) to be set public (new updated version)
 2015-07-11 10:19:19 +02:00
cmrd Senya
7a5a0a909a Allow extended profile fields (previously private profile) to be set public (#5684). 
This adds a new boolean field "public_details" to person model.
By default it is false and represents old behaviour. When it is
set to true, extended profile (bio,location,gender,birthday)
get available to people who didn't log into diaspora and to
people you don't share with (i.e. it is made public).

In UI, a bootstrap-switch added on the profile-edit page in order to
change the setting.

This also changes wording from public/private profile to basic/extended.
The latter could be public and limited.
 2015-07-11 04:36:45 +03:00
Jonne Haß
84d5a13ce1 Merge branch 'stable' into develop 2015-07-11 00:17:19 +02:00
realtin
9eadc251ae added post guid to the post_serializer 
closes #6185
 2015-07-11 00:17:01 +02:00
zaziemo
787c1cfce9 add spec and code to include guid in comment's export 
#6115
 2015-07-11 00:16:24 +02:00
Benjamin Neff
0fca8ceeaf create temporary fixture tests and remove old tests 2015-07-10 01:46:48 +02:00
Benjamin Neff
46a22fefe9 use federation-gem for webfinger/hcard generation 
remove old webfinger/hcard generation code

this fixes #5143
 2015-07-10 01:46:48 +02:00
Spanti Nicola (RyDroid)
df440ed8d8 Very minor changes of some JS files 2015-07-08 19:09:08 +02:00
Jonne Haß
1e4224813e Merge branch 'stable' into develop 2015-07-05 20:50:42 +02:00
Benjamin Neff
b0a9a6342f add url_to 
closes #6168
 2015-07-05 20:46:18 +02:00
Benjamin Neff
2294e59ee3 change public_url to atom_url and profile_url 2015-07-05 20:44:24 +02:00
Jonne Haß
202b6108e9 Merge branch 'stable' into develop [ci skip] 2015-07-05 12:22:35 +02:00
Mohammed Rashid
c652374787 typo in spec [ci skip] 
closes #6167
 2015-07-05 12:22:23 +02:00
Steffen van Bergerem
61edda0fca Aspect creation modal now creates an aspect when pressing enter 2015-07-03 18:20:32 +02:00
Steffen van Bergerem
9c4f80346b Use entypo-rails mappings 2015-07-03 15:31:29 +02:00
Jonne Haß
1cd2562572 Merge branch 'stable' into develop 2015-07-02 11:12:16 +02:00
Jonne Haß
6601576149 Merge branch 'master' into stable 2015-07-02 11:11:58 +02:00
Dennis Schubert
e92c8000ba Do not leak private profile fields in JSON format 
Signed-off-by: Dennis Schubert <mail@dennis-schubert.de>
 2015-07-02 10:07:59 +02:00
Steffen van Bergerem
df12878371 Fix overflow with perfect scrollbar 2015-06-22 00:44:42 +02:00
Jonne Haß
188e554b7b Merge branch 'stable' into develop 2015-06-21 20:48:57 +02:00
fap
1061e101fd Adds welcome message on registration Welcome message is only send out if podmin account is defined and welcome message is enabled in the config. 
This also enables the podmin account to send messages
to any local user.

closes #6128
 2015-06-21 20:48:48 +02:00
Steffen van Bergerem
049c8eb384 Bootstrap header rewrite 2015-06-20 00:38:40 +02:00
Steffen van Bergerem
92a3dd53f0 Replace jquery.autoresize with autosize 2015-06-14 20:03:15 +02:00
fla
7f6609d17b Remove old service keys in statistics.json 2015-06-13 11:03:47 +02:00
Steffen van Bergerem
18a8211cc3 Add img-responsive to image class 2015-06-12 00:01:56 +02:00
Dennis Schubert
8a4ec1d4c6 Merge branch 'stable' into develop 2015-06-08 04:18:38 +02:00
Benjamin Neff
d42b5c128e update photos when received over public path 
closes #6082
 2015-06-08 04:18:31 +02:00
Benjamin Neff
e16b9af7e6 make public and private receiver work similar ... 2015-06-08 04:15:17 +02:00
Dennis Schubert
ad52eaf6d7 Merge branch 'stable' into develop 2015-06-08 04:09:57 +02:00
Benjamin Neff
97153ad08b update tests for new twitter client 
closes #6083
 2015-06-08 04:08:46 +02:00
Dennis Schubert
0c6ca1d235 Merge branch 'stable' into develop 2015-06-08 00:58:20 +02:00
Benjamin Neff
aa2297a8c0 retry receive share-visibility when failed while receiving parallel 
refactoring:
- remove unused return-values (were used for caching, which was removed again)
- remove transaction (doesn't help here, added in 2615126)

closes #6068
 2015-06-08 00:58:00 +02:00
Dennis Schubert
e0420d733a Merge branch 'stable' into develop 2015-06-08 00:49:55 +02:00
Benjamin Neff
010afa1019 refactor: iterate over visiblities 
closes #6060
 2015-06-08 00:45:16 +02:00
efstrian
69c3a4100d Issue #4297: Color themes can override bootstrap variables 2015-06-07 19:58:54 +03:00
efstrian
d64ea15891 Issue #4297: Style fixes - Default theme is configurable 2015-06-07 19:58:14 +03:00
dimana
31d760867c Issue #4297: Updated color themes and testing 2015-06-07 19:57:37 +03:00
efstrian
57d766346c Issue #4297: Enable color theme setup 2015-06-07 19:57:16 +03:00
Jonne Haß
7bfa0f857c Merge branch 'stable' into develop 2015-06-06 15:23:44 +02:00
Jonne Haß
6c71d9f257 Only strip text direction markers around hashtags for now 
Fixes #6067
 2015-06-06 15:23:12 +02:00
Jonne Haß
8df9cb9cd2 Merge branch 'stable' into develop 2015-06-05 09:40:39 +02:00
Benjamin Neff
214ce1cf6e change path to uma.jpg to /assets 
closes #6064
 2015-06-05 09:40:34 +02:00
Steffen van Bergerem
700df9af23 Fix jasmine tests 
Fix notifications jasmine tests
 2015-06-04 18:05:44 +02:00
Steffen van Bergerem
f64eb9ff41 Fix hound remarks 2015-06-04 18:05:44 +02:00
theworldbright
98f11b944a Fix styleguide violations 
Fix hound remark 12

Remove unnecessary explicit div tag

Rename el_**** to ****El (hound remark 2 and 3)

Only find and replace operations were done with
this commit

Fix hound remark 4 and 8

Fix hound remark 6

Fix hound remark 7

Fix hound remark 9

Fix hound remark 10 and 11

Fix hound remark 13

Fix hound remark 1

Change single quotes to double quotes

Change single quotes to double in publisher view

Fix camelCase and missing {} in publisher view

Change single quotes to double in bookmarklet view

Use dot notation for serializedForm in publisher

Change single quotes to double in bookmarklet spec

Change single quotes to double in publisher spec

Fix missing {} in publisher views

Use ruby 1.9 hash syntax in invite_link

Fix indentation in publisher view
 2015-06-04 18:05:44 +02:00
Steffen van Bergerem
f5bb4a4557 Refactor button colors 2015-06-04 18:05:44 +02:00
Augier
207b6c6153 Port to Bootstrap 3 
correcting images display on stream sidebar

Corrections on profile page
 2015-06-04 18:05:43 +02:00
Jonne Haß
3850118e4e Merge branch 'stable' into develop 2015-06-02 12:14:42 +02:00
Steffen van Bergerem
1b77258d0e Set default for post title truncation to 70 characters 
closes #6022
 2015-06-02 12:14:35 +02:00
Dennis Schubert
ffc3cb711f Merge branch 'stable' into develop 2015-06-02 02:35:21 +02:00
Benjamin Neff
03dbb75dd5 don't save default avatars to the database 2015-06-02 02:32:01 +02:00
Dennis Schubert
8c4bcd8bd3 Merge branch 'stable' into develop 2015-05-31 01:47:09 +02:00
Steffen van Bergerem
fdad348898 Fix tag rendering in emails 
closes #6009
 2015-05-31 01:47:05 +02:00
Dennis Schubert
b2dbdb3706 Merge branch 'stable' into develop 2015-05-30 03:08:30 +02:00
Jonne Haß
ac52cef546 Only return the current_users participation for post interactions 
closes #6007
 2015-05-30 03:08:25 +02:00
Jonne Haß
351f54d74f Merge branch 'stable' into develop 2015-05-28 11:24:34 +02:00
Sandip Trivedi
2ba2ef1b9c Replaces the zipzip gem with the rubyzip gem 2015-05-28 11:23:57 +02:00
Dennis Schubert
44919233c0 Merge branch 'stable' into develop 2015-05-28 01:34:28 +02:00
Benjamin Neff
21ae93e658 handle when the diaspora xml parser returns nil 
closes #5991
 2015-05-28 01:34:24 +02:00
Dennis Schubert
f9f73f56db Merge branch 'stable' into develop 2015-05-25 04:18:46 +02:00
Jason Robinson
7c0e50c2c2 Introduce 'authorized' configuration option for services 
Since the Facebook API has changed and additional permissions are required for all users on a pod to cross-post, an additional 'authorized' flag is needed to be set for the Facebook service.
This flag allows either all users, one user or no users to use the cross-posting service.

Clarifies the situation for #5923, #5260 and #5085.

closes #5985
 2015-05-25 04:18:38 +02:00
Jonne Haß
3e35ef0b63 Merge branch 'stable' into develop 2015-05-24 11:16:09 +02:00
Benjamin Neff
986ad0df14 fix validation for status-message when the author is missing 
closes #5986
 2015-05-24 11:16:05 +02:00
Dennis Schubert
2ca0a17ee0 Merge branch 'stable' into develop 2015-05-24 02:30:08 +02:00
Benjamin Neff
8531b160a6 gracefully handle when a like is already deleted again 
closes #5983
 2015-05-24 02:30:02 +02:00
Dennis Schubert
ba9b947173 Merge branch 'stable' into develop 2015-05-23 01:24:14 +02:00
Benjamin Neff
68f7208ff5 use id from preloaded gon.post to fix broken liking with guid 
closes #5978
 2015-05-23 01:24:09 +02:00
Jonne Haß
5a3b62d801 Merge branch 'stable' into develop 2015-05-19 10:42:44 +02:00
Benjamin Neff
9a4a7255e7 remove unused older and newer methods for posts 
last renamed in 8386179f16

closes #5970
 2015-05-19 10:42:39 +02:00
Dennis Schubert
2549f44b7c Merge branch 'stable' into develop 2015-05-19 03:00:56 +02:00
Benjamin Neff
289753e068 add "original post deleted" message on single post view 
closes #5968
 2015-05-19 03:00:51 +02:00
Benjamin Neff
267a1df3c4 fix root_diaspora_id when root was deleted 2015-05-19 02:59:31 +02:00
Dennis Schubert
6a1ec27b3c Merge branch 'stable' into develop 2015-05-19 02:58:41 +02:00
Steffen van Bergerem
ceec5084af Use case insensitive unconfirmed email 
closes #5967
 2015-05-19 02:58:37 +02:00
Dennis Schubert
3446cb2f3f Merge branch 'stable' into develop 2015-05-18 03:31:17 +02:00
Benjamin Neff
a396a246ee remove unused hasPhotos and hasText functions 
- added in a836b06d3e
- removed in 49ea8c8563

closes #5969
 2015-05-18 03:31:11 +02:00
Dennis Schubert
944c57f874 Merge branch 'stable' into develop 2015-05-18 03:23:43 +02:00
Benjamin Neff
7cccb6594f remove security hax comment 2015-05-18 03:23:15 +02:00
Jonne Haß
13b69f81d1 Merge branch 'stable' into develop 2015-05-16 13:54:05 +02:00
Benjamin Neff
d74e20a790 fetch public posts when someone starts sharing with you 
closes #5960
 2015-05-16 13:54:01 +02:00
Jonne Haß
ca33e984d3 Merge branch 'stable' into develop 2015-05-16 12:48:41 +02:00
Benjamin Neff
30cc330747 fix empty searchable in hcard, parse empty as false 
closes #5962
 2015-05-16 12:48:33 +02:00
Dennis Schubert
42a408045e Merge branch 'stable' into develop 2015-05-16 03:44:35 +02:00
Benjamin Neff
c01fdb6e1c fix the url for the public-posts json 
closes #5958
 2015-05-16 03:44:31 +02:00
Dennis Schubert
84dc40326a Merge branch 'stable' into develop 2015-05-16 03:36:30 +02:00
Jason Robinson
aec2467e98 Fix inactive user removal not respecting configuration for daily limits 
It seems ActiveRecord ignores .limit() if .find_each() is used to iterate the query (http://stackoverflow.com/a/6680541/1489738). Using .each() instead. Added a test.

closes #5953
 2015-05-16 03:36:25 +02:00
Dennis Schubert
aac0a2582e Merge branch 'stable' into develop 2015-05-12 04:00:12 +02:00
Steffen van Bergerem
40bb44eb96 Mobile: manage followed tags 
closes #5945
 2015-05-12 04:00:07 +02:00
Dennis Schubert
3f3148af2c Merge branch 'stable' into develop 2015-05-10 02:00:41 +02:00
Steffen van Bergerem
0c5443d543 Make js-routes use compact and camelcase function names 
closes #5941
 2015-05-10 02:00:30 +02:00
Dennis Schubert
5477c7df96 Merge branch 'stable' into develop 2015-05-10 01:59:21 +02:00
Steffen van Bergerem
59e57c013b Update jasmine-ajax 
closes #5937
 2015-05-10 01:59:17 +02:00
Dennis Schubert
300376a854 Merge branch 'stable' into develop 2015-05-09 23:49:05 +02:00
Steffen van Bergerem
05ec235ea3 Pass along current_user in ContactPresenter#full_hash_with_person 
closes #5936
 2015-05-09 23:48:59 +02:00
Dennis Schubert
b05d183f91 Merge branch 'stable' into develop 2015-05-07 04:10:28 +02:00
Steffen van Bergerem
06e6e1db78 Remove private post content of also commented mails 
merges #5931
 2015-05-07 04:10:21 +02:00
Jonne Haß
4612937787 Merge branch 'stable' into develop 2015-05-06 23:56:23 +02:00
Jonne Haß
166a152dc0 Merge branch 'master' into stable 2015-05-06 23:53:52 +02:00
Dennis Schubert
d27061d5d6 Set captcha length correctly, fix #5932 2015-05-06 23:51:28 +02:00
Florian Staudacher
5c012e7871 limit the parameter length for the GET request to the bookmarklet to ~2000 chars 2015-05-05 18:25:01 +02:00
Jonne Haß
4a7c358be9 Merge branch 'stable' into develop 2015-05-05 01:39:52 +02:00
Steffen van Bergerem
399fdb2c7d Check request.format :mobile in home controller 2015-05-05 01:39:48 +02:00
Jonne Haß
3fadcfa568 Merge branch 'stable' into develop 2015-05-04 15:14:41 +02:00
Jonne Haß
bb14128052 bump ruby-oembed 2015-05-04 14:22:57 +02:00
Jonne Haß
971a3dd021 Merge branch 'stable' into develop 2015-05-04 04:04:48 +02:00
Steffen van Bergerem
0cffa00004 Add syntax highlighting for markdown content 2015-05-04 04:04:34 +02:00
Jonne Haß
234e205602 Merge branch 'stable' into develop 2015-05-04 03:38:44 +02:00
Steffen van Bergerem
a22127bfb1 Add ctrl+enter shortcut for conversations 2015-05-04 03:38:42 +02:00
Jonne Haß
f257658e46 Revert "Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations"" 
This reverts commit 2c7848e3cb.
 2015-05-04 00:43:41 +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
Jonne Haß
2382f9eb24 Merge pull request #5896 from Raven24/fix-db-seeds 
fix minor errors in db:seed task
 2015-04-30 13:09:54 +02:00
Jonne Haß
78ea2c8204 Merge pull request #5878 from Flaburgan/chrome-frame 
Fix the IE version number extractor to work without space between MSIE and the version number
 2015-04-30 13:04:29 +02:00
Benjamin Neff
28c9cfdfd4 write cucumber test and add order_id on create 2015-04-28 02:38:28 +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
Florian Staudacher
913d3484a6 fix minor errors in spec helper scripts, remove db/seeeds.rb 2015-04-28 01:02:27 +02:00
Simon Wörner
cee4f1c3cd fixed aspect sorting, added minimal jquery ui, added test 2015-04-26 01:57:00 +02:00
Dennis Schubert
c95dd68545 Merge pull request #5883 from SuperTux88/fix-camo-on-contacts-page 
use camo for medium and small avatars
 2015-04-25 01:26:28 +02:00
Dennis Schubert
b06a699dd6 Merge pull request #5879 from SuperTux88/encode-urls 
encode unencoded urls and normalize IDN urls
 2015-04-25 01:11:42 +02:00
Dennis Schubert
67a6c8be0c Merge pull request #5877 from SuperTux88/fix-notification-mails 
fix notification mails for limited posts
 2015-04-25 01:09:46 +02:00
Benjamin Neff
344b198900 use camo for medium and small avatars 2015-04-24 03:10:48 +02:00
Benjamin Neff
a863f3ebb2 encode unencoded urls and normalize IDN urls 2015-04-23 00:24:53 +02:00
Flaburgan
2b2c39eef3 Fix the IE version number extractor to work without space between MSIE and the version number, close #5858 2015-04-22 22:09:22 +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
Benjamin Neff
84c3814b94 fix notification mails for limited posts 2015-04-22 19:59:08 +02:00
Steffen van Bergerem
8e2103e69b Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 22:26:22 +02:00
Benjamin Neff
6cbb959700 add mumble protocol to linkify 
also use double-quotes in the whole file
 2015-04-21 21:16:55 +02:00
Jonne Haß
c8f990359d Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 20:50:27 +02:00
Steffen van Bergerem
a14713b985 Update markdown-it, disable fuzzy links 2015-04-21 20:50:16 +02:00
Jonne Haß
37ec00f80b Merge pull request #5854 from svbergerem/remove-managing-services-standalone 
Remove 'manage services' link in standalone mode
 2015-04-20 22:36:11 +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
b885b8583d Remove 'manage services' link in standalone mode 2015-04-08 12:49:05 +02: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
Jonne Haß
4b841ef076 Merge pull request #5843 from margori/private_post_subject_content 
Limited post content excluded from subject of comment email
 2015-04-04 00:39:40 +02:00
Marcelo Briones
aa6b590b3c Limited post content excluded from subject of comment email 2015-04-03 16:37:17 -03:00
Steffen van Bergerem
07a344d051 Disable auto follow back on aspect deletion 2015-04-03 14:10:14 +02:00
Steffen van Bergerem
1701bc30d0 Don't add mentions and reshares to all streams 2015-04-01 16:51:08 +02:00
Jonne Haß
548b0d8161 Rescue correct constant in Workers::ReceiveLocalBatch 
Fixes #5834
 2015-04-01 04:01:40 +02:00
Steffen van Bergerem
adf9bcf8e8 Update markdown-it 2015-03-26 00:07:25 +01:00
Jonne Haß
65a738e604 bump rspec-rails 2015-03-25 02:33:56 +01:00
Jonne Haß
61461db913 fix jasmine spec for correct reshare behavior 2015-03-24 17:20:33 +01:00
Jonne Haß
73b6c75278 On reshare insert the reshare built from the response 
Also make sure comments_count and the like is always set in the
response.
 2015-03-23 23:02:23 +01:00
Jonne Haß
644fc46dee Merge pull request #5792 from MothOnMars/4020-role-specs 
added specs and validations for Role model
 2015-03-20 01:54:04 +01:00
Steffen van Bergerem
d9bf4a2fa6 Remove layout 'centered_with_header_with_footer' 2015-03-18 21:59:56 +01:00
Martha
d4f1a5dbe8 added specs and validations for Role model 
- added shoulda-matchers gem for one-line specs
- added FactoryGirl syntax methods
 2015-03-18 09:16:15 -07:00
Steffen van Bergerem
a161e4d3a7 Uncomment jasmine tests 2015-03-18 00:01:22 +01:00
Jonne Haß
256d7862b9 Merge pull request #5782 from svbergerem/reshared-poll 
Display reshared poll
 2015-03-15 20:45:51 +01:00
Jonne Haß
5ea90016b3 Merge pull request #5783 from visualsayed/5737-too-long-tag-name 
5737 too long tag name
 2015-03-15 18:06:53 +01:00
Steffen van Bergerem
81cd1753e4 Improve link to original post in reshared polls 2015-03-15 17:07:16 +01:00
Hincu Petru
9589cb2e0f disable poll voting for reshared post 2015-03-15 16:46:48 +01:00
Sayed
18a1958ef8 fix too long tag name #5737 2015-03-15 16:15:33 +02:00
Augier
322ee30005 Tests with Jasmine 2015-03-15 14:52:49 +01:00
Augier
f4534ec412 Refactor notification badge view (again) 2015-03-15 11:48:06 +01:00
Augier
673661b798 Ported searchbar 2015-03-15 11:48:06 +01:00
Augier
2a9fddf7a0 Port notifications to backbone part. 2 2015-03-15 11:48:06 +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
52c2a73d83 Merge pull request #5707 from AugierLe42e/port-notifications-backbone 
[WIP] Port of notifications.js and notification-badge.js to Backbone part.1
 2015-03-11 17:05:14 +01:00
Steffen van Bergerem
f5bf53a004 Refactor vendor javascript 2015-03-11 15:51:08 +01:00
Augier
95f4675ddf Port of notifications to Backbone 2015-03-11 02:11:05 +01:00
Jonne Haß
8ab6f31e0a Merge pull request #5751 from svbergerem/fix-photo-count-profile 
Fix photo count in the profile view
 2015-03-10 17:45:12 +01:00
Steffen van Bergerem
d2222a97e5 Fix photo count in the profile view 2015-03-10 11:38:49 +01:00
Steffen van Bergerem
1b2b10877a Fix services char counter 2015-03-09 21:18:10 +01:00
Steffen van Bergerem
73d04b706e Use entypo icons for left navbar 2015-03-09 17:57:50 +01:00
Steffen van Bergerem
3298373a7f Add missing http:// to urls 2015-03-09 01:42:40 +01:00
Jonne Haß
f525f9e34d Merge pull request #5730 from Flaburgan/strip-markdown-from-title 
Strip markdown from the heading of a post
 2015-03-06 23:43:13 +01:00
Steffen van Bergerem
2a52f65160 Bump markdown-it 2015-03-06 20:40:06 +01:00
flaburgan
5dc8642a99 Strip markdown from the heading of a post. Impact notifications, email subjects, SPV <title>, the Atom feed... 2015-03-04 19:30:00 +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
Steffen van Bergerem
c838389b67 Fix invitations and tests 2015-03-02 00:04:56 +01:00
Jonne Haß
987281270a bump ruby-oembed 2015-02-28 02:36:13 +01:00
Jonne Haß
678033fa23 replace deprecated stub syntax in export user spec 2015-02-27 17:00:42 +01:00
Jonne Haß
7a741c6dce Ensure deliveries are cleared after each example 2015-02-27 17:00:41 +01:00
Jonne Haß
3a90386303 deliver needs to be called on the return value of the mailer call 2015-02-27 16:58:39 +01:00
Jonne Haß
d295b5d5b5 ActiveRecord::Base::reflection returns strings now 2015-02-27 16:58:39 +01:00
Jonne Haß
9530f00bd6 Don't use a too large invalid id 2015-02-27 16:58:39 +01:00
Jonne Haß
1ec3f5caa6 Don't pass a model instance where an id is expected 2015-02-27 16:58:39 +01:00
Jonne Haß
290aded7f6 ActionMailer deliver -> deliver_now 2015-02-27 16:58:39 +01:00
Jonne Haß
ed44689670 Fix a spec for LikesController 2015-02-27 16:36:45 +01:00
Jonne Haß
99ea156e1c Refactor User.total_users into a scope 2015-02-27 16:30:51 +01:00
Jonne Haß
6432bbe67b fix 2015-02-27 16:29:49 +01:00
Jonne Haß
93c9ad6eba Fix participations controller spec 2015-02-27 16:27:55 +01:00
Jonne Haß
95053ccbf2 Merge pull request #5351 from MarcBurt/5041-Total-user-statistic-shouldnt-include-closed-accounts 
5041 total user statistic shouldnt include closed accounts
 2015-02-27 16:02:35 +01:00
Jonne Haß
be1ab6c6a3 Merge branch 'collimarco-issue5350' into develop 2015-02-27 15:33:55 +01:00
Augier
168adae009 Adding help section for chat 2015-02-26 18:06:39 +01:00
PIOTR KLOSINSKI
b8be76be3c changed reshare function, so it adds the object to the stream 
tests for reshares

Changelog.md update

fixing a style issue

removed unnecessary semicolon
 2015-02-23 15:44:31 +01:00
zachrab
f695b5d3e7 Set disable_mail to true 
Add #clear_account! disable mail spec

Add migration for disabling mail for all closed accounts

Change migration to use #update_all for disable_mail attribute

Add #clear_account! false fields spec
 2015-02-19 16:45:39 -08:00
Akash Agrawall
3bb5e78893 Lock account #5564 2015-02-19 05:45:04 +05:30
Jonne Haß
6a5a407e49 Strip Unicode format characters prior post processing 2015-02-17 23:29:05 +01:00
Steffen van Bergerem
eb7e2eac9d Update jasmine-ajax 2015-02-17 04:03:42 +01:00
Steffen van Bergerem
9c22ed6aef Add year to notifications page 2015-02-16 18:02:50 +01:00
Steffen van Bergerem
9373d5bd20 Fix jasmine tests for new help routes 2015-02-14 19:38:00 +01:00
Augier
aa62266376 Added routing system to open a section in help 2015-02-14 18:05:40 +01:00
Jonne Haß
84cfaa1cfb Merge pull request #5659 from Zauberstuhl/link_to_remote_profile 
Add the ability to link remote user profiles
 2015-02-13 20:35:14 +01:00
Lukas Matt
a475d5fb62 Add the ability to link to remote user profile 
related to diaspora/jsxc#77
 2015-02-13 19:23:26 +01:00
Jonne Haß
b910adc52b Merge pull request #5663 from svbergerem/pending-specs 
Green pending specs for evil query spec tag stream
 2015-02-13 13:46:08 +01:00
Steffen van Bergerem
55cb2dd30a Green pending specs for evil query spec tag stream 2015-02-13 12:30:53 +01:00
Steffen van Bergerem
d09e8a3758 Bump markdown-it-sanitizer 2015-02-13 02:58:31 +01:00
Jonne Haß
3c58cbeaee Merge pull request #5646 from svbergerem/fix-conversation-scrolling 
Conversations: fix badge count and automatic scrolling
 2015-02-11 14:19:48 +01:00
Steffen van Bergerem
7112cb112b Add hovercards for mentions 2015-02-11 00:46:00 +01:00
Steffen van Bergerem
8962d75eb7 Conversations: fix badge count and automatic scrolling 2015-02-10 19:11:20 +01:00
Steffen van Bergerem
3312f97981 Fix timeago for notifications, add 'no notifications yet' message 2015-02-09 03:56:37 +01:00
Steffen van Bergerem
2ec093a54c JSHint boss, evil, loopfunc and scripturl 2015-02-08 23:41:33 +01:00
Steffen van Bergerem
ab6732cac1 JSHint eqeqeq 2015-02-08 23:41:32 +01:00
Steffen van Bergerem
5fa6b8253e JSHint unused and undefined variables 2015-02-08 23:41:32 +01:00
Steffen van Bergerem
a9a480da0a JSHint semicolon errors 2015-02-08 23:41:31 +01:00
Steffen van Bergerem
6b0a5823e3 Add JSHint javascript linter 2015-02-08 23:41:31 +01:00
Marc Burt
9f5131b6ec Fixed #5041 with new User method to find total accounts excluding closed and invitations 2015-02-08 13:49:12 +00:00
Steffen van Bergerem
c1d714d2c7 Remove unused files, fix syntax in jasmine tests 2015-02-07 21:17:51 +01:00
Steffen van Bergerem
8b33b9eb18 Merge pull request #5602 from Faldrian/more-shortcuts 
Add shortcuts for reshare, expand Post and open first link in a post

Conflicts:
	config/locales/diaspora/en.yml
 2015-02-07 14:41:56 +01:00
Sam Radhakrishnan
a12c0d83c0 Fixed Bug #5593. Added length validation to location in profile model with maximum length 255. 2015-02-02 19:42:53 +05:30
goobertron
42cd2337be Amend all text strings in en locales to use sentence case 
Adapt cukes to work with new capitalisation rules
 2015-01-31 17:44:57 +00:00
Augier
55d258c5ac Fix registrations displaying 2015-01-30 18:00:22 +01:00
Faldrian
099974ddef Add shortcuts for reshare, expand Post and open first link in a post 2015-01-28 16:19:18 +01:00
Marco Colli
eccab62e32 Allow user to enable / disable notifications for a post from stream #5350 2015-01-25 18:40:47 +01:00
Sakshi Jain
8b1f0453a1 5560 Hide community spotlight setting if not enabled 2015-01-20 10:31:31 +05:30
Jonne Haß
6502000429 Merge pull request #5574 from svbergerem/fix-linkify 
Fix markdown-it linkify blocking Firefox
 2015-01-19 15:02:00 +01:00
Steffen van Bergerem
b63d8fc679 Fix markdown-it linkify blocking Firefox 2015-01-19 02:09:10 +01:00
Marcelo Briones
63eca447d0 Strip EXIF data as user preference 2015-01-18 10:28:28 -03:00
Jason Robinson
6513053586 Merge pull request #5499 from gdpelican/feature/json-exporter-deux 
JSON Exporter, part deux
 2015-01-17 00:51:38 +02:00
James Kiesel
1c69dd7752 Add contacts/posts, and GZipping JSON exporter output 2015-01-15 00:20:19 +13:00
Steffen van Bergerem
61c17c7896 Add more markdown-it plugins 
activate sanitizer, sub and sup
 2015-01-13 03:41:06 +01:00
Steffen van Bergerem
d692e6df7d Bump markdown-it to 3.0.3, markdown-it-hashtag to 0.2.2 and markdown-it-diaspora-mention to 0.1.2 2015-01-11 02:54:30 +01:00
flaburgan
46223a2dfc Don't truncate notification emails anymore, close #4342 2015-01-10 22:10:11 +01:00
Steffen van Bergerem
026773194a Replace pagedown by markdown-it 2015-01-10 18:56:20 +01:00
Jonne Haß
9c99ae357a Merge pull request #5493 from collimarco/solved5341 2015-01-06 14:43:58 +01:00
Jonne Haß
f20020f06b Merge pull request #5473 from svbergerem/contacts-backbonejs 
Port contacts page to backbonejs
 2015-01-06 14:38:55 +01:00
Jonne Haß
3f49bc52f4 Merge pull request #5468 from Flaburgan/add-followed-tags-to-mobile-menu 
Add followed tags to the mobile menu

Conflicts:
	Changelog.md
 2015-01-06 14:35:37 +01:00
Steffen van Bergerem
99fd5712b2 Fix jasmine specs 
toBeTruethy and toBeFalsy don't test anything
use toBeTruthy() and toBeFalsy() instead
 2015-01-04 17:13:18 +01:00
Steffen van Bergerem
9de6a26a22 Port contacts page to backbonejs 2015-01-04 17:13:18 +01:00
François Lamontagne
4c33a6adeb Replace %{third_party_tools} by the appropriate hyperlink in tags FAQ (issue #5273) 2015-01-03 13:25:16 -05:00
Marcelo Briones
fe6052865c Remove limited content from email notifications 2014-12-28 22:15:47 -03:00
flaburgan
3ff298606f Add menu mobile and drawer navigation tests 2014-12-28 18:49:03 +01:00
Jonne Haß
45b385d694 Handle reshares of deleted posts in OpenGraph tags generation code 2014-12-27 15:07:16 +01:00
Marco Colli
f775d74cfd Add failing test 2014-12-24 11:49:35 +01:00
Marco Colli
76cc5e2d5c Add ActiveRecord::RecordNotFound catching. Add tests. 2014-12-22 12:36:09 +01:00
margori
27a1886834 Changes delete conversation button tooltip to 'hide' or 'delete' 2014-12-19 18:26:43 -03:00
Jonne Haß
6806b2daf8 Merge pull request #5354 from gdpelican/feature/json-exporter 
Feature/json exporter
 2014-12-17 16:45:25 +01:00
margori
e6c605d92b Destroy conversation when all participants leave it 2014-12-17 11:33:23 -03:00
James Kiesel
e174514d69 Add JSON exporter for user profile download 2014-12-16 08:55:35 +13:00
Marcelo Briones
4e83e4c7ed BUG: new messages to person that is not sharing 
Conversation recipient validated

- Conversation foreign recipient not required to be validated.
- Added 'peter' as spec_helper user.
- New fixture, new statistic values.

- Clearer identifier names
 2014-12-10 17:02:20 -03:00
Jonne Haß
f4c756cd34 use URI.join in the specs too 2014-12-09 17:27:27 +01:00
Dennis Schubert
cc0c19b482 Merge pull request #5462 from jhass/open_graph_reader 
Bye opengraph_parser, hi open_graph_reader
 2014-12-09 04:42:20 +01:00
Jonne Haß
3a92efbfaf drop deferred garbage collection 2014-12-08 04:51:06 +01:00
Jonne Haß
74a6f42501 Bye opengraph_parser, hi open_graph_reader 
opengraph_parser is basically unmainted, issues are ignored
or deliberately closed without fixing. It pollutes the global
namespace and has no verification of correctness.

The opengraph gem has basically the same issues, not really maintained,
unreleased patches on master since over a year, not really smart either.

So I created my own version and while at it, why not strive try to be
complete and robust, although it's still a work in progress.

This also improves general URL detection by parsing them
from the message after stripping markdown.

An additional dependency was added to support
fetching sites that require cookies to work at all.
For the same reason Faraday's default redirect limit was
bumped.
 2014-12-08 02:01:31 +01:00
Steffen van Bergerem
8a50db76b1 Only show aspect chat control if chat is enabled 2014-12-05 13:07:17 +01:00
Jonne Haß
63e9d7b73f Update aspect list checkmarks only after the stream was fetched 2014-12-05 03:18:30 +01:00
Jonne Haß
9d5e1f604d Make app.helpers.truncate tolerant to null and undefined 2014-12-04 16:45:00 +01:00
Dennis Schubert
339111867e Merge pull request #5443 from jhass/spring 
Replace spork with spring, update & use binstubs
 2014-12-04 00:38:30 +01:00
Steffen van Bergerem
4c655d8c8b Speed up notifications controller spec 2014-12-02 02:43:01 +01:00
Jonne Haß
a580171e32 Replace spork with spring, update & use binstubs 
Spring is the recommended application preloader for rails
 2014-12-01 08:06:07 +01:00
Jonne Haß
d22f59d6bd Merge pull request #5447 from svbergerem/try-to-improve-notifications-spec 
Try to improve the notifications controller spec
 2014-12-01 08:02:38 +01:00
Steffen van Bergerem
7b17b78de7 Try to improve the notifications controller spec 2014-12-01 02:27:19 +01:00
Jonne Haß
5af0b1cbdd don't use 666 as non-existant ID in report model spec 2014-11-30 21:56:27 +01:00
Faldrian
29f55f42b6 truncate long opengraph description to 250 chars in mobile and stream view 2014-11-29 17:18:01 +01:00
Steffen van Bergerem
55b60f7bde Remove unused files in lib 2014-11-22 21:21:38 +01:00
Lukas Matt
2712b413c3 Fixed privilege spec; use correct container for trigger event 2014-11-13 12:28:45 +01:00
Lukas Matt
bb18c8e028 Test chat privilege option; should replace text/icon on trigger 2014-11-13 11:49:03 +01:00
Lukas Matt
32dcf8cabb Test jsxc helper spec; should respond with correct url 2014-11-13 11:43:56 +01:00
Lukas Matt
46097ba8c8 Test token authentication; should allow it 2014-11-13 11:42:24 +01:00
Dennis Schubert
aec00f834f Add Camo for <img>-tags inside Markdown contents 2014-11-10 02:19:45 +01:00
Jonne Haß
4be6dc208f update maintenance mailer spec for new mail text 2014-11-09 19:47:37 +01:00
Dennis Schubert
6808150920 Method calling convention and doc improvements 
... and a stealth-commit of an already introduced bug prevention system.
;)
 2014-11-09 07:20:30 -08:00
Dennis Schubert
a4a63c4c85 A little bit of cleanup 2014-11-09 02:27:17 +01:00
Dennis Schubert
cca0c9eec4 Some refactorings, safer regex 2014-11-08 23:12:45 +01:00
Steffen van Bergerem
25e4e558c5 Ask for confirmation when leaving a submittable publisher 2014-11-02 01:49:33 +01:00
Jonne Haß
f361a0f885 Merge pull request #5288 from jaywink/remove-old-users 
Maintenance feature to remove old users, scheduled in settings
 2014-10-17 01:00:51 +02:00
Augier
2ce98b49d7 Fix issue #4416 
Conflicts:
	spec/helpers/notifier_helper_spec.rb
 2014-10-16 23:27:48 +02:00
Jason Robinson
69c3566958 Maintenance feature to remove old users 
Add Sidetiq webview to the Sidekiq monitoring panel

Add rake task maintenance:queue_users_for_removal
This basically just triggers an immediate run of the normal maintenance remove old users functionality that is normally (if enabled) scheduled to run once a day via sidetiq

Add extra safety when checking for user removal due to inactivity.
Now also user.last_seen will also be checked to make sure a user will not be removed in the event that the Devise rememember me login functionality has stopped the users remove_after timestamp from being removed.

Add initializer for maintenance job.
Add warning about mail being disabled if remove_old_users maintenance is enabled.
 2014-10-16 22:53:08 +03:00
Jonne Haß
7313bafe86 update notifier helper spec expecatations to redcarpet 3.2 2014-10-15 01:00:27 +02:00
Jonne Haß
f532efeac5 Merge pull request #5276 from svbergerem/reshare-absolute-root 
Reshare the absolute root of a post

Conflicts:
	Changelog.md
 2014-10-14 19:40:35 +02:00
Jonne Haß
e892b115ac Merge pull request #5289 from svbergerem/convert-cukes-tags 
Convert some cukes to rspec tests
 2014-10-14 13:26:53 +02:00
Jonne Haß
a7c702d631 Merge pull request #5308 from Flaburgan/add-network-key-to-statistics 
Add network key to statistics.json

Conflicts:
	Changelog.md
 2014-10-14 13:25:16 +02:00
Jonne Haß
0a20d6a2b7 Merge pull request #5316 from gdpelican/feature/allow-nil-http-agent 
Allow nil HTTP user agent
 2014-10-14 13:22:28 +02:00
Jonne Haß
8a63f6f1f7 Merge pull request #5317 from gdpelican/feature/strip-search-query 
Feature/strip search query
 2014-10-14 13:19:36 +02:00
flaburgan
20d2b8fc5e Add a link to a reported comment in the admin panel 2014-10-13 14:11:51 +02:00
Steffen van Bergerem
a12ca511c3 Convert close mentioned account cuke 2014-10-10 03:49:56 +02:00
Steffen van Bergerem
226f1bbfc3 Convert activity stream cuke 2014-10-10 03:49:56 +02:00
Steffen van Bergerem
823316d7f7 Convert tag cukes to rspec tests 2014-10-10 03:49:41 +02:00
Steffen van Bergerem
8ca5ca7c92 Reshare the absolute root of a post 2014-10-10 03:12:07 +02:00
James Kiesel
206ec99f8f Strip search query of leading & trailing whitespace 2014-10-09 23:34:11 +13:00
James Kiesel
2d44107b5d Allow nil HTTP user agent 2014-10-09 23:08:33 +13:00
flaburgan
adc839d620 Add network key to statistics.json, close #5042 2014-10-08 01:16:54 +02:00
Florian Staudacher
4f87a47d0a Merge pull request #4657 from svbergerem/bootstrap-people-view 
Redesign profile page and port to Bootstrap
 2014-10-06 15:09:08 +02:00
Alex Nordlund
acc7377e5f Removed setting for statistics, showing both instead. 2014-10-05 01:45:48 +02:00
Alex Nordlund
03f3c74cee Moved services to a JSON list. 
Added AppConfig.privacy.statistics.deprecated_format to toggle showing the old style format.
 2014-10-05 01:07:30 +02:00
Jonne Haß
eac3f042a4 Reset dynamic configuration after each example in the testsuite 2014-10-04 00:59:03 +02:00
Jonne Haß
66c2f7f869 Fix statistics_presenter_spec 2014-10-04 01:01:19 +03:00
Jason Robinson
309e690a66 Fix services in statistics.json. 
Currently there is a bug in configurate that reports incorrectly the services settings if they are set as ENV variables, instead of diaspora.yml settings.
This commit works around that issue by changing the way the setting is fetched.
 2014-10-03 23:54:42 +03:00
Jonne Haß
1959f0d939 Merge branch 'hotfix/0.4.1.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-10-03 17:14:55 +02:00
Jonne Haß
a5ca738e91 Fix XSS issue in poll questions 
closes #5274
 2014-10-03 17:12:11 +02:00
Steffen van Bergerem
976ff0fcda Redesign profile page and port to Bootstrap 2014-10-01 12:28:56 +02:00
Florian Staudacher
c7b4b77ce8 Merge pull request #5209 from jhass/federation_improvements 
Federation improvements
 2014-09-27 16:18:37 +02:00
Jonne Haß
d6f5368474 Handle already deleted photos gracefully in process photo job 2014-09-20 15:13:14 +02:00
Jonne Haß
499ff6e0f4 Fix receiving a relayable retraction through the public route 2014-09-20 15:03:53 +02:00