diaspora

Author	SHA1	Message	Date
Jonne Haß	f1c75e6a54	Bump open_graph_reader It now returns the origin for a missing og:url	2015-05-04 23:43:53 +02:00
Dennis Schubert	9db8cea504	Merge branch 'stable' into develop	2015-05-04 04:42:20 +02:00
efstrian	63be9d57b6	Issue #5884 : Added link to diasporafoundation.org to invitation email (en)	2015-05-04 04:42:08 +02:00
Jonne Haß	2570d88cc3	Merge pull request #5904 from Raven24/JesseWeinstein-patch-1 prefill bookmarklet with markdown-formatted content	2015-05-04 04:10:03 +02:00
Jonne Haß	f2e26dfafc	Merge branch 'stable' into develop	2015-05-04 04:07:10 +02:00
Jonne Haß	19fd36b1ce	add changelog entry for #5908 [ci skip]	2015-05-04 04:06:55 +02:00
Jonne Haß	234e205602	Merge branch 'stable' into develop	2015-05-04 03:38:44 +02:00
Steffen van Bergerem	a22127bfb1	Add ctrl+enter shortcut for conversations	2015-05-04 03:38:42 +02:00
Jonne Haß	8172eee43c	Merge branch 'stable' into develop	2015-05-04 03:31:34 +02:00
Steffen van Bergerem	1fc31cc313	Fix close account for mobile view and use Bootstrap modal for desktop close account	2015-05-04 03:31:28 +02:00
Jonne Haß	a365d802c7	Recommend Ruby 2.2, drop Ruby 2.0 support As per https://www.loomio.org/d/VuwvXWU7/ruby-versions?proposal=DM8zidhc	2015-05-04 00:58:38 +02:00
Jonne Haß	4fad5041cf	update changelog and version for 0.6.0.0	2015-05-04 00:47:36 +02:00
Jonne Haß	f257658e46	Revert "Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations"" This reverts commit `2c7848e3cb`.	2015-05-04 00:43:41 +02:00
Jonne Haß	db08cec9c0	update changelog and version for 0.5.1.0	2015-05-04 00:41:55 +02:00
Jonne Haß	2c7848e3cb	Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations" This reverts commit `096fa2ddbb`, reversing changes made to `f7d1105148`.	2015-05-04 00:36:27 +02:00
Jonne Haß	5371c3876f	Merge pull request #5907 from pravi/add-x-permissions-to-scripts add execution permission to scripts	2015-05-02 15:14:51 +02:00
Jonne Haß	2382f9eb24	Merge pull request #5896 from Raven24/fix-db-seeds fix minor errors in db:seed task	2015-04-30 13:09:54 +02:00
Jonne Haß	fe64db013b	Merge pull request #5888 from szlend/5508-fix-post-presenter-autoreload Issue #5508: Remove post_presenter from initializers	2015-04-30 13:06:21 +02:00
Jonne Haß	78ea2c8204	Merge pull request #5878 from Flaburgan/chrome-frame Fix the IE version number extractor to work without space between MSIE and the version number	2015-04-30 13:04:29 +02:00
Jonne Haß	59e8fc93a2	Merge pull request #5559 from SWW13/aspect_sort Readd aspect sorting	2015-04-30 13:02:24 +02:00
Steffen van Bergerem	31bbfe8eab	Merge pull request #5887 from szlend/5874-fix-bold-links Issue #5874 Fix styled links	2015-04-30 11:05:24 +02:00
Jonne Haß	288b83bd8d	Merge pull request #5891 from mrbrdo/3824_environment_sanity_check fix script/server sanity checks	2015-04-25 19:09:43 +02:00
Jonne Haß	cfa4567d26	Merge pull request #5886 from artoartnik/develop Fix unconventional image asset inclusion in css asset	2015-04-25 17:40:45 +02:00
Jonne Haß	e50dfea875	Merge pull request #5885 from mrbrdo/server-script-fix fix broken output of script/server	2015-04-25 16:31:08 +02:00
Dennis Schubert	c95dd68545	Merge pull request #5883 from SuperTux88/fix-camo-on-contacts-page use camo for medium and small avatars	2015-04-25 01:26:28 +02:00
Benjamin Neff	84c3814b94	fix notification mails for limited posts	2015-04-22 19:59:08 +02:00
Jonne Haß	61c890f274	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-21 22:02:28 +02:00
Steffen van Bergerem	6bb5e0a29b	Only render hovercard if the mouse is still on the username	2015-04-21 22:02:18 +02:00
Jonne Haß	9a9cf6f6a5	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-21 20:48:41 +02:00
Steffen van Bergerem	2d3c0680ea	Fix uppercase registration/login labels and btn style	2015-04-21 20:48:30 +02:00
Jonne Haß	37ec00f80b	Merge pull request #5854 from svbergerem/remove-managing-services-standalone Remove 'manage services' link in standalone mode	2015-04-20 22:36:11 +02:00
Jonne Haß	d959dd725b	Merge pull request #5850 from svbergerem/modal-for-new-aspect Use Bootstrap modal for new aspect form	2015-04-20 22:34:51 +02:00
Jonne Haß	3a8724bf0b	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-19 16:22:34 +02:00
Jonne Haß	fa7a7c5d59	Merge pull request #5865 from SuperTux88/fix-mysql_to_unicode_mb4-migration use "CONVERT TO" to change the encoding for the table and all character columns	2015-04-19 16:21:35 +02:00
Jonne Haß	85c376e591	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-19 15:58:41 +02:00
goobertron	a75ec75ec7	Update aspect edits text, reorder posting section First iteration to update Help section Changes from Fla	2015-04-19 15:57:21 +02:00
Jonne Haß	f11a6b5417	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-15 15:41:41 +02:00
Praveen Arimbrathodiyil	2613896cfd	fix for #5862 , check for compiled assets	2015-04-15 15:39:19 +02:00
Jonne Haß	b3575ab56f	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-14 15:42:33 +02:00
goobertron	a687a8dc01	Update help text for renaming an aspect	2015-04-14 15:40:58 +02:00
Jonne Haß	096fa2ddbb	Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations	2015-04-11 20:42:34 +02:00
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
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
Jonne Haß	12c507d6a2	Merge pull request #5048 from kpcyrd/fix-5031 Fix self-xss issue in contact-group-rename	2014-07-01 14:44:41 +02:00
Jonne Haß	6fb6a08980	Merge pull request #4945 from hpetru/notifications Refactoring Notification#notify	2014-07-01 14:33:54 +02:00
Jonne Haß	47b7434263	update changelog [ci skip]	2014-07-01 14:31:00 +02:00
Hincu Petru	1d09978440	Fix hidding of poll publisher for close action	2014-06-25 10:54:00 +00:00
Hincu Petru	653612b74d	Remove posts for ignored person	2014-06-25 08:56:12 +00:00
Jason Robinson	b246c7b5ef	Merge branch 'master' into develop	2014-06-24 22:26:20 +03:00
Jason Robinson	c7536e523a	Re-bump version to 0.4.0.1	2014-06-24 22:23:26 +03:00
Jason Robinson	bd4dea608a	Merge branch 'hotfix/0.4.0.1' into develop Conflicts: Changelog.md config/defaults.yml	2014-06-24 22:08:07 +03:00
Jason Robinson	90dd5d3868	Bump to 0.4.0.1	2014-06-24 22:01:12 +03:00
Jason Robinson	c475a3985e	start new development cycle	2014-06-22 19:32:23 +03:00
Jason Robinson	51ecae1b77	bump to 0.4.0.0	2014-06-22 19:01:31 +03:00
Jonne Haß	b7d310f318	Merge pull request #5012 from goobertron/changelog Update changelog Conflicts: Changelog.md	2014-06-22 15:03:23 +02:00
goobertron	184f6225df	Update changelog to reference fixes rather than bug reports, fix couple of typos.	2014-06-22 13:34:31 +01:00
Jason Robinson	e4e9f40b2c	Revert "Fix toggling services for mobile bookmarklet" This fixed the toggling of services, but broke the actual bookmarklet :) This reverts commit `1bd7989045`.	2014-06-19 21:47:34 +03:00
Jason Robinson	1bd7989045	Fix toggling services for mobile bookmarklet	2014-06-02 23:29:47 +03:00
Jonne Haß	553a5258a8	Merge pull request #4968 from taratatach/4967-use-https-for-osm-locator Use https to load the location from OSM	2014-05-26 20:11:49 +02:00
Jonne Haß	77133a4062	Merge pull request #4963 from Ruxton/feature/rake_task_to_run_account_deletion_fixes_4792 Rake task for running outstanding account deletions	2014-05-24 18:03:10 +02:00
Jonne Haß	a3bfc4e92d	Add changelog entry for #4758 [ci skip]	2014-05-24 17:58:20 +02:00
Jonne Haß	cbd9c56a7a	Merge pull request #4919 from hpetru/4776-mention-on-mobile Unescape text before add mention, this commit solve #4776 Conflicts: Changelog.md	2014-05-24 17:34:29 +02:00
Jonne Haß	63c44d9f6b	Merge pull request #4781 from Zauberstuhl/report_feature It is now possible to report posts and comments	2014-05-15 19:53:44 +02:00
Oliver Azevedo Barnes	aec0c700b3	Add account_deleter.rb to load_libraries initializer	2014-05-07 14:36:18 -05:00
Hincu Petru	e699a682f4	Unescape text before add mention, this commit solve #4776	2014-05-06 12:13:43 +00:00
Florian Staudacher	95efbfa9c9	add changelog for #4932 [ci skip]	2014-05-06 14:06:50 +02:00
Steffen van Bergerem	232e4fa236	Improve set read/unread in notifications dropdown	2014-04-16 23:33:22 +02:00
Jason Robinson	b64e418020	Merge pull request #4810 from svbergerem/notifications-no-auto-mark-as-read Remove auto 'mark as read' in notifications dropdown	2014-04-16 21:56:53 +03:00
Steffen van Bergerem	e1685c9a29	Remove auto 'mark as read' for notifications	2014-04-15 14:51:38 +02:00
Gabriel Lima	f6c0648a55	bug #4832 - send the rspec test and changelog	2014-04-15 09:23:58 -03:00
flaburgan	a4886fa77b	SPV: Improve padding and interaction counts	2014-04-13 11:27:12 +02:00
Jason Robinson	ee3a9f9be0	Merge pull request #4912 from goobertron/settings Reorder items on settings page and improve wording	2014-04-12 21:37:52 +03:00
Jason Robinson	6947a1945c	Merge pull request #4883 from MrZYX/uuid Use uuids for guid generation	2014-04-11 16:40:57 +03:00
Jonne Haß	66c511197c	Merge pull request #4917 from hpetru/4806-new-status_messages-page Redirect to stream_path if is destkop	2014-04-08 13:45:04 +02:00
goobertron	63abe9055b	Reorder items on settings page and improve wording Update cukes to be text-independent Update changelog	2014-04-08 00:28:25 +01:00
Jonne Haß	5a60cb72bf	Merge pull request #4899 from hpetru/poll-in-post-preview Add poll in post preview	2014-04-04 14:12:13 +02:00
Jonne Haß	be19c2f104	Merge pull request #4897 from hpetru/update-poll-view-in-stream I update design for poll in post stream	2014-04-04 09:54:06 +02:00
Jonne Haß	9eb2339368	Merge pull request #4894 from hpetru/4893-poll-in-spv Add poll for single post view	2014-04-03 20:36:34 +02:00
Jonne Haß	211963d320	Merge pull request #4889 from hpetru/4874-malformed-url Catch error from decodeURI for prevent crash in posts parsing	2014-04-01 00:49:27 +02:00
Jannik Streek	167884e565	added changelog pull link	2014-03-31 18:14:08 +02:00
Jannik Streek	a3837a4f19	added changelog entry	2014-03-31 18:14:07 +02:00
Jonne Haß	0ea53aa5ed	Merge pull request #4882 from hpetru/4868-mention-inside-tags 4868 mention inside tags	2014-03-31 12:06:39 +02:00
Jonne Haß	98057885ac	use uuids for guid generation	2014-03-30 15:38:18 +02:00
Jonne Haß	07aec2a630	Merge branch 'hpetru-4864-ui-bug-when-tag-is-long' into develop	2014-03-30 13:39:32 +02:00
Jonne Haß	3a91061d4f	Merge pull request #4708 from goobertron/opengraph_link_fix Opengraph link fix (issue #4492)	2014-03-30 11:15:29 +02:00
Jonne Haß	1b70f6fe09	Replace .rvmrc by .ruby-version Also relax the requirement. The .ruby-version represents merely a recomendation for the Ruby version. The incompability issues in the Ruby world are far less currently, than they were when we introduced strict version enforcement. Thus strict enforcement is no longer appropiate. Same holds for RubyGems. This implicity also removes the recomendation on using RVM. The .ruby-version file is supported by all major Ruby version managers. Gemsets are no longer a needed feature since Bundler handles multiple concurrrently installed Gems just well.	2014-03-24 15:33:29 +01:00
Jonne Haß	ab15bad53f	Merge pull request #4858 from hincupetru/4514-clicking-show-more-comments-empties-textarea Save textarea value before rendering comments when clicked 'show more....'	2014-03-24 14:56:45 +01:00
Steffen van Bergerem	cd241ee94d	Hovercards! Everywhere!	2014-03-23 01:15:26 +01:00
Steffen van Bergerem	4fc9c6416e	Port notifications to Bootstrap	2014-03-19 18:45:52 +01:00
Steffen van Bergerem	f217a5bc11	Add filters to notifications controller	2014-03-19 17:54:22 +01:00
Hincu Petru	1cef3e42ce	I save textarea value before rendering comments when clicked 'show more..'	2014-03-19 12:36:04 +00:00
Jonne Haß	835608f06f	Merge pull request #4856 from hincupetru/3692-hashtags-inside-markdown-link Check if the hashtag is a link in function .hashtagify	2014-03-16 14:39:20 +01:00
Jonne Haß	cfca0e88f1	Revert "Merge pull request #4847 from hincupetru/3692-hashtags-inside-markdown-link" This reverts commit `06ab498620`, reversing changes made to `3c4d8d95d3`. Conflicts: Changelog.md	2014-03-15 21:08:54 +01:00
Jonne Haß	f2fedea3db	Merge pull request #4853 from hincupetru/4693-notifications-hovercard-avatars-misaligned Fixed "hovercard avatars misaligned in notifications drop-down"	2014-03-15 19:15:08 +01:00
Jonne Haß	06ab498620	Merge pull request #4847 from hincupetru/3692-hashtags-inside-markdown-link Solved problem with hashtags inside markdown links	2014-03-15 19:12:37 +01:00
Jonne Haß	3c4d8d95d3	Merge pull request #4794 from Flaburgan/improve-search-page Add handle indication on search page, improve design	2014-03-15 19:09:42 +01:00
Jonne Haß	d4e046ecbc	Merge pull request #4787 from hincupetru/4726-infinite-photo-stream Added limit by max_time to photos#index for prevent "infinite photo stream"	2014-03-15 19:07:48 +01:00
flaburgan	027650e856	Add handle indication on search page, improve design	2014-03-13 23:01:42 +01:00
Jonne Haß	11603f5496	Merge pull request #4843 from svbergerem/4228-hovercards-same-pod Show hovercards in the notification drop-down for users on the same pod Conflicts: Changelog.md	2014-03-11 21:50:33 +01:00
MatrixCrawler	3273028ed2	Fix atom feed for reshares of deleted posts. Propose for fix #4638 Added Changelog line Added Specs for testing if the reshared origin post is deleted and therefore not shown in the atom feed	2014-03-11 21:27:08 +01:00
Steffen van Bergerem	aefcfc7b30	Show hovercards in the notification drop-down for users on the same pod	2014-03-11 20:44:28 +01:00
Steffen van Bergerem	0cc3b10b1f	port publisher and bookmarklet to bootstrap	2014-03-10 15:15:40 +01:00
Jonne Haß	bd24cb71a4	Fix plaintext mode for mentionable Also slight refactors to it.	2014-03-09 14:02:15 +01:00
Jonne Haß	4fce682635	Merge pull request #4834 from Faldrian/atomfeedtohtml atom-feed content changed to html, use better post-title extractor	2014-03-09 01:13:38 +01:00
Jonne Haß	a1c222dd23	Merge pull request #4681 from diaspora/upgrade_to_jquery_10 Upgrade to jquery 10	2014-02-24 10:29:08 +01:00
Jason Robinson	5fe5507128	Add devise_lastseenable for user last seen tracking. Adds a timestamp to user model which is touched when user comes back. Statistics active users counts now use these more reliable timestamps. Fixes #4734	2014-02-22 23:22:46 +02:00
Jason Robinson	f54931c813	Put #4799 changelog to correct place	2014-02-21 21:51:18 +02:00
Jason Robinson	ea82a91085	Merge pull request #4799 from JannikStreek/feature/4778-comment_counters Added count of comments to statistics	2014-02-21 21:49:25 +02:00
Jason Robinson	d7748718f7	Merge pull request #4793 from Flaburgan/refactor-right-side-bar Refactor right side bar, see you, BRs.	2014-02-21 20:27:02 +02:00
Jannik Streek	d603ff818c	added comment count to statistic to calculate posts/comments ratios fixeds tests for comment count in statistics added changelog entry and default entry	2014-02-21 12:25:23 +01:00
flaburgan	16309dc832	Remove the limit to 8 pictures in the view	2014-02-21 01:31:12 +01:00
flaburgan	a7c7e4b1e3	Refactor right side bar, see you, BRs.	2014-02-20 13:01:07 +01:00
Jonne Haß	57991187d1	Merge branch 'hotfix/0.3.0.3' into develop Conflicts: Changelog.md config/defaults.yml	2014-02-19 11:31:02 +01:00
Jonne Haß	1df3f546c9	update rails to 3.2.17	2014-02-19 11:09:06 +01:00
Jason Robinson	283e06bd26	Merge branch 'hotfix/0.3.0.2' into develop Conflicts: Changelog.md config/defaults.yml	2014-02-18 22:13:52 +02:00
Jason Robinson	d6d97c17b0	Changelogs for 0.3.0.2, changelog for #4714	2014-02-15 17:04:18 +02:00
Steffen van Bergerem	ab9e7d8035	fix hovercards (cherry picked from commit `a51c4f0ddc`) Conflicts: Changelog.md	2014-02-15 16:58:12 +02:00
Steffen van Bergerem	a51c4f0ddc	fix hovercards	2014-02-15 14:09:03 +01:00
Jonne Haß	adf6c3c009	Merge pull request #4775 from dash-rai/move-mentions-input-plugin Moved jquery.mentionsInput plugin	2014-02-10 21:12:12 +01:00
Jonne Haß	3ed4467155	Merge pull request #4765 from goobertron/jquery_source Update JQuery source to jquery.com Conflicts: Changelog.md	2014-02-10 17:02:09 +01:00
Jonne Haß	3a616469f4	Merge pull request #4707 from goobertron/improved_new_password New reset password form Conflicts: Changelog.md	2014-02-10 01:35:37 +01:00
Jonne Haß	3e3979cc28	Merge pull request #4656 from svbergerem/conversations-add-participants Add participants to conversations menu	2014-02-09 20:20:47 +01:00
Jonne Haß	141438a33e	add changelog entry for #4768 [ci skip]	2014-02-09 20:08:23 +01:00
Steffen van Bergerem	a2b3917505	Add participants to conversations menu	2014-02-09 19:55:10 +01:00
goobertron	23e8bfa082	Update JQuery source to jquery.com	2014-02-09 17:36:35 +00:00
Jonne Haß	11b3fe7df4	Merge pull request #4673 from Flaburgan/drawer-scrollable New menu for the mobile version	2014-02-09 18:06:43 +01:00
goobertron	2a145e67ab	Update design of forgot_password and change_password forms Fix redirect to stream, make labels lower-case Fix cuke	2014-02-09 15:48:06 +00:00
Jonne Haß	4a3869cda8	Merge pull request #4769 from Ruxton/feature/faster_stream_queries Updating queries for the stream to be faster	2014-02-09 16:25:59 +01:00
Jonne Haß	a462c84fae	Merge branch 'goobertron-rename_messages' into develop	2014-02-09 15:45:15 +01:00
Jonne Haß	17754f1da8	Merge pull request #4747 from Raven24/fix_aspect_stream fix regression caused by updating backbone.js in aspect stream	2014-02-09 15:38:35 +01:00
Jonne Haß	976b21ab05	Merge pull request #4702 from goobertron/new_logos Updated image branding (issue #4444)	2014-02-09 14:47:40 +01:00
Jonne Haß	ecd8a8200b	Merge pull request #4754 from svbergerem/small-improvements-spv SPV small improvements	2014-02-09 14:26:41 +01:00
Florian Staudacher	6c9cce7cda	Merge branch '4264-embed-youtube-on-https' of https://github.com/arlogn/diaspora into arlogn-4264-embed-youtube-on-https	2014-02-09 13:05:39 +01:00
Steffen van Bergerem	97f1c286f4	improve reshared posts	2014-01-31 22:48:40 +01:00
Steffen van Bergerem	0f156cd9a4	Remove unused beta code	2014-01-24 09:01:30 +01:00
Jonne Haß	0b15e66d06	Merge pull request #4577 from svbergerem/2302-permalink-comments [Ready to review & merge] Add permalinks for comments Conflicts: app/assets/stylesheets/application.css.sass	2014-01-22 11:24:42 +01:00
Steffen van Bergerem	3d4bdfb665	Drop number of followers from tags page	2014-01-21 14:49:05 +01:00
Jason Robinson	590778502d	Merge branch 'hotfix/0.3.0.1' into develop Conflicts: Changelog.md config/defaults.yml	2014-01-20 23:40:58 +02:00
Florian Staudacher	0c5c17f5e2	fix regression in conversations causing an infinite recursion (fix #4715 ) (cherry picked from commit `5c059b2925`) Conflicts: Changelog.md	2014-01-20 23:39:19 +02:00
Florian Staudacher	5c059b2925	fix regression in conversations causing an infinite recursion (fix #4715 )	2014-01-20 22:00:26 +01:00
Jonne Haß	9ea6e9c166	Merge pull request #4517 from Zauberstuhl/report_post_feature Added post reporter feature Conflicts: Changelog.md app/assets/stylesheets/application.css.sass db/schema.rb	2014-01-20 10:03:45 +01:00
Jonne Haß	0e291fd9c4	Merge pull request #4281 from Ruxton/feature/use_rails_timeago_gem_instead_of_vendored_js Switched to using rails-timeago to make keeping on top of new versions o...	2014-01-20 09:57:10 +01:00
Jason Robinson	93b30dcda4	start new development cycle	2014-01-19 22:47:56 +02:00
Jason Robinson	edbed6c44a	bump to 0.3.0.0	2014-01-19 22:38:10 +02:00
flaburgan	565aba5036	Add gems upgrade in the changelog	2014-01-19 20:58:17 +01:00
Steffen van Bergerem	20e1626453	add permalinks for comments	2014-01-17 22:11:17 +01:00
Florian Staudacher	1924c40d38	replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem - updates underscore to 1.5.2 and backbone to 1.1.0 backbone had some breaking changes: - fix url/urlRoot handling in models & collections - options are no longer attached to the view by default - collections reset when 'fetch' is called, tell it to keep the existing models other changes: - fix some events triggering multiple times in connection with deleting a model - use document fragments instead of an element array for stream entries - adapt jasmine and cucumber specs to the changed code * no longer test the backbone router as part of our code * jasmine factory already returns model instances, no need to wrap that again	2014-01-16 23:23:30 +01:00
Lukas Matt	5c9a3aaf3e	Added post report feature You can report a single post by clicking the correct icon in the controler section Workflow: * Report a post as offensive * Trigger alerts to every pod-admin * Pod-admin can review it in the admin interface * Delete the post or mark it as reviewed	2014-01-14 15:00:55 -05:00
Steffen van Bergerem	580068ed7c	Remove background from badges in header	2014-01-14 15:00:36 +01:00
Jonne Haß	42f790fa13	Merge pull request #4666 from jaywink/signup-form-error-redirect Instead of redirect on signup form validation, render new	2014-01-11 14:08:18 -08:00
Jason Robinson	35ece9d65f	Instead of redirect on signup form validation, render new with submitted data.	2014-01-06 22:12:07 +02:00
Jason Robinson	db71c9c50b	Add mobile signup page captcha. Add test for user.sign_up method. Rewrite simple_captcha views to haml. Revert .rvmrc, fix indentation in config examp$	2014-01-06 22:00:53 +02:00
Damien Monet	b849d6c641	Fix: remove location when publisher is cleared by user	2014-01-05 11:09:03 +01:00
Florian Staudacher	9be0b075ac	add changelog entry for #4623 [ci skip]	2014-01-04 01:58:41 +01:00
Jonne Haß	2734471feb	Merge pull request #4653 from svbergerem/3119-change-more-comments-link Change more comments link	2014-01-02 01:14:33 -08:00
Steffen van Bergerem	55b967caf9	remove participants popover + improve conversations menu	2014-01-01 21:58:56 +01:00
Steffen van Bergerem	ef128575ae	Change more comments link	2013-12-30 13:20:58 +01:00
Jonne Haß	5d83402dc3	Merge pull request #4628 from jaywink/4627-twitter-truncation-problem Fix posting to Twitter by correctly catching over limit exception	2013-12-22 14:14:30 -08:00
Jonne Haß	4dcc712ea1	bump recommended ruby version to 2.0.0	2013-12-21 09:28:03 +01:00
Jonne Haß	b3ebe1a408	Merge pull request #4622 from svbergerem/improve-conversations-view Improve conversations view, port to bootstrap	2013-12-16 12:55:48 +01:00
Jason Robinson	e665ebdab1	Fix posting to Twitter by correctly catching over limit exception (#4627 ). Also when doing a retry, make smaller cuts to max characters	2013-12-15 22:01:09 +02:00
flaburgan	923a4f2ab4	Add indication about markdown formatting in the publisher	2013-12-13 16:02:39 +01:00
Jonne Haß	c660c90091	Merge pull request #4612 from diaspora/drop_spv_old_code Drop spv old code	2013-12-11 07:41:51 -08:00
Fabian Rodriguez	4adb460c51	add changelog entry	2013-12-10 18:50:30 -02:00
Jason Robinson	4d3c48607a	Add mention in changelog about statistics route, relating to already closed and merged #4602	2013-12-08 22:10:20 +02:00
Fabian Rodriguez	c339090f6e	Merge branch 'release/0.2.0.1' into develop Conflicts: Changelog.md config/defaults.yml	2013-12-05 09:11:41 -02:00
Fabian Rodriguez	740c0bc082	bump Rails to version 3.2.16	2013-12-04 21:36:54 -02:00
Fabian Rodriguez	90b0cc51a0	bump recommended Ruby version 1.9.3-p484	2013-12-04 21:04:25 -02:00
Jason Robinson	2c83d0e846	Statistics route with general info, some user and total posts stats. By default statistics off, enabled in settings.	2013-12-02 22:35:18 +02:00
flaburgan	b6e08fc39f	Complete changelog	2013-12-02 11:09:24 +01:00
Jonne Haß	1ce027eb2c	Merge pull request #4605 from manwithtwowatches/feature/4509-image-upload-response-errors Feature/4509 image upload response errors	2013-12-02 00:10:25 +01:00
Jonne Haß	d18bbd8405	Merge pull request #4604 from Flaburgan/refactor-mobile-publisher Refactor mobile publisher	2013-12-02 00:07:08 +01:00
Jonne Haß	4b1255fa8d	Merge pull request #4592 from Flaburgan/link-show-more-pictures-mobile [Ready to review] Fix "more picture" indication (+n) on mobile by adding a link on the indication Conflicts: Changelog.md	2013-12-02 00:04:37 +01:00
Jonne Haß	8baa06e477	Merge pull request #4590 from diaspora/4432-photo-lightbox-quickfix Add lightbox html to unauthenticated header Conflicts: Changelog.md	2013-12-01 23:58:00 +01:00
Jonne Haß	478159f1cd	Merge pull request #4593 from Flaburgan/improve-mobile-design Improve notifications and conversations views design on mobile	2013-11-20 12:05:28 -08:00
flaburgan	58886a6b30	Improve notifications and conversations views design	2013-11-16 03:06:25 -08:00
flaburgan	a02b0519c9	Fix "more picture" indication (+n) on mobile by adding a link on the indication	2013-11-16 02:06:45 -08:00
flaburgan	76b151eb7d	Fix avatar display on mobile profile	2013-11-16 01:57:37 -08:00
Raphael Sofaer	6ad083bf5b	Mark changelog to note fix for 4432	2013-11-15 15:07:09 -08:00
Jonne Haß	859cd83e38	Merge pull request #4583 from Flaburgan/refactor-mobile-header Refactor mobile header, close #4579 Conflicts: Changelog.md	2013-11-10 23:55:55 +01:00
flaburgan	0f2773053e	refactor mobile header, close #4579	2013-11-09 23:21:32 -08:00
movilla	1fcd675b3e	getting started page mobile error 500. Fix #4534	2013-11-09 19:25:32 -02:00
Fabian Rodriguez	146044bd36	Merge pull request #4578 from taratatach/force-comments-sort-order-in-mobile-spv force comments sort order in mobile spv	2013-11-07 18:16:52 -08:00
Erwan Guyader	0afdb134f8	force comments sort order in mobile spv	2013-11-07 17:19:23 -08:00
flaburgan	3df0fdc09b	Improve the management of the contacts visibility settings in an aspect	2013-11-07 12:55:35 -08:00
flaburgan	47645dd985	Put the stream first in the left menu	2013-11-04 17:46:45 -08:00
Florian Staudacher	1c4ad0986c	refactor message creation (conversations)	2013-10-20 22:46:53 +02:00
Florian Staudacher	830747a11e	refactor conversations_controller#create	2013-10-10 21:42:46 +02:00
Jonne Haß	eea9467846	refactor twitter service model	2013-09-30 10:13:14 +02:00
Florian Staudacher	260d86d501	refactor ConversationsController, move query builing to User model	2013-09-30 01:44:57 +02:00
Florian Staudacher	e614562470	avoid publishing empty posts (fixes #4401 ) invalidate empty posts when created by a local user add changelog entry	2013-09-24 21:57:22 +02:00
flaburgan	02ef9e08f6	Remove the (now useless) last post link from the user profile.	2013-09-20 17:37:34 -07:00
Fabian Rodriguez	abc06686ce	Merge pull request #4523 from Flaburgan:improve-getting-started Conflicts: Changelog.md	2013-09-19 19:37:54 -03:00
Jonne Haß	68da48f0d6	Merge pull request #4079 from Flaburgan/patch-3 Fix #4078 by refactoring 404.html	2013-09-19 14:34:34 -07:00
Jonne Haß	ac13e79225	Merge pull request #4529 from Flaburgan/fix-timeago-color Change .timeago color and align notification, fix #4502	2013-09-19 23:32:32 +02:00
Jonne Haß	e6be888707	Merge pull request #4522 from fubik/transparent_background Add a white background to images displayed in the lightbox Conflicts: Changelog.md	2013-09-19 23:27:57 +02:00
PallaviTS	5caa46cc83	fixing commenting Added jamisne tests for comments Added 2 jasmine tests for fixing commenting Bugfix: #4005 added changelog entry	2013-09-19 23:22:48 +02:00
flaburgan	126e7bdc9c	Refactor getting_started page, test if facebook is available, fix #4520	2013-09-18 22:06:47 -07:00
Antoine D	48dcea0746	Fix #4078 by refactoring 404.html I moved 404 to the assets to avoid loading font and images from joindiaspora. #- Can I move the design to a 404-style.css file which will be in the public repository too ? #- This pull request proposes to insert the two font files and the cat image, do you agree ? Depend of amazon seems really bad for me.	2013-09-18 15:55:46 -07:00
Jonne Haß	e2825e6ba7	Merge pull request #4525 from marekjm/bugfix/issue-4499 Fix issue #4499: changed :width in .item_count to :min-width	2013-09-14 20:23:26 +02:00
Jonne Haß	f76f35c097	Merge branch 'WebSpider-remove_s3_dependency' into develop	2013-09-14 20:17:28 +02:00
Titouan Lorieul	8bad0673b3	Add a white background to images shown in the lightbox Fixes issue #4475	2013-09-13 09:47:57 +02:00
Titouan Lorieul	6bd575d05c	Changelog updated	2013-09-12 08:28:47 +02:00
Jonne Haß	72e421b38f	Merge pull request #4480 from Raven24/publisher_backbone Publisher - now with even more Backbone	2013-09-04 16:52:30 +02:00
Jonne Haß	78b31f5298	fix some typos in the changelog [ci skip]	2013-09-04 14:50:53 +02:00
sjain1107	e47e5bd3be	Added success function and modified changelog.md	2013-09-04 14:47:29 +02:00
Jonne Haß	5eb5057864	Merge pull request #4351 from netom/3711_fix_stream_render_time Batch insert new posts to stream	2013-09-01 19:36:07 +02:00
Jonne Haß	fb7de8a4f5	Merge branch 'ssrihari-highlight-current-stream' into develop	2013-09-01 19:33:36 +02:00
Jonne Haß	991a505439	Merge pull request #4485 from colindean/rename_bitcoin_wallet_id change bitcoin_wallet_id to bitcoin_address	2013-09-01 19:24:44 +02:00
Jonne Haß	99657947a9	Merge pull request #4487 from arlogn/word-wrap-on-single-post-view Prevent overflow of strings too long on single page view	2013-09-01 19:23:07 +02:00
Jonne Haß	0cdfc7cfbd	Make I18n systems more robust against missing keys in pluralization data Should make situations like #4468 less frequent	2013-08-30 19:31:48 +02:00
Jonne Haß	9d092c1b2f	Merge pull request #4479 from ssrihari/fix-colors-more Refactored the colors palette a little more	2013-08-30 15:23:05 +02:00
Jonne Haß	e38966cec0	Merge branch 'WebSpider-develop' into develop	2013-08-30 14:44:07 +02:00
Jonne Haß	08dcc8c52d	Merge branch 'ssrihari-fix-colors' into develop	2013-08-30 10:37:24 +02:00
Jonne Haß	27f671814b	Merge pull request #4471 from svbergerem/fix-size-of-images-in-spv Fix size of images in the SPV	2013-08-29 21:37:10 +02:00
Steffen van Bergerem	6bc16bcdba	Fix preview with more than one mention	2013-08-29 20:36:49 +02:00
Jonne Haß	d40b09878a	Merge branch 'ssrihari-hide-inactive-streams' into develop	2013-08-29 14:53:24 +02:00
Jonne Haß	eda65f3258	Merge pull request #4464 from movilla/profile_mobile_500 Error 500 when visit probile mobile and logged out. Fix #4458	2013-08-29 05:19:18 -07:00
movilla	2b97f74015	error 500 when visit probile mobile and logged out. Fix #4458	2013-08-29 12:18:53 +02:00
Jonne Haß	26e13c5edf	Merge branch 'ssrihari-disable-mark-all-read' into develop	2013-08-29 12:13:32 +02:00
Jonne Haß	e194a07f18	Merge branch 'develop' of github.com:diaspora/diaspora into develop Conflicts: Changelog.md	2013-08-28 20:43:01 +02:00
Jonne Haß	e24e024f5f	Merge branch 'ssrihari-click-to-select-invite-link' into develop	2013-08-28 20:41:33 +02:00
svbergerem	fa7a03e9a7	Fix style in profile sidebar / contacts	2013-08-28 13:07:01 +02:00
Florian Staudacher	ba9e715c66	Merge branch '4239-move-federation-stuff-into-lib' of github.com:oliverbarnes/diaspora into oliverbarnes-4239-move-federation-stuff-into-lib	2013-08-27 22:05:27 +02:00
Jonne Haß	17580c123d	Merge pull request #4353 from netom/oembed_to_mobile_view Added oembed display to mobile stream view Conflicts: app/views/status_messages/_status_message.mobile.haml	2013-08-27 21:59:00 +02:00
Jonne Haß	c94ca826b2	Merge pull request #4448 from ssrihari/fix-invite-code-input-width Fixing Invite code input width to be same across browsers	2013-08-27 21:48:29 +02:00
Jonne Haß	f86ecdb327	Merge pull request #4441 from ssrihari/user-menu-highlight Hightlighting the down-arrow next to user name on hover	2013-08-27 21:46:56 +02:00
Jonne Haß	625159c8ad	start new development cycle	2013-08-27 09:59:46 +02:00
Jonne Haß	2919c7c73f	bump to 0.2.0.0	2013-08-27 09:57:46 +02:00
flaburgan	3899e383ee	Re align check icon in aspect dropdown	2013-08-26 21:24:02 +02:00
Steffen van Bergerem	324b09a72a	add help page	2013-08-26 15:26:18 +02:00
Jonne Haß	f9a3990562	do not leak photos through photos#show	2013-08-26 09:39:39 +02:00
Jonne Haß	e58019fe8e	Merge pull request #4440 from Flaburgan/fix-contacts-page Add aspect modification and fix check icon regression on contacts page, close #4397	2013-08-25 15:46:11 -07:00
Jonne Haß	20adeae204	add gem updates to changelog [ci skip]	2013-08-25 23:05:44 +02:00
flaburgan	96e18c6a7b	Add aspect modification and fix check icon regression on contacts page, close #4397	2013-08-25 21:42:32 +02:00
Jonne Haß	2d18184653	Merge branch 'ssrihari-header_icons_hover' into develop	2013-08-25 11:51:41 +02:00
Jonne Haß	1b7bc02eee	Merge pull request #4410 from rogerbraun/feature/spv-redesign New single post view Conflicts: app/assets/stylesheets/application.css.sass	2013-08-22 10:37:25 +02:00
Roger Braun	039cf4dea1	Fix changelog.md	2013-08-22 09:56:36 +02:00
flaburgan	abba8d8dfc	Add header to the single post view	2013-08-22 09:56:34 +02:00
Steffen van Bergerem	7fe972555a	profile message and mention icons	2013-08-21 23:05:42 +02:00
flaburgan	ba886d127a	Valid meta elements, add pod personalization	2013-08-21 10:30:20 +02:00
Steffen van Bergerem	e5e63b09a3	fix opacity of control icons	2013-08-20 12:20:24 +02:00
Steffen van Bergerem	f22b4d7da7	Change contact list on profile page	2013-08-19 14:02:08 +02:00
carolina	d107e7d11d	Changelog.md changed	2013-08-19 12:49:38 +02:00
Jonne Haß	caae0d6af6	Merge pull request #4358 from arlogn/2943-fix-embedded-media-over-elements Fix the overlapping of youtube embedded videos	2013-08-19 09:23:42 +02:00
Jonne Haß	684067be4f	Merge pull request #4409 from movilla/remove_comments Remove comments from the mobile site. Close #4225	2013-08-16 15:21:35 -07:00
movilla	d1c679cc22	remove comments from the mobile site. Close #4225	2013-08-16 22:14:52 +02:00
Jonne Haß	22db89a361	Merge pull request #4408 from movilla/reremove_post Remove post from the mobile site	2013-08-16 12:21:31 -07:00
movilla	73825ab94a	Remove post from the mobile site	2013-08-16 20:44:22 +02:00
Jonne Haß	3b06184d72	Merge pull request #4398 from movilla/deleted_reshared_mobile Mobile Error 500 if a reshared (original) post will be deleted. Conflicts: Changelog.md	2013-08-16 14:08:53 +02:00
Jonne Haß	30778ffbd0	Merge pull request #4407 from rogerbraun/feature/spv-photo-background-removal SPV photo background removal,	2013-08-16 14:07:43 +02:00
movilla	795a7a5751	mobile error 500 if a reshared (original) post will be deleted.	2013-08-16 12:07:14 +02:00
Jonne Haß	2207069b86	Merge pull request #4396 from movilla/registration_mobile_width Fix layout on the registration page for mobile Conflicts: Changelog.md	2013-08-14 21:28:17 +02:00
movilla	77c4731157	fix layout on the registration page for mobile	2013-08-14 13:52:52 +02:00
flaburgan	485c0dae7f	Remove placeholders for name fields in settings (no more Sofaer)	2013-08-13 19:03:16 +02:00
movilla	152c08963a	fix mobile search tags	2013-08-12 16:01:26 +02:00
flaburgan	96337ef7d4	Fix regression in header style	2013-08-11 23:23:15 +02:00
Jonne Haß	041f7b7402	Merge branch 'max258-develop' into develop	2013-08-11 15:34:07 +02:00
Jonne Haß	f4169d7f30	Merge pull request #4384 from andrewcsmith/bug/4211-twitter-should-not-cut-links Fixed problem where the add_post_link method would truncate the status update in the middle of a link	2013-08-11 00:25:12 +02:00
Sean Tilley	e7ea763ab5	Merge pull request #4373 from Flaburgan/patch-4 Make contacts visible in new aspect unchecked by default, close #4343	2013-08-10 15:00:16 -07:00
Jonne Haß	948939cd30	Merge pull request #4381 from goobertron/4380-facebook-count Updated Facebook character limit.	2013-08-10 21:40:44 +02:00
Jonne Haß	cbfcea7198	Merge pull request #4379 from Flaburgan/fix-welcome-banner Remove overflow hidden on welcome banner, close #4377	2013-08-10 12:02:58 +02:00
Antoine D	ef24275f7c	Make contacts visible in new aspect unchecked by default, close #4343	2013-08-09 22:13:40 +02:00
Jonne Haß	a2e5f1f88e	Merge pull request #4335 from Team-D/feature/4169-tag_search_autocomplete #4169 tag search autocomplete	2013-08-06 13:29:12 -07:00
Jonne Haß	a267f2a4db	Merge pull request #4354 from Flaburgan/improve-mobile-view Improve mobile usability Conflicts: Changelog.md	2013-08-06 21:31:55 +02:00
Jonne Haß	efbd3c8605	Merge pull request #4344 from oliverbarnes/4124-check-twitter-write-access-before-auth Issue #4124 Check write access before authorizing Twitter	2013-08-06 21:21:56 +02:00
Jonne Haß	a67e2dc1cd	Merge pull request #4348 from svbergerem/4346-post-preview-auto-expand auto expand post preview Conflicts: Changelog.md	2013-08-06 21:17:35 +02:00
Jonne Haß	1ab14ef368	Merge pull request #4337 from oliverbarnes/4312-index-key-too-long Limit index key length when creating oembed caches Conflicts: db/schema.rb	2013-08-06 20:52:37 +02:00
Steffen van Bergerem	8a8fb10b18	auto expand post preview	2013-08-06 20:48:27 +02:00
Jonne Haß	1639ae2b31	Merge pull request #4316 from Flaburgan/feature/4271-refactor-left-side-bar Feature/4271 refactor left side bar	2013-08-06 11:45:15 -07:00
flaburgan	aa27b7a1f5	Resize preview button	2013-08-06 18:40:20 +02:00
flaburgan	ac533f8383	Refactor the left bar side menu, improve tag autosuggestion design, close #4271	2013-08-06 18:30:24 +02:00
flaburgan	086d512d83	Improve mobile usability	2013-08-06 17:05:35 +02:00
Oliver Azevedo Barnes	55a58713a5	Issue #4124 Check write access before authorizing Twitter	2013-08-05 13:52:19 -05:00
Jonne Haß	9ec9ae0c6c	Merge pull request #4349 from arlogn/webkit-cursor-pointer-on-input-file-button Cursor pointer on upload-photos button in webkit browsers	2013-08-05 20:35:13 +02:00
mokus	df9a42c397	update search controller + serch.js so that autocomplete works Added search_controller_spec, moved some tests from people_controller_spec to search_controller_spec Fixed merged conflict in Changelog update routes and search controller remove useless except from search controller Fix indentation in search_controller	2013-08-05 11:49:23 +02:00
Jonne Haß	6689f20710	Merge pull request #4321 from andrewcsmith/feature/4100-add-support-for-posting-to-wordpress-as-a-service Feature/4100 add support for posting to wordpress as a service Conflicts: Gemfile.lock	2013-08-04 17:15:39 +02:00
Andrew Smith	2bb6bc8eef	Added Wordpress service functionality, for cross-posting to OAuth-enabled Wordpress.com or Jetpack-enabled Wordpress.org blogs. Added model for Wordpress service Added very very basic Wordpress cross-posting functionality. Added markdown support to post body Fixed Wordpress::MAX_CHARACTERS problem cleanup Added default settings for Wordpress OAuth Added default settings for Wordpress OAuth Added Wordpress to configured services spec. changelog changes	2013-08-04 07:46:56 -07:00
Fábián Tamás László	ba3d60b00f	Only parse opengraph if oembed is not available	2013-08-04 15:55:09 +02:00
Jonne Haß	9d6ac1abe5	Merge pull request #4331 from meitar/tumblr-delete-deleted Tumblr posts should be deleted when users delete their originating Diaspora post.	2013-08-03 14:41:57 +02:00
Jonne Haß	c7eed23c61	Merge pull request #4223 from svbergerem/3229-change-src-on-closing-lightbox Change image to ajax-loader when closing lightbox	2013-08-02 06:26:49 -07:00
Steffen van Bergerem	f810e39f52	Change image to ajax-loader when closing lightbox	2013-08-02 14:46:15 +02:00
Jonne Haß	2e9de37594	add changelog entry for strong parameters [ci skip]	2013-08-02 11:51:43 +02:00
Plurrtard	6900146852	fix #4163 - Now updating correct contact attribute on retraction Added test case for Issue #4163	2013-07-31 15:20:57 +02:00
Jonne Haß	7729b1e8e0	Merge branch 'Team-D-feature/4144-convert_ActivityStreamSPhoto_to_StatusMessages' into develop	2013-07-31 15:18:28 +02:00
Jonne Haß	4710144b02	Merge pull request #4293 from Team-D/feature/4274-error_message_vanishes_too_fast fixes issue 4274 flash-messages stay longer	2013-07-31 15:12:44 +02:00
Jonne Haß	7ea2888c6d	Merge branch 'tsrivishnu-publisher_autoclose' into develop	2013-07-31 15:09:23 +02:00
Jonne Haß	77c94bf4c2	Merge branch 'ZBarg-feature/improve-post-title' into develop	2013-07-31 15:01:44 +02:00
Jonne Haß	d5fbeff03b	Merge branch 'Ruxton-develop' into develop	2013-07-31 14:27:08 +02:00
Jonne Haß	cdc29e449d	Move facebox configuration into the initialization of the Backbone app Facebox is already called from some Backbone views very early, making its icons 404 otherwise.	2013-07-29 12:20:05 +02:00
Jonne Haß	3627f46b2d	Merge pull request #4309 from jflemingprod/feature/4068-logout-delete-request Log out should be a DELETE request	2013-07-17 21:56:15 +02:00
Jonne Haß	4d196c5453	Merge pull request #4289 from rivendale2010/patch-2 fix link to background image	2013-07-09 19:23:06 +02:00
Jonne Haß	4fb3170f7f	Merge branch 'netom-4257-conversations-timeago' into develop	2013-07-07 14:45:45 +02:00
fabianfiorotto	3e5b29b289	Fix pagination for people list on the tag stream page Update _index.html.haml This params broken the pagination of the followers list in tags page To reproduce try to paginate in https://joindiaspora.com/tags/diaspora test for people pagination patch reducing the per page limit removing tabs	2013-07-06 13:10:29 +02:00
Ruxton	dce1531ba6	Changed follow_diasporahq to be configurable to auto follow any user on join. Fixing example config file Updated changelog	2013-07-06 13:02:27 +02:00
Fábián Tamás László	aa472b25de	Put preloads into gon.preloads Fixed tagFollowing not getting into preloads	2013-07-06 12:45:23 +02:00
Jonne Haß	3da9b1bf7f	Merge pull request #4259 from netom/4173-disable-invite-button Disable invite button after sending invite Conflicts: Changelog.md	2013-07-06 12:40:05 +02:00
Jonne Haß	9d4377dc23	Merge pull request #4251 from 0TWAIN0/feature/4182-render-markdown-in-mails Feature/4182 render markdown in mails Conflicts: Changelog.md	2013-07-06 12:20:09 +02:00
kevivmatrix	6623e86a5a	private message sending changed to ajax added specs for change in controller one form of hash used in single line of code rendering create response on sending message redirect user to conversation page if message sent successfully removed deprecated way of rendering file conversations create for mobile fixed minor code style change updated changelog	2013-07-06 14:35:09 +05:30
Jonne Haß	091951a929	bumped unicorn timeout to 90 seconds and made it configurable	2013-07-03 12:52:35 +02:00
twain	e1ca8df15e	added strip_markdown to notification mails	2013-07-03 11:16:31 +02:00
Jonne Haß	2c70222a76	add changelog entry for #4277 [ci skip]	2013-07-02 09:16:47 +02:00
Fábián Tamás László	6e178af551	Disable invite button after sending invite	2013-07-01 10:19:56 +02:00
Jonne Haß	30dff802d5	Merge pull request #4243 from davexunit/feature/2948 Show the user if a contact is sharing with them when viewing their profile page	2013-06-29 10:16:41 +02:00
Jonne Haß	521aaf894b	Merge pull request #4255 from netom/4194-mobile-photo-view 4194 mobile photo view	2013-06-29 10:06:46 +02:00
Jonne Haß	92d3bb9c69	Merge pull request #4252 from Raven24/diasp-feature/1283-coppa-admin Admin: find users under the age of 13 (COPPA)	2013-06-29 10:03:59 +02:00
Steffen van Bergerem	71f03544e4	Don't focus comment form on 'show n more comments'	2013-06-28 20:40:24 +02:00
Jonne Haß	e0812c9a0e	start new development cycle	2013-06-28 17:50:01 +02:00
Jonne Haß	2e7c571fa7	bump to 0.1.1.0	2013-06-28 17:38:13 +02:00
Jonne Haß	e286531687	remove restriction on guid length	2013-06-28 08:10:57 +02:00
Jonne Haß	e7954132aa	bump recommended Ruby version to 1.9.3-p448 See http://www.ruby-lang.org/en/news/2013/06/27/hostname-check-bypassing-vulnerability-in-openssl-client-cve-2013-4073/	2013-06-27 17:15:56 +02:00
Florian Staudacher	02be4a5335	make age search postgres compatible, add spec, changelog	2013-06-24 12:34:22 +02:00
Jonne Haß	9c7237ca1c	Merge pull request #4244 from svbergerem/4237-consistent-conversation-list Show avatar of recent user in conversation list Conflicts: Changelog.md	2013-06-22 02:38:54 +02:00
Jason Robinson	f30cee3b6e	Fix hashtags that start a line when posting to Facebook or Twitter, by applying all the same options to strip_markdown as applying to markdownify, fixes #3768 and #4154	2013-06-20 00:06:13 +03:00
Steffen van Bergerem	ffb150f227	Show avatar of recent user in conversation list	2013-06-19 22:59:05 +02:00
Jonne Haß	221c1bf959	update all wiki links	2013-06-17 20:00:48 +02:00
Jonne Haß	c9e981096c	Merge pull request #4229 from davexunit/4227-private-message-error Check for nil before splitting contact_ids param in ConversationsController	2013-06-17 15:30:56 +02:00
Antoine D.	17067d6f79	#4180 was placed in the wrong milestone	2013-06-16 12:05:30 +02:00
Jonne Haß	ed36786edc	Merge pull request #4217 from svbergerem/4041-loading-indicator Add loading indicator on tag pages, remove second one from profile page Conflicts: Changelog.md	2013-06-14 18:23:39 +02:00
Steffen van Bergerem	4cbab628c9	Fix login for short passwords	2013-06-14 12:02:44 +02:00
Steffen van Bergerem	a8ade65e1a	Add loading indicator on tag pages, remove the second one from the profile page	2013-06-14 01:25:36 +02:00
Jonne Haß	6948462f66	fix changelog [ci skip]	2013-06-13 21:46:32 +02:00
Jonne Haß	c6d158bd81	move asset_sync require to the earliest point possible	2013-06-13 20:57:38 +02:00
Steffen van Bergerem	21ef1c8e41	Remove alpha branding	2013-06-12 23:08:13 +02:00
Jonne Haß	c7909a39cb	add gem updates to changelog [ci skip]	2013-06-12 20:40:15 +02:00
Steffen van Bergerem	a02fdc6e45	unify ignore and hide #bugmash #monday	2013-06-12 14:11:06 +02:00
Florian Staudacher	4ee5d5f19c	replace mentions of out-of-aspect people in limited posts with just a markdown link to their profile (fixes #2516) add failing spec for #4160 / #2516 extend the spec a bit more refactor mention handling in a status message add method for filtering mentions by aspects wire mention filtering into the status message model, adapt a few tests to work properly cosmetic changes shorten helper methods add changelog entry	2013-06-09 19:16:40 +02:00
Steffen van Bergerem	bcd43cbfee	Don't show hovercards for current user in comments	2013-06-09 12:31:18 +02:00
Jason Robinson	3fa9f6414d	Fix Twitter crossposting (#2758 ). Refactor some service posting related code.	2013-06-08 17:38:07 +03:00
Steffen van Bergerem	17876d1de6	show medium avatar in hovercard	2013-06-07 11:23:28 +02:00
Florian Staudacher	c2a9cb55ef	Merge branch 'add_conv_participants_preview' of https://github.com/marpo60/diaspora into marpo60-add_conv_participants_preview	2013-06-04 17:12:38 +02:00
Florian Staudacher	b7b4edeeb0	Merge branch 'reoponed_issue3897' of https://github.com/RoonyH/diaspora into RoonyH-reoponed_issue3897	2013-06-04 16:43:16 +02:00
Florian Staudacher	bcb1214f99	Merge pull request #4162 from MrZYX/typhoeus bump Typhoeus and refactor HydraWrapper	2013-06-04 03:36:39 -07:00
Juan Azambuja	3f3fe3ecc7	Add participants preview con conversations	2013-06-01 12:14:16 -03:00
Steffen van Bergerem	272cf60788	Add back-to-top button on tag and user pages	2013-05-31 02:02:14 +02:00
Juan Azambuja	e59066bd66	Fix icons-deletelabel styles	2013-05-27 10:25:04 -03:00
Aruna Herath	7803df5ecd	Changed post/comment submit keyboard shortcut to ctrl+enter from shift+enter Fixes reopened #3897	2013-05-27 17:08:39 +05:30
Liane Nakamura	5f25a52676	Fix post iframe src url Add test for posts helper	2013-05-26 20:49:56 +02:00
Fabián Rodríguez	aed81c1b3b	Fix tags ordering in chrome	2013-05-25 15:44:53 -03:00
Jonne Haß	d331242d94	Merge branch 'feature/retract_tweets_when_post_retracted' of git://github.com/Ruxton/diaspora into develop Conflicts: Changelog.md	2013-05-25 13:50:28 +02:00
Jonne Haß	272f405ab7	Merge pull request #4177 from svbergerem/4157-post-preview-tag-page Fix #4157: post preview from tag pages	2013-05-25 04:46:58 -07:00
Jonne Haß	009209d939	bump Typhoeus and refactor HydraWrapper	2013-05-25 13:45:37 +02:00
Jonne Haß	f2f7800b30	drop fallback donation form	2013-05-25 13:37:17 +02:00
Steffen van Bergerem	7f596cfd36	Fix #4157 : post preview from tag pages	2013-05-25 12:39:01 +02:00
Dennis Schubert	cdb4be14ce	Merge branch 'hotfix/v0.1.0.1' into develop	2013-05-20 21:29:17 +02:00
Dennis Schubert	1661615fe6	Changelog and version number for the hotfix	2013-05-20 21:28:10 +02:00
Jonne Haß	63b667bbef	gracefully handle unavailable git in script/server	2013-05-20 18:14:33 +02:00
Ruxton	48b48470bc	Service.delete_post now more generic, for future implementations Service.delete_post now accepts post to be more generic and supports deleting post from any service that overrides delete_post(post)	2013-05-20 12:19:39 +08:00
Ruxton	ba0e2509c9	Twitter service removes status from twitter when post is revoked	2013-05-20 11:00:49 +08:00
Jonne Haß	ac147cc9f4	Refactor config/ directory * Get rid of early pathname requirement * Use require_relative where approciate * Drop unused files * Imported new application.rb, environment.rb and environments/* from fresh Rails app * Cleaned up boot.rb * Load config in boot.rb * Deduplicate environments/integration.rb Move username blacklist into defaults.yml * Ruby 1.9 Hash syntax everywhere * Reorganize lib/diaspora/markdownify to match conventions * Get rid of full path requires where possible * Add dummy content to production section diaspora.yml.example to prevent warning * Drop sqlite? method * Move postgres? method into ConfigurationMethods * Drop token authentication from User	2013-05-19 18:54:54 +02:00
Jonne Haß	bf90dfffbd	start new development cycle	2013-05-19 16:03:01 +02:00
Jonne Haß	79c9460e0b	change version to 0.1.0.0	2013-05-19 16:01:16 +02:00
Jonne Haß	69e115d234	Add the gem updates section for the current release to the changelog	2013-05-18 23:09:39 +02:00
Jonne Haß	11eecc3d3a	404, not 500, if signed out user wants to see a non public/existing post Also add some specs for Post#find_by_guid_or_id_with_user	2013-05-18 20:55:22 +02:00
Jonne Haß	aa60fac217	Merge branch 'error_404_mobile' of git://github.com/movilla/diaspora into movilla-error_404_mobile Conflicts: Changelog.md	2013-05-18 20:06:49 +02:00
Jonne Haß	f5a4bc51c2	Merge branch 'patch-2' of git://github.com/rivendale2010/diaspora into develop Conflicts: Changelog.md app/views/layouts/_header.html.haml	2013-05-18 20:03:59 +02:00
Steffen van Bergerem	63040bb8cc	fix mentions at the end of a post	2013-05-17 19:27:08 +02:00
Steffen van Bergerem	da532e18bd	Fix preview with locator feature	2013-05-08 13:07:13 +02:00
Ruxton	4f1bfd7eea	oembed_providers.yml added for custom (outside of ruby-oembed) oEmbed providers.	2013-05-07 09:38:30 +08:00
Jonne Haß	e462b95316	add changelog entry for locator [ci skip]	2013-05-06 17:34:55 +02:00
Braulio Martinez	00a3332013	Remove unnecessary ruby187 hacks	2013-05-02 10:07:30 -03:00
Jonne Haß	d2c9295389	Merge pull request #4111 from Raven24/install_refactor refactor install script	2013-05-01 13:33:35 -07:00
movilla	19d22a8928	fix missing translation back to top	2013-05-01 19:22:53 +02:00
Florian Staudacher	4005cd05ea	refactor install script the script is now split up in parts that will be fetched from github on demand. fixes #4047	2013-05-01 14:01:11 +02:00
rivendale	4f8ce5cb98	Update Changelog.md	2013-04-29 10:57:28 -03:00
movilla	5839d304db	Fix reactions link on mobile broken	2013-04-25 13:55:57 +02:00
movilla	f17d16385f	mobile private post dont show error 404	2013-04-24 22:17:47 +02:00
Jonne Haß	25b3f6bcdc	Merge pull request #4127 from marpo60/fix_aspects_max_selection Fix select & deselect all aspects check image	2013-04-22 08:34:13 -07:00
Juan Manuel Azambuja	06ef58bc97	Add changelog entry for pull 4127	2013-04-22 10:25:24 -03:00
Florian Staudacher	c1b680e51d	show username of the services in the publisher original work by @Ruxton rebased and extended to include feedback from the original PR #3959	2013-04-21 23:29:04 +02:00
Jonne Haß	322f4da4d8	Embed associated photos into the status message xml	2013-04-21 19:44:09 +02:00
Jonne Haß	aca134d54a	Refactor script/server * Made style consistent * Add helper functions to print messages * Abort script if critical command fails * Made number of started Sidekiq workers configurable again	2013-04-15 17:03:41 +02:00
Florian Staudacher	f3aa802a0d	remove capistrano from the main source code repo capistrano deployment scripts will be maintained in a separate deployment repo	2013-04-15 00:50:23 +02:00
movilla	c1479b36ca	Correction typos for changelog and activity mobile feature	2013-04-13 22:24:07 +02:00
Jonne Haß	3572ae8d2e	Merge branch 'remove_navbar' of git://github.com/movilla/diaspora into movilla-remove_navbar Conflicts: Changelog.md	2013-04-13 13:04:52 +02:00
Jonne Haß	fd069af2c6	Merge branch 'activity_more' of git://github.com/movilla/diaspora into movilla-activity_more Conflicts: Changelog.md	2013-04-13 12:53:31 +02:00
Jonne Haß	7a0d1c647a	Merge pull request #4096 from RoonyH/3897-submit_a_comment_by_shift+enter 3897 submit a comment by shift+enter	2013-04-13 03:49:40 -07:00
Jonne Haß	bef05c14d7	Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop Conflicts: Changelog.md	2013-04-10 18:24:47 +02:00
Jonne Haß	15418eae67	Merge pull request #4112 from marpo60/issues_4017_4107_fixes close issues #4017 and 4107 by including jquery.textchange	2013-04-10 07:58:30 -07:00
Juan Manuel Azambuja	01d91e02d4	Add changelog entry for #4017 & #4107	2013-04-10 11:17:40 -03:00
Jonne Haß	f272c7ed03	Merge branch 'brauliomartinezlm-4058_redirect_to_downcase_version_of_tags' into develop	2013-04-10 10:20:18 +02:00
Aruna Herath	b0879dd256	added same feature to publisher	2013-04-08 19:29:36 +05:30
Aruna Herath	5f6ce87a23	added shift+enter key from new comment box to submit the comment.	2013-04-08 19:08:29 +05:30
movilla	bc87b501f2	Fix show more post in my activity mobile page. Close #4108	2013-04-08 00:04:42 +02:00
Steffen van Bergerem	6e724fc1d4	preview posts in stream	2013-04-07 17:43:27 +02:00
Jason Robinson	9c0c5a7258	Include missing javascript in bookmarklet, regression introduced in commit `ffc6c1102e`. Fixes #4057	2013-04-07 00:06:02 +03:00
movilla	33ecc50fbc	Mobile buttons are only clickable when scrolled to the top	2013-04-05 19:16:15 +02:00
embs	16cf699d4b	Fix default image url in profiles table. Closes #3795	2013-04-04 19:22:43 -03:00
embs	4ef37c64be	Add explanation to services index page. Closes #3064	2013-04-04 15:51:11 -03:00
Dennis Schubert	3b7bb2c44e	Fix the tag number in sidekiq's changelog notes ... it's been a while ...	2013-04-04 12:22:50 +03:00
Dennis Schubert	f3b7d57b3a	Merge pull request #3993 from MrZYX/sidekiq Sidekiq (+ some cleanup)	2013-04-03 15:19:15 -07:00
Steffen van Bergerem	a693a0970b	added hotkeys to navigate in stream	2013-04-02 19:24:20 +02:00
Bruno Machado	29af94ce4e	Remove unnecessary dotted CSS borders. Closes #2940	2013-04-01 15:53:27 -03:00
movilla	8375433788	* Remove unnecessary navigation bar to access mobile site * Re-add flash warning to registrations mobile * Remove excess :css * Fix littles css errors	2013-03-30 23:09:45 +01:00
Tom Scott	74690088f2	Update changelog. Apologize for idiocy.	2013-03-30 09:33:42 -04:00
Tom Scott	8a7f6c9fdf	Merge pull request #4067 from movilla/multiphoto Add multiphoto for mobile post. Close #4053	2013-03-30 06:26:07 -07:00
Tom Scott	af8485f47f	Merge pull request #4074 from L3MNcakes/feature/3975-send-profile-update Issue #3976: Send a profile update alongside a sharing notification	2013-03-30 06:07:16 -07:00
movilla	b257939f7e	Add multiphoto for mobile post	2013-03-30 10:59:06 +01:00
Marcelo Casiraghi	b0f76f1764	Fix confirmation at getting_started page	2013-03-25 23:09:38 -03:00
L3MNcakes	8eed16c245	Issue #3976 : Send a profile update alongside a sharing notification Issue #3976: Send a profile update alongside a sharing notification	2013-03-24 06:04:47 +00:00
Jonne Haß	79a79d65d6	Bye Resque. Ohai Sidekiq. * Dropped all references to Resque * Moved all jobs under app/workers since that's the Sidekiq convention * Renamed Jobs module to Worker to match new location * Adapted all jobs to Sidekiq * Replaced all enqueue calls with perform_async * Dropped Resque hacks from specs and features, replaced with sidekig/testing in RSpec and sidekig/testing/inline in Cucumber * Updated scripts to start a Sidekiq server * Inline Sidekiq sinatra app * Let Sidekiq create the actual Redis instance * Workaround already initialized constant warnings in service models * Resolved ToDo in one job definition by creating proper exception clases for some errors in receiving posts * Added sidekiq section to configuration to make it completly configurable to the user * Add Sidekiq middleware for clean backtraces * Delay HttpMulti retry to give offline pods a chance to come back up * Do not retry on GUID already taken and alike errors * Be graceful about deleted posts in GatherOEmbedData	2013-03-21 23:39:07 +01:00
Jonne Haß	a55f6fd98c	Merge branch 'hotfix/0.0.3.4' into develop Conflicts: Changelog.md config/defaults.yml	2013-03-18 21:10:29 +01:00
Jonne Haß	1a995aa47c	bump rails to 3.2.13, release 0.0.3.4	2013-03-18 21:07:55 +01:00
Jonne Haß	1a58f9cf29	Merge branch 'mobile_comment' of https://github.com/movilla/diaspora into develop Conflicts: Changelog.md	2013-03-18 20:59:39 +01:00
movilla	bf2bd5a97c	Hide comment button in the mobile view when not signed in	2013-03-18 20:15:55 +01:00
movilla	3990bebcf4	Fix mobile view of deleted reshares	2013-03-18 16:52:37 +01:00
Jonne Haß	e51443b3ef	Merge pull request #4059 from marpo60/remove_unnecessary_javascript_views delete unused javascript views	2013-03-15 11:45:22 -07:00
Juan Manuel Azambuja	06dc53749a	delete unused javascript views	2013-03-15 14:39:34 -03:00
Jonne Haß	d9b36cd312	update changelog [ci skip]	2013-03-15 17:47:09 +01:00
Fabián Rodríguez	d63aff8ea8	update changelog	2013-03-12 20:24:03 -03:00
Jonne Haß	33acc1f7a2	Merge branch 'hotfix/0.0.3.3' into develop Conflicts: Changelog.md config/defaults.yml	2013-03-11 21:24:56 +01:00
Jonne Haß	c7283c60a1	release 0.0.3.3	2013-03-11 21:23:28 +01:00
Florian Staudacher	0de68fb713	Merge pull request #4029 from MrZYX/4027-unicode-tags decode tag name before passing it into TagFollowingAction	2013-03-11 05:51:54 -07:00
Jonne Haß	97a8ff65ba	Merge pull request #4048 from marpo60/s3_max_age Set max-age header to Amazon S3 resources	2013-03-10 06:14:49 -07:00
Jason Robinson	affa713616	If post has photos, always include url in post to Facebook to stay consistant with other servies, fixes #3706	2013-03-10 08:15:12 +02:00
Marcelo Dominguez	b950c4f171	Set max-age header to Amazon S3 resources	2013-03-08 16:07:56 -02:00
Jonne Haß	60bd29aa68	decode tag name before passing it into TagFollowingAction, fixes #4027	2013-03-08 13:47:55 +01:00
Florian Staudacher	f8513c2005	Merge pull request #3944 from MrZYX/modular_layouts Modular layouts	2013-03-08 02:50:43 -08:00
embs	e7daa978e3	Show timestamp when hovering on comment time-ago string. Closes #4042	2013-03-08 00:33:19 -03:00
pestrada	18aeeb052b	reset comment box height after posting a comment refactor create comment method	2013-03-07 12:55:03 -06:00
Jonne Haß	55cb070ac9	add header to sign up page	2013-03-06 19:01:07 +01:00
Jonne Haß	ffc6c1102e	dry up and modularize layouts	2013-03-06 19:00:34 +01:00
Jonne Haß	43f21d6e55	Pass the real values to stderr_path and stdout_path in unicorn.rb since it runs a case statement on them	2013-03-05 23:37:51 +01:00
Jonne Haß	ad16451e1f	Merge pull request #4006 from afrerich/feature/3899-long-tags-break-the-layout fade long tag names - refs diaspora/diaspora#3899	2013-03-02 12:20:15 -08:00
aaronf	cd78aa5a65	fade long tag names - refs diaspora/diaspora#3899	2013-03-02 13:57:30 -06:00
Jonne Haß	7b56c2dd52	Do not fail on receiving a SignedRetraction via the public route	2013-03-01 03:38:36 +01:00
Jonne Haß	ccedb6eff0	delegate parent_author to the target of a RelayableRetraction	2013-02-28 17:01:58 +01:00
Jonne Haß	b1cdc30367	Merge pull request #4004 from movilla/upload_photo Upload photo mobile. Close #3324	2013-02-26 15:30:09 -08:00
movilla	76b1e9b0dc	Add the ability to upload photos from the mobile site	2013-02-26 23:25:58 +01:00
Jonne Haß	cf9659de4a	fix XSS vulnerability in conversations#new, closes #4010	2013-02-26 19:09:30 +01:00
Jonne Haß	d6ff67fde2	fix XSS vulnerability in conversations#new, closes #4010	2013-02-26 19:06:01 +01:00
pestrada	3f3409a0a5	avoid posting empty comments fix Jasmine test updated changelog with bugfix #3836 fix changelog update remove wrong bug fix line	2013-02-25 18:27:46 -06:00
Jonne Haß	3c9ce435e1	Merge branch 'hotfix/0.0.3.1' into develop Conflicts: Changelog.md config/defaults.yml	2013-02-24 17:26:45 +01:00
Jonne Haß	b487c389bc	release 0.0.3.1	2013-02-24 17:25:02 +01:00
Jonne Haß	6bb644f058	Sort tag followings alphabetically, not in reverse, fixes #3986	2013-02-24 17:23:01 +01:00
movilla	5d46baf33e	Wrap text if too long in mobile notifications Conflicts: Changelog.md	2013-02-24 17:23:01 +01:00
movilla	bfa8b92c57	Fixed removing images from publisher on the profile and tags pages	2013-02-24 17:23:01 +01:00
Jonne Haß	ee0d7b2e8b	move custom splash page login into the controller, fixes #3991	2013-02-24 17:23:01 +01:00
movilla	099f4a61e4	Include our custom fileuploader on the mobile site too	2013-02-24 17:23:01 +01:00
Jonne Haß	e232e164e4	exec foreman in script/server	2013-02-24 17:23:00 +01:00
Jonne Haß	ce8b3c89db	update changelog; replace "pre" releases with a plain "head" Conflicts: config/defaults.yml	2013-02-24 17:22:56 +01:00
Jonne Haß	0cf1c2d020	Sort tag followings alphabetically, not in reverse, fixes #3986	2013-02-24 16:22:01 +01:00
Fabián Rodríguez	eb8e777873	update changelog	2013-02-24 12:24:35 -02:00
Jonne Haß	19b9b0edb8	Merge pull request #3990 from movilla/mismatch_author_name Wrap text if too long in mobile notifications	2013-02-22 07:51:20 -08:00
movilla	c52a878e86	Wrap text if too long in mobile notifications	2013-02-22 16:15:25 +01:00
Florian Staudacher	f788f3426a	Merge pull request #3946 from MrZYX/feature/1781-include-reshares-in-user-feed Include reshares in the public user feed, closes #1781	2013-02-21 13:37:29 -08:00
movilla	e0d0d0f668	Fixed removing images from publisher on the profile and tags pages	2013-02-21 22:19:24 +01:00
Jonne Haß	35350d1ceb	Include reshares in the public user feed, closes #1781	2013-02-21 14:32:28 +01:00
Jonne Haß	0fd3bcb397	move custom splash page login into the controller, fixes #3991	2013-02-21 13:46:04 +01:00
movilla	5769abcc32	Include our custom fileuploader on the mobile site too	2013-02-20 16:01:08 +01:00
Jonne Haß	5cede18e8d	exec foreman in script/server	2013-02-18 21:31:54 +01:00
Jonne Haß	ba9aee5902	update changelog; replace "pre" releases with a plain "head"	2013-02-18 20:20:50 +01:00
Jonne Haß	35ba082ab5	Merge branch 'overflow_mobile_post' of git://github.com/movilla/diaspora into develop Conflicts: Changelog.md	2013-02-17 15:48:34 +01:00
Jonne Haß	40b10dc0d9	Merge branch 'overflow_author_infor' of git://github.com/movilla/diaspora into develop Conflicts: Changelog.md	2013-02-17 15:47:20 +01:00
Jonne Haß	4264804343	Merge pull request #3984 from movilla/frienliar_new_conversation Friendlier new conversation mobile	2013-02-17 06:44:59 -08:00
Jonne Haß	c5e712b17a	fix markdown syntax in the changelog [ci skip]	2013-02-17 15:09:15 +01:00
Jonne Haß	469b361869	update changelog [ci skip]	2013-02-17 14:58:28 +01:00
Jonne Haß	0a124acdf0	Revert "fix regression from #3968 " Revert "Merge pull request #3968 from marpo60/limit_shareable_from_person_queries" This reverts commit `ddfc558a9b`. This reverts commit `30ed4b4e70`, reversing changes made to `f50ce2cb1d`. limiting the fetch of the IDs breaks paginating, there's no quick way to fix that I left the spec in for future use.	2013-02-16 23:48:10 +01:00
movilla	ce76f12591	friendlier new-conversation mobile	2013-02-16 22:53:43 +01:00
movilla	dfcc8e7c80	Overflow info_author mobile web	2013-02-16 14:51:51 +01:00
movilla	4d6110246e	Overflow name author mobile post	2013-02-15 17:44:54 +01:00
Jonne Haß	ad4ba363a9	Merge branch 'hotfix/0.0.2.5' into develop Conflicts: Changelog.md Gemfile.lock config/defaults.yml	2013-02-11 20:54:35 +01:00
Jonne Haß	f2ce9fa17f	* Fix CVE-2013-0269 by updating the gems json to 1.7.7 and multi\_json to 1.5.1. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/4_YvCpLzL58 ) * Additionally ensure can't affect us by bumping Rails to 3.2.12. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/AFBKNY7VSH8) * And exclude CVE-2013-0262 and CVE-2013-0263 by updating rack to 1.4.5.	2013-02-11 20:51:02 +01:00
Lennart Prelle	2d0abe8309	added a id and a autoscroll to first unread message in conversation (Fix: #3216 )	2013-02-11 16:15:01 +01:00
movilla	63f1d1c197	friendlier mobile buttons	2013-02-09 15:23:04 +01:00
Jonne Haß	30ed4b4e70	Merge pull request #3968 from marpo60/limit_shareable_from_person_queries limit ShareablesFromPerson queries to improve performance	2013-02-06 05:27:07 -08:00
Fabián Rodríguez	38cf1efdd4	update changelog	2013-02-05 23:52:04 -02:00
movilla	4343914cdb	Twitter/Facebook/Tumblr count down characters is hidden by the picture of the post	2013-02-04 21:31:48 +01:00
Ruxton	60f5173c77	Spec coverage for changelog_url and adjustment to behaviour	2013-02-04 11:00:57 +08:00
movilla	0ea7bc5258	Adapt css for search mobile page	2013-02-02 23:23:22 +01:00
Jonne Haß	865152be90	Merge pull request #3949 from movilla/gettins_started Add Getting_Started page mobile. Close #3854	2013-02-02 08:00:16 -08:00

... 12 13 14 15 16 ...

1472 commits