Commit graph

18017 commits

Author SHA1 Message Date
Jonne Haß
e712e4c92f Merge pull request #6986 from SuperTux88/cleanup-rake-tasks
Cleanup old rake tasks
2016-08-14 20:57:22 +02:00
Benjamin Neff
80d1352ba4 Cleanup old rake tasks
* accounts:run_deletions: was added with 0.4.0.0 two years ago for one-time usage.
* db:rebuild: db:reset does basically the same
* db:integration:preprare: the integration environments are not used.
* db:reset: there is a default db:reset, no need to write our own.
* db:drop_integration: the integration environments are not used.
* db:fix_diaspora_handle: really old migration from 2010
* db:move_private_key: also old migration from 2010
* maintenance:clear_carrierwave_temp_uploads: tmp/uploads doesn't exist anymore. And we have CleanCachedFiles as cronjob.
* maintenance:install_logrotate_config: diaspora has built-in logrotate support now, and people who want to use logrotate instead can write their own configs with the values they want.
* migrations:copy_hidden_share_visibilities_to_users: old migration from 2012
* migrations:invitations: legacy invitations were removed with #6976
* migrations:absolutify_image_references: old migration from 2010
* migrations:rewire_uppercase_hashtags: old migration from 2012
* migrations:remove_uppercase_hashtags: old migration from 2012
2016-08-14 19:42:30 +02:00
Jonne Haß
200486b6f1
Merge pull request #6984 from SuperTux88/6294-ignore-notifications
Don't create notifications from ignored people
2016-08-14 18:28:13 +02:00
Benjamin Neff
0d338b6f79 don't create notifications if the notification-actor is ignored
Also move "shareable hidden"-logic to AlsoCommented, because it is the
only one that needs it. And write some specs for mentioned and started
sharing notifications.

