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

687 commits

Author SHA1 Message Date
Flaburgan
f9e9a0521d Add followed tags to the mobile menu 2014-12-28 13:48:48 +01:00
Jonne Haß
6c9f191696 Merge pull request #5491 from collimarco/solved5348 
Solve #5348
 2014-12-23 23:00:06 +01:00
Dennis Schubert
7b0cff3250 Merge pull request #5488 from Faldrian/5240-fix_async_searchresults_blueprint 
Set refresh_search async searchresults load to use bootstrap
Fix #5240
 2014-12-20 04:55:25 +01:00
Steffen van Bergerem
1efed0ea61 Merge pull request #5477 from margori/Leave_conversation_tooltip 
Changed delete conversation button tooltip
 2014-12-20 00:59:46 +01:00
Jonne Haß
6806b2daf8 Merge pull request #5354 from gdpelican/feature/json-exporter 
Feature/json exporter
 2014-12-17 16:45:25 +01:00
Jonne Haß
edc1a23f50 Merge pull request #5478 from margori/Purge_orphan_conversation 
Destroy conversation when all participants leave it
 2014-12-17 16:44:03 +01:00
James Kiesel
e174514d69 Add JSON exporter for user profile download 2014-12-16 08:55:35 +13:00
Jonne Haß
98cb1bbb1f fix some typos in the changelog [ci skip] 2014-12-13 22:23:58 +01:00
Jonne Haß
691061c68b Merge pull request #5471 from svbergerem/fix-poll-answer-order 
Fix order of poll answers
 2014-12-13 22:10:03 +01:00
Jonne Haß
88e150e4a0 Merge pull request #5449 from margori/3016_block_messages_to_not_sharing_user 
BUG: new messages to person that is not sharing
 2014-12-10 21:42:16 +01:00
Dennis Schubert
cc0c19b482 Merge pull request #5462 from jhass/open_graph_reader 
Bye opengraph_parser, hi open_graph_reader
 2014-12-09 04:42:20 +01:00
Steffen van Bergerem
7c775208b1 Merge pull request #5422 from SansPseudoFix/fix-code-overflow-spv-and-profile 
Fix code overflow spv and profile
 2014-12-02 22:44:08 +01:00
Jonne Haß
5ccdcc0b95 Merge pull request #5450 from svbergerem/exceeding-profile-content 
Content shouldn't exceed the profile sidebar
 2014-12-02 14:33:16 +01:00
Jonne Haß
4f8cf0fe07 Merge pull request #5442 from svbergerem/pre-fill-tag-publisher 
Pre-fill publisher on tag page
 2014-11-30 18:59:11 +01:00
Jonne Haß
2ab16d473c Merge pull request #5410 from svbergerem/configurable-source-url 
Make source code url configurable

Conflicts:
	config/diaspora.yml.example
 2014-11-29 23:46:45 +01:00
Jonne Haß
ff04310158 Merge pull request #5426 from axilleas/diaspora_yml 
Improve diaspora.yml comments
 2014-11-29 17:55:24 +01:00
Jonne Haß
1f00f47de5 add missing changelog entry for #5387 [ci skip] 2014-11-29 17:21:39 +01:00
Jonne Haß
c0aa5565cc Merge pull request #5403 from pravi/bump_rack-protection 
bump sinatra to 1.4.5 and rack-protection to 1.4
 2014-11-29 16:17:56 +01:00
Jonne Haß
da718c9d11 Merge pull request #5434 from DharmaCommunity/5430-missing-empty-list-msg-on-default-privacy-page 
issue #5430 : message added
 2014-11-29 16:02:30 +01:00
Steffen van Bergerem
77b627dbe9 Merge pull request #5419 from SansPseudoFix/add-handle-search-terms 
Add handle search terms
 2014-11-24 18:09:02 +01:00
Jonne Haß
137e60ca51 Merge pull request #5400 from Faldrian/5003-fix-more-button-mobile 
Fix for "more" link on mobile view
 2014-11-22 19:06:31 +01:00
Jonne Haß
6a034f172b Merge pull request #5401 from Faldrian/4721-adjust-bootstrap-headerbar-like-blueprint 
fixed margins and fonts in headerbar. fixed bootstrap2 placeholder error
 2014-11-22 19:00:55 +01:00
Steffen van Bergerem
8f956383bd Merge pull request #5407 from SansPseudoFix/5251-add-contact-dropdown-hidden 
Issue #5251: fix hidden overflow
 2014-11-22 16:38:16 +01:00
Jonne Haß
7f51d8710e Merge pull request #5073 from Zauberstuhl/xmpp_chat_feature 
[Feature] XMPP javascript client plus ruby (vines) server
 2014-11-15 17:02:20 +01:00
Jonne Haß
b4a24bd49e Drop no longer needed and too open crossdomain.xml 
It allowed Flash apps on any domain to make requests on
behalf of a signed in user.

Thanks to Oliver Beg for the hint.
 2014-11-11 14:25:10 +01:00
Jonne Haß
404a286588 Merge pull request #5355 from Chocobozzz/header-logo-hover 
Replace the black header logo with the white logo on hover
 2014-11-09 18:55:59 +01:00
Jonne Haß
c7c57d40f5 Merge pull request #5380 from Faldrian/feature/3098-publisher-imageupload-layouterror-fix 
Feature/3098 publisher imageupload layouterror fix
 2014-11-09 18:52:13 +01:00
Dennis Schubert
df4063fd45 Documentation improvements and changelog entry 
I just assume camo is cool enough to get an own section.
 2014-11-09 06:51:17 +01:00
Florian Staudacher
c7f4051ac0 Merge branch 'roymckenzie-body-classes' into develop 2014-11-07 16:41:53 +01:00
Faldrian
ba551f6ac4 edit changelog 2014-11-07 16:37:52 +01: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
Jonne Haß
86a53b48ca Merge pull request #5320 from zikalify/librejs_headers 
Librejs headers
 2014-10-21 10:20:38 +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
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