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

14977 commits

This branch
This branch
All branches
Author SHA1 Message Date
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ß
ef71c57190 Merge pull request #5342 from AugierLe42e/sass-to-scss 
Refactor application.css and bootstrap-headerfix.css
 2014-10-14 19:42:31 +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
Augier
cdf4fc05df Refactored the two last sass files in scss. #3796 2014-10-14 17:47:52 +02:00
Jonne Haß
673f14e050 Revert "bump rails-timeago" 
This reverts commit bea94bd7b5.
 2014-10-14 16:12:27 +02:00
Jonne Haß
4e6eacbeb1 Update _.template calls to undscore.js 1.7 2014-10-14 15:04:01 +02:00
Jonne Haß
13cb07fed7 bump simple_oauth 2014-10-14 14:09:55 +02:00
Jonne Haß
cc98362ffe bump ruby-progressbar 2014-10-14 14:09:37 +02:00
Jonne Haß
c98c216864 bump listen 2014-10-14 14:09:21 +02:00
Jonne Haß
a41bc99a9a bump rspec-rails 2014-10-14 14:09:05 +02:00
Jonne Haß
d924556ff8 bump childprocess 2014-10-14 14:08:39 +02:00
Jonne Haß
67bf4de895 bump webmock 2014-10-14 14:07:28 +02:00
Jonne Haß
2dbc20522f bump test_after_commit 2014-10-14 14:07:06 +02:00
Jonne Haß
bea94bd7b5 bump rails-timeago 2014-10-14 14:05:38 +02:00
Jonne Haß
94f5f59872 bump rails-assets-perfect-scrollbar 2014-10-14 14:05:12 +02:00
Jonne Haß
b6caef127f bump jasmine 2014-10-14 14:04:04 +02:00
Jonne Haß
1c35921e3c bump fog 2014-10-14 14:03:48 +02:00
Jonne Haß
0c5c737a38 bump cucumber-rails 2014-10-14 14:03:26 +02:00
Jonne Haß
e5189cf457 bump devise 2014-10-14 14:01:10 +02:00
Jonne Haß
995d3f900a bump capybara 2014-10-14 14:00:32 +02:00
Jonne Haß
2bc0fa5a6e bump backbone-on-rails 2014-10-14 14:00:05 +02:00
Jonne Haß
18b7a75b36 bump activerecord-import 2014-10-14 13:58:29 +02:00
Jonne Haß
9a8b1359e9 bump rails_admin 2014-10-14 13:57:27 +02:00
Jonne Haß
e86f76ea8c bump redcarpet, closes #4549 2014-10-14 13:46:27 +02:00
Jonne Haß
1c0cf98958 Merge pull request #5237 from jaideng123/added_infinite_scrolling_to_notedropdown 
Notifications Dropdown infinite scrolling
 2014-10-14 13:37:55 +02:00
Jonne Haß
e5b20106c6 Merge pull request #5279 from svbergerem/overflow-long-names-tag-page 
Hidden overflow for long names on tag pages

Conflicts:
	Changelog.md
 2014-10-14 13:30:22 +02:00
Jonne Haß
aa13623472 add changelog entry for #5289 [ci skip] 2014-10-14 13:28:01 +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
Jonne Haß
b9cad8485d Merge pull request #5318 from gdpelican/feature/fix-missing-password-translation 
Fix missing password translations
 2014-10-14 13:17:57 +02:00
Jonne Haß
b4e4b7f007 Merge pull request #5325 from gdpelican/feature/fix-change-password-error-message 
Show error message on invalid reset password attempt
 2014-10-14 13:09:02 +02:00
Jonne Haß
e135301642 Merge pull request #5331 from roymckenzie/feature/admin-show-recent-weekly-users 
Most recent new users show on Weekly User Stats admin page
 2014-10-14 13:07:33 +02:00
Jonne Haß
0419174570 Merge pull request #5334 from svbergerem/fix-bootstrap-poll 
Fix poll for Bootstrap publisher
 2014-10-14 13:03:19 +02:00
Jonne Haß
dcc629bc4c Merge pull request #5337 from Flaburgan/add-link-to-comment-in-report 
Add a link to a reported comment in the admin panel
 2014-10-14 12:48:30 +02:00
Jonne Haß
c1fa0beacd backfill changelog [ci skip] 2014-10-14 12:46:50 +02:00
flaburgan
20d2b8fc5e Add a link to a reported comment in the admin panel 2014-10-13 14:11:51 +02:00
Jason Robinson
7be8370924 Add changelog for #5296 2014-10-12 22:48:16 +03:00
Jason Robinson
13de3f318e Merge pull request #5296 from 'deepy/develop' into develop 2014-10-12 22:41:42 +03:00
Jonne Haß
720ec1c64a make nds and en_valspeak available 2014-10-12 15:20:20 +02:00
Jonne Haß
061dfab00b updated 83 locale files [ci skip] 2014-10-12 15:20:20 +02:00
Florian Staudacher
bf5709a5ed Merge pull request #5328 from svbergerem/fix-5292 
Only collapse empty comment box
 2014-10-12 13:33:36 +02:00
Steffen van Bergerem
42a3e702e6 Fix poll for Bootstrap publisher 2014-10-11 19:18:13 +02:00
Roy McKenzie
258959e1c2 Updated Weekly User Stats page to show the most recent week. Page should show most recent information 2014-10-10 19:12:37 -07:00
James Kiesel
e2e502ea68 Show error message on invalid reset password attempt 2014-10-11 10:47:00 +13:00
Steffen van Bergerem
715f451ed4 only collapse empty comment box 2014-10-10 20:05:28 +02:00
James Kiesel
1400228757 Fix missing password translations 2014-10-11 00:41:52 +13: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