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

3354 commits

Author SHA1 Message Date
theworldbright
24fd70676c Fix webfinger discovery route 2016-01-04 16:49:53 +09:00
theworldbright
4dae744a4a Adjust translations for user applications page 2016-01-04 16:49:53 +09:00
augier
469521c572 Addin scopes translation and description 2016-01-04 16:49:52 +09:00
theworldbright
3734e074a6 Fix pronto errors 2016-01-04 16:49:52 +09:00
augier
b9da104b28 Revoke button on applications page 2016-01-04 16:49:52 +09:00
augier
308170f691 Add applications information page 2016-01-04 16:49:52 +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
bc5e5c7420 Fix pronto errors 2016-01-04 16:49:51 +09:00
theworldbright
17fde49d61 Implement ID Token for the implicit flow 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
Augier
c6eb722517 Replace ERB by HAML, added locales, corrected Gemfile 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
3fc0f64c56 Move openid controllers to openid connect namespace 2016-01-04 16:49:48 +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
augier
8d8faf684c OpenID Connect debut work 2016-01-04 16:45:21 +09:00
Jonne Haß
1ed904449d Merge branch 'stable' into develop 2015-12-31 14:21:10 +01:00
Jonne Haß
237445d41b Drop plurals hack at the contacts key 
as it's not even used anymore and confuses WTI
 2015-12-31 14:20:10 +01:00
Dennis Schubert
d4fbbd86b3 Merge branch 'stable' into develop 2015-12-30 14:51:05 +01:00
Benjamin Neff
9f8e018422 add subscribe url to webfinger 2015-12-30 14:50:34 +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
eb3cc24a4a Merge branch 'stable' into develop 2015-12-28 16:42:43 +01:00
Steffen van Bergerem
4cb2575474 Add media.ccc.de as trusted oEmbed endpoint 2015-12-28 16:42:34 +01:00
Jonne Haß
505071336f Merge branch 'stable' into develop 2015-12-27 17:51:33 +01:00
Besnik Bleta
680955ad8c Update for sq translation 2015-12-27 17:49:39 +01:00
Jonne Haß
13029235d0 Merge branch 'stable' into develop 2015-12-13 12:28:04 +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ß
22711ff7f0 Merge branch 'stable' into develop 2015-12-04 06:55:41 +01:00
Stéphane Guillou
2f4b817c46 Fix missing word in locked account message 
closes #6577
 2015-12-04 06:55:10 +01:00
Jonne Haß
29d10a42f8 start 0.5.6.0 cycle 2015-11-23 03:12:00 +01:00
Jonne Haß
5f2e0907b7 freeze 0.5.5.0 2015-11-23 03:10:46 +01:00
Jonne Haß
d9c4f6fe07 Merge branch 'stable' into develop 2015-11-22 18:02:47 +01:00
Jonne Haß
bbb348ea5b updated 32 locale files [ci skip] 2015-11-22 16:02:28 +01:00
Marien Fressinaud
461e4cfd8c Cleanup the code 
- Extract JS from HTML
- Remove search link on message
- Remove duplicated invitation modal
 2015-10-14 22:31:39 +02:00
fla
da1b0b5666 Add links to add or invite contacts 2015-10-14 22:31:22 +02:00
Jonne Haß
d9572ec337 Merge branch 'stable' into develop 2015-10-14 11:00:47 +02:00
Lincoln Stoll
6ac6dc1059 Don't set key for logfile on Heroku 
This fixes the issue reported in #5947. Sidekiq will only log to stdout when this key evals to false, so this can't be forced with an empty string. This change eliminates the key altogether when running on Heroku.

closes #6500
 2015-10-14 11:00:42 +02:00
Dennis Schubert
9df2cb7290 Prepare 0.5.5.0 release 
[ci skip]
 2015-10-12 03:41:38 +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
