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

700 commits

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
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ß
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
Steffen van Bergerem
8ca5ca7c92 Reshare the absolute root of a post 2014-10-10 03:12:07 +02:00
flaburgan
adc839d620 Add network key to statistics.json, close #5042 2014-10-08 01:16:54 +02:00
Steffen van Bergerem
4cfe3d7005 Merge pull request #5271 from polsVoice/feature/4901-hoverable-left-menu 
Feature/4901 hoverable left menu
 2014-10-07 22:21:05 +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
Steffen van Bergerem
65e9e1c744 Hidden overflow for long names on tag pages 2014-10-04 22:58:57 +02: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
Jonne Haß
0e1bac59f7 Merge pull request #5263 from strivedi183/5194-replace_punycodejs_vendored_asset_with_bower_package 
Replaced punycode.js vendored asset with a bower package #5194
 2014-10-01 12:23:00 +02:00
Jonne Haß
5133458d30 Start converting IDN emails 2014-09-20 04:05:57 +02:00
Jonne Haß
eb7d6083e3 Merge pull request #5232 from taro-k/develop5231 
fix locale of invitation email subject #5231
 2014-09-19 12:38:14 +02:00
Jonne Haß
31613e7784 Merge pull request #5227 from jaideng123/5218-fix_deformed_getstarted_popover 
Fixed deformation of getting started popovers
 2014-09-18 12:44:19 +02:00
Jonne Haß
538d55dbfc Merge pull request #5180 from Raven24/profile_status 
port profile page to backbone.js
 2014-09-18 01:26:26 +02:00
Jason Robinson
cb3db09a5d Merge tag 'v0.4.1.0' into develop 
Release 0.4.1.0
 2014-09-14 21:07:02 +03:00
Jason Robinson
afb64ff025 Add changelog text about new rake task for admin mails. 
Related to #5111
 2014-09-14 20:56:11 +03:00
Jason Robinson
658041c412 Changelog entry to explain new terms of service feature. 
Related to #5104
 2014-09-14 20:55:55 +03:00
Jonne Haß
d5474c3992 Merge pull request #5208 from jaideng123/5081-truncate_open_graph_data 
Fixed Open Graph db insertion
 2014-09-08 12:31:09 +02:00
Jonne Haß
291a2f31df Merge branch 'release/0.4.1.0' into develop 2014-09-01 19:40:40 +02:00
Florian Staudacher
36e92b322f fix hovercard aspect selectio z-index by moving it out of the stream element 
- create handlebars template for hovercards
- fix notifications-dropdown (workaround) to remain open when aspect
  selector is clicked
 2014-09-01 19:39:23 +02:00
Jonne Haß
1ae0085d64 instruct to clear cache in changelog [ci skip] 2014-09-01 14:07:53 +02:00
Steffen van Bergerem
854dcf04db Display new conversation form on conversations/index 2014-08-31 18:02:37 +02:00
Jonne Haß
2b2f4e44e5 bump sidekiq 2014-08-31 00:11:23 +02:00
Jonne Haß
bb0d24eab4 Merge pull request #5181 from jhass/bump_ruby 
drop Ruby 1.9 support, recommend Ruby 2.1
 2014-08-30 23:59:20 +02:00
Jonne Haß
62ce1c3a43 Merge pull request #5185 from goobertron/mobile_features 
Add sign-up tests for mobile version
 2014-08-30 22:17:27 +02:00
Jonne Haß
1515848120 Merge branch 'release/0.4.1.0' into develop 
Conflicts:
	app/controllers/conversations_controller.rb
	spec/controllers/conversations_controller_spec.rb
 2014-08-30 20:09:08 +02:00
Jonne Haß
5d549f553b Escape person name in contacts json 
jQuery autoSuggest uses .html to insert it into the DOM
 2014-08-30 20:06:03 +02:00
Jonne Haß
201b590423 drop Ruby 1.9 support, recommend Ruby 2.1 2014-08-29 22:56:47 +02:00
Jonne Haß
1c9f030f7f Merge pull request #5173 from remcohh/develop 
Consolidate migrations
 2014-08-29 17:42:33 +02:00
Jonne Haß
7c28921ec7 Merge pull request #5138 from svbergerem/bootstrap-tags-view 
Port tags page to Bootstrap
 2014-08-28 23:12:32 +02:00
Jonne Haß
462198799b Dynamic asset paths everywhere 
* Use asset pipeline aware helpers in CSS files
* Add js_image_paths to push image asset names to the client side JS
 2014-08-28 21:04:29 +02:00
