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

881 commits

Author SHA1 Message Date
Dennis Schubert
cfc98d9a2a Merge branch 'hotfix/0.4.1.3' into release/0.5.0.0-RC 2015-04-11 20:15:10 +02:00
Dennis Schubert
f7d1105148 Merge branch 'hotfix/0.4.1.3' into develop 2015-04-11 20:12:13 +02:00
Dennis Schubert
9fc00d0814 Bump Redcarpet to fix OSVDB-120415 2015-04-11 19:51:18 +02:00
Jonne Haß
4812dc7a23 Merge pull request #5849 from svbergerem/406-on-people-contacts-json 
Return 406 on people/guid/contacts, format json
 2015-04-06 12:49:46 +02:00
Jonne Haß
f4ed086ae0 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-06 12:30:11 +02:00
Steffen van Bergerem
e6cc20d686 Add link to custom splash page wiki examples 2015-04-06 12:26:28 +02:00
Jonne Haß
4b841ef076 Merge pull request #5843 from margori/private_post_subject_content 
Limited post content excluded from subject of comment email
 2015-04-04 00:39:40 +02:00
Jonne Haß
cc5bd16eb4 Merge pull request #5848 from svbergerem/migrate-only-sharing 
Fix only sharing flag for contacts that are receiving
 2015-04-04 00:16:37 +02:00
Jonne Haß
b90dc790e5 Merge pull request #5846 from svbergerem/fix-destroying-auto-follow-back-aspect 
Disable auto follow back on aspect deletion
 2015-04-04 00:13:24 +02:00
Jonne Haß
2dd4bf0acf Merge pull request #5838 from svbergerem/check-stream-before-adding-posts 
Don't add mentions and reshares to all streams
 2015-04-01 18:27:06 +02:00
Jason Robinson
c0b8f03225 bump to 0.5.0.0-RC 2015-03-30 17:49:15 +03:00
Steffen van Bergerem
c9457ffd86 Add missing .container to admin pages, add note to changelog 2015-03-26 23:51:41 +01:00
Steffen van Bergerem
b69239ed2f Merge pull request #5791 from SansPseudoFix/5745-Conversation-pagination-design-is-broken 
Fix for 5745 - conversation pagination design is broken
 2015-03-26 20:05:24 +01:00
Jonne Haß
2eaa5a4d3b Merge pull request #5816 from svbergerem/remove-footer-stream-pages 
Remove footer from stream and profile pages
 2015-03-26 17:30:13 +01:00
Steffen van Bergerem
f3cbaddac4 Merge pull request #5743 from Flaburgan/change-make-something 
Replace Make Something text by the diaspora ball logo on registration page
 2015-03-26 01:10:58 +01:00
Steffen van Bergerem
50c187537d Merge pull request #5721 from sam09/fixissue5626 
Added margin top to lists. Fixes issue #5626
 2015-03-22 00:38:51 +01:00
Jonne Haß
644fc46dee Merge pull request #5792 from MothOnMars/4020-role-specs 
added specs and validations for Role model
 2015-03-20 01:54:04 +01:00
Jonne Haß
241d12d824 Merge pull request #5798 from svbergerem/remove-centered-layout 
Remove layout 'centered_with_header_with_footer'
 2015-03-20 01:51:27 +01:00
Jonne Haß
5115582c55 Merge pull request #5790 from visualsayed/5693-reshare-count-broken-on-mobile-stream 
fix missing reshares count on mobile stream #5693
 2015-03-17 21:27:44 +01:00
Jonne Haß
e4a79fb77b Merge pull request #5786 from svbergerem/refactor-sidebar-css 
Refactor and improve sidebar css
 2015-03-16 12:14:34 +01:00
Jonne Haß
256d7862b9 Merge pull request #5782 from svbergerem/reshared-poll 
Display reshared poll
 2015-03-15 20:45:51 +01:00
Jonne Haß
5ea90016b3 Merge pull request #5783 from visualsayed/5737-too-long-tag-name 
5737 too long tag name
 2015-03-15 18:06:53 +01:00
Steffen van Bergerem
c3bf9dd831 Merge pull request #5761 from AugierLe42e/port-notifications-backbone-part2 
Port notifications to backbone part. 2
 2015-03-15 15:10:47 +01:00
Jonne Haß
25e80fddc8 Merge pull request #5781 from svbergerem/various-style-fixes 
Various style fixes
 2015-03-15 04:20:47 +01:00