Steffen van Bergerem
64773d883e Add permalink for stream elements 2015-10-06 23:29:09 +02:00
Jonne Haß
e2d895c636 Merge branch 'stable' into develop 2015-10-05 15:22:55 +02:00
Jonne Haß
c5819b9c57 Enable SQL logging by default in development mode 2015-10-05 15:22:28 +02:00
Lukas Matt
d1e3e568b9 Report tab; bootstrap3 compatible, add user detail btn 
The reported_user_details button will redirect you
to admin user_search. This can be useful if the podmin
wants to lock, unlock or delete the account which is
responsible for the reported post

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-10-03 10:58:01 +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ß
c3c84b95a4 Merge branch 'stable' into develop 2015-09-19 11:33:10 +02:00
Achilleas Pipinellis
9888b4ce43 Add option to set a pid file for unicorn in diaspora.yml 
http://unicorn.bogomips.org/Unicorn/Configurator.html#method-i-pid

closes #6411
 2015-09-19 11:33:04 +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
zaziemo
e5cc8dff0e outsource map credentials 
and allow podmin to enable and disable the feature
(#5813)
 2015-09-09 12:25:45 +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
Jonne Haß
176b32c815 Merge branch 'stable' into develop 2015-09-07 12:41:36 +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
Jonne Haß
6fb6b8dc8a Merge branch 'stable' into develop 2015-09-06 13:56:25 +02:00
Jonne Haß
c0da031e33 Merge branch 'release/0.5.3.0' into stable 2015-09-06 13:56:10 +02:00
Jonne Haß
f855fb9718 updated 60 locale files [ci skip] 2015-09-06 13:53:41 +02:00
Jonne Haß
ac6e9fd7c7 Merge branch 'stable' into develop 2015-09-03 21:39:24 +02:00
Jonne Haß
ca5fa14376 Merge branch 'release/0.5.3.0' into stable 2015-09-03 21:39:13 +02:00
Lukas Matt
23c016cf36 Update wiki links in diaspora config 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-09-03 21:38:56 +02:00
Dennis Schubert
f75a6147a5 Bump version number 
[ci skip]
 2015-09-01 03:52:06 +02:00
Dennis Schubert
39fb1a6db2 Merge branch 'stable' into develop 2015-08-30 10:17:28 +02:00
Jason Robinson
0087fefd14 Change default autofollow_on_join_user 
Due to performance of joindiaspora.com, a decision was made to set up a project pod that hosts the official support and news autofollow account (see https://www.loomio.org/d/tyZdcGNo/diasporahq-account-move-to-a-project-pod). The new account is hq@pod.diaspora.software.

closes #6369
 2015-08-30 10:17:05 +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
Jonne Haß
24d9be2e68 Merge branch 'stable' into develop 2015-08-27 21:03:16 +02:00
augier
2ce7a1e185 Mobile subdomain 
closes #6354
 2015-08-27 21:01:36 +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
Faldrian
37793f7dbb beautify ignored people list and add diaspora handle for identification 2015-08-27 09:52:49 +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ß
aeea030c9a Merge branch 'stable' into develop 2015-08-24 20:30:03 +02:00
Johan
c3041fd516 updating locales es-VE 2015-08-23 20:20:17 -04:30
augier
a7bd029526 Add 'toggle mobile' item to menu + minor styling 2015-08-23 13:53:05 +02:00
Jonne Haß
e54208d39b Merge branch 'stable' into develop 2015-08-23 11:13:47 +02:00
Steffen van Bergerem
a7287f4f93 Disable the handlebars auto-indent feature 
closes #6339
 2015-08-23 11:13:42 +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
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
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
Dennis Schubert
23c83b9447 Merge branch 'stable' into develop 2015-07-29 12:10:36 +02:00
Steffen van Bergerem
d8505b2ae0 Fix conversations view with no contacts 
closes #6266
 2015-07-29 12:08:35 +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
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ß
487b0d90ca Implement NodeInfo 2015-07-24 03:50:02 +02:00
Jonne Haß
2ae8b2f611 Load diaspora.yml overrides for test env 2015-07-24 03:47:46 +02:00
Steffen van Bergerem
6fafa731e6 Display locations on mobile devices 2015-07-23 16:06:28 +02:00
Steffen van Bergerem
5d39461443 Display polls on mobile devices 2015-07-23 14:09:38 +02:00