Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2014-11-07Fix: displaying more than one row of image attachments broke publisherFaldrian
2014-11-07Merge branch 'body-classes' of https://github.com/roymckenzie/diaspora into ↵Florian Staudacher
roymckenzie-body-classes
2014-11-02Ask for confirmation when leaving a submittable publisherSteffen van Bergerem
2014-10-21LibreJS should work with most of the sitePaul Hill
2014-10-17Merge pull request #5288 from jaywink/remove-old-usersJonne Haß
Maintenance feature to remove old users, scheduled in settings
2014-10-17Fix issue #4416Augier
Conflicts: spec/helpers/notifier_helper_spec.rb
2014-10-16Maintenance feature to remove old usersJason Robinson
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-14Merge pull request #5342 from AugierLe42e/sass-to-scssJonne Haß
Refactor application.css and bootstrap-headerfix.css
2014-10-14Merge pull request #5276 from svbergerem/reshare-absolute-rootJonne Haß
Reshare the absolute root of a post Conflicts: Changelog.md
2014-10-14Refactored the two last sass files in scss. #3796Augier
2014-10-14Update _.template calls to undscore.js 1.7Jonne Haß
2014-10-14Merge pull request #5237 from ↵Jonne Haß
jaideng123/added_infinite_scrolling_to_notedropdown Notifications Dropdown infinite scrolling
2014-10-14Merge pull request #5279 from svbergerem/overflow-long-names-tag-pageJonne Haß
Hidden overflow for long names on tag pages Conflicts: Changelog.md
2014-10-14Merge pull request #5308 from Flaburgan/add-network-key-to-statisticsJonne Haß
Add network key to statistics.json Conflicts: Changelog.md
2014-10-14Merge pull request #5316 from gdpelican/feature/allow-nil-http-agentJonne Haß
Allow nil HTTP user agent
2014-10-14Merge pull request #5317 from gdpelican/feature/strip-search-queryJonne Haß
Feature/strip search query
2014-10-14Merge pull request #5318 from gdpelican/feature/fix-missing-password-translationJonne Haß
Fix missing password translations
2014-10-14Merge pull request #5325 from ↵Jonne Haß
gdpelican/feature/fix-change-password-error-message Show error message on invalid reset password attempt
2014-10-14Merge pull request #5331 from roymckenzie/feature/admin-show-recent-weekly-usersJonne Haß
Most recent new users show on Weekly User Stats admin page
2014-10-14Merge pull request #5334 from svbergerem/fix-bootstrap-pollJonne Haß
Fix poll for Bootstrap publisher
2014-10-13Add a link to a reported comment in the admin panelflaburgan
2014-10-12Merge pull request #5296 from 'deepy/develop' into developJason Robinson
2014-10-11Fix poll for Bootstrap publisherSteffen van Bergerem
2014-10-11Updated Weekly User Stats page to show the most recent week. Page should ↵Roy McKenzie
show most recent information
2014-10-11Show error message on invalid reset password attemptJames Kiesel
2014-10-10only collapse empty comment boxSteffen van Bergerem
2014-10-10Fix missing password translationsJames Kiesel
2014-10-10Reshare the absolute root of a postSteffen van Bergerem
2014-10-09Strip search query of leading & trailing whitespaceJames Kiesel
2014-10-09Allow nil HTTP user agentJames Kiesel
2014-10-08Remove one border-bottom on the photo pageflaburgan
2014-10-08Replaced jquery.idle-timer.js vendored asset with a bower package #5194Sandip Trivedi
2014-10-08Add network key to statistics.json, close #5042flaburgan
2014-10-08Merge pull request #5271 from polsVoice/feature/4901-hoverable-left-menuSteffen van Bergerem
Feature/4901 hoverable left menu
2014-10-07Merge pull request #5299 from ↵Jonne Haß
strivedi183/5194-replace_jqueryplaceholderjs_vendored_asset_with_bower_package Replaced jquery.placeholder.js vendored asset with bower package and updated to latest version #5194
2014-10-07Fix pagination for people/guid/contactsSteffen van Bergerem
2014-10-07Replaced jquery.placeholder.js vendored asset with a bower package #5194Sandip Trivedi
2014-10-07Merge pull request #5297 from ↵Jonne Haß
strivedi183/5194-replace_jquerytextchangejs_vendored_asset_with_bower_package Replaced jquery.textchange.js vendored asset with a bower package #5194
2014-10-07Replaced jquery.textchange.js vendored asset with a bower package #5194Sandip Trivedi
2014-10-06Added cucumber test for notifications dropdownjaideng123
2014-10-06Add margin to reshareflaburgan
2014-10-06Merge pull request #4657 from svbergerem/bootstrap-people-viewFlorian Staudacher
Redesign profile page and port to Bootstrap
2014-10-05Added classes to the body for easier page specific styling.Roy McKenzie
2014-10-05Removed setting for statistics, showing both instead.Alex Nordlund
2014-10-05Moved services to a JSON list.Alex Nordlund
Added AppConfig.privacy.statistics.deprecated_format to toggle showing the old style format.
2014-10-05Hidden overflow for long names on tag pagesSteffen van Bergerem
2014-10-04Fix statistics_presenter_specJonne Haß
2014-10-04Fix services in statistics.json.Jason Robinson
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-03Merge branch 'hotfix/0.4.1.1' into developJonne Haß
Conflicts: Changelog.md config/defaults.yml
2014-10-03Fix XSS issue in poll questionsv0.4.1.1Jonne Haß
closes #5274