Steffen van Bergerem
194fc3ea71 Merge pull request #5776 from lislis/rewrite-conversation-hover-in-css 
Rewrite hover effect on conversations with multiple participants in css

Conflicts:
	Changelog.md
 2015-03-14 17:36:00 +01:00
Steffen van Bergerem
2e071a185c Merge pull request #5741 from goobertron/add_likes_tests 
Add tests for liking and unliking posts
 2015-03-14 17:10:58 +01:00
Lisa Passing
a11322fd5d make css nicer 
update Changelog

remove weird merge thing

think of the padding and margin
 2015-03-14 17:00:14 +01:00
Steffen van Bergerem
2328f64d56 Merge pull request #5580 from MothOnMars/5549-password-reset-error 
display specific error messages for password change (issue #5549)
 2015-03-14 03:25:08 +01:00
Steffen van Bergerem
d7d9891293 Merge pull request #5722 from AugierLe42e/add-notif-unsubscribe-single-post-view 
Add a notification subscribtion to the single post view
 2015-03-14 00:52:03 +01:00
Martha
985141c0e8 display specific error messages for password change (issue #5549) 2015-03-13 11:35:21 -07:00
Steffen van Bergerem
fb8bc7b99e Merge pull request #5764 from giniouxe/#5670-refactor-registration 
Refactor registrations #5670 - Partial form
 2015-03-13 18:31:40 +01:00
Steffen van Bergerem
4f960fd34a Merge pull request #5733 from margori/avatar_shadow 
Avatar aspect update and DRY
 2015-03-12 14:28:16 +01:00
Steffen van Bergerem
e99fe86ca0 Merge pull request #5752 from SansPseudoFix/fix-tag-button-overflow 
fix tag button overflow
 2015-03-12 10:43:56 +01:00
Steffen van Bergerem
52c2a73d83 Merge pull request #5707 from AugierLe42e/port-notifications-backbone 
[WIP] Port of notifications.js and notification-badge.js to Backbone part.1
 2015-03-11 17:05:14 +01:00
Jonne Haß
a0bcc8c335 Merge pull request #5754 from svbergerem/fix-invitations-mobile 
Fix mobile sign up with invitation
 2015-03-11 12:41:45 +01:00
Jonne Haß
8ab6f31e0a Merge pull request #5751 from svbergerem/fix-photo-count-profile 
Fix photo count in the profile view
 2015-03-10 17:45:12 +01:00
Steffen van Bergerem
e5584e400e Update Changelog for #5731 [ci skip] 2015-03-10 16:45:04 +01:00
Steffen van Bergerem
9d6fc0a671 Merge pull request #5744 from Flaburgan/conversation-design 
Fix conversaton publisher trailing border
 2015-03-08 22:49:44 +01:00
Jonne Haß
f525f9e34d Merge pull request #5730 from Flaburgan/strip-markdown-from-title 
Strip markdown from the heading of a post
 2015-03-06 23:43:13 +01:00
Jonne Haß
abc4203840 Merge pull request #5685 from margori/1802_export_photos 
Export user photos
 2015-03-04 01:45:51 +01:00
Selman Ercan
35fe6bda68 Issue #5631. Made top and left coordinates of hovercards match those of their parents. 
Added line to changelog for bug fix of issue #5631.

Processing the 'mouseleave' event only if we've left both the parent and the hovercard.

Fixed indentation.

Replaced issue id with pull request id and fixed indentation.
 2015-03-02 09:41:29 +01:00
Jonne Haß
66f8503740 Merge pull request #5715 from svbergerem/bootstrap-port-streams 
Port stream views to Bootstrap
 2015-03-02 01:00:10 +01:00
Jonne Haß
8dd313efc6 Merge pull request #5711 from svbergerem/update-markdown-it-plugins 
Update markdown-it-diaspora-mention and markdown-it-sanitizer
 2015-02-28 12:42:05 +01:00
Jonne Haß
95053ccbf2 Merge pull request #5351 from MarcBurt/5041-Total-user-statistic-shouldnt-include-closed-accounts 
5041 total user statistic shouldnt include closed accounts
 2015-02-27 16:02:35 +01:00
Jonne Haß
e46a77ba19 Merge pull request #5706 from aka001/help_section 
Update the help section #5698
 2015-02-27 15:57:12 +01:00
Jonne Haß
be1ab6c6a3 Merge branch 'collimarco-issue5350' into develop 2015-02-27 15:33:55 +01:00
Jonne Haß
39c50b231f Merge pull request #5665 from AugierLe42e/chat-help-section-bis-repetita 
Adding help section for chat
 2015-02-26 22:20:57 +01:00
Jonne Haß
3a0857b4bf Merge pull request #5699 from WebDevFromScratch/5690-update-stream-on-reshare 
5690 update stream on reshare
 2015-02-23 16:37:54 +01:00
PIOTR KLOSINSKI
b8be76be3c changed reshare function, so it adds the object to the stream 
tests for reshares

Changelog.md update

fixing a style issue

removed unnecessary semicolon
 2015-02-23 15:44:31 +01:00
Jonne Haß
9ad26604b7 Merge pull request #5640 from zachrab/5625-disable-mail-to-deleted-user 
Fixes issue #5625
 2015-02-20 02:29:51 +01:00
Jonne Haß
a19b91083e Merge pull request #5643 from aka001/5564_lock_account 
Lock account #5564
 2015-02-19 03:43:38 +01:00
flaburgan
44649e9167 Unify not connected pages 2015-02-18 22:45:46 +01:00
Steffen van Bergerem
b4ab31d6f9 Merge pull request #5680 from jhass/strip_formatting_chars 
Strip Unicode format characters prior post processing
 2015-02-18 03:26:50 +01:00
Steffen van Bergerem
c03eb0c191 Merge pull request #5675 from SansPseudoFix/5586-fix-overflow-code-mobile 
fix code overflow in mobile comments #5586
 2015-02-17 13:09:56 +01:00
Jonne Haß
278ca84ec2 Merge pull request #5676 from svbergerem/notifications-add-year 
Add year to notifications page
 2015-02-16 18:44:48 +01:00
Jonne Haß
34ad598cff Merge pull request #5594 from Faldrian/4055-add_contacts_mobile 
4055 add contacts mobile
 2015-02-15 23:12:18 +01:00
Faldrian
8f3c03edfa Added dropdown to add/remove people from/to aspects in mobile view 2015-02-15 22:08:15 +01:00
Jonne Haß
e801c859a8 Merge pull request #5671 from giniouxe/5662-privacy-button-text 
Issue #5662 Fix text on change button
 2015-02-15 20:38:52 +01:00
Jonne Haß
9dbf6b82a8 Merge pull request #5655 from svbergerem/contacts-page-add-invitations 
Add invitation link to contacts page
 2015-02-15 16:00:20 +01:00
Jonne Haß
e05ae411eb Merge pull request #5667 from svbergerem/help-section-routing 
Add routes for help sections
 2015-02-14 22:19:37 +01:00
Steffen van Bergerem
f37a018b0e Merge pull request #5521 from arlogn/profile-photos-as-thumbnails 
profile photos as thumbnails
 2015-02-14 02:55:57 +01:00
goobertron
5cad9b3c6c Ahem! 2015-02-11 20:30:09 +00:00
Jonne Haß
3c58cbeaee Merge pull request #5646 from svbergerem/fix-conversation-scrolling 
Conversations: fix badge count and automatic scrolling
 2015-02-11 14:19:48 +01:00
Jonne Haß
97a5e24edc update changelog for #5652 [ci skip] 2015-02-11 14:12:02 +01:00
Jonne Haß
ab2e4781f8 Merge pull request #5639 from aka001/5373_technical_limitation 
Technical limitations of how old one can be on D* #5373
 2015-02-09 02:28:15 +01:00
Marc Burt
9f5131b6ec Fixed #5041 with new User method to find total accounts excluding closed and invitations 2015-02-08 13:49:12 +00:00
Jonne Haß
b991ffe455 Merge pull request #5624 from dimaursu/emoji 
Add collation and config check
 2015-02-08 00:04:46 +01:00
Steffen van Bergerem
8b33b9eb18 Merge pull request #5602 from Faldrian/more-shortcuts 
Add shortcuts for reshare, expand Post and open first link in a post

Conflicts:
	config/locales/diaspora/en.yml
 2015-02-07 14:41:56 +01:00
Dumitru Ursu
0829e6f394 Add collation and config check 2015-02-06 00:49:07 +02:00
Jonne Haß
c61a4a91a5 update changelog [ci skip] 2015-02-02 15:46:31 +01:00
Steffen van Bergerem
b4ff1f97e7 Merge pull request #5612 from Flaburgan/hide-signup-button-when-registration-are-disabled 
Hide sign up button when registration are disabled
 2015-02-02 00:44:35 +01:00
goobertron
42cd2337be Amend all text strings in en locales to use sentence case 
Adapt cukes to work with new capitalisation rules
 2015-01-31 17:44:57 +00:00
Faldrian
099974ddef Add shortcuts for reshare, expand Post and open first link in a post 2015-01-28 16:19:18 +01:00
Faldrian
31c39a59d1 Added post moderation buttons in SPV 2015-01-25 05:11:59 +01:00
Jonne Haß
9eaa92068f Merge pull request #5464 from SansPseudoFix/statistics_design 
[Feature] Statistics page
 2015-01-24 23:57:40 +01:00
Jonne Haß
caab38875b tell people to stop the server while running migrations [ci skip] 2015-01-23 14:23:47 +01:00
Jonne Haß
cd6475d572 Merge pull request #5562 from sjain1107/5560-Hide-community-spotlight 
5560 Hide community spotlight setting if not enabled
 2015-01-21 05:38:25 +01:00
Jonne Haß
a7d652c7c9 Merge pull request #5530 from dimaursu/emoji 
Convert MySQL fields to 4 byte unicode
 2015-01-21 02:34:53 +01:00
Dumitru Ursu
28fdba5d89 Shorten indexes 
Fix merge conflict
 2015-01-20 22:41:52 +02:00
Dumitru Ursu
dda5f71124 Add warning about encoding change 
Add warning about MySQL collation

Fix database index length

This allows new databases to be created with utf8mb4, on MySQL. The maximum
column size is 767 bytes. Each character is 4 bytes long -> 767 / 4 = 191
characters for the column.
 2015-01-19 02:19:39 +02:00
Jonne Haß
4d8790d61e Merge pull request #5510 from margori/779_remove_exif 2015-01-18 15:29:02 +01:00
Jason Robinson
9282a4ea8f Refactor mobile javascript to get rid of console errors. 
Fixes also mobile bookmarklet services.
 2015-01-17 15:50:06 +02:00
Jason Robinson
8cd4ce2381 Add changelog for #5489 [ci skip] 2015-01-17 03:42:11 +02:00
James Kiesel
1c69dd7752 Add contacts/posts, and GZipping JSON exporter output 2015-01-15 00:20:19 +13:00
flaburgan
46223a2dfc Don't truncate notification emails anymore, close #4342 2015-01-10 22:10:11 +01:00
Jonne Haß
5b2d615d82 Merge pull request #5526 from svbergerem/update-pagedown 
Replace pagedown by markdown-it
 2015-01-10 20:38:35 +01:00
Jonne Haß
145aac4d28 Merge pull request #5532 from dimaursu/autoprefixer 
Remove CSS vendor prefixes and switch to autoprefixer
 2015-01-09 12:55:42 +01:00
Jonne Haß
9c99ae357a Merge pull request #5493 from collimarco/solved5341 2015-01-06 14:43:58 +01:00
Jonne Haß
f20020f06b Merge pull request #5473 from svbergerem/contacts-backbonejs 
Port contacts page to backbonejs
 2015-01-06 14:38:55 +01:00
Jonne Haß
3f49bc52f4 Merge pull request #5468 from Flaburgan/add-followed-tags-to-mobile-menu 
Add followed tags to the mobile menu

Conflicts:
	Changelog.md
 2015-01-06 14:35:37 +01:00
Jonne Haß
e94e9add1a Merge pull request #5452 from Flaburgan/allow-non-hosted-paypal-buttons 
Add currency setting to paypal donation and allow unhosted button setting

Conflicts:
	Changelog.md
 2015-01-06 14:32:57 +01:00
François Lamontagne
4c33a6adeb Replace %{third_party_tools} by the appropriate hyperlink in tags FAQ (issue #5273) 2015-01-03 13:25:16 -05:00
Jonne Haß
8fa0ae1db2 Merge pull request #5494 from margori/4266-remove-content-from-email-notifications 
Remove limited content from email notifications
 2014-12-29 17:33:43 +01:00
Flaburgan
b444cdf1ea Add currency and allow unhosted button to paypal donation 2014-12-28 19:50:45 +01:00
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
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