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

15053 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jason Robinson
cd4502f476 Merge pull request #5309 from svbergerem/confirm-unload-publisher 
Ask for confirmation when leaving a submittable publisher
 2014-11-06 22:44:02 +02:00
Steffen van Bergerem
25e4e558c5 Ask for confirmation when leaving a submittable publisher 2014-11-02 01:49:33 +01:00
Jonne Haß
aab1e4b5b1 Merge branch 'hotfix/0.4.1.2' into develop 
Conflicts:
	Changelog.md
	Gemfile
	Gemfile.lock
	config/defaults.yml
 2014-10-30 21:36:46 +01:00
Jonne Haß
7000f39881 bump Rails to fix CVE-2014-7818 2014-10-30 21:29:16 +01:00
Jonne Haß
62f1015d77 Merge pull request #5368 from strivedi183/5194-replace-jqueryhotkysjs-vendored-asset-with-bower-package 
Replaced jquery.hotkeys.js vendored asset with a bower package #5194
 2014-10-23 11:25:13 +02:00
Sandip Trivedi
722112314b Replaced jquery.hotkeys.js vendored asset with a bower package #5194 2014-10-23 01:12:26 -04:00
Jonne Haß
3c808142fb let default sidekiq config actually process the maintenance queue 2014-10-22 23:23:14 +02:00
Chocobozzz
e411a344f4 Commit the new branding sprite 2014-10-21 17:14:25 +02:00
Jonne Haß
6176502627 Merge pull request #5365 from zikalify/librejs_headers 
Librejs headers
 2014-10-21 17:08:01 +02:00
Paul Hill
fa9989cecf change x11 to expat license 2014-10-21 15:42:21 +01:00
Paul Hill
f3d1176354 Added more LibreJS support 2014-10-21 15:39:02 +01:00
Jonne Haß
86a53b48ca Merge pull request #5320 from zikalify/librejs_headers 
Librejs headers
 2014-10-21 10:20:38 +02:00
Paul Hill
ac4607d75c LibreJS should work with most of the site 2014-10-21 02:48:18 +01:00
Jonne Haß
954627c16c Merge pull request #5359 from goobertron/ac_close_text 
Ka-BOOM! Fixes #5358
 2014-10-20 21:35:59 +02:00
goobertron
4b7761e52a Clarify explanation of account deleteion process 2014-10-20 20:15:38 +01:00
Chocobozzz
1aff0d8c2c Add header logo when hoovered (white logo) 2014-10-18 22:24:05 +02:00
goobertron
797f7eae8d Reword account removal email notification 2014-10-17 14:49:25 +01:00
Jonne Haß
ea97258f8e Merge pull request #5352 from AugierLe42e/gitignore-adds 
Added files in .gitignore
 2014-10-17 13:29:40 +02:00
Augier
0a0272e08b Added files in .gitignore 2014-10-17 13:08:37 +02:00
Jonne Haß
f361a0f885 Merge pull request #5288 from jaywink/remove-old-users 
Maintenance feature to remove old users, scheduled in settings
 2014-10-17 01:00:51 +02:00
Jonne Haß
c460218a4b Merge pull request #5347 from AugierLe42e/markdown-strip-404 
Fix issue #4416
 2014-10-17 00:58:36 +02:00
Augier
2ce98b49d7 Fix issue #4416 
Conflicts:
	spec/helpers/notifier_helper_spec.rb
 2014-10-16 23:27:48 +02:00
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ß
7313bafe86 update notifier helper spec expecatations to redcarpet 3.2 2014-10-15 01:00:27 +02: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