Steffen van Bergerem
3f3087c77f Port tags page to Bootstrap 2014-08-28 18:02:02 +02:00
Jonne Haß
de9acef27f add changelog entry for rspec 3 port 2014-08-27 18:25:28 +02:00
Jonne Haß
806de6a9ba Merge pull request #5084 from Flaburgan/profile-mobile-improvements 
Improve profile page design on mobile
 2014-08-27 17:48:59 +02:00
Jonne Haß
6623fb66a6 Merge pull request #4960 from Flaburgan/polish-conversation-view 
Polish conversation view
 2014-08-27 17:47:33 +02:00
flaburgan
1dbce6d84d Improve profile page design on mobile 2014-08-27 14:17:05 +02:00
Jonne Haß
f1ab434b18 Merge pull request #5153 from svbergerem/redesign-contacts-page 
Redesign contacts page
 2014-08-27 10:01:41 +02:00
Jonne Haß
8867023592 Merge pull request #4982 from Flaburgan/add-icon-in-dropdown-aspect 
Add visibility icons in publisher dropdown aspect
 2014-08-27 09:50:51 +02:00
Jonne Haß
b53ee9c7b3 Merge pull request #5169 from jaideng123/5157-Increase_captcha_field_length 
Increase max length of simple_captcha to 12
 2014-08-27 01:29:38 +02:00
Steffen van Bergerem
ff84ee0485 Small style changes, add tests 2014-08-26 22:45:43 +02:00
goobertron
9ee23017b8 Changelog note for change in jQuery CDN default 2014-08-26 16:37:45 +01:00
Jonne Haß
00de34ba38 Merge pull request #5129 from jaideng123/5106-scrolling_in_notifications 
Increased the number of notifications shown in drop down bar to 15

Conflicts:
	Gemfile.lock
 2014-08-26 02:06:55 +02:00
Jonne Haß
3b3a44b39b Merge pull request #5158 from khall/issue_5044 
Fix for issue 5044
 2014-08-26 01:18:39 +02:00
Jonne Haß
f772af86a6 Merge pull request #5156 from khall/issue_5040 
Fix for issue 5040
 2014-08-26 01:16:41 +02:00
Jonne Haß
cb6c79a885 Merge pull request #5151 from khall/issue_5090 
Fix for issue 5090
 2014-08-26 01:14:45 +02:00
Jonne Haß
2619beb157 Merge pull request #4481 from diaspora/rails4 
Port to Rails 4
 2014-08-24 13:42:31 +02:00
Jonne Haß
a1e547f8d7 Merge pull request #5105 from goobertron/jquery_default 
Change default for jQuery CDN to false
 2014-08-24 13:36:57 +02:00
Jonne Haß
3044195ebc Merge branch 'release/0.4.1.0' into develop 2014-08-24 13:34:29 +02:00
Jonne Haß
52d5a1cd1a Merge pull request #5141 from svbergerem/mark-read-link-notifications 
Change mark read link on notifications page
 2014-08-24 13:32:32 +02:00
Jonne Haß
5c60f10022 start new development cycle 2014-08-24 13:28:02 +02:00
Jonne Haß
527fb559e5 Bump version to 0.4.1.0 2014-08-24 13:17:29 +02:00
Steffen van Bergerem
c18df1c32f Change mark read link on notifications page 2014-08-23 17:42:19 +02:00
Jonne Haß
d75632401b make everything boot again 2014-08-23 16:34:00 +02:00
Jonne Haß
c4970b485f Merge pull request #5131 from wegotcoders/3801_delete_own_photos 
3801 delete own photos
 2014-08-23 10:52:29 +02:00
Steffen van Bergerem
9e32eb370a Remove unused js code for login page 2014-08-19 09:25:48 +02:00
Jonne Haß
ae24495c7d Merge pull request #5127 from Raven24/hpetru-2875-ignore-user-posts 
Remove ignored peoples posts without refresh (II)
 2014-08-18 11:35:56 +02:00
Jonne Haß
ec02f54613 Merge pull request #5122 from jaideng123/5113-mark-as-read-by-filter 
Added Mark all in filter as read feature
 2014-08-18 11:30:18 +02:00
Jonne Haß
fa9c079955 Merge pull request #5121 from wegotcoders/4943-add-services-to-statistics-json 
Service have been added to /statistics.json
 2014-08-18 11:20:26 +02:00
Jonne Haß
d3b901801c Merge pull request #5111 from jaywink/user-mailer 
Rake task to send mails to users
 2014-08-18 11:18:25 +02:00
Jason Robinson
e58f0b2ad4 Terms of service and privacy policy feature. 
If enabled, terms of service link will be shown in sign up page.
 2014-08-17 17:44:44 +03:00
