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

3637 commits

Author SHA1 Message Date
Jonne Haß
3a92efbfaf drop deferred garbage collection 2014-12-08 04:51:06 +01:00
Steffen van Bergerem
8a50db76b1 Only show aspect chat control if chat is enabled 2014-12-05 13:07:17 +01:00
Jonne Haß
63e9d7b73f Update aspect list checkmarks only after the stream was fetched 2014-12-05 03:18:30 +01:00
Jonne Haß
9d5e1f604d Make app.helpers.truncate tolerant to null and undefined 2014-12-04 16:45:00 +01:00
Dennis Schubert
339111867e Merge pull request #5443 from jhass/spring 
Replace spork with spring, update & use binstubs
 2014-12-04 00:38:30 +01:00
Steffen van Bergerem
4c655d8c8b Speed up notifications controller spec 2014-12-02 02:43:01 +01:00
Jonne Haß
a580171e32 Replace spork with spring, update & use binstubs 
Spring is the recommended application preloader for rails
 2014-12-01 08:06:07 +01:00
Jonne Haß
d22f59d6bd Merge pull request #5447 from svbergerem/try-to-improve-notifications-spec 
Try to improve the notifications controller spec
 2014-12-01 08:02:38 +01:00
Steffen van Bergerem
7b17b78de7 Try to improve the notifications controller spec 2014-12-01 02:27:19 +01:00
Jonne Haß
5af0b1cbdd don't use 666 as non-existant ID in report model spec 2014-11-30 21:56:27 +01:00
Faldrian
29f55f42b6 truncate long opengraph description to 250 chars in mobile and stream view 2014-11-29 17:18:01 +01:00
Steffen van Bergerem
55b60f7bde Remove unused files in lib 2014-11-22 21:21:38 +01:00
Lukas Matt
2712b413c3 Fixed privilege spec; use correct container for trigger event 2014-11-13 12:28:45 +01:00
Lukas Matt
bb18c8e028 Test chat privilege option; should replace text/icon on trigger 2014-11-13 11:49:03 +01:00
Lukas Matt
32dcf8cabb Test jsxc helper spec; should respond with correct url 2014-11-13 11:43:56 +01:00
Lukas Matt
46097ba8c8 Test token authentication; should allow it 2014-11-13 11:42:24 +01:00
Dennis Schubert
aec00f834f Add Camo for <img>-tags inside Markdown contents 2014-11-10 02:19:45 +01:00
Jonne Haß
4be6dc208f update maintenance mailer spec for new mail text 2014-11-09 19:47:37 +01:00
Dennis Schubert
6808150920 Method calling convention and doc improvements 
... and a stealth-commit of an already introduced bug prevention system.
;)
 2014-11-09 07:20:30 -08:00
Dennis Schubert
a4a63c4c85 A little bit of cleanup 2014-11-09 02:27:17 +01:00
Dennis Schubert
cca0c9eec4 Some refactorings, safer regex 2014-11-08 23:12:45 +01:00
Steffen van Bergerem
25e4e558c5 Ask for confirmation when leaving a submittable publisher 2014-11-02 01:49:33 +01: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
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ß
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
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
flaburgan
20d2b8fc5e Add a link to a reported comment in the admin panel 2014-10-13 14:11:51 +02: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
Steffen van Bergerem
823316d7f7 Convert tag cukes to rspec tests 2014-10-10 03:49:41 +02:00
Steffen van Bergerem
8ca5ca7c92 Reshare the absolute root of a post 2014-10-10 03:12:07 +02:00
James Kiesel
206ec99f8f Strip search query of leading & trailing whitespace 2014-10-09 23:34:11 +13:00
James Kiesel
2d44107b5d Allow nil HTTP user agent 2014-10-09 23:08:33 +13:00
flaburgan
adc839d620 Add network key to statistics.json, close #5042 2014-10-08 01:16:54 +02:00
Florian Staudacher
4f87a47d0a Merge pull request #4657 from svbergerem/bootstrap-people-view 
Redesign profile page and port to Bootstrap
 2014-10-06 15:09:08 +02:00
Alex Nordlund
acc7377e5f Removed setting for statistics, showing both instead. 2014-10-05 01:45:48 +02:00
Alex Nordlund
03f3c74cee Moved services to a JSON list. 
Added AppConfig.privacy.statistics.deprecated_format to toggle showing the old style format.
 2014-10-05 01:07:30 +02:00
Jonne Haß
eac3f042a4 Reset dynamic configuration after each example in the testsuite 2014-10-04 00:59:03 +02:00
Jonne Haß
66c2f7f869 Fix statistics_presenter_spec 2014-10-04 01:01:19 +03:00
Jason Robinson
309e690a66 Fix services in statistics.json. 
Currently there is a bug in configurate that reports incorrectly the services settings if they are set as ENV variables, instead of diaspora.yml settings.
This commit works around that issue by changing the way the setting is fetched.
 2014-10-03 23:54:42 +03:00
Jonne Haß
1959f0d939 Merge branch 'hotfix/0.4.1.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-10-03 17:14:55 +02:00
Jonne Haß
a5ca738e91 Fix XSS issue in poll questions 
closes #5274
 2014-10-03 17:12:11 +02:00
Steffen van Bergerem
976ff0fcda Redesign profile page and port to Bootstrap 2014-10-01 12:28:56 +02:00
Florian Staudacher
c7b4b77ce8 Merge pull request #5209 from jhass/federation_improvements 
Federation improvements
 2014-09-27 16:18:37 +02:00
Jonne Haß
d6f5368474 Handle already deleted photos gracefully in process photo job 2014-09-20 15:13:14 +02:00