Commit graph

3134 commits

Author SHA1 Message Date
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
fap
073f028f88 Adds welcome message options to config 2015-06-21 20:48:20 +02:00
SansPseudoFix
cce5a98537 Add link to pod statistics in right navigation
closes #6117
2015-06-19 21:29:25 +02:00
Benjamin Neff
beb06bc42d precompile images from facebox gem
regression from #6005

closes #6105
2015-06-15 13:46:07 +02:00
Jonne Haß
5a63d201a3 Merge branch 'release/0.5.1.0-RC' into stable 2015-06-14 17:41:42 +02:00
Jonne Haß
7052f2a63b updated 12 locale files [ci skip] 2015-06-14 17:40:55 +02:00
Benjamin Neff
ce380d78c9 make sql and federation debug-logging configurable
by default both are disabled now, you can enable them in the
diaspora.yml if you need them.

closes #6090
2015-06-09 22:55:16 +02:00
Jonne Haß
38b32ca2c4 updated 73 locale files [ci skip] 2015-06-09 05:51:16 +02:00
Jonne Haß
dd1cea9665 Merge branch 'release/0.5.0.0-RC' into stable 2015-06-08 13:52:42 +02:00
Jonne Haß
baafa9c51b updated 73 locale files [ci skip] 2015-06-08 13:51:17 +02:00
Dennis Schubert
b80785e06e Update Changelog for the upcoming 0.5.2.0 2015-06-08 04:32:29 +02:00
Jan Berdajs
ec4e7b4a69 upgrade Twitter gem - fixes Faraday deprecation warning 2015-06-08 04:08:02 +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
5655eead7c make the logrotation configurable
closes #5994
2015-05-28 01:26:48 +02:00
Benjamin Neff
4f2ee11158 split eye output in 2 logfiles and forward stdout to terminal in dev mode
closes #5989
2015-05-26 03:06:42 +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
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
Benjamin Neff
be3b2852be use logging-logger for sidekiq
closes #5975
2015-05-22 02:53:50 +02:00
Benjamin Neff
ac96232d85 use logging gem for better logging with class name and log-level 2015-05-22 02:53:19 +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
Jonne Haß
4bde00177c replace foreman with eye
closes #5966
2015-05-19 02:55:31 +02:00
Jonne Haß
a21de8b190 Make listen directive for Unicorn configurable 2015-05-19 02:55:01 +02:00
Akash Agrawall
8c7aa38aba Indicates in the setting that the email is not visibile to the other users #5315 2015-05-16 03:41:52 +02:00
goobertron
2668c487e7 Remove dupe line from en.yml [ci skip]
closes #5951
2015-05-12 14:20:03 +02:00
Steffen van Bergerem
40bb44eb96 Mobile: manage followed tags
closes #5945
2015-05-12 04:00:07 +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
Steffen van Bergerem
1428369849 Mobile: Add button to follow/unfollow tags 2015-05-10 01:59:50 +02:00
Jonne Haß
f0d51e24b8 Fix invalid setting calls in config/unicorn.rb
* .present? is an AS extension that isn't loaded at this point
* single_process_mode is defined in environment, not at the toplevel
2015-05-07 22:07:22 +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ß
a7699c2a2c Update configurate and enable missing key exceptions
closes #5934
2015-05-07 04:03:43 +02:00
Jonne Haß
166a152dc0 Merge branch 'master' into stable 2015-05-06 23:53:52 +02:00
Jonne Haß
51918a798a bump to 0.5.0.1 2015-05-06 23:52:40 +02:00
Dennis Schubert
d27061d5d6 Set captcha length correctly, fix #5932 2015-05-06 23:51:28 +02:00
Jonne Haß
f1c75e6a54 Bump open_graph_reader
It now returns the origin for a missing og:url
2015-05-04 23:43:53 +02:00
efstrian
63be9d57b6 Issue #5884: Added link to diasporafoundation.org to invitation email (en) 2015-05-04 04:42:08 +02:00
Jonne Haß
db08cec9c0 update changelog and version for 0.5.1.0 2015-05-04 00:41:55 +02:00
Jonne Haß
69842b84a4 Merge branch 'master' into develop 2015-05-03 15:48:42 +02:00
Jonne Haß
8e2278b80d Merge branch 'release/0.5.0.0-RC' into develop 2015-05-03 15:43:55 +02:00
Jonne Haß
260a10b2f2 updated 60 locale files [ci skip] 2015-05-03 15:43:35 +02:00
Jonne Haß
fe64db013b Merge pull request #5888 from szlend/5508-fix-post-presenter-autoreload
Issue #5508: Remove post_presenter from initializers
2015-04-30 13:06:21 +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
Simon Žlender
bec886109f Issue #5508: Remove post_presenter from initializers 2015-04-25 17:21:07 +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
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