Fixes #6294
2016-08-14 17:03:49 +02:00
Jonne Haß
4afa77b003 Merge pull request #6980 from svbergerem/post-content-inline-images
Display markdown images inline
2016-08-14 12:22:03 +02:00
Jonne Haß
76a5f8e6be Merge pull request #6982 from svbergerem/update-gems
Update gems
2016-08-14 12:13:19 +02:00
Steffen van Bergerem
7c6cbf364c
Bump jquery.slimscroll 2016-08-14 11:09:00 +02:00
Steffen van Bergerem
cea77f5f74
Bump get_process_mem 2016-08-14 11:01:21 +02:00
Steffen van Bergerem
04dc3be21a
Bump font-awesome-rails 2016-08-14 11:00:01 +02:00
Steffen van Bergerem
d2725b11dd
Bump domain_name 2016-08-14 10:54:05 +02:00
Steffen van Bergerem
0a56e409dc
Bump coffee-rails 2016-08-14 10:51:37 +02:00
Steffen van Bergerem
163fc98e20
Bump chunky_png 2016-08-14 10:50:45 +02:00
Steffen van Bergerem
61f6966fc4
Bump celluloid-supervision 2016-08-14 10:47:52 +02:00
Steffen van Bergerem
7e3d770572
Bump uglifier 2016-08-14 10:41:09 +02:00
Steffen van Bergerem
3691bba100
Bump typhoeus 2016-08-14 10:39:35 +02:00
Steffen van Bergerem
0f5ab81d0b
Bump twitter-text 2016-08-14 10:37:59 +02:00
Steffen van Bergerem
3afc998b2d
Bump test_after_commit 2016-08-14 10:35:53 +02:00
Steffen van Bergerem
2ba6ed0b48
Bump spring 2016-08-14 10:34:36 +02:00
Steffen van Bergerem
21712f7c8f
Bump sass-rails 2016-08-14 10:31:23 +02:00
Steffen van Bergerem
30fb58a3df
Bump perfect-scrollbar 2016-08-14 10:27:08 +02:00
Steffen van Bergerem
beab9e9925
Bump markdown-it-diaspora-mention 2016-08-14 10:25:50 +02:00
Steffen van Bergerem
5dd6e143ea
Bump markdown-it 2016-08-14 10:23:20 +02:00
Steffen van Bergerem
be4d7c9a43
Bump highlightjs 2016-08-14 10:22:22 +02:00
Steffen van Bergerem
f71d5c472b
Bump bootstrap-markdown 2016-08-14 10:21:20 +02:00
Steffen van Bergerem
1148e3a839
Bump blueimp-gallery 2016-08-14 10:19:02 +02:00
Steffen van Bergerem
d4a700d939
Bump autosize 2016-08-14 10:18:01 +02:00
Steffen van Bergerem
e2cc9f9c24
Bump openid_connect 2016-08-14 10:15:47 +02:00
Steffen van Bergerem
0fbddbe8f8
Bump omniauth-facebook 2016-08-14 10:13:26 +02:00
Steffen van Bergerem
a01764278a
Bump js-routes 2016-08-14 10:05:46 +02:00
Steffen van Bergerem
957da66aa0
Bump handlebars_assets 2016-08-14 10:01:04 +02:00
Steffen van Bergerem
a76dd9c6ca
Bump haml_lint 2016-08-14 09:59:47 +02:00
Steffen van Bergerem
a5e4d11f7b
Bump gon 2016-08-14 09:58:12 +02:00
Steffen van Bergerem
36910095fd
Bump fuubar 2016-08-14 09:56:42 +02:00
Steffen van Bergerem
415713b6d3
Bump bootstrap-rails 2016-08-14 09:51:49 +02:00
Steffen van Bergerem
791c8f3fc4
Bump autoprefixer-rails 2016-08-14 09:43:17 +02:00
Steffen van Bergerem
9d02c6595d
Bump acts_as_api 2016-08-14 09:25:56 +02:00
Steffen van Bergerem
f1065c8127
Bump activerecord-import 2016-08-14 09:24:20 +02:00
Steffen van Bergerem
9f8482174b
Display markdown images inline 2016-08-14 08:18:48 +02:00
Benjamin Neff
f4459488e5 allow other people to share with a user who ignores them
otherwise we have data-inconsistency if the user stops ignoring the
person.
2016-08-14 01:08:26 +02:00
Jonne Haß
3dd2f2159c Merge pull request #6975 from cmrd-senya/6857-misscoped-destroy
[API] don't store ID tokens in DB
2016-08-13 20:11:54 +02:00
cmrd Senya
9546fddb9e
[API] don't store ID tokens in DB
fix #6857
2016-08-13 20:09:43 +03:00
Jonne Haß
9eea1b85ce Merge pull request #6978 from SuperTux88/fix-invitation-cleanup
fix migration for invitation-cleanup
2016-08-13 18:48:33 +02:00
Benjamin Neff
6248e945c2 fix migration for invitation-cleanup
delete invitations-table (and constraints) before deleting the users
2016-08-13 18:41:57 +02:00
Dennis Schubert
3942dca08f
Merge pull request #6972 from jhass/queue_migration
Add rake task to move jobs from any legacy queue to the default queue
2016-08-13 17:31:14 +02:00
Jonne Haß
b2fa3357eb
Merge pull request #6976 from SuperTux88/cleanup-invitations
Cleanup invitations
2016-08-13 14:16:41 +02:00
Benjamin Neff
bc6c8a0598 disable registration with invite-code when invitations are closed
also display message if the user has no invitations left and refactored
InvitationsController spec and remove unused message parameter
2016-08-13 13:51:28 +02:00
Benjamin Neff
3b1a5c6bdf don't reduce number of invites when registration is open
otherwise the counter goes into negative ;)

also  reset all negative counters
2016-08-13 13:51:02 +02:00
Jonne Haß
c28865e0a9 Merge pull request #6977 from svbergerem/fix-char-counter-position
Fix charcounter position in publisher
2016-08-13 08:36:14 +02:00
Steffen van Bergerem
da5aef2b75
Fix charcounter position in publisher 2016-08-13 03:21:40 +02:00
Benjamin Neff
e749bbef15 don't reduce number of available invites if there were errors. 2016-08-13 01:47:27 +02:00