8790 commits

Author	SHA1	Message	Date
Benjamin Neff	b6c46b3fc4	add logging mixin and replace federation-logger	2015-06-04 04:16:03 +02:00
Jonne Haß	3850118e4e	Merge branch 'stable' into develop	2015-06-02 12:14:42 +02:00
Steffen van Bergerem	1b77258d0e	Set default for post title truncation to 70 characters ... closes #6022	2015-06-02 12:14:35 +02:00
Dennis Schubert	ffc3cb711f	Merge branch 'stable' into develop	2015-06-02 02:35:21 +02:00
Benjamin Neff	03dbb75dd5	don't save default avatars to the database	2015-06-02 02:32:01 +02:00
Jonne Haß	b722a75a44	Merge branch 'stable' into develop	2015-06-02 00:44:56 +02:00
Benjamin Neff	a7fa3eabcb	Disable autocorrect/autocapitalize for the username ... and cleanup the code so it follows the code guidelines closes #5955 closes #6028	2015-06-02 00:44:47 +02:00
Dennis Schubert	70da822d69	Merge branch 'stable' into develop	2015-06-01 04:55:32 +02:00
Steffen van Bergerem	35e75b3c64	Atom feed: set post title length to 50 and use configured pod name in the feed title ... closes #6020	2015-06-01 04:55:27 +02:00
Jonne Haß	c196ef11bb	Merge branch 'stable' into develop	2015-05-31 20:40:18 +02:00
theworldbright	45a5e3d1c5	Change markdown-content hr style #5987 ... The <hr> tag in the markdown-content was #eee, and thus almost invisible. It has been changed to $border-gray (currently #ddd) to be consistent with the other <hr> tags. Adjust markdown-content hr style further The hr tag is now centered at 85% width. It also adds a default vertical margin that is equivalent to the 0.8em the paragraph tags provide. Refactor scss for markdown-content hr Closes #6016	2015-05-31 20:39:55 +02:00
Dennis Schubert	7401808e3f	Merge branch 'stable' into develop	2015-05-31 01:49:43 +02:00
Benjamin Neff	76ca4fdc70	use image_url for the logo in mails ... closes #6013	2015-05-31 01:49:38 +02:00
Dennis Schubert	b2dbdb3706	Merge branch 'stable' into develop	2015-05-30 03:08:30 +02:00
Jonne Haß	ac52cef546	Only return the current_users participation for post interactions ... closes #6007	2015-05-30 03:08:25 +02:00
Jonne Haß	146f7eea52	Merge branch 'stable' into develop	2015-05-29 11:42:03 +02:00
Sandip Trivedi	b026a2afe8	Replaces facebox vendored asset with rails gem #5194 ... closes #6005	2015-05-29 11:41:57 +02:00
Jonne Haß	6581c580f8	Merge branch 'stable' into develop	2015-05-29 11:39:36 +02:00
Benjamin Neff	604ffb445a	optimized sprites ... - move mobile icons to mobile-folder, so they aren't included in the icons-sprite - move logos to branding/logos, and create a logos-sprite without the big other branding-images - delete duplicate images closes #6004	2015-05-29 11:39:30 +02:00
Benjamin Neff	247e9efe49	remove unused branding images	2015-05-29 11:39:01 +02:00
Benjamin Neff	bd8888291d	remove more old assets	2015-05-29 11:39:01 +02:00
Benjamin Neff	a22be8a4cb	remove unused social media logos and add attribution	2015-05-29 11:39:01 +02:00
Benjamin Neff	36b1568d32	remove old unused icons (mostly replaced by entypo)	2015-05-29 11:39:00 +02:00
Jonne Haß	351f54d74f	Merge branch 'stable' into develop	2015-05-28 11:24:34 +02:00
Sandip Trivedi	2ba2ef1b9c	Replaces the zipzip gem with the rubyzip gem	2015-05-28 11:23:57 +02:00
Dennis Schubert	44919233c0	Merge branch 'stable' into develop	2015-05-28 01:34:28 +02:00
Benjamin Neff	21ae93e658	handle when the diaspora xml parser returns nil ... closes #5991	2015-05-28 01:34:24 +02:00
Dennis Schubert	8c408a57ae	Merge branch 'stable' into develop	2015-05-26 05:25:43 +02:00
Dennis Schubert	62e8f87f2c	Do not mute ActiveRecord::RecordNotUnique for now see #5971, regression from #5938 ... closes #5992	2015-05-26 05:25:39 +02:00
Dennis Schubert	aae11e07ae	Merge branch 'stable' into develop	2015-05-25 04:23:33 +02:00
Benjamin Neff	b491ecac31	wrap the sidekiq logger to add the context info again ... closes #5988	2015-05-25 04:23:28 +02:00
Dennis Schubert	f9f73f56db	Merge branch 'stable' into develop	2015-05-25 04:18:46 +02:00
Jason Robinson	7c0e50c2c2	Introduce 'authorized' configuration option for services ... Since the Facebook API has changed and additional permissions are required for all users on a pod to cross-post, an additional 'authorized' flag is needed to be set for the Facebook service. This flag allows either all users, one user or no users to use the cross-posting service. Clarifies the situation for #5923, #5260 and #5085. closes #5985	2015-05-25 04:18:38 +02:00
Jonne Haß	3e35ef0b63	Merge branch 'stable' into develop	2015-05-24 11:16:09 +02:00
Benjamin Neff	986ad0df14	fix validation for status-message when the author is missing ... closes #5986	2015-05-24 11:16:05 +02:00
Dennis Schubert	2ca0a17ee0	Merge branch 'stable' into develop	2015-05-24 02:30:08 +02:00
Benjamin Neff	8531b160a6	gracefully handle when a like is already deleted again ... closes #5983	2015-05-24 02:30:02 +02:00
Dennis Schubert	ba9b947173	Merge branch 'stable' into develop	2015-05-23 01:24:14 +02:00
Benjamin Neff	68f7208ff5	use id from preloaded gon.post to fix broken liking with guid ... closes #5978	2015-05-23 01:24:09 +02:00
Dennis Schubert	70dc4fcab1	Merge branch 'stable' into develop	2015-05-22 02:53:55 +02:00
Benjamin Neff	be3b2852be	use logging-logger for sidekiq ... closes #5975	2015-05-22 02:53:50 +02:00
Jonne Haß	9b7a3c86e6	Merge branch 'stable' into develop	2015-05-21 00:46:59 +02:00
Benjamin Neff	9cc0faa4e6	fixes reshares with no text but with photo ... regression from 1da1c53f203e6eb9dad50872e573a4965219ef92 closes #5976	2015-05-21 00:46:50 +02:00
Jonne Haß	5a3b62d801	Merge branch 'stable' into develop	2015-05-19 10:42:44 +02:00
Benjamin Neff	9a4a7255e7	remove unused older and newer methods for posts ... last renamed in 8386179f16 closes #5970	2015-05-19 10:42:39 +02:00
Dennis Schubert	2549f44b7c	Merge branch 'stable' into develop	2015-05-19 03:00:56 +02:00
Benjamin Neff	289753e068	add "original post deleted" message on single post view ... closes #5968	2015-05-19 03:00:51 +02:00
Benjamin Neff	cde9b24476	fix margin/padding for "original post deleted"-message	2015-05-19 02:59:31 +02:00
Benjamin Neff	267a1df3c4	fix root_diaspora_id when root was deleted	2015-05-19 02:59:31 +02:00
Dennis Schubert	6a1ec27b3c	Merge branch 'stable' into develop	2015-05-19 02:58:41 +02:00
Steffen van Bergerem	ceec5084af	Use case insensitive unconfirmed email ... closes #5967	2015-05-19 02:58:37 +02:00
Dennis Schubert	3446cb2f3f	Merge branch 'stable' into develop	2015-05-18 03:31:17 +02:00
Benjamin Neff	a396a246ee	remove unused hasPhotos and hasText functions ... - added in a836b06d3e - removed in 49ea8c8563 closes #5969	2015-05-18 03:31:11 +02:00
Dennis Schubert	944c57f874	Merge branch 'stable' into develop	2015-05-18 03:23:43 +02:00
Benjamin Neff	494c03a3fd	re add user atom feed on profile-page	2015-05-18 03:23:15 +02:00
Benjamin Neff	196e438286	remove some hardcoded diasporahq hax	2015-05-18 03:23:14 +02:00
Jonne Haß	13b69f81d1	Merge branch 'stable' into develop	2015-05-16 13:54:05 +02:00
Benjamin Neff	d74e20a790	fetch public posts when someone starts sharing with you ... closes #5960	2015-05-16 13:54:01 +02:00
Dennis Schubert	3ae370780c	Merge branch 'stable' into develop	2015-05-16 03:42:18 +02:00
Steffen van Bergerem	716952dc0d	Put 'email not visible' text into popover/tooltip ... closes #5956	2015-05-16 03:42:14 +02:00
Akash Agrawall	8c7aa38aba	Indicates in the setting that the email is not visibile to the other users #5315	2015-05-16 03:41:52 +02:00
Dennis Schubert	1f084c28a8	Merge branch 'stable' into develop	2015-05-16 03:40:24 +02:00
Jason Robinson	ce16a122fc	Fix missing localization of inactive user removal warning emails. ... Fixes #5950	2015-05-16 03:40:06 +02:00
Dennis Schubert	84dc40326a	Merge branch 'stable' into develop	2015-05-16 03:36:30 +02:00
Jason Robinson	aec2467e98	Fix inactive user removal not respecting configuration for daily limits ... It seems ActiveRecord ignores .limit() if .find_each() is used to iterate the query (http://stackoverflow.com/a/6680541/1489738). Using .each() instead. Added a test. closes #5953	2015-05-16 03:36:25 +02:00
Dennis Schubert	aac0a2582e	Merge branch 'stable' into develop	2015-05-12 04:00:12 +02:00
Steffen van Bergerem	40bb44eb96	Mobile: manage followed tags ... closes #5945	2015-05-12 04:00:07 +02:00
Jonne Haß	890029b19e	Merge branch 'stable' into develop	2015-05-10 14:26:26 +02:00
Dennis Schubert	1a4e3cef48	Mute ActiveRecord::RecordInvalid due to ignores ... closes #5943	2015-05-10 14:26:21 +02:00
Dennis Schubert	32f95a860c	We don't always have invalid record messages ... so log the exception message instead.	2015-05-10 14:25:50 +02:00
Dennis Schubert	3f3148af2c	Merge branch 'stable' into develop	2015-05-10 02:00:41 +02:00
Steffen van Bergerem	0c5443d543	Make js-routes use compact and camelcase function names ... closes #5941	2015-05-10 02:00:30 +02:00
Steffen van Bergerem	1428369849	Mobile: Add button to follow/unfollow tags	2015-05-10 01:59:50 +02:00
Jonne Haß	59e77675ce	Merge branch 'stable' into develop	2015-05-10 00:10:19 +02:00
Dennis Schubert	6273c2959a	Rescue from private objects sent to the public api ... closes #5938	2015-05-10 00:10:12 +02:00
Dennis Schubert	915dee3c4b	Mute some ActiveRecord::RecordNotUnique exceptions	2015-05-10 00:09:25 +02:00
Dennis Schubert	300376a854	Merge branch 'stable' into develop	2015-05-09 23:49:05 +02:00
Steffen van Bergerem	05ec235ea3	Pass along current_user in ContactPresenter#full_hash_with_person ... closes #5936	2015-05-09 23:48:59 +02:00
Dennis Schubert	b05d183f91	Merge branch 'stable' into develop	2015-05-07 04:10:28 +02:00
Steffen van Bergerem	06e6e1db78	Remove private post content of also commented mails ... merges #5931	2015-05-07 04:10:21 +02:00
Jonne Haß	abeb99bb7c	Merge pull request #5930 from Raven24/fix3076 ... limit the GET request to the bookmarklet to ~2000 chars	2015-05-05 21:32:44 +02:00
Florian Staudacher	5c012e7871	limit the parameter length for the GET request to the bookmarklet to ~2000 chars	2015-05-05 18:25:01 +02:00
Jonne Haß	bd17c528e1	Merge branch 'stable' into develop	2015-05-05 18:02:26 +02:00
Rich	2ce0e8045b	Change <subtitle> branding on atom feeds ... Minor consistency change ( from Diaspora to diaspora* ) closes #5929	2015-05-05 18:02:14 +02:00
Jonne Haß	4a7c358be9	Merge branch 'stable' into develop	2015-05-05 01:39:52 +02:00
Steffen van Bergerem	399fdb2c7d	Check request.format :mobile in home controller	2015-05-05 01:39:48 +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ß	971a3dd021	Merge branch 'stable' into develop	2015-05-04 04:04:48 +02:00
Steffen van Bergerem	0cffa00004	Add syntax highlighting for markdown content	2015-05-04 04:04:34 +02:00
Jonne Haß	2dc7f4c2b5	Merge branch 'stable' into develop	2015-05-04 03:51:38 +02:00
Steffen van Bergerem	dd2e1ea29e	Use rails-assets for jquery.elastic.js	2015-05-04 03:51:20 +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ß	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ß	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
Florian Staudacher	0bb316e893	update bookmarklet ... * snippet now in a separate JS file - compiled and uglified with the other assets * popup gets centered in opening browser window * publisher gets pre-filled with markdown-styled content	2015-05-01 20:20:46 +02:00
Florian Staudacher	9479be6360	Merge branch 'patch-1' of git://github.com/JesseWeinstein/diaspora into JesseWeinstein-patch-1	2015-05-01 13:18:46 +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
Benjamin Neff	28c9cfdfd4	write cucumber test and add order_id on create	2015-04-28 02:38:28 +02:00
Benjamin Neff	3c09756417	refactoring javascript and controller ... - move to contacts.js - use json - move to aspects_controller - add route - rewrite test - fix css in chrome	2015-04-28 01:57:43 +02:00
Simon Wörner	cee4f1c3cd	fixed aspect sorting, added minimal jquery ui, added test	2015-04-26 01:57:00 +02:00
Simon Žlender	f5ce612299	Issue #5874 Fix styled links	2015-04-25 16:51:11 +02:00
Martin Artnik	283f22fc84	Fix unconventional image asset inclusion in css asset	2015-04-25 16:18:27 +02:00
Simon Wörner	4c13fd2b42	Revert "remove aspect sorting logic" ... This reverts commit 8d8d3c649a. Conflicts: app/assets/javascripts/main.js	2015-04-25 02:16:54 +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
Dennis Schubert	67a6c8be0c	Merge pull request #5877 from SuperTux88/fix-notification-mails ... fix notification mails for limited posts	2015-04-25 01:09:46 +02:00
Benjamin Neff	344b198900	use camo for medium and small avatars	2015-04-24 03:10:48 +02:00
Jonne Haß	0bad6dba88	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-22 20:58:54 +02:00
Jonne Haß	6e546ff2bf	Trigger exports through a POST request ... GET requests don't get any CSRF protection by Rails, thus these sensitive actions should be better protected. Thanks to @tomekr for the report.	2015-04-22 20:20:10 +02:00
Jonne Haß	0a70e51f74	Add a token the filename for exported user data ... Also redirect to it for download, for Amazon S3 compatibility. Prior to this patch an attacker could obtain an users export by guessing the filename with a high chance of success. Fully authenticating the download request is a lot harder due to our diverse deployment scenarios. This brings the used method in line with the photo export feature. Thanks to @tomekr for the report.	2015-04-22 20:19:17 +02:00
Benjamin Neff	84c3814b94	fix notification mails for limited posts	2015-04-22 19:59:08 +02:00
Steffen van Bergerem	8e2103e69b	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-21 22:26:22 +02:00
Steffen van Bergerem	7648b58c15	Merge pull request #5875 from SuperTux88/add-mumble-protocol ... add mumble protocol to linkify	2015-04-21 22:17:43 +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
Benjamin Neff	6cbb959700	add mumble protocol to linkify ... also use double-quotes in the whole file	2015-04-21 21:16:55 +02:00
Jonne Haß	c8f990359d	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-21 20:50:27 +02:00
Steffen van Bergerem	a14713b985	Update markdown-it, disable fuzzy links	2015-04-21 20:50:16 +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ß	9d4916709b	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-20 22:40:12 +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
Benjamin Neff	128cfb247c	fix not_public page ... body was rendered in the head	2015-04-20 22:32:32 +02:00
Jonne Haß	e996bd7e36	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-20 21:49:55 +02:00
Jonne Haß	6fe06f6d3c	Merge pull request #5868 from SuperTux88/fix-service-icons ... fixed service-icons in sidebar	2015-04-20 21:49:46 +02:00
Benjamin Neff	13a6b1389d	fixed service-icons in sidebar ... recovered css from old application.scss was removed in e188782a9a	2015-04-20 21:49:36 +02:00
Jonne Haß	a06448447a	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-20 21:19:49 +02:00
Benjamin Neff	0211da4116	fix control icon alignment in chromium browser	2015-04-20 21:06:17 +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
Marcelo Briones	6636a89118	Add participation counter	2015-04-11 14:41:17 -03:00
Asphyxia	5fb328864e	Activity stream keeping retracted participations	2015-04-10 21:46:42 -03:00
Jonne Haß	5481ddb540	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-10 19:23:00 +02:00
Jonne Haß	ec2a209b68	Lazily initialize Contact proxy in service helper ... This prevents connecting to the database on rake assets:precompile, which fails in certain build environments. Running git blame on this and figuring out what in gods name this is for, is for another time.	2015-04-10 19:19:16 +02:00
Steffen van Bergerem	895d38de21	Refactor available services settings	2015-04-08 18:43:35 +02:00
Steffen van Bergerem	b885b8583d	Remove 'manage services' link in standalone mode	2015-04-08 12:49:05 +02:00
Steffen van Bergerem	75ef9f47d0	Use Bootstrap modal for new aspect form	2015-04-07 10:45:09 +02:00
Steffen van Bergerem	a6b9c6c057	Return 406 on people/guid/contacts, format json	2015-04-04 03:48:44 +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
Marcelo Briones	aa6b590b3c	Limited post content excluded from subject of comment email	2015-04-03 16:37:17 -03:00
Steffen van Bergerem	07a344d051	Disable auto follow back on aspect deletion	2015-04-03 14:10:14 +02:00
Jonne Haß	bec2508545	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-03 02:21:59 +02:00
Steffen van Bergerem	3e5eb350ae	Notification dropdown: 'mark all as read' link scroll fix	2015-04-03 02:21:06 +02:00
Jonne Haß	0155d8972a	Merge pull request #5839 from svbergerem/use-test-instead-of-match ... Use test instead of match wherever possible	2015-04-01 23:54:42 +02:00
Steffen van Bergerem	f8707e0e1a	Use test instead of match wherever possible	2015-04-01 18:35:20 +02:00
Jonne Haß	099bb01005	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-01 18:28:08 +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
Steffen van Bergerem	1701bc30d0	Don't add mentions and reshares to all streams	2015-04-01 16:51:08 +02:00
SansPseudoFix	5b90e1a060	Fix tag overflow mobile page ... modified: app/assets/stylesheets/mobile/mobile.scss modified: app/assets/stylesheets/mobile/mobile.scss	2015-04-01 14:55:45 +02:00
Steffen van Bergerem	6b024dcd45	Fix missing button styles in donate and admin sections	2015-04-01 13:34:56 +02:00
Jonne Haß	548b0d8161	Rescue correct constant in Workers::ReceiveLocalBatch ... Fixes #5834	2015-04-01 04:01:40 +02:00
Jonne Haß	5c78ab6838	Merge pull request #5832 from svbergerem/remove-border-conversations ... Remove border from conversation stream	2015-04-01 03:07:07 +02:00
Steffen van Bergerem	cb04e40de7	Remove border from conversation stream	2015-04-01 01:03:15 +02:00
Steffen van Bergerem	7870f3b127	Contacts page: remove broken title from 'Start a conversation' button	2015-04-01 00:47:31 +02:00
Jonne Haß	e274470d55	Replace default.html with a regular view ... So we can correctly reference the images	2015-03-28 23:12:07 +01:00
Dennis Schubert	61c2fbf5ef	Merge pull request #5817 from jhass/generated_error_pages ... Generate error pages on assets:precompile	2015-03-28 21:46:35 +01:00
Steffen van Bergerem	176938c486	Fix layout regression: missing header on search page	2015-03-28 13:54:52 +01:00
Jonne Haß	e7d0a978ba	Generate error pages on assets:precompile ... This allows us to reuse any CSS we have, unify their look and unify their look with the regular page design. This works by instantiating ActionView and rendering templates in a rake task. Inspired by the errgent gem.	2015-03-27 11:15:59 +01:00
Dennis Schubert	b07ad67946	Merge pull request #5819 from svbergerem/no-contacts-in-aspect-message ... Add 'no contacts in this aspect yet' message	2015-03-27 03:50:42 +01:00
Steffen van Bergerem	9069fd235d	Add 'no contacts in this aspect yet' message	2015-03-27 03:20:42 +01: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	6f7f820ff4	Fix oembed style regression	2015-03-26 23:51:08 +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
SansPseudoFix	a97bfec39c	add option pagination ... center pagination Fix pagination css Symbols for previous and next modified: app/assets/stylesheets/conversations.scss modified: app/views/conversations/index.haml Add responsive pagination Fix broken pagination modified: app/assets/stylesheets/conversations.scss modified: app/views/conversations/index.haml Fix broken pagination for mobile Mobile pagination Unify desktop and mobile background change background color	2015-03-26 19:53:23 +01:00
Steffen van Bergerem	3a202d8fa9	Remove footer from stream and profile pages	2015-03-26 16:28:01 +01:00
Jonne Haß	b047013dd0	Merge pull request #5814 from svbergerem/update-markdown-it ... Update markdown-it	2015-03-26 10:16:22 +01:00
Steffen van Bergerem	153efe7d7a	Change url to image-url in registration.css, added in #5743	2015-03-26 01:13:11 +01:00
flaburgan	ef977a170f	Replace Make Something text by the diaspora ball logo on registration page ... Add ball.svg to /graphics	2015-03-26 00:32:41 +01:00
Steffen van Bergerem	adf9bcf8e8	Update markdown-it	2015-03-26 00:07:25 +01:00
Jonne Haß	73b6c75278	On reshare insert the reshare built from the response ... Also make sure comments_count and the like is always set in the response.	2015-03-23 23:02:23 +01:00
Steffen van Bergerem	4d6c513b8e	Refactor post content css, fix margin-bottom for lists in comments	2015-03-22 02:19:36 +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
Sam Radhakrishnan	af410ef4e5	Added margin top to lists. Fixes issue5626	2015-03-22 02:43:01 +05:30
Sayed	e21afc6636	order-of-comments-on-the-mobile-version-is-reversed #5804	2015-03-21 15:20:57 +02: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ß	496a16d14d	Merge pull request #5799 from svbergerem/invitation-input ... Unify invite code and contacts page link style	2015-03-20 01:52:00 +01:00
Steffen van Bergerem	4a7781f1e7	Unify invite code and contacts page link style	2015-03-19 02:46:25 +01:00
Steffen van Bergerem	d9bf4a2fa6	Remove layout 'centered_with_header_with_footer'	2015-03-18 21:59:56 +01:00
Martha	d4f1a5dbe8	added specs and validations for Role model ... - added shoulda-matchers gem for one-line specs - added FactoryGirl syntax methods	2015-03-18 09:16:15 -07: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
Sayed	bf3d903c11	refactor mobile stream post_stats	2015-03-17 20:37:16 +02:00
Sayed	99f42cb643	fix missing reshares count on mobile stream	2015-03-17 01:14:22 +02:00
Steffen van Bergerem	0856eb8f86	Merge pull request #5788 from AugierLe42e/fix-search-element-selection ... Fixes #5787	2015-03-16 23:36:51 +01:00
Augier	571685d590	Fix the broken searchbar (#5787)	2015-03-16 22:07:51 +01:00
Steffen van Bergerem	e7ec3d495f	Refactor and improve sidebar css	2015-03-16 02:03:53 +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	81cd1753e4	Improve link to original post in reshared polls	2015-03-15 17:07:16 +01:00
Hincu Petru	9589cb2e0f	disable poll voting for reshared post	2015-03-15 16:46:48 +01:00
Sayed	18a1958ef8	fix too long tag name #5737	2015-03-15 16:15:33 +02:00
Augier	322ee30005	Tests with Jasmine	2015-03-15 14:52:49 +01:00
Augier	f4534ec412	Refactor notification badge view (again)	2015-03-15 11:48:06 +01:00
Augier	673661b798	Ported searchbar	2015-03-15 11:48:06 +01:00
Augier	2a9fddf7a0	Port notifications to backbone part. 2	2015-03-15 11:48:06 +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	caf7470e8e	Various style fixes	2015-03-15 01:58:29 +01:00
Steffen van Bergerem	ca087d6b26	Conversations: Add rounded corners to participants count and improve readability	2015-03-14 18:16:21 +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
Christophe	e2a591249a	Replace JQuery slide with transition ... Conflicts: app/assets/javascripts/inbox.js app/assets/stylesheets/conversations.css.scss	2015-03-14 14:30:59 +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
Augier	0887137262	Add a notification subscribtion to the single post view	2015-03-13 23:27:49 +01:00
Martha	985141c0e8	display specific error messages for password change (issue #5549)	2015-03-13 11:35:21 -07:00
Giniouxe	efcff444fd	Refactor registrations #5670 - Partial form	2015-03-13 16:16:45 +01:00
Jonne Haß	2c2b47eae2	Merge pull request #5769 from svbergerem/remove-unused-css ... Remove unused css and reduce blockquote font-size	2015-03-13 10:44:44 +01:00
Steffen van Bergerem	6dc18ac317	Reduce blockquote font-size	2015-03-13 01:41:14 +01:00
Steffen van Bergerem	84a5992a42	Refactor css code, remove unused code	2015-03-13 01:41:14 +01:00
Steffen van Bergerem	992c75da55	Merge pull request #5767 from SansPseudoFix/overflow-button-tag-too-long ... Change overflow-x to overflow for long tag button	2015-03-13 01:19:11 +01:00
SansPseudoFix	8dd8daf37e	Change overflow-x to overflow for long tag button	2015-03-12 23:46:15 +01:00
Steffen van Bergerem	1ff644c13e	Fix mobile notifications	2015-03-12 22:45:04 +01:00
Jonne Haß	cc585805ad	Merge pull request #5762 from svbergerem/entypo-controls ... Use entypo for control icons	2015-03-12 19:29:40 +01:00
Steffen van Bergerem	af9d6ddab3	Use handlebars helpers wherever possible	2015-03-12 16:20:32 +01:00
Steffen van Bergerem	0715107735	Remove stream frame template	2015-03-12 14:43:20 +01:00
Marcelo Briones	7be56849d9	DRY on avatars	2015-03-12 09:52:36 -03:00
goobertron	b04a2638a5	Add box shadow and radius to avatars	2015-03-12 09:52:36 -03:00
Steffen van Bergerem	cb30ffc368	Use entypo for post control icons	2015-03-12 13:08:23 +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
SansPseudoFix	26ad537a18	fix tag button overflow ... fix tag button overflow modified: app/assets/stylesheets/tag.scss modified: app/assets/templates/tag_following_action_tpl.jst.hbs	2015-03-12 00:28:31 +01:00
Jonne Haß	2c7b7bb0dc	bump open_graph_reader	2015-03-11 21:59:02 +01:00
Steffen van Bergerem	4f4dfc7554	Fix missing assets bug	2015-03-11 19:18:05 +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
Steffen van Bergerem	f5bf53a004	Refactor vendor javascript	2015-03-11 15:51:08 +01:00
Steffen van Bergerem	be175e969e	Fix mobile sign up with invitation	2015-03-11 10:52:42 +01:00
Augier	95f4675ddf	Port of notifications to Backbone	2015-03-11 02:11:05 +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
Jonne Haß	add6dd3c50	Merge pull request #5749 from svbergerem/char-counter-fix ... Publisher: fix services char counter	2015-03-10 17:43:32 +01:00
Steffen van Bergerem	d2222a97e5	Fix photo count in the profile view	2015-03-10 11:38:49 +01:00
SansPseudoFix	6cf509454c	fix overflow blockquote stream ... change word-break to wrap-wrap modified: app/assets/stylesheets/stream_element.scss remove useless word-wrap global prevent for overflow global overflow fix Remove useless word-wrap modified: app/assets/stylesheets/conversations.scss modified: app/assets/stylesheets/new_styles/_base.scss modified: app/assets/stylesheets/new_styles/_code.scss modified: app/assets/stylesheets/single-post-view.scss modified: app/assets/stylesheets/stream_element.scss indent	2015-03-09 23:59:52 +01:00
Steffen van Bergerem	1b2b10877a	Fix services char counter	2015-03-09 21:18:10 +01:00
Steffen van Bergerem	73d04b706e	Use entypo icons for left navbar	2015-03-09 17:57:50 +01:00
Steffen van Bergerem	d3c0259026	Remove unused aspect files	2015-03-09 17:57:50 +01:00
Steffen van Bergerem	31d7904701	Remove unused blueprint invitations view	2015-03-09 17:57:49 +01:00
Steffen van Bergerem	3298373a7f	Add missing http:// to urls	2015-03-09 01:42:40 +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
flaburgan	ab4467954b	Fix conversaton publisher border	2015-03-08 21:59:23 +01:00
Steffen van Bergerem	49894ec05d	Merge pull request #5740 from jhass/publisher_margin ... Reduce gap between publisher and stream	2015-03-08 16:08:51 +01:00
Jonne Haß	e6444cea67	Reduce gap between publisher and stream [ci skip]	2015-03-08 14:27:07 +01:00
Jonne Haß	00817c8583	Merge pull request #5728 from SansPseudoFix/5716-focus-link-color-bootstrap-header ... Fix #5716 focus header link color	2015-03-06 23:44:03 +01:00
Jonne Haß	2dafe8554c	Merge pull request #5735 from svbergerem/improve-bootstrap-stream-style ... Improve Bootstrap stream style	2015-03-06 23:40:24 +01:00
Steffen van Bergerem	b083560266	Improve Bootstrap stream style	2015-03-06 21:59:36 +01:00
Steffen van Bergerem	2a52f65160	Bump markdown-it	2015-03-06 20:40:06 +01:00
Steffen van Bergerem	96fcae3532	Remove unused (vendor) css	2015-03-06 07:58:13 +01:00
Steffen van Bergerem	0f9ba4885c	Import chat.scss and change container to container-fluid	2015-03-06 01:18:37 +01:00
Jonne Haß	c2dab008ab	We may no longer have a file for an unprocessed photo	2015-03-06 00:52:17 +01:00
Jonne Haß	e7b92c15e2	Replace export_photos and export_users by export queue	2015-03-06 00:38:16 +01:00
SansPseudoFix	53ac63cafa	refactoring - grey link with dark grey dots for focus	2015-03-04 23:46:52 +01:00
SansPseudoFix	f8b69ae7d7	grey link with black grey dots border	2015-03-04 18:35:59 +01:00
SansPseudoFix	2b29bfe403	focus link grey with grey dots	2015-03-04 15:00:39 +01:00
Jonne Haß	26cda1b1c5	Merge pull request #5724 from AugierLe42e/comment-design ... Changed color border on active text	2015-03-04 11:52:09 +01:00
SansPseudoFix	330ae471f1	Fix #5716 focus header link color	2015-03-04 11:03:44 +01:00
Marcelo Briones	b154d87070	Exports user photos as zip file	2015-03-03 19:45:57 -03:00
Augier	5be2fbafab	Changed color border on active text"	2015-03-03 21:18:53 +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
Steffen van Bergerem	0c7d319fdc	Remove unused css files	2015-03-02 00:04:58 +01:00
Steffen van Bergerem	e188782a9a	Remove blueprint code	2015-03-02 00:04:57 +01:00
Steffen van Bergerem	c838389b67	Fix invitations and tests	2015-03-02 00:04:56 +01:00
Pablo Cuadrado	56a79828bc	using circled help icon	2015-03-01 12:04:55 +01:00
Pablo Cuadrado	3721861c94	border on the left of the stream and profile header	2015-03-01 12:04:55 +01:00
Pablo Cuadrado	b0a8ecf8be	margin 0 was messing up the left bar	2015-03-01 12:04:55 +01:00
Pablo Cuadrado	2fb594735e	main stream widths with fluid container	2015-03-01 12:04:55 +01:00
Pablo Cuadrado	c402c65f56	unprefixing opacity	2015-03-01 12:04:55 +01:00
Pablo Cuadrado	52fef10bea	lame BR removed	2015-03-01 12:04:54 +01:00
Pablo Cuadrado	75480c5454	using entypo on the right section, better alignment and styles	2015-03-01 12:04:54 +01:00
Pablo Cuadrado	ba9bb619e4	using container instead of container fluid for the stream, we can manage this ... better when migrating to Bootstrap 3	2015-03-01 12:04:54 +01:00
Pablo Cuadrado	84739a86d1	invite code box fix	2015-03-01 12:04:54 +01:00
Pablo Cuadrado	9cbc09316d	text shadow made the buttons look blurry	2015-03-01 12:04:53 +01:00
Pablo Cuadrado	b23c0f7ae4	ensuring that the oembed element has the same size of the thumb	2015-03-01 12:04:53 +01:00
Pablo Cuadrado	7f2ee4bf3d	dropping blueprint option on publisher	2015-03-01 12:04:53 +01:00
Pablo Cuadrado	24fdf8fb84	rightbar invitations ported to bootstrap	2015-03-01 12:04:53 +01:00
Pablo Cuadrado	b2e3866217	removing blueprint classes from new aspect modal	2015-03-01 12:04:53 +01:00
Pablo Cuadrado	122fde9093	colliding style removed	2015-03-01 12:04:52 +01:00
Pablo Cuadrado	cfff769152	comment button using bootstrap styles	2015-03-01 12:04:52 +01:00
Pablo Cuadrado	bb18803665	welcome to diaspora styles ported	2015-03-01 12:04:52 +01:00
Pablo Cuadrado	cb99ad9e68	left bar styles adjusted	2015-03-01 12:04:51 +01:00
Pablo Cuadrado	e48679affe	removing a missing mixing, using row instead of row-fluid	2015-03-01 12:04:51 +01:00
Pablo Cuadrado	c4fda4b563	main_stream ported, no further styling applied	2015-03-01 12:04:51 +01:00
flaburgan	741a24bc08	Add tooltip style on post report icon	2015-02-28 16:57:41 +01:00
Dennis Schubert	ab4e04e8c4	Don't specify file extensions in SCSS imports	2015-02-28 05:04:39 +01:00
Jonne Haß	c96834bdf2	Remove .css extension from SCSS files ... sass-rails 5.0 deprecated those	2015-02-28 03:37:46 +01:00
Jonne Haß	1b0cf2d11f	bump compass & sass	2015-02-28 02:36:14 +01:00
Jonne Haß	3a90386303	deliver needs to be called on the return value of the mailer call	2015-02-27 16:58:39 +01:00
Jonne Haß	f62ba0f73c	Don't split contact_ids when they already are an array	2015-02-27 16:58:39 +01:00
Jonne Haß	f49c8884f4	Use _url, not _path, in mailers	2015-02-27 16:58:39 +01:00
Jonne Haß	290aded7f6	ActionMailer deliver -> deliver_now	2015-02-27 16:58:39 +01:00
Jonne Haß	162303db37	Enable Rails 5 behavior for exceptions in after_commit callbacks	2015-02-27 16:58:39 +01:00
Jonne Haß	9ad2409264	Don't use AR internals (@attributes)	2015-02-27 16:58:38 +01:00
Jonne Haß	99ea156e1c	Refactor User.total_users into a scope	2015-02-27 16:30:51 +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ß	e8440bb25f	Merge pull request #5683 from svbergerem/mobile-fix-style-more ... Mobile: fix style of 'more' button	2015-02-27 15:53:36 +01:00
Jonne Haß	205f82bfd0	Merge pull request #5648 from Zauberstuhl/jsxc_use_ajax_login ... Adjust jsxc initialization for ajax login	2015-02-27 15:52:30 +01:00
Jonne Haß	be1ab6c6a3	Merge branch 'collimarco-issue5350' into develop	2015-02-27 15:33:55 +01:00
Jonne Haß	073e99992e	Some fixes to participation controls ... * prevent default event in JS handlers to prevent jumping back to the top. * Use js-routes * Use sprite for icons * Reply with 200 instead of 204 when destroying a participation, to prevent errors in the browser console.	2015-02-27 15:31:30 +01:00
Akash Agrawall	e85cb7b373	Help_section_update_keyboard_shortcut	2015-02-27 16:36:11 +05:30
Augier	168adae009	Adding help section for chat	2015-02-26 18:06:39 +01:00
Lukas Matt	e484ebc85f	Using dot notation for accessing token	2015-02-25 00:11:01 +01:00
Lukas Matt	30685b2709	Adjust jsxc initialization for ajax login ... related to diaspora/jsxc#81	2015-02-25 00:09:23 +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
zachrab	f695b5d3e7	Set disable_mail to true ... Add #clear_account! disable mail spec Add migration for disabling mail for all closed accounts Change migration to use #update_all for disable_mail attribute Add #clear_account! false fields spec	2015-02-19 16:45:39 -08:00
Steffen van Bergerem	0434599bd0	Contacts page: 'Start a conversation' button should depend on number of contacts in aspect	2015-02-19 20:22:07 +01:00
Steffen van Bergerem	53714c4699	Fix notification for new conversations	2015-02-19 13:39:25 +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
Akash Agrawall	3bb5e78893	Lock account #5564	2015-02-19 05:45:04 +05:30
flaburgan	2b19b4bfc9	Remove #sign-up-text, change placeholder text to lower-case, fix tests	2015-02-19 00:07:41 +01:00
Steffen van Bergerem	b3558d0db1	Fix captcha and box-shadow	2015-02-18 22:45:46 +01:00
flaburgan	1c231f3171	refactoring of the public pages design	2015-02-18 22:45:46 +01:00
flaburgan	44649e9167	Unify not connected pages	2015-02-18 22:45:46 +01:00
Steffen van Bergerem	06ab4d0514	Mobile: fix style of 'more' button	2015-02-18 20:41:01 +01:00
Steffen van Bergerem	7d485ce6a6	Add opacity transition for post controls	2015-02-18 18:16:10 +01:00
SansPseudoFix	0c49219ca7	Global prevent for overflow in mobile view	2015-02-17 13:00:39 +01:00
Steffen van Bergerem	eb7e2eac9d	Update jasmine-ajax	2015-02-17 04:03:42 +01:00
Steffen van Bergerem	d1dfd7c1cd	Style improvements for the year on the notifications page	2015-02-16 21:45:39 +01:00
Steffen van Bergerem	9c22ed6aef	Add year to notifications page	2015-02-16 18:02:50 +01:00
Steffen van Bergerem	4da6b075ad	Bootstrap stream: fix interaction buttons	2015-02-16 06:23:34 +01:00
Steffen van Bergerem	f1836580db	Bootstrap stream: add spinner and improve comment box	2015-02-16 04:56:35 +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
Giniouxe	e2866a12ea	Issue #5662: Fix text on change button	2015-02-15 20:42:55 +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ß	f326b58d31	Merge pull request #5664 from svbergerem/remove-people-last_post ... Remove last_post from PeopleController	2015-02-15 15:58:02 +01:00
Steffen van Bergerem	9373d5bd20	Fix jasmine tests for new help routes	2015-02-14 19:38:00 +01:00
Augier	aa62266376	Added routing system to open a section in help	2015-02-14 18:05:40 +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
arlogn	43a2a5c336	profile photos as thumbnails	2015-02-14 02:27:32 +01:00
Lukas Matt	a475d5fb62	Add the ability to link to remote user profile ... related to diaspora/jsxc#77	2015-02-13 19:23:26 +01:00
Steffen van Bergerem	2193ff2b58	Remove last_post from PeopleController	2015-02-13 12:25:50 +01:00
Steffen van Bergerem	1733131c0c	Add invitation link to contacts page	2015-02-12 03:34:24 +01: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
Steffen van Bergerem	7112cb112b	Add hovercards for mentions	2015-02-11 00:46:00 +01:00
Steffen van Bergerem	8962d75eb7	Conversations: fix badge count and automatic scrolling	2015-02-10 19:11:20 +01:00
Steffen van Bergerem	17c7771a6b	Fix typo in AspectGlobalHelper	2015-02-10 16:43:14 +01:00
Jonne Haß	dece3cf6b0	Merge pull request #5417 from svbergerem/notifications-fix-timeago ... Fix timeago for notifications, add 'no notifications yet' message	2015-02-10 12:20:09 +01:00
Steffen van Bergerem	3312f97981	Fix timeago for notifications, add 'no notifications yet' message	2015-02-09 03:56:37 +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
Akash Agrawall	6b105274af	Technical limitation of how old one can be on D* 5373	2015-02-09 06:19:09 +05:30
Steffen van Bergerem	2ec093a54c	JSHint boss, evil, loopfunc and scripturl	2015-02-08 23:41:33 +01:00
Steffen van Bergerem	ab6732cac1	JSHint eqeqeq	2015-02-08 23:41:32 +01:00
Steffen van Bergerem	5fa6b8253e	JSHint unused and undefined variables	2015-02-08 23:41:32 +01:00
Steffen van Bergerem	a9a480da0a	JSHint semicolon errors	2015-02-08 23:41:31 +01:00
Steffen van Bergerem	6b0a5823e3	Add JSHint javascript linter	2015-02-08 23:41:31 +01:00
Faldrian	5d3145bf8f	added avatar error correction on core view rendering	2015-02-08 19:32:50 +01:00
Faldrian	32ca5cc16d	removed css-spill on reshare link in stream	2015-02-08 17:24:16 +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ß	3114b04a08	Merge pull request #5635 from svbergerem/remove-unused-files ... Remove unused files, fix syntax in jasmine tests	2015-02-07 23:43:48 +01:00
Jonne Haß	63363340f6	Merge pull request #5623 from AugierLe42e/fix-mobile-login-view ... [Mobile] Does not display the header on sing_in page	2015-02-07 21:30:03 +01:00
Steffen van Bergerem	c1d714d2c7	Remove unused files, fix syntax in jasmine tests	2015-02-07 21:17:51 +01:00
Steffen van Bergerem	7e5f5964e9	Remove photo export from settings	2015-02-07 14:59:18 +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
Steffen van Bergerem	5e98308b2c	Fix aspect dropdown on people search page inserted after initial page load	2015-02-07 11:22:26 +01:00
Jason Robinson	28ff7fb557	Merge pull request #5601 from Faldrian/5591-correct-moderation-placement-reshare ... Fixed moderation-button-position when viewing reshare	2015-02-05 22:25:28 +02:00
Augier	4be1e2b38e	Does not display the header on sing_in page	2015-02-04 23:45:13 +01:00
Sam Radhakrishnan	9fcef5b101	Fixed Isssue #5618. The profile update page shows the correct message.	2015-02-03 14:39:08 +05:30
Faldrian	db6464ed61	Fixed moderation-button-position when viewing reshare	2015-02-03 00:24:26 +01:00
Sam Radhakrishnan	a12c0d83c0	Fixed Bug #5593. Added length validation to location in profile model with maximum length 255.	2015-02-02 19:42:53 +05:30
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
flaburgan	b8aaad6318	Hide sign up button when registration are disabled	2015-02-01 14:01:44 +01:00
Jason Robinson	512de9cfd9	Merge pull request #5597 from gdpelican/feature/json-exporter-post-fields ... Add created_at to json posts for #5585	2015-02-01 13:18:48 +01:00
Augier	55d258c5ac	Fix registrations displaying	2015-01-30 18:00:22 +01:00
Faldrian	099974ddef	Add shortcuts for reshare, expand Post and open first link in a post	2015-01-28 16:19:18 +01:00
James Kiesel	43f48d0ae2	Add created_at to json posts for #5585	2015-01-28 10:21:16 +13:00
Augier	4ff5483025	Fix available services not correctly displayed	2015-01-26 20:45:03 +01:00
Flaburgan	69b881f34b	Fix monthly and halfyear active users count	2015-01-26 10:03:37 +01:00
Marco Colli	eccab62e32	Allow user to enable / disable notifications for a post from stream #5350	2015-01-25 18:40:47 +01:00
Augier	f14ad5ce35	Fixes the header problem rendering statistics page	2015-01-25 13:24:19 +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
SansPseudoFix	dc44485230	Feature : Statistics design	2015-01-24 22:34:41 +01:00
SansPseudoFix	7e9525740b	fix #5568 - overflow json exporter	2015-01-21 17:54:59 +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
Sakshi Jain	8b1f0453a1	5560 Hide community spotlight setting if not enabled	2015-01-20 10:31:31 +05:30
James Kiesel	7bbd9138de	Fix bad email formatting	2015-01-20 16:51:08 +13:00
Jonne Haß	6502000429	Merge pull request #5574 from svbergerem/fix-linkify ... Fix markdown-it linkify blocking Firefox	2015-01-19 15:02:00 +01:00
Steffen van Bergerem	b63d8fc679	Fix markdown-it linkify blocking Firefox	2015-01-19 02:09:10 +01:00
Marcelo Briones	63eca447d0	Strip EXIF data as user preference	2015-01-18 10:28:28 -03: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	5c810a8a2e	Merge pull request #5489 from collimarco/solved5482 ... Solved #5482	2015-01-17 03:39:03 +02:00
Jason Robinson	6513053586	Merge pull request #5499 from gdpelican/feature/json-exporter-deux ... JSON Exporter, part deux	2015-01-17 00:51:38 +02:00
James Kiesel	1c69dd7752	Add contacts/posts, and GZipping JSON exporter output	2015-01-15 00:20:19 +13:00
Steffen van Bergerem	61c17c7896	Add more markdown-it plugins ... activate sanitizer, sub and sup	2015-01-13 03:41:06 +01:00
flaburgan	46223a2dfc	Don't truncate notification emails anymore, close #4342	2015-01-10 22:10:11 +01:00
Steffen van Bergerem	026773194a	Replace pagedown by markdown-it	2015-01-10 18:56:20 +01:00
Dumitru Ursu	36b66624e2	Invert gradient	2015-01-09 17:13:35 +02:00
Dumitru Ursu	80b4cb90ef	Use the standard syntax for gradient	2015-01-09 16:49:26 +02:00
Dumitru Ursu	3e1b944121	Remove prefixed CSS properties	2015-01-09 13:50:29 +02: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ß	d7a3559f4b	Merge pull request #5472 from svbergerem/fix-typo-profile-header ... Fix typo in profile_header_view	2015-01-06 14:37:34 +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
Steffen van Bergerem	9de6a26a22	Port contacts page to backbonejs	2015-01-04 17:13:18 +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
Steffen van Bergerem	59e9597c77	Remove asyncSubHeader from app.pages.Profile	2015-01-03 15:20:33 +01:00
Marcelo Briones	fe6052865c	Remove limited content from email notifications	2014-12-28 22:15:47 -03: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ß	45b385d694	Handle reshares of deleted posts in OpenGraph tags generation code	2014-12-27 15:07:16 +01:00
Marco Colli	8dea4b5fd9	Solve #5341	2014-12-24 11:52:12 +01:00
Jonne Haß	6c9f191696	Merge pull request #5491 from collimarco/solved5348 ... Solve #5348	2014-12-23 23:00:06 +01:00
Jason Robinson	30eaf82762	Merge pull request #5481 from svbergerem/remove-stream-template ... Remove unused stream template	2014-12-22 23:30:55 +02:00
Marco Colli	76cc5e2d5c	Add ActiveRecord::RecordNotFound catching. Add tests.	2014-12-22 12:36:09 +01:00
Marco Colli	d75071bac9	Solve #5348	2014-12-20 19:09:33 +01:00
Marco Colli	1ac2e728f4	Solved #5482	2014-12-20 11:05:12 +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
Dennis Schubert	91c14c19e3	Merge pull request #5487 from Faldrian/5313-adding_contacts_racecondition_fix ... Fixed growing number on events on hovercard dropdown container	2014-12-20 04:08:32 +01:00
Faldrian	43fd6e7ed6	Set refresh_search async searchresults load to use bootstrap	2014-12-20 03:58:20 +01:00
Faldrian	710d03b1c2	Fixed growing number on events on hovercard dropdown container	2014-12-20 02:44:48 +01:00
margori	27a1886834	Changes delete conversation button tooltip to 'hide' or 'delete'	2014-12-19 18:26:43 -03:00
Jonne Haß	3000d86d57	Merge pull request #5475 from svbergerem/tag-page-improve-wording ... Improve wording for tagged people on tag page	2014-12-17 16:46:09 +01:00
Steffen van Bergerem	7612f5e939	Remove unused stream template	2014-12-17 16:45:51 +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
margori	e6c605d92b	Destroy conversation when all participants leave it	2014-12-17 11:33:23 -03:00
James Kiesel	e174514d69	Add JSON exporter for user profile download	2014-12-16 08:55:35 +13:00
Steffen van Bergerem	a5068259bb	Improve wording for tagged people on tag page	2014-12-15 18:08:53 +01:00
Steffen van Bergerem	e5895a1f1b	Fix order of poll answers	2014-12-13 18:22:30 +01:00
Marcelo Briones	4e83e4c7ed	BUG: new messages to person that is not sharing ... Conversation recipient validated - Conversation foreign recipient not required to be validated. - Added 'peter' as spec_helper user. - New fixture, new statistic values. - Clearer identifier names	2014-12-10 17:02:20 -03: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
Jonne Haß	6836af89ad	Correctly implement OpenGraph tags ... Just defining og:site_name indicates that we support the OpenGraph protocol, but then we didn't set the required properties.	2014-12-08 02:25:09 +01:00
Jonne Haß	74a6f42501	Bye opengraph_parser, hi open_graph_reader ... opengraph_parser is basically unmainted, issues are ignored or deliberately closed without fixing. It pollutes the global namespace and has no verification of correctness. The opengraph gem has basically the same issues, not really maintained, unreleased patches on master since over a year, not really smart either. So I created my own version and while at it, why not strive try to be complete and robust, although it's still a work in progress. This also improves general URL detection by parsing them from the message after stripping markdown. An additional dependency was added to support fetching sites that require cookies to work at all. For the same reason Faraday's default redirect limit was bumped.	2014-12-08 02:01:31 +01:00
Steffen van Bergerem	8a50db76b1	Only show aspect chat control if chat is enabled	2014-12-05 13:07:17 +01:00
Jonne Haß	63e9d7b73f	Update aspect list checkmarks only after the stream was fetched	2014-12-05 03:18:30 +01:00
Jonne Haß	9d5e1f604d	Make app.helpers.truncate tolerant to null and undefined	2014-12-04 16:45:00 +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
SansPseudoFix	6d681f8306	Fix code overflow ... new file: app/assets/stylesheets/new_styles/_code.scss	2014-12-02 16:51:50 +01:00
Steffen van Bergerem	d742f23cd5	Content shouldn't exceed the profile sidebar	2014-12-02 02:03:15 +01:00
Steffen van Bergerem	4cc1b40443	Only remove photos from view when destroyed on server	2014-12-01 00:36:56 +01:00
Steffen van Bergerem	f6fbbbb5f6	Move tag prefill to Backbone, add tests	2014-11-30 17:14:05 +01:00
taro-k	b01026f9b8	pre-fill tag page form with the tag #4234	2014-11-30 14:15:45 +01:00
Steffen van Bergerem	b275b2edbc	Merge pull request #5435 from SansPseudoFix/5329-fix-mention-popup-hidden ... A temporary fix for mention modal #5329	2014-11-30 13:48:24 +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
SansPseudoFix	90b9f227d8	A temporary fix for mention modal #5329 ... A temporary fix for mention modal #5329 modified: app/assets/stylesheets/bootstrap-fix.css.scss modified: app/assets/stylesheets/bootstrap-fix.css.scss	2014-11-29 17:36:46 +01:00
Faldrian	29f55f42b6	truncate long opengraph description to 250 chars in mobile and stream view	2014-11-29 17:18:01 +01:00
Steffen van Bergerem	55f881da08	Make source code url configurable	2014-11-29 16:36:17 +01:00
Jonne Haß	544501a0e6	Merge pull request #5418 from svbergerem/publisher-counter-style-fix ... Fix character count placement for publisher	2014-11-29 16:11:45 +01:00
Laurent PERON	9661d00ec8	issue #5430 : message added	2014-11-28 10:31:47 +01:00
Steffen van Bergerem	389edbe3aa	Don't display undefined handle in search widget	2014-11-27 16:57:32 +01:00
Jonne Haß	49dfc27011	Merge pull request #5421 from Zauberstuhl/optimize_jsxc_login_process ... Optimize jsxc login process and bump jsxc version	2014-11-24 23:01:03 +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
Lukas Matt	ef29de8176	Configure form element and move xmpp config	2014-11-24 17:19:57 +01:00
Lukas Matt	0d4da2fba8	Login function deprecated ... related to diaspora/jsxc#50	2014-11-24 17:19:30 +01:00
Lukas Matt	44bc48ad5e	Remove debug output on default	2014-11-24 17:19:09 +01:00
SansPseudoFix	322ca4dac0	display handle for search bar ... fix margin and color hidden overflow for long handle and names modified: app/assets/javascripts/widgets/search.js modified: app/assets/stylesheets/autocomplete.css.scss add min width 300px modified: app/assets/javascripts/widgets/search.js modified: app/assets/stylesheets/autocomplete.css.scss	2014-11-24 13:17:57 +01:00
Steffen van Bergerem	8cb6e242bf	Fix character count placement for publisher	2014-11-23 18:36:05 +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
Jonne Haß	32c5508f3d	Merge pull request #5408 from Zauberstuhl/show_roster_minimized ... Display chat box minimized on default	2014-11-22 18:58:16 +01:00
Jonne Haß	9b49df80a5	Merge pull request #5409 from svbergerem/chat-extra-padding-for-roster ... Chat: add extra padding for the roster	2014-11-22 18:57:51 +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
SansPseudoFix	66b76024ed	Issue #5251: fix hidden overflow ... modified: app/assets/stylesheets/getting-started.css.scss modified: app/assets/stylesheets/getting-started.css.scss	2014-11-22 15:01:20 +01:00
Steffen van Bergerem	472d65cb61	Chat: add extra padding for the roster	2014-11-21 23:29:06 +01:00
Lukas Matt	5fee67e5e7	Display chat box minimized on default ... Currently it slides in if you login. with time it is annoying	2014-11-21 21:56:27 +01:00
Praveen Arimbrathodiyil	6378af5417	remove execution permissions from images and css	2014-11-20 23:38:36 +05:30
Faldrian	328a515dbe	fixed margins and fonts in headerbar. fixed bootstrap2 placeholder error	2014-11-16 18:19:32 +01:00
Faldrian	4dbf42d970	added different behaviour depending on existence of posts	2014-11-16 15:06:08 +01:00
Faldrian	21806a2c9b	mobile more-link only if there may be a next page; added message for end of stream	2014-11-16 01:43:55 +01:00
Lukas Matt	e40cf25177	Swap aspect chat privilege title	2014-11-13 14:38:23 +01:00
Lukas Matt	ea11133084	Include the chat front-end if chat is enabled ... * add jsxc helper file	2014-11-13 11:34:21 +01:00
Lukas Matt	735b10cc63	Chat privilege checkbox ... * add to contacts header for later modification * add to aspect creation box	2014-11-13 11:30:12 +01:00
Lukas Matt	24e1732256	Implement token authentication ... * create a new token on a new session * delete the current token on session exit	2014-11-13 11:27:56 +01:00
Lukas Matt	ae582e4543	Add toggle_chat_privilege to aspect controller	2014-11-13 11:24:07 +01:00
Lukas Matt	38a238eb36	Set chat-flag for every aspect manually ... On default none is permitted to chat with you. You have to set extra privilege for an aspect.	2014-11-13 11:21:21 +01:00
Lukas Matt	50a7541d14	Include jsxc deps and initialize the client on login	2014-11-13 11:17:19 +01:00
JesseWeinstein	fb51e9aa43	Only include the quote markdown if needed ... Intentionally do a converting-comparison against the empty string, to see if text is selected.	2014-11-10 23:41:34 -08:00
JesseWeinstein	ea33ef9e0b	Add Markdown to generated post ... Switch to using content parameter, which doesn't alter its value, unlike the other ones. Use a H2 header for the document.title, quote the selected text, and put the URL at the bottom, in a separate paragraph.	2014-11-10 23:24:23 -08:00
JesseWeinstein	9585a1877b	Split bookmarklet_url literal string into lines ... To improve the readabilit of diffs that modify it, per https://github.com/diaspora/diaspora/pull/5384#issuecomment-62443426	2014-11-10 23:16:31 -08:00
Jonne Haß	e68704890e	make sure to import perfect scrollbar plugin before our own mixins ... otherwise it overrides the border-radius mixin with an incompatible one	2014-11-09 20:31:24 +01:00
Jonne Haß	30de98cf3e	Merge pull request #5335 from svbergerem/paginate-contacts ... Paginate contacts	2014-11-09 19:04:07 +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	4c98445f1c	Fix presenters instead of modifying the getters	2014-11-09 07:47:40 -08:00
Dennis Schubert	6808150920	Method calling convention and doc improvements ... ... and a stealth-commit of an already introduced bug prevention system. ;)	2014-11-09 07:20:30 -08:00
Dennis Schubert	5bcd5087bf	Add Camo for remote images	2014-11-09 02:17:43 +01:00
Dennis Schubert	db2560d7fc	Add Camo for OpenGraph images	2014-11-09 01:36:16 +01:00
Dennis Schubert	89ad5b96ad	Add Camo for a profiles bio and location ... yes, we do have Markdown there. But please don't tell anyone.	2014-11-08 23:12:55 +01:00
Dennis Schubert	0a619749f2	Add Camo for profile images	2014-11-08 23:12:55 +01:00
Dennis Schubert	613f2d1142	Add Camo for comments	2014-11-08 23:12:55 +01:00
Dennis Schubert	92cd4e6b78	Use camo for Markdown images ... just a quick proof of concept	2014-11-08 05:14:18 +01:00
Faldrian	db13811c2c	added scrollbar to bookmark publisher, fixed mention layout bugs	2014-11-07 19:17:54 +01:00
Florian Staudacher	2c8bbd3343	Merge branch 'body-classes' of https://github.com/roymckenzie/diaspora into roymckenzie-body-classes	2014-11-07 16:39:33 +01:00
Faldrian	d928c69e36	Fix: displaying more than one row of image attachments broke publisher	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
Chocobozzz	e411a344f4	Commit the new branding sprite	2014-10-21 17:14:25 +02:00
Paul Hill	ac4607d75c	LibreJS should work with most of the site	2014-10-21 02:48:18 +01:00
Chocobozzz	1aff0d8c2c	Add header logo when hoovered (white logo)	2014-10-18 22:24:05 +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
Augier	2ce98b49d7	Fix issue #4416 ... Conflicts: spec/helpers/notifier_helper_spec.rb	2014-10-16 23:27:48 +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
Augier	cdf4fc05df	Refactored the two last sass files in scss. #3796	2014-10-14 17:47:52 +02:00
Jonne Haß	4e6eacbeb1	Update _.template calls to undscore.js 1.7	2014-10-14 15:04:01 +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ß	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
flaburgan	20d2b8fc5e	Add a link to a reported comment in the admin panel	2014-10-13 14:11:51 +02:00
Jason Robinson	13de3f318e	Merge pull request #5296 from 'deepy/develop' into develop	2014-10-12 22:41:42 +03:00
Steffen van Bergerem	8cc5847aec	Paginate contacts	2014-10-11 22:21:31 +02:00
Steffen van Bergerem	42a3e702e6	Fix poll for Bootstrap publisher	2014-10-11 19:18:13 +02:00
Roy McKenzie	258959e1c2	Updated Weekly User Stats page to show the most recent week. Page should show most recent information	2014-10-10 19:12:37 -07:00
James Kiesel	e2e502ea68	Show error message on invalid reset password attempt	2014-10-11 10:47:00 +13:00
Steffen van Bergerem	715f451ed4	only collapse empty comment box	2014-10-10 20:05:28 +02:00
James Kiesel	1400228757	Fix missing password translations	2014-10-11 00:41:52 +13:00
Steffen van Bergerem	8ca5ca7c92	Reshare the absolute root of a post	2014-10-10 03:12:07 +02:00
James Kiesel	206ec99f8f	Strip search query of leading & trailing whitespace	2014-10-09 23:34:11 +13:00
James Kiesel	2d44107b5d	Allow nil HTTP user agent	2014-10-09 23:08:33 +13:00
flaburgan	476f694bca	Remove one border-bottom on the photo page	2014-10-08 19:40:06 +02:00
Sandip Trivedi	215fc1c96b	Replaced jquery.idle-timer.js vendored asset with a bower package #5194	2014-10-08 00:00:14 -04: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
Jonne Haß	518186a538	Merge pull request #5299 from strivedi183/5194-replace_jqueryplaceholderjs_vendored_asset_with_bower_package ... Replaced jquery.placeholder.js vendored asset with bower package and updated to latest version #5194	2014-10-07 14:40:47 +02:00
Steffen van Bergerem	d04cf7046b	Fix pagination for people/guid/contacts	2014-10-07 10:55:58 +02:00
Sandip Trivedi	2af32220a5	Replaced jquery.placeholder.js vendored asset with a bower package #5194	2014-10-07 00:46:24 -04:00
Jonne Haß	803c257ecf	Merge pull request #5297 from strivedi183/5194-replace_jquerytextchangejs_vendored_asset_with_bower_package ... Replaced jquery.textchange.js vendored asset with a bower package #5194	2014-10-07 02:43:06 +02:00
Sandip Trivedi	d7e8e2ce2c	Replaced jquery.textchange.js vendored asset with a bower package #5194	2014-10-06 18:54:50 -04:00
jaideng123	bd24d6bebe	Added cucumber test for notifications dropdown	2014-10-06 13:55:46 -05:00
flaburgan	82a8673a36	Add margin to reshare	2014-10-06 20:00:07 +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
Roy McKenzie	1df8f0cf20	Added classes to the body for easier page specific styling.	2014-10-04 17:58:39 -07:00
Alex Nordlund	acc7377e5f	Removed setting for statistics, showing both instead.	2014-10-05 01:45:48 +02:00
Alex Nordlund	03f3c74cee	Moved services to a JSON list. ... Added AppConfig.privacy.statistics.deprecated_format to toggle showing the old style format.	2014-10-05 01:07:30 +02:00
Steffen van Bergerem	65e9e1c744	Hidden overflow for long names on tag pages	2014-10-04 22:58:57 +02:00
Jonne Haß	66c2f7f869	Fix statistics_presenter_spec	2014-10-04 01:01:19 +03: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
Brent Bartlett	f9564af0ba	moved hoverable class from <li> to <a>	2014-10-02 17:02:15 -07:00
Steffen van Bergerem	976ff0fcda	Redesign profile page and port to Bootstrap	2014-10-01 12:28:56 +02:00
jaideng123	2b6ac9261b	Notifications Dropdown now infinite scrolls	2014-09-29 16:30:36 -05:00
Florian Staudacher	c7b4b77ce8	Merge pull request #5209 from jhass/federation_improvements ... Federation improvements	2014-09-27 16:18:37 +02:00
Jonne Haß	9520d06c7b	Handle already deleted items gracefully in receive local batch job	2014-09-20 15:26:31 +02:00
Jonne Haß	d6f5368474	Handle already deleted photos gracefully in process photo job	2014-09-20 15:13:14 +02:00
Jonne Haß	4b754b51f9	Discard dispatch jobs of already deleted records	2014-09-20 13:39:31 +02:00
Jonne Haß	5133458d30	Start converting IDN emails	2014-09-20 04:05:57 +02:00
taro@diasporajp	93c6159c56	fix locale of invitation email subject #5231	2014-09-19 16:56:55 +09:00
Florian Staudacher	926556c145	fix profile badge too much margin [ci skip]	2014-09-18 22:30:57 +02:00
jaideng123	b448f92c61	Fixed deformation of getting started popovers	2014-09-17 21:13:22 -05:00
Florian Staudacher	6e1bd7216d	fix /u/[username] route	2014-09-18 00:23:43 +02:00
Florian Staudacher	fe0f8df9c9	add a 'css mutex' for cuke failures	2014-09-17 14:36:04 +02:00
Florian Staudacher	300496090b	add the publisher back to ones own profile, fix some cukes	2014-09-16 02:16:14 +02:00
Florian Staudacher	a5da2ca48c	small fixes and more jasmine specs	2014-09-15 01:37:24 +02:00
Florian Staudacher	10609c3692	fix jasmine and add some specs for direction detection	2014-09-15 01:37:23 +02:00
Florian Staudacher	be86014540	rspec should now be running a green build	2014-09-15 01:37:23 +02:00
Florian Staudacher	89d468cdcc	first round of specs and code cleanups/fixes	2014-09-15 01:37:23 +02:00
Florian Staudacher	e4ee28885a	make photos page work with backbone	2014-09-15 01:37:23 +02:00
Florian Staudacher	1f724dd123	* add a (hash)tag helper for handlebars ... * re-add stream on profile page * more controller refactoring	2014-09-15 01:37:23 +02:00
Florian Staudacher	2572fb77fc	* refactored text direction detector into helper (also for handlebars) ... * added handlebars helper for markdown formatting * finished port of profile sidebar view to handlebars template * people_controller refactoring	2014-09-15 01:37:23 +02:00
Florian Staudacher	9a16560d8d	* rename profile header view to make name more accurate ... * include 'js-routes' for rails routes in javascript (TODO: config options?) * add handlebars helper for rails routes	2014-09-15 01:37:23 +02:00
Florian Staudacher	0092c9c483	* create a handlebars view for the profile header ... * unblock the user via ajax	2014-09-15 01:37:23 +02:00
Florian Staudacher	fba3092c61	* cleanup people_controller#show, add people_controller#stream for json ... * introduce new presenters and extend the functionality of the BasePresenter * add a handlebars template for the profile sidebar, render it everytime we need to update * introduce a 'aspect_membership:update' global event	2014-09-15 01:37:23 +02:00
Florian Staudacher	d00d69814e	port profile page to backbone.js	2014-09-15 01:37:23 +02:00
Jonne Haß	619bc3f537	A reshares root may be already gone when generating the notification	2014-09-07 10:47:47 +02:00
Jonne Haß	777e3123d6	Try fetching missing parent of relayables ... * Extract post fetching logic from Reshare into its own module * raise proper error message when fetching fails * raise proper error message when parent is still missing We can't skip fetch failures or missing parents and still need to retry them in case we're sent the parent later on	2014-09-07 10:47:47 +02:00
jaideng123	642e5ab45b	Fixed Open Graph db insertion	2014-09-06 14:49:34 -05:00
Jonne Haß	01e0127287	Ignore embedded photos if invalid ... For example if they're already present Also refactor StatusMessage XML specs	2014-09-06 04:52:18 +02:00
Jonne Haß	476376dcb0	Don't retry Diaspora::AuthorXMLAuthorMismatch ... They're not healable and seem to only occur on Friendica posts	2014-09-06 03:26:07 +02:00
Jonne Haß	4e5fa6cc7e	Merge branch 'release/0.4.1.0' into develop	2014-09-03 15:53:58 +02:00
Jonne Haß	2d9c6a945d	Don't let the dropdown indicator flow into the user name in the user ... menu	2014-09-03 15:53:01 +02:00
Jonne Haß	d4dc20f59c	Merge branch 'release/0.4.1.0' into develop	2014-09-03 11:17:04 +02:00
Jonne Haß	12dc9cbc23	prevent user menu from moving	2014-09-02 01:17:18 +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ß	6445487936	Merge pull request #5193 from svbergerem/conversations-redirect-new ... Redirect conversations/new to conversations	2014-09-01 18:39:22 +02:00
Steffen van Bergerem	ba0bccbef1	Redirect conversations/new to conversations	2014-09-01 17:11:56 +02:00
Jonne Haß	5da86def06	bump handlebars_assets	2014-09-01 11:44:34 +02:00
Jonne Haß	d4a2d5708c	Hide welcome to diaspora after all popovers are closed ... As a side effect stabilizes signs up cuke	2014-08-31 21:29:46 +02:00
Steffen van Bergerem	854dcf04db	Display new conversation form on conversations/index	2014-08-31 18:02:37 +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
Steffen van Bergerem	0ca59e828a	Rounded contact search input	2014-08-29 14:45:16 +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ß	806de6a9ba	Merge pull request #5084 from Flaburgan/profile-mobile-improvements ... Improve profile page design on mobile	2014-08-27 17:48:59 +02:00
Flaburgan	b83295b4e4	Polish conversation view	2014-08-27 14:40:58 +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
Flaburgan	2151b4f791	Add jasmine tests	2014-08-27 00:03:49 +02:00
flaburgan	3d793679e0	Add visibilit icons in publisher dropdown aspect	2014-08-26 22:47:41 +02:00
Steffen van Bergerem	ff84ee0485	Small style changes, add tests	2014-08-26 22:45:43 +02:00
Steffen van Bergerem	f1408a7a09	Add contacts search and port aspect membership save/destroy to backbone	2014-08-26 21:41:11 +02:00
Steffen van Bergerem	9587961883	Display all contacts in the contact list	2014-08-26 21:41:02 +02:00
Steffen van Bergerem	6461135bfd	Redesign contacts page	2014-08-26 19:18:32 +02:00
Jonne Haß	e3dc82bdcd	Merge branch 'release/0.4.1.0' into develop	2014-08-26 19:12:14 +02:00
Steffen van Bergerem	5a4697e254	Remove validation.js from mobile sign in page (fix regression)	2014-08-26 19:11:59 +02:00
Jonne Haß	39379421dc	Merge pull request #5165 from jaideng123/5106-scrolling_in_notifications ... Fixed notifications dropdown on bootstrap pages	2014-08-26 17:00:56 +02:00
jaideng123	83e677401f	Fixed bootstrap pages	2014-08-26 09:51:36 -05:00
Jonne Haß	541d5580e0	Fix loading issues in rails_admin ... Properly declare Admin module and explicitly list models to be display in rails_admin	2014-08-26 02:57:47 +02: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ß	9e5ac86a36	Merge branch 'release/0.4.1.0' into develop	2014-08-26 01:50:58 +02:00
lyzellis	8c90fea1e1	changes hovercard background color to grey on hover	2014-08-26 01:50:36 +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
khall	1d0446fcab	Adding tabindex='0' attributes to non-blueprint view elements since blueprint is so last week	2014-08-25 15:50:53 -07:00
jaideng123	b70f306ff5	Integrated Perfect Scrollbar into notifications dropdown	2014-08-25 15:33:25 -05:00
Jonne Haß	ef214d7681	bump http_accept_language	2014-08-25 22:06:28 +02:00
Jonne Haß	42b08e8ab8	Update to Rails 4.1	2014-08-25 17:37:02 +02:00
khall	049e504ad3	Fix for issue 5044: Adding tabindex attributes for add contact dropdown and contents, also binding keypress event to perform same action that click does.	2014-08-24 21:37:39 -07:00
khall	41dc950a06	Adding scope for account_deletion to get only those that are uncompleted and then adding that scope to accounts.rake. Tested it out and it works well	2014-08-24 19:02:11 -07:00
khall	6d56a6fbac	Updating with jhass's code change. Still looking into Travis failure...	2014-08-24 16:01:59 -07:00
khall	a9fd16db3e	Fix for issue 5090: Changing error message wording and providing more information to user when status message is too long.	2014-08-24 13:28:57 -07:00
Jonne Haß	13f50eeee6	do not touch the own model in an after commit hook ... That just recurses endlessly, fixes #5146	2014-08-24 16:03:17 +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ß	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ß	feb45a6291	Merge pull request #5135 from goobertron/tos2 ... Minor formatting changes to ToS	2014-08-24 13:30:51 +02:00
Jonne Haß	cf3d6293dc	Merge pull request #5130 from wegotcoders/4948-add-linebreaks ... line breaks have been added to long headings	2014-08-24 13:25:22 +02:00
Jonne Haß	01c4fa18d3	fix and stablize some cukes	2014-08-24 01:02:35 +02:00
Jonne Haß	2c6e9a9786	try working around precompilation bug by committing generated sprites, not nice but luckily they don't change often	2014-08-24 01:02:35 +02:00
Jonne Haß	0a70a125be	Remove deprecation warning in blueprint view	2014-08-24 01:02:35 +02:00
goobertron	0f2929a0ce	Add strong codes for pod name	2014-08-23 19:40:02 +01:00
Steffen van Bergerem	c18df1c32f	Change mark read link on notifications page	2014-08-23 17:42:19 +02:00
Jonne Haß	d6d65cd0fd	apply rails 4 todos and fix specs after rebase	2014-08-23 16:47:57 +02:00
Jonne Haß	5068be90e8	reduce cuke failures ... * Bump sass-rails (without effect) * Bump mobile-fu (without effect) * Cosmetically fix two cukes * Refactor Taggable#tag_strings * Rename default.css to default.css.scss (without effect) * Fix receiving a conversation * Pass aspect_ids instead of a relation to User#aspects_from_ids	2014-08-23 16:47:57 +02:00
Jonne Haß	d070f19243	make rspec and jasmine pass with the new code	2014-08-23 16:47:57 +02:00
Florian Staudacher	adf7aa98dd	port router specs, don't test backbone - our own code is enough	2014-08-23 16:38:58 +02:00
Florian Staudacher	c81379d38f	port some more JS specs to jasmine 2.0... still a lot to do	2014-08-23 16:38:57 +02:00
Jonne Haß	1b3a2185eb	Fix and simplify current_page? check on profile page	2014-08-23 16:38:57 +02:00
Jonne Haß	cb13d30a02	Directly query photos when doing an update_all ... For some reason it doesn't correctly set the bind variables when called through an association with non-standard keys. Probably a Rails bug.	2014-08-23 16:38:57 +02:00
Jonne Haß	35b17d8c4f	Do not call self-modifying Enumerable methods on AR::Relation objects	2014-08-23 16:38:57 +02:00
Jonne Haß	da9c1db14f	before_action	2014-08-23 16:38:57 +02:00
Niall Paterson	f33038f105	updated before_filters to before_actions as recommended for rails 4	2014-08-23 16:34:01 +02:00
Jonne Haß	244388fcb5	make aspect membership controller specs green	2014-08-23 16:34:01 +02:00
Jonne Haß	645a427798	Fix account deleter by not relying on protected_atrributes	2014-08-23 16:34:01 +02:00
Jonne Haß	dc12479070	Filter :id in User.build for now ... Rails 4 seem to allow setting the id through supplied parameters The controllers ported to strong_parameters should guard against attacks over this vector, but I didn't want to remove the specs that test this here	2014-08-23 16:34:01 +02:00
Jonne Haß	76c6d95a0e	replace deprecated disable_with option	2014-08-23 16:34:01 +02:00
Jonne Haß	09f0665225	replace deprecated usages for all	2014-08-23 16:34:01 +02:00
Jonne Haß	cc8a614c29	Remove attr_accessible from OpenGraphCache	2014-08-23 16:34:01 +02:00
Jonne Haß	2f1193fa36	Fix "prepared statements" errors ... See https://coderwall.com/p/45ombq	2014-08-23 16:34:00 +02:00
Jonne Haß	dfa0245f4b	make assets:precompile work	2014-08-23 16:34:00 +02:00
Jonne Haß	a9e107364a	make status message controller spec pass and deprecation free	2014-08-23 16:34:00 +02:00
Jonne Haß	2cca5745c9	remove deprecated scoped	2014-08-23 16:34:00 +02:00
Jonne Haß	cb195f4d55	access connection through class	2014-08-23 16:34:00 +02:00
Jonne Haß	2f54d4f17d	remove conditions on association deprecation warnings	2014-08-23 16:34:00 +02:00
Jonne Haß	89afb616cf	replace deprecated scope syntax and unify it	2014-08-23 16:34:00 +02:00
Jonne Haß	33c3b38f2f	replace deprecated finder and finder_options syntax	2014-08-23 16:34:00 +02:00
Steffen van Bergerem	d682821f2d	Refactor css	2014-08-23 15:45:45 +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	987c982bb5	Fix mobile sign in page regression	2014-08-21 22:19:14 +02:00
goobertron	c8e5b326e5	Minor formatting changes to ToS	2014-08-21 11:36:21 +01:00
damzcodes	ab71205261	line breaks have been added in correct stylesheet	2014-08-19 14:51:42 +01:00
Daniel Sun	13419066d4	refactor authorIsCurrentUser to user model as isAuthorOf ... Dried up authorIsCurrentUser in views.js removed authorIsCurrentUser, now called from views.js remove authorIsCurrentUser from views.js	2014-08-19 10:37:57 +01:00
op48	844fe9d6b9	Allow users to delete own photos from gallery ... Added delete label to photos in gallery added an event to delete photos of current user Added css for hiding/revealing the delete label Included the photo stylesheet Added cucumber test for deleting your own photos Removed wip	2014-08-19 10:11:06 +01:00
Steffen van Bergerem	9e32eb370a	Remove unused js code for login page	2014-08-19 09:25:48 +02:00
Jonne Haß	8654e1b3ad	remove unused variable in i18n.js [ci skip]	2014-08-18 21:09:57 +02:00
Jonne Haß	b582e1f707	i18n.js: Add interface to retrieve entire sections ... And make use of that in HelpView	2014-08-18 21:06:52 +02:00
damzcodes	c58a56c5fe	line breaks have been added to long headings	2014-08-18 14:06:07 +01:00
Jonne Haß	ec877e3784	Merge pull request #4978 from jhass/bump_acts_as_taggable_on ... Bump acts-as-taggable-on	2014-08-18 12:20:19 +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
jaideng123	c68eeb70fb	Added the button changing effect + the ability to read all of a type to mobile	2014-08-17 15:51:37 -05:00
jaideng123	406397988b	Made wording more clear, refactored read_all	2014-08-17 11:16:30 -05:00
jaideng123	6456a441fe	Modified behavior of mark all as read button	2014-08-17 10:12:23 -05:00
Jason Robinson	a4eafe8a87	Allow sending emails with custom subject via Notifier.admin	2014-08-17 18:02:16 +03: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
Florian Staudacher	4fd9bae056	refactor global event broker and user blocking from stream posts	2014-08-17 14:05:56 +02:00
Steffen van Bergerem	022bc1007d	Remove unused code	2014-08-16 11:47:31 +02:00
damzcodes	de069962b3	Service have been added to /statistics.json ... Services have been added to /statistics.json tidying up edits	2014-08-15 14:02:03 +01:00
Jonne Haß	92a6fc9eb5	Add fallback system to frontend I18n system ... Load the default locale and fall back to it on missing key and interpolation errors	2014-08-15 13:53:28 +02: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ß	691594e0fd	Merge pull request #5119 from svbergerem/people-search-fix-aspect-membership ... Fix aspect membership dropdown on people search page	2014-08-15 03:22:54 +02:00
Steffen van Bergerem	0d064cbefe	Redesign login page	2014-08-15 00:46:20 +02:00
Steffen van Bergerem	ae3dec0167	Fix aspect membership dropdown on people search page	2014-08-15 00:16:11 +02:00
Błażej Pankowiak	7ff0776d59	Move color to it's real home	2014-08-14 21:54:24 +02:00
Błażej Pankowiak	ede042f6cd	Make new aspect popup Bootstrap compatible	2014-08-14 21:09:58 +02:00
Błażej Pankowiak	f085436160	Port aspect edit pane to Bootstrap	2014-08-14 21:09:58 +02:00
Błażej Pankowiak	2424301112	Port Community Spotlight to Bootstrap	2014-08-14 21:09:58 +02:00
Błażej Pankowiak	19bcf103aa	Style selected aspect	2014-08-14 21:09:58 +02:00
Błażej Pankowiak	64537f8763	Center remove buttons vertically	2014-08-14 21:09:58 +02:00
Błażej Pankowiak	d0cbde2394	Style aspect controls	2014-08-14 21:09:58 +02:00
Błażej Pankowiak	0ad658f98c	Port main Contact page to Bootstrap	2014-08-14 21:09:57 +02:00
Pablo Cuadrado	a74a02929d	max-width for profile avatar	2014-08-14 04:53:20 -03:00
Pablo Cuadrado	83b1682750	removed border in tags, checkboxes centered inside the well classes	2014-08-14 04:53:20 -03:00
Pablo Cuadrado	beb795e3b3	elements are centered within the grid	2014-08-14 04:53:20 -03:00
Pablo Cuadrado	a6998c23b7	narrower settings pages	2014-08-14 04:53:20 -03:00
Pablo Cuadrado	39ae80027a	profile birthday proportional selects (using responsive classes)	2014-08-14 04:53:20 -03:00
Pablo Cuadrado	1662814333	Narrower content for settings pages (2/3 of available width).	2014-08-14 04:49:50 -03:00
Pablo Cuadrado	9c5b9b8767	:only keyword added to the layout calls	2014-08-14 04:49:50 -03:00
Pablo Cuadrado	c6511c9299	services edit page ported to bootstrap	2014-08-14 04:49:50 -03:00
Pablo Cuadrado	2611747875	privacy settings page ported to bootstrap	2014-08-14 04:49:49 -03:00
Pablo Cuadrado	9e34887712	profile edit page ported to bootstrap	2014-08-14 04:49:49 -03:00
Pablo Cuadrado	855597541a	user account edit page fully ported to bootstrap	2014-08-14 04:49:49 -03:00
op48	66fcfcfcbc	Ignoring validation for last poll answer input ... last input field is only deleted if there are more than three input fields and the last one is empty poll is validated only if the last input is empty, and the first three have been filled Removed duplicate remove last answer. Dont need to check that the last value is populated as we are ignoring last value Fixing poll step Placeholder text edited Fixed translations for poll answer placeholder text Removed numbers on publisher option Removed numbers in placeholder for poll answers	2014-08-13 13:40:14 +01: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
op48	aa11f7c261	Poll answers are added dynamically on keypress ... Removed add option button poll option can be added dynamically & last option removed if empty upon submission Poll answer can be added dynamically by losing focus poll option can be added dynamically & last option removed if empty upon submission refractored to avoid repetition of publisher:sync event poll option can be added dynamically & last option removed if empty upon submission Added a missing semicolon	2014-08-11 10:42:11 +01:00
Błażej Pankowiak	255b8c02a2	Set top margin only on the body element	2014-08-07 00:15:17 +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
Faldrian	9636f372a4	inserted line breaks and wrote a test for app.views.Content.smallPhotos	2014-08-03 17:17:12 +02:00
Faldrian	7a4dbc8b67	fixed ugly comment	2014-08-03 16:00:11 +02:00
Faldrian	a3811f767c	style fixes for prev / next buttons	2014-08-03 15:53:38 +02:00
Faldrian	172bc80ec1	thumbnails scroll to currently selected image smoothly	2014-08-03 15:32:57 +02:00
Faldrian	f9215ce7dd	images are shown in a single row and can be scrolled using buttons on sides	2014-08-03 14:41:12 +02:00
Faldrian	9d02b0a586	remove first thumbnail; duplicate of big photo	2014-08-03 12:47:44 +02:00
Faldrian	a2a37742e4	added keyboard shortcut help topic	2014-08-01 22:13:55 +02: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
theatre-x	bf479f6715	Change end year ... Changed to 1910. So people like THIS: https://en.wikipedia.org/wiki/Jacque_Fresco#Early_life can actually use Diaspora.	2014-07-20 20:31:14 -04:00
Steffen van Bergerem	f615ad3115	Port people search to Bootstrap	2014-07-20 18:21:13 +02:00
lyzellis	bdc5c1f958	changes border color to dark grey and removes box shadow for textareas and text inputs on focus	2014-07-18 17:27:41 -07:00
Utah Kate Newman	a282a37a8c	revised argument order and changed colors to color variables defined in colors.css.scss	2014-07-08 17:45:52 -07: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
arlogn	2394c3df39	flexible font-size for sign_in podname huge text	2014-07-06 19:18:21 +02:00
Mikael Nordfeldth	65e7840085	Publish salmon endpoint URL in Webfinger XRD ... Specification in Panzer draft for Salmon, paragraph 3.3 mentions: "The 'salmon' link relation may specify a Salmon endpoint used to notify a resource, typically a user account, about external mentions of that resource. For a user account, the salmon mention link SHOULD appear in the Webfinger [Webfinger] XRD document for the user account." Source: http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-salmon-00.html#SMLR	2014-07-06 15:05:51 +02:00
Jonne Haß	265691b47b	Merge pull request #5061 from blase/feature/4466-port-getting-started-page-to-bootstrap ... Remove text shadow from the button	2014-07-06 13:29:33 +02:00
Błażej Pankowiak	a9b0412982	Remove text shadow from the button	2014-07-06 13:03:26 +02:00
Dennis Schubert	4a2836b108	Remove stylesheet tag from mobile sign_up template	2014-07-05 00:39:39 +02:00
Błażej Pankowiak	0d0ed4db28	Port Getting Started page to Bootstrap	2014-07-04 18:06:49 +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
Utah Kate Newman	7f2b3d3bf3	replaces blue comment box border and box shadow with gray border and no box shadow	2014-07-02 16:31:29 -07: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
Maxwell Salzberg	cc53e1762b	A podmin can now disable a spam account from the interface.	2014-07-01 17:51:39 +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ß	f86b19efee	Merge pull request #5047 from pablocubico/feature/user-menu-styles-minor-fix ... [4703] Minor style fix for user menu	2014-07-01 14:17:04 +02:00
Pablo Cuadrado	45d04a44ea	added title_header key for the Help header, only for EN lang so far	2014-07-01 06:19:29 -03:00
Pablo Cuadrado	14fbd7b205	help page ported to bootstrap	2014-07-01 05:56:49 -03:00
kpcyrd	6833ca46bb	Fix broken aspect-edit sidebar update	2014-07-01 00:33:17 +02:00
kpcyrd	20ffa8fa13	Fix another self-xss issue	2014-07-01 00:12:26 +02:00
kpcyrd	fb4898c4fa	Fix self-xss issue in contact-group-rename	2014-06-30 21:32:46 +02:00
Pablo Cuadrado	4232d830ee	left padding added, unnecesary cursor pointer removed	2014-06-29 18:24:54 -03:00
Pablo Cuadrado	7aa1028cbe	minor style fix for user menu	2014-06-29 15:12:30 -03:00
Jason Robinson	c9552c2cd9	Merge pull request #5030 from hpetru/5029-hide-poll-input-after-post-submit ... Fix hiding poll publisher for close action	2014-06-27 11:12:52 +03:00
Jason Robinson	831af6507d	Merge pull request #5006 from taratatach/4940-mention-notification-not-marked-as-read-when-viewing-post ... Set mention notification as read when viewing post	2014-06-27 10:17:01 +03:00
Jason Robinson	c6f2691cc3	Merge pull request #5009 from taratatach/4951-sharing-notification-not-marked-as-read-when-visiting-profile ... Set sharing notification as read	2014-06-27 10:16:17 +03: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	e776beed11	Merge pull request #5020 from Zauberstuhl/reports_email_notification_bug ... [Bug] Reports email notification; wrong recipient	2014-06-24 22:17:25 +03:00
Jason Robinson	80075c13f4	Use different user.construct_public_followings_sql query depending on database backend. ... This is done for performance reasons as a temporary fix for problems with 0.4.0.0 on MySQL. This madness is explained in issue https://github.com/diaspora/diaspora/issues/5014.	2014-06-24 17:07:40 +03:00
Lukas Matt	01a45ccf40	Reports email notification; wrong recipient ... The mailer uses the person_id to find a user which cannot work on a production environment. I haven't used a remote user on my test setup.	2014-06-23 15:54:25 -04:00
Jonne Haß	96fa96b88c	Merge pull request #5007 from jaywink/revert-mobile-bookmarklet-fix ... Revert "Fix toggling services for mobile bookmarklet"	2014-06-22 15:01:34 +02:00
Jason Robinson	126ced4383	Fix broken bookmarklet if params have encoded linefeeds. ... Closes #4994	2014-06-22 11:48:24 +03:00
Erwan Guyader	f92dd85748	Set sharing notification as read ... Fix issue #4951 If the displayed user (on her profile) started sharing with the current user, mark the notification as read	2014-06-20 10:55:17 +02:00
Erwan Guyader	126252d47a	Add test for mention notifications	2014-06-20 01:23:53 +02: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
Erwan Guyader	48a3909fe0	Set mention notification as read when viewing post ... - If a mention for the current user and the displayed post exists, mark it as read - Use set_read_state instead of manually setting unread as false	2014-06-19 00:15:55 +02:00
Jonne Haß	0843db468e	Merge pull request #5001 from Zauberstuhl/fixed_unauthorized_report_prompt ... Hide SPV controls unless authenticated	2014-06-18 21:45:27 +02:00
Lukas Matt	c86b57fe8f	Fixed overridden interactions by re-initializing	2014-06-18 13:03:07 -04:00
Erwan Guyader	e804f30823	Code style + allow aspects to be nil ... - Only use old hash style - Don't replace the aspect ids list with an empty array if it's nil	2014-06-17 21:19:17 +02:00
Lukas Matt	10117b81b3	Hide report icon on SPV if author is current user	2014-06-17 12:23:54 -04:00
Lukas Matt	dec7ef667e	Hide SPV controls unless authenticated ... * cleaned and removed dead code refs diaspora/diaspora#4711	2014-06-17 11:31:16 -04:00
Erwan Guyader	499eb6a9bb	Load right stream with Show More on mobile ... - Load aspects stream if user is on this stream instead of loading the activity stream	2014-06-16 18:13:05 +02:00
Jason Robinson	1bd7989045	Fix toggling services for mobile bookmarklet	2014-06-02 23:29:47 +03:00
Jonne Haß	72d1ed8f7d	bump acts-as-taggable-on	2014-06-01 18:42:51 +02:00
Jason Robinson	ad0982f35e	Remove custom bookmarklet error message. ... Flash error is shown on bookmarklet post error. On error, return post_something message to form	2014-06-01 15:37:54 +03:00
Jason Robinson	f130ab3842	Remove double setButtonsEnabled in publisher error	2014-06-01 15:17:16 +03:00
Jason Robinson	6cf484c9a3	Make sure publisher is totally hidden in bookmarklet after post success	2014-06-01 15:02:40 +03:00
Jason Robinson	8fead54ab6	Make publisher spinner also work in bootstrap publisher	2014-06-01 14:52:59 +03:00
Jason Robinson	128be9204c	Refactor UI hint on status message submit. ... Now we close the publisher on submit and reopen it on error. The spinner is shown while submission is in progress. Fixes #4949	2014-06-01 14:25:34 +03:00
Jason Robinson	6fd4894997	Add error flash message to publisher on error from server	2014-06-01 13:21:45 +03:00
Jason Robinson	b73e478e26	Add spinner to publisher when posting a message ... Fixes #4949	2014-05-31 21:05:36 +03:00
Jonne Haß	a151ab9e30	Merge pull request #4970 from Flaburgan/realign-check-icons ... Realign check icon in aspect dropdown	2014-05-27 08:07:28 +02:00
Jonne Haß	fc1f249129	Harden account deletion ... * Wrap it into a transaction * Use destroy over delete so dependent destroys get triggered and we thus don't fail on the foreign key constraits * Check if a photos status message actually exists before accessing it * Add missing dependent destroys	2014-05-27 00:15:15 +02:00
flaburgan	db18d9810c	Realign check icon in aspect dropdown	2014-05-27 00:03:20 +02:00
Erwan Guyader	24d2ac0ec2	4967 Use https to load the location form OSM	2014-05-26 11:34:01 +02:00
Jonne Haß	e6348aa705	Use toggle() to hide the poll creator	2014-05-24 21:40:48 +02:00
Jonne Haß	f650808828	Merge pull request #4758 from bronislav/feature/4724-remove-own-hovercard-popup-in-reshares ... [WIP] Fix hovercard in reshares	2014-05-24 17:56:33 +02:00
Jonne Haß	9537c45d2a	Merge pull request #4916 from hpetru/validate-poll-answer ... I added the validation to poll question and poll answer Conflicts: app/assets/javascripts/app/views/publisher_view.js	2014-05-24 17:42:18 +02:00
Jonne Haß	0c5cc216c6	Replace vaild with valid ... Thanks to Josias for the hint	2014-05-24 17:24:36 +02:00
Jonne Haß	ecb1b80e24	Render flash message content with .text ... .html does not escape any html input in these, leading to XSS attack vectors. Thanks to A Kai (@sixhundredns) for reporting the related issues.	2014-05-24 16:08:32 +02:00
Marien Fressinaud	fa2de8c195	Remove duplicate checkbox in Settings ... Fix issue #4964	2014-05-22 22:39:09 +02:00
Lukas Matt	8170ef8363	Validate on report that post or comment does exist	2014-05-16 09:48:14 -04:00
Lukas Matt	6d6ebd297e	Do not try to render posts/comments which are not present ... refs diaspora/diaspora#4959	2014-05-16 09:48:14 -04:00
Jason Robinson	01381ddf25	Merge pull request #4957 from MrZYX/4956_deleted_reshare ... Use absolute_root more consistently in Reshare	2014-05-16 10:00:31 +03:00
Lukas Matt	3d9fceb479	DB fix to work with existing entries ... * added temp. default values for user_id and item_type * changed model validation for item_type	2014-05-15 07:23:44 -04:00
Lukas Matt	462a7116de	Fixed possible XSS; escape comment text in report helper	2014-05-15 07:23:44 -04:00
Lukas Matt	7ef802127e	Added confirm-dialog to report-delete-button ... * changed button description * replaced links with buttons	2014-05-15 07:23:44 -04:00
Lukas Matt	693986bba0	Fixed report icon in single post view	2014-05-15 07:23:44 -04:00
Lukas Matt	6ff2141503	If you're able to remove the comment you shouldn't be able to report it	2014-05-15 07:23:44 -04:00
Lukas Matt	23d0890bdc	Fixed and cleaned comment template/stylesheet ... fixed: * comment-report-icon will not be displayed when post author is current user * if you hover a comment all report icons will be displayed	2014-05-15 07:23:44 -04:00
Lukas Matt	218845d5b4	Changed and renamed database columns ... * changed user_id type to integer * renamed post_id to item_id * renamed post_type to item_type	2014-05-15 07:23:44 -04:00
Lukas Matt	9d3af93c7d	Removed unicode from entypo css file	2014-05-15 07:23:43 -04:00
Lukas Matt	6f65ef8437	Using save for report model ... Instead of checking the status code I am using success and error callbacks from model-save. In that case we have to return json in the controller for signaling that the request was sucessfully.	2014-05-15 07:23:43 -04:00
Lukas Matt	8b8a232b17	Added diaspora copyright	2014-05-15 07:23:43 -04:00
Lukas Matt	011db282b7	Removed local variable in ReportMailer	2014-05-15 07:23:43 -04:00
Lukas Matt	045ced0518	Joined if statements and removed duplicated code	2014-05-15 07:23:43 -04:00
Lukas Matt	512d96bda6	Display validation errors to user	2014-05-15 07:23:43 -04:00
Lukas Matt	6309e1a4ee	Cleaned and optimized report model	2014-05-15 07:23:43 -04:00
Lukas Matt	0fae1137fa	Using unless instead of 'if !'	2014-05-15 07:23:43 -04:00
Lukas Matt	1a0c9f5983	Make report-type translatable	2014-05-15 07:23:43 -04:00
Lukas Matt	6f21ccda06	Using case instead of equal	2014-05-15 07:23:43 -04:00
Lukas Matt	26d0c81dae	Added the ability to disable report-email-notification ... Podmin can see a extra checkbox in Settings > Account for disabling report-email-notification	2014-05-15 07:23:43 -04:00
Lukas Matt	719edcd1a7	Added missing action in report controller	2014-05-15 07:23:43 -04:00
Lukas Matt	2e36f8d375	Diaspora review part 1 ... * join the conditions of the inner ifs * add a uniqueness constraint to the model * differentiate between author is a local or a remote user * simplify controller/mailer functions	2014-05-15 07:23:43 -04:00
Lukas Matt	ed96ddac98	Display status when the user send a report	2014-05-15 07:23:43 -04:00
Lukas Matt	d23f4a66da	Cleaned javascript report view	2014-05-15 07:23:43 -04:00
Lukas Matt	1748d3b940	It is now possible to report comments ... * Renamed PostReport to Report * Added report button to SPV * Updated rspec refs diaspora/diaspora#4732 refs diaspora/diaspora#4710 refs diaspora/diaspora#4711 refs diaspora/diaspora#4517	2014-05-15 07:23:43 -04:00
Jonne Haß	8a599e1c1d	Use absolute_root more consistently in Reshare ... Closes #4956	2014-05-14 22:41:24 +02:00
Hincu Petru	7b42084cdb	Refactoring method Notification#notify	2014-05-06 11:58:51 +00:00
Jason Robinson	62b5fea526	Merge pull request #4932 from Raven24/fix-bookmarklet ... port bookmarklet to Backbone.js, use gon for params	2014-05-01 13:29:36 +03:00
Florian Staudacher	9da3bc347b	disable publisher after successfully posting in standalone mode	2014-04-25 19:51:45 +02:00
Florian Staudacher	0d51bba959	port bookmarklet to Backbone.js, use gon for params (fixes #4931)	2014-04-19 17:41:21 +02:00
flaburgan	b1f59a9b53	Switch back from Roboto to Helvetica on bootstrap pages	2014-04-18 18:34:25 +02:00
Steffen van Bergerem	232e4fa236	Improve set read/unread in notifications dropdown	2014-04-16 23:33:22 +02:00
Steffen van Bergerem	e1685c9a29	Remove auto 'mark as read' for notifications	2014-04-15 14:51:38 +02:00
Jason Robinson	07ae7d7862	Merge pull request #4426 from Flaburgan/fix-padding-spv ... [Ready to merge] fix padding between panels	2014-04-13 15:08:29 +03:00
Jason Robinson	356096a7eb	Merge pull request #4836 from MrZYX/message_renderer ... Introduce message renderer	2014-04-13 15:00:46 +03:00
flaburgan	a4886fa77b	SPV: Improve padding and interaction counts	2014-04-13 11:27:12 +02:00
Jason Robinson	7d9248b7ac	Merge pull request #4854 from Flaburgan/fix-mobile-drawer ... Fix mobile drawer	2014-04-12 21:46:54 +03: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
flaburgan	86e71cd1b6	fix registration test	2014-04-11 20:25:58 +02:00
flaburgan	438ebc839f	Fix scroll in the drawer nav	2014-04-11 19:02:26 +02:00
flaburgan	a9b9420214	Fix header search bar in safari	2014-04-11 19:02:25 +02:00
flaburgan	e4244f01f5	Remove span12, main content now expand smoothly and the drawer become correctly displayed even in big resolution	2014-04-11 19:02:25 +02:00
flaburgan	c25ae02ff2	Remove mobile footer	2014-04-11 19:02:25 +02:00
flaburgan	53b1f9effd	Fix search field in the header of the mobile version	2014-04-11 19:02:25 +02:00
Hincu Petru	2311b761e1	Redirect to stream_path if is destkop	2014-04-08 09:34:14 +00: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
Hincu Petru	57de031f6b	I added the validation for blank to poll question and poll answer	2014-04-07 17:17:41 +00:00
Jonne Haß	682a49605e	Merge pull request #4910 from hpetru/rewrite-poll-creator ... Rewrite poll creation inputs	2014-04-06 22:27:01 +02:00
Jannik Streek	095d616198	fixed federation issue due to missing delegation + test + some minor tweaks ... fixed indenting renamed test	2014-04-06 20:58:58 +02:00
Hincu Petru	2d3933ccd8	Rewrite poll creation inputs	2014-04-06 15:01:18 +00:00
Jonne Haß	79bc1a7800	Merge pull request #4906 from hpetru/4903-poll-crash-spv ... Fixed 4903 and not render vote form when user is not logged	2014-04-05 19:17:31 +02:00
goobertron	5556420740	Fix missing translation in #4905.	2014-04-05 17:06:40 +01:00
Hincu Petru	2ae4d41db3	Fixed 4903 and not render vote form when user is not logged	2014-04-05 14:29:07 +00:00
Hincu Petru	f356ae7216	Add poll in post preview	2014-04-04 11:45:33 +00:00
Hincu Petru	6c00db23cd	I update design for poll in post stream	2014-04-03 20:57:14 +00:00
Hincu Petru	cee90e737c	Make poll to be compatible with bootstrap	2014-04-03 09:03:54 +00:00
Hincu Petru	fed5ea8cda	Refactored poll_view.js	2014-04-02 16:19:07 +00: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
Hincu Petru	552310796c	Catch error from decodeURI for prevent crash in posts parsing	2014-03-31 20:24:47 +00:00
Jannik Streek	4130592ca5	fixed bookmarklet	2014-03-31 18:30:01 +02:00
Jannik Streek	6f3844b73b	fixed language files, added rails cache counter for poll answer, fixed bug with same poll input for form	2014-03-31 18:14:08 +02:00
Jannik Streek	4174b88987	percentage result round + minor language fix	2014-03-31 18:14:08 +02:00
Jannik Streek	2d0abbae23	added jasmine test for poll view	2014-03-31 18:14:07 +02:00
Jannik Streek	a9843ae996	added cucumber tests, updated spec with xml class test	2014-03-31 18:14:07 +02:00
Jannik Streek	8f9736a741	fixed poll js bug	2014-03-31 18:14:07 +02:00
Jannik Streek	7dcf11e629	fixed federation bug due to roxml missing underscore	2014-03-31 18:14:07 +02:00
Jannik Streek	9c24365fde	changed poll result + some minor text improvements	2014-03-31 18:14:07 +02:00
Jannik Streek	c484b2cd0c	fixed poll icon issue, improved code, poll in bookmarklets now available	2014-03-31 18:14:07 +02:00
Jannik Streek	12fabe2fb9	finalized voting design + some design fixes + improved code	2014-03-31 18:14:07 +02:00
Jannik Streek	e4c68a4edb	improved status messages controller code	2014-03-31 18:14:07 +02:00
Jannik Streek	d0a77ce6b3	design for poll participation implemented, saving works as well	2014-03-31 18:14:07 +02:00
Jannik Streek	04199837b3	poll creation done	2014-03-31 18:14:07 +02:00
Jannik Streek	18a43295b7	poll form completed	2014-03-31 18:14:06 +02:00
Jannik Streek	95d98ff2b6	improved code for poll participation	2014-03-31 18:14:06 +02:00
Jannik Streek	c02414c36d	fixed wrong indenting and broken messages tab for polls	2014-03-31 18:14:06 +02:00
Jannik Streek	8a4f833d1d	added more tests for the poll federation + fixed broken rspec tests	2014-03-31 18:14:06 +02:00
Jannik Streek	5d560609e4	poll_participation_spec no longer fails, added poll_participation factory	2014-03-31 18:14:06 +02:00
Jannik Streek	fe67bdf2e7	added tests for poll federation and impl for the federation itself. Still in progess	2014-03-31 18:14:06 +02:00
Jannik Streek	dfbe17d046	Poll input fields and data model now available ... question field of poll now in db fixed merge issues	2014-03-31 18:14:06 +02:00
Jonne Haß	b207077405	Merge pull request #4859 from hpetru/4848-aspect-memberships-in-notification-dropdown ... Fixed jQuery evenets in notifications-badge	2014-03-31 13:58:11 +02:00
Hincu Petru	b43e56485d	Fixed jquery event listener from notifications-badge.js	2014-03-31 09:52:07 +00:00
Jonne Haß	24a3a42e90	Merge pull request #4880 from svbergerem/hovercard-bootstrap-style-fixes ... Improve hovercard style on Bootstrap pages	2014-03-30 22:34:31 +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
Hincu Petru	699f327762	Long tags are no longer cut off in the post streams ... Fixed in streams	2014-03-30 13:37:31 +02:00
goobertron	57d796be1d	Fix indentation	2014-03-28 15:21:22 +00:00
Steffen van Bergerem	1fc38278bb	Improve hovercard style on Bootstrap pages	2014-03-28 14:00:16 +01:00
goobertron	1dfde65556	Alter link behaviour of OG previews	2014-03-26 19:24:06 +00: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	d9857a3a10	Add separator between days, don't display grey zero	2014-03-20 00:23:38 +01:00
Steffen van Bergerem	4fc9c6416e	Port notifications to Bootstrap	2014-03-19 18:45:52 +01:00
Steffen van Bergerem	eabdc7390c	Port aspect membership dropdown and hovercards	2014-03-19 17:54:22 +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
Hincu Petru	694dc7d80b	Check if the hashtag is a link in function .hashtagify	2014-03-16 11:59:49 +00: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
Jonne Haß	8280556a47	Introduce message renderer ... This new class replaces all existing server side message rendering helpers and is the new global entry point for such needs. All models with relevant fields now expose an instance of MessageRenderer for those. MessageRenderer acts as gateway between the existing processing solutions for markdown, mentions and tags and provides a very flexible interface for all output needs. This makes the API to obtain a message in a certain format clear. As a result of centralizing the processing a lot of duplication is eliminated. Centralizing the message processing also makes it clear where to change its behaviour, add new representations and what options are already available.	2014-03-15 17:16:17 +01:00
Hincu Petru	638744b914	Fixed #4693	2014-03-15 15:25:18 +00:00
Hincu Petru	7c4d783d51	Check if the hashtag is a link in function .hashtagify	2014-03-14 15:49:41 +00:00
flaburgan	027650e856	Add handle indication on search page, improve design	2014-03-13 23:01:42 +01:00
Hincu Petru	e0b23b2dc4	Fixed #4726 infinite photo stream	2014-03-12 22:22:24 +00:00
flaburgan	1250973267	Fix publisher broken after jquery upgrade	2014-03-12 18:41:38 +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	5d44a70e62	Fix different button sizes in new publisher	2014-03-11 17:32:07 +01:00
Steffen van Bergerem	0241d9c7db	use fixture	2014-03-10 17:21:54 +01:00
Steffen van Bergerem	6fc6474e98	Refactor publisher	2014-03-10 15:15:40 +01:00
Steffen van Bergerem	1b85d9d032	Use a button instead of input to submit, use smaller photos	2014-03-10 15:15:40 +01:00
Steffen van Bergerem	0cc3b10b1f	port publisher and bookmarklet to bootstrap	2014-03-10 15:15:40 +01:00
Faldrian	da0b305514	atom-feed content changed to html, use better post-title extractor ... Valid atom feed. Also these features are partially included: - http://activitystrea.ms/specs/atom/1.0/#activity.verb - http://portablecontacts.net/draft-spec.html#anchor16	2014-03-09 00:13:32 +01:00
Anton Ilin	88f502236a	Fix arguments for hevercardable helper ... We should pass person object to the hovecrardable helper. In the current case `this` is the status message, not the status author. So, let's pass `author` instead of `this`.	2014-03-07 11:20:45 +02:00
flaburgan	2c4dc830fc	Fix aspect renaming after a regression caused by jquery upgrade, close #4822	2014-03-06 00:04:48 +01:00
flaburgan	4cc8f1f76c	Fix avatar position in mobile notification	2014-03-03 23:21:31 +01:00
flaburgan	67d71e2280	Fix drawer in some mobile browsers. ... Remove the black background on menu badges. Fix body content on screen width > 768px. Start split of mobile css in different files in /mobile/	2014-02-24 23:30:57 +01:00
Florian Staudacher	a2aff720a2	clear locale on each spec run, fix indentation	2014-02-23 17:13:01 +01:00
Florian Staudacher	dc1c156175	try to appease CI	2014-02-23 16:48:48 +01:00
Florian Staudacher	b0502ef07e	don't depend on the order of events (focus has two variants in jQuery)	2014-02-23 16:48:48 +01:00
Florian Staudacher	e3b22ed95c	fix likes spec	2014-02-23 16:48:47 +01:00
Florian Staudacher	b27edcb2d1	fix search specs	2014-02-23 16:48:47 +01:00
Fabian Rodriguez	f0ae80b82f	add browser detection	2014-02-23 16:48:47 +01:00
Fabian Rodriguez	97ede99c0f	#toggle was removed	2014-02-23 16:48:47 +01:00
Fabian Rodriguez	4042e50289	Removes client_side_validations ... Conflicts: Gemfile Gemfile.lock	2014-02-23 16:48:47 +01:00
Fabian Rodriguez	1c09b75cc2	remove comment, for the record, it was an arbitrary number picked due to performance reasons	2014-02-23 16:48:47 +01:00
Fabian Rodriguez	9fc70a03a9	remove unused variable	2014-02-23 16:48:47 +01:00
Fabian Rodriguez	8d8d3c649a	remove aspect sorting logic	2014-02-23 16:48:47 +01:00
Fabian Rodriguez	d3921f1f2b	#live is no longer supported, use on instead	2014-02-23 16:48:46 +01:00
Fabian Rodriguez	cc9c6c780a	remove require if jquery-ui-1.8.9.custom.min	2014-02-23 16:48:46 +01:00
Jonne Haß	c3161943f9	Merge pull request #4787 from arlogn/new-wordpress-logo-icon ... New wordpress logo icon Conflicts: app/assets/stylesheets/application.css.sass	2014-02-23 15:55:19 +01:00
vcuculo	96fc16f9b5	Fixed heart icon height in right sidebar	2014-02-23 15:02:44 +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	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
arlogn	d1aaf0acba	new wordpress icons	2014-02-20 20:36:08 +01:00
flaburgan	a7c7e4b1e3	Refactor right side bar, see you, BRs.	2014-02-20 13:01:07 +01:00
arlogn	659ee3ca82	align rightbar icon heart	2014-02-18 20:39:13 +01:00
Steffen van Bergerem	a51c4f0ddc	fix hovercards	2014-02-15 14:09:03 +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
Steffen van Bergerem	29d524d836	fix image branding logo_caps	2014-02-09 20:31:01 +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ß	90784b3b38	Merge pull request #4768 from MrZYX/manwithtwowatches-feature/4455-make-help-view-backbone-view ... Make help pages a backbone view	2014-02-09 20:05:09 +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
flaburgan	119ed2d8f5	Fix nav in header empty with webkit browser	2014-02-09 17:42:29 +01:00
flaburgan	c7c1e874b9	Fix broken header on the settings page on webkit browsers	2014-02-09 17:42:29 +01:00
flaburgan	725fbbf85e	Toggle with jquery + link on the whole line of the menu	2014-02-09 17:42:29 +01:00
flaburgan	70f305958b	Polish the code	2014-02-09 17:42:29 +01:00
flaburgan	4d9d35cbfa	Add current user avatar in the drawer	2014-02-09 17:42:28 +01:00
flaburgan	8c6342170b	Add link on aspects and allow to show / hide them in the drawer	2014-02-09 17:42:28 +01:00
flaburgan	b8bb7ae857	Fix tests	2014-02-09 17:42:28 +01:00
flaburgan	e204a9a121	Add aspects list and mentions link	2014-02-09 17:42:28 +01:00
flaburgan	0a31d61ccc	Make the drawer scrollable	2014-02-09 17:42:28 +01:00
flaburgan	94888f70be	Compose_mobile icon	2014-02-09 17:42:28 +01:00
flaburgan	1a52631bd2	Remove margin of the nav elem	2014-02-09 17:42:28 +01:00
flaburgan	3c5d68dbb4	Fix mobile publisher	2014-02-09 17:42:28 +01:00
flaburgan	c53afe586b	Add new icons to the mobile version	2014-02-09 17:42:28 +01:00
Erwan Guyader	754bd8178d	add drawer to mobile ... - Functional drawer with menu icon	2014-02-09 17:42:28 +01:00
Erwan Guyader	1e159a027e	Add drawer menu to mobile version ... - Added basic drawer menu with JS code working on /stream	2014-02-09 17:42:28 +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ß	c20bc77535	Adjust help views to updated backbone, thanks @raven24	2014-02-09 16:45:21 +01: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ß	f64f55b567	Move help page initialization into backbone router	2014-02-09 16:00:16 +01:00
Jonne Haß	e402a4093d	Actually load a different section when requested in get_javascript_strings_for, add spec for changes in JS i18n helper	2014-02-09 16:00:16 +01:00
Richard	a132b6c1b5	refactored a bit in help section views. using backbone jquery selector shorthand and jquery each.	2014-02-09 16:00:16 +01:00
Richard	1561690303	moved call to help backbone view init to separate file included only on faq view. ... extending loaded js locales. cleaned up unused routes. removed some comments. loading help locales only on help view. removed afterRender from backbone views. extended load_javascript_locales method to take a section.	2014-02-09 16:00:15 +01:00
Richard	55efa82756	made a help view spec and cleaned up the views a bit.	2014-02-09 16:00:15 +01:00
Richard	da6b037f24	highlighting menu items when clicked. collapsing questions and answers on the static content help sections. ... removed unused help haml templates. put locales back to how they were and wrote a small js parser to swap in links to help views which have generated links in them. using locales text for help section headers.	2014-02-09 16:00:15 +01:00
Richard	afec5977e9	Started converting the help section into a backbone view. Things missing are: some urls which were calculated and inserted into the yml, all the pre-existing erb templates are still there, it's still at /faq/faq, nothing has been tested, some of the questions don't collapse and expand. ... changed the locales to have the hard coded urls in them because they can no longer be calculated server side. this is pretty crap because i'm going to have to change it for all the languages now so i might change my mind about this later. deleted some unused views.	2014-02-09 16:00:15 +01:00
Jonne Haß	41a4326993	Merge pull request #4770 from svbergerem/fix-spv-4754 ... Fix bugs introduced by #4754	2014-02-09 15:57:27 +01:00
Steffen van Bergerem	6c7dde1733	Fix bugs introduced by #4754	2014-02-09 15:54:22 +01:00
goobertron	7bcea07b99	Standardise - code refs to 'messages' to 'conversations'	2014-02-09 15:44:12 +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
Ruxton	c8a0c81b6a	Updating queries for the stream to be faster	2014-02-07 14:23:19 +08:00
Steffen van Bergerem	97f1c286f4	improve reshared posts	2014-01-31 22:48:40 +01:00
Steffen van Bergerem	318d190404	SPV small improvements	2014-01-30 22:12:51 +01:00
Steffen van Bergerem	655fbfcd79	Fix timeago on mobile devices. Fix missing space	2014-01-30 10:15:14 +01:00
Steffen van Bergerem	fe01734a3d	fix timeago	2014-01-29 03:24:10 +01:00
Raphael Sofaer	300a7c1c31	Merge pull request #4737 from rsofaer/no_retries_for_bad_cert ... Do not retry sending out posts on SSL errors. See #4728	2014-01-27 20:11:57 -08:00
Raphael Sofaer	de593f6e9f	Do not retry sending out posts on SSL errors. See #4728 ... Refactor HydraWrapper so the when-to-retry logic is in the worker	2014-01-27 15:45:45 -08:00
Dennis Schubert	1f76a9a354	Merge pull request #4739 from MrZYX/stabilize_cukes ... Stabilize cukes	2014-01-26 14:39:43 -08:00
Florian Staudacher	09a840ea41	fix regression caused by updating backbone.js without updating changed parameters	2014-01-26 19:51:12 +01:00
Steffen van Bergerem	763fb95947	Fix css for keyboard navigation	2014-01-26 04:31:11 +01:00
Jonne Haß	8b8071925d	Make toggle aspect call synchronous and bump capybaras wait timeout ... in features/desktop/aspect_navigation.feature:18 we quickly leave the page before waiting for the request to finish. By making the HTTP call synchronous we wait for it to finish before we reflect the change in the DOM, thus giving Capybara a chance to wait for it. Also let Capybara wait longer. This should random failures of the aforementioned cuke rarer.	2014-01-26 00:13:06 +01:00
Jonne Haß	f9c230dd31	Merge pull request #4738 from svbergerem/remove-unused-spv-files ... Remove unused beta code	2014-01-24 04:19:22 -08:00
Steffen van Bergerem	0f156cd9a4	Remove unused beta code	2014-01-24 09:01:30 +01:00
Steffen van Bergerem	7519fcc255	Remove unused cubbies code	2014-01-24 08:58:47 +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
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
Ruxton	a3113cce7c	Switched to using rails-timeago to make keeping on top of new versions of plugin easier	2014-01-20 09:33:35 +08:00
goobertron	19c9c0f394	new version of white2x	2014-01-19 14:53:52 +00:00
goobertron	2fb5098be2	Submitted new images with blurred edges	2014-01-19 14:42:34 +00:00
goobertron	97b5c723af	Updated image branding and files with refs to them	2014-01-18 13:03:59 +00: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
Dennis Schubert	6fc5ccb9f9	Merge pull request #4511 from MrZYX/bump_devise ... update devise to 3.2	2014-01-15 13:17:48 -08:00
Jonne Haß	d97fd8089b	Merge pull request #4688 from ivanzotov/develop ... Fix after_create to after_commit	2014-01-15 11:47:23 -08:00
Jonne Haß	15b1dae362	update devise to 3.2	2014-01-15 12:59:59 +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
Ivan Zotov	a4ce6e267a	Fix after_create to after_commit	2014-01-14 22:35:29 +04:00
Steffen van Bergerem	580068ed7c	Remove background from badges in header	2014-01-14 15:00:36 +01:00
goobertron	706b11b14d	Now with passing Cucumber tests	2014-01-13 18:14:43 +00:00
goobertron	a1ac848d62	Change NSFW explanation on profile settings page (and stop altering of text depending on NSFW setting)	2014-01-12 20:02:33 +00: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
Jonne Haß	7608319787	Merge pull request #4665 from svbergerem/fix-500-conversations ... fix bug in conversations view causing server error	2014-01-08 23:55:09 -08:00
arlogn	31177e6bdb	bookmarklet publisher more usable mobile	2014-01-09 02:33:47 +01:00
Jonne Haß	ca9e2e24ea	Merge pull request #4670 from arlogn/bookmarklet-publisher-more-usable ... bookmarklet publisher more usable	2014-01-07 11:29:50 -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
maruf	c17a474142	Simple captcha for signup page	2014-01-06 22:00:37 +02:00
Jonne Haß	7c9460d5b0	Merge pull request #4667 from Flaburgan/fix-markdown-display ... Fix markdown indication in the publisher when the user upload an image	2014-01-06 02:22:21 -08:00
arlogn	61bfbc82e0	bookmarklet publisher more usable	2014-01-06 01:07:05 +01:00
Damien Monet	b849d6c641	Fix: remove location when publisher is cleared by user	2014-01-05 11:09:03 +01:00
flaburgan	f758163f2e	Fix markdown indication in the publisher when the user upload an image	2014-01-04 15:58:20 +01:00