Jonne Haß
9346fadefc
Merge branch 'stable' into develop
2016-06-07 13:11:52 +02:00
Jonne Haß
c8aa323d13
Set ca_file explicitly for the mail gem too
2016-06-07 13:11:32 +02:00
Lukas Matt
f0d5ff12a2
Diaspora configuration wrapper for Prosody
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2016-04-25 15:30:28 +02:00
Dennis Schubert
d6171e53c3
Merge pull request #6778 from Zauberstuhl/facebook_review_changes
...
Changes for my successful facebook reviews
2016-04-21 06:50:57 +02:00
Lukas Matt
267d91bf66
Changes for a successful facebook review
...
I had two facebook reviews in the past days
Removing the display type and adding a explicit
'Share to' provider tag did the trick
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2016-03-30 10:36:28 +02:00
Dennis Schubert
e95c742aa1
Merge branch 'stable' into develop
2016-03-30 10:18:09 +02:00
Benjamin Neff
69f08a4a7e
add fetch callbacks
2016-03-30 10:01:54 +02:00
Benjamin Neff
a3ed9da210
changes for new federation-gem version
2016-03-30 09:45:46 +02:00
Benjamin Neff
b1a6516474
add migration for pods-table
...
* add port to pods
* remove url from person and link people with pod-table
2016-03-05 00:12:54 +01:00
Takashi Kokubun
3028f8e9ad
Use Hamlit to render Haml
2016-02-07 14:39:25 +09:00
cmrd Senya
ed61ef6d6a
Replace sidetiq with sidekiq-cron
...
closes #6616
2016-01-24 07:20:44 +01:00
theworldbright
58aef5658b
Fix remaining remarks
2016-01-04 17:01:40 +09:00
augier
10314ffc8c
Fixing more remarks
2016-01-04 16:49:58 +09:00
theworldbright
21175e7eee
Allow POST requests for user info endpoint
2016-01-04 16:49:54 +09:00
theworldbright
28fc65ae26
Add CORS support to OIDC
2016-01-04 16:49:54 +09: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
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
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ß
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
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
Benjamin Neff
804784ed3f
fix @pod_uri/@pod_url and add url_to to AppConfig
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
Benjamin Neff
94fc378eb7
fix @pod_uri/@pod_url and add url_to to AppConfig
2015-07-11 11:19:42 +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
Steffen van Bergerem
9c4f80346b
Use entypo-rails mappings
2015-07-03 15:31:29 +02:00
Dennis Schubert
ad52eaf6d7
Merge branch 'stable' into develop
2015-06-08 04:09:57 +02:00
Jan Berdajs
ec4e7b4a69
upgrade Twitter gem - fixes Faraday deprecation warning
2015-06-08 04:08:02 +02:00
efstrian
d64ea15891
Issue #4297 : Style fixes - Default theme is configurable
2015-06-07 19:58:14 +03:00
efstrian
57d766346c
Issue #4297 : Enable color theme setup
2015-06-07 19:57:16 +03: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
Benjamin Neff
b6c46b3fc4
add logging mixin and replace federation-logger
2015-06-04 04:16:03 +02:00
Jason Robinson
d2e0b3ceae
Fix Facebook scopes for cross-posting
...
Facebook deprecated their v1.0 API and thus the old ones no longer work (for new authorizations).
closes #6019 [ci skip]
2015-06-02 02:47:20 +02:00
Sandip Trivedi
36d6c5d2ba
Remove unnecessary initializer and comments in Gemfile and add explicit rubyzip gem version in Gemfile with description
...
closes #6001
2015-05-28 11:24:30 +02:00
Sandip Trivedi
2ba2ef1b9c
Replaces the zipzip gem with the rubyzip gem
2015-05-28 11:23:57 +02:00
Benjamin Neff
b491ecac31
wrap the sidekiq logger to add the context info again
...
closes #5988
2015-05-25 04:23:28 +02:00
Benjamin Neff
be3b2852be
use logging-logger for sidekiq
...
closes #5975
2015-05-22 02:53:50 +02:00
Benjamin Neff
49f0fb6dcd
replace silence_assets.rb with quiet_assets gem
2015-05-22 02:53:19 +02:00
Steffen van Bergerem
ceec5084af
Use case insensitive unconfirmed email
...
closes #5967
2015-05-19 02:58:37 +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
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