Jonne Haß
0127852936 Merge pull request #5112 from svbergerem/login-redesign 
Redesign login page

Conflicts:
	Changelog.md
 2014-08-15 11:44:05 +02:00
Jonne Haß
f82a5ba4d5 Merge pull request #5118 from blase/feature/4466-port-everything-to-bootstrap 
Port everything under /contacts to bootstrap
 2014-08-15 02:35:34 +02:00
Steffen van Bergerem
0d064cbefe Redesign login page 2014-08-15 00:46:20 +02:00
Pablo Cuadrado
5f80394801 changelog entry 2014-08-14 04:54:07 -03:00
Jonne Haß
0bc83b93e5 Merge pull request #5109 from wegotcoders/4886-auto-add-poll-answer 
4886 auto add poll answer
 2014-08-13 16:44:02 +02:00
Florian Staudacher
163b76ae3d Merge branch '2875-ignore-user-posts' of https://github.com/hpetru/diaspora into hpetru-2875-ignore-user-posts 
Conflicts:
	Changelog.md
 2014-08-13 14:30:28 +02:00
Jonne Haß
80a0a9f999 Merge pull request #5108 from blase/feature/5107-set-top-margin-on-body 
Set top margin only on the body element
 2014-08-07 10:59:38 +02:00
Jonne Haß
3f21593111 Merge pull request #5088 from goobertron/defaults 
Clarify explanations and defaults in diaspora.yml.example
 2014-08-05 21:52:09 +02:00
Jonne Haß
0421d9336a Merge pull request #5100 from Faldrian/feature/add_help_keyboard_shortcuts 
added keyboard shortcut help topic
 2014-08-03 20:12:15 +02:00
Jonne Haß
bd388d61e7 Merge pull request #5102 from Faldrian/feature/4474-fix_lightbox_thumbnails 
Feature/4474 fix lightbox thumbnails
 2014-08-03 20:10:20 +02:00
goobertron
49be5b82fe Clarify explanations and defaults in diaspora.yml.example 2014-07-31 11:42:18 +01:00
Jonne Haß
344cb55b06 Merge pull request #5083 from theatre-x/patch-3 
Change end year
 2014-07-30 19:11:05 +02:00
Jonne Haß
ddb80ad366 Merge pull request #5077 from svbergerem/bootstrap-people-search 
Port people search to Bootstrap

Conflicts:
	app/assets/stylesheets/application.css.sass
 2014-07-30 19:07:35 +02:00
Jonne Haß
6c6efd6e9a Merge pull request #5069 from TeamOmniaExtares/bugfix_remove_bootstrap_for_SPV_comments 
Bugfix remove bootstrap for spv comments Issue #4425
 2014-07-30 19:02:10 +02:00
Steffen van Bergerem
f615ad3115 Port people search to Bootstrap 2014-07-20 18:21:13 +02:00
Jason Robinson
ead86d3353 Add changelog entries for #5006 & #5009 [ci skip] 2014-07-14 22:12:26 +03:00
Jonne Haß
fe1d1bd7a8 Merge pull request #5056 from arlogn/login-podname-size-flexible 
Flexible font-size for huge text in sign_in page
 2014-07-07 09:03:48 +02:00
Jason Robinson
d26f9cfae7 Add changelog for mobile sign-in fix [ci skip] 2014-07-06 18:49:44 +03:00
Jonne Haß
25fac9a90f Merge pull request #5062 from mmn/develop 
Publish salmon endpoint URL in Webfinger XRD
 2014-07-06 16:56:34 +02:00
Jonne Haß
2fcb16de99 Merge pull request #5057 from blase/feature/4466-port-getting-started-page-to-bootstrap 
Port Getting Started page to Bootstrap
 2014-07-04 19:31:53 +02:00
Jonne Haß
0515c33769 Use double quotes when embeding translations in JS 
Translations commonly include single quotes, which closes
the JavaScript string unexpectedly. Closes #5055
 2014-07-03 22:57:42 +02:00
Florian Staudacher
13b716a449 allow admins to close user accounts from the backend 
* thanks to @maxwell for the initial work on this

port admin pages to bootstrap
* improve user view on admin search page
* add 'close account' link to each user in the search results
* keep the same blue color for the admin menu

some refactoring of the routes and the admin code
* try to be more RESTful (possibly)
* use a 'UserSearch' model for search parameters and querying

add changelog entry
 2014-07-01 23:33:15 +02:00
Jonne Haß
5a3d329703 Merge pull request #5049 from kpcyrd/aspect-edit-fix 
Fix broken aspect-edit sidebar update

Conflicts:
	app/assets/javascripts/aspect-edit-pane.js
 2014-07-01 14:49:53 +02:00