2206 commits

Author	SHA1	Message	Date
Steffen van Bergerem	839d76c15e	Moar entypo on mobile website	2015-07-21 21:16:46 +02:00
Steffen van Bergerem	484e70a68f	Add dashboard to admin page	2015-07-21 14:36:41 +02:00
Dennis Schubert	b4bc7d8198	Merge branch 'stable' into develop	2015-07-20 03:56:59 +02:00
Steffen van Bergerem	cf4143f4a1	Remove jquery-idletimer	2015-07-20 03:51:03 +02:00
Steffen van Bergerem	295c8533a1	Fix profile visibility icon	2015-07-17 14:37:22 +02:00
Augier	adef7ee37c	Better display for stream faces	2015-07-15 20:31:40 +02:00
Jonne Haß	397845161f	Merge pull request #6162 from cmrd-senya/5684-public-additional-profile ... Allow additional profile fields (previously private profile) to be set public (new updated version)	2015-07-11 10:19:19 +02:00
cmrd Senya	7a5a0a909a	Allow extended profile fields (previously private profile) to be set public (#5684). ... This adds a new boolean field "public_details" to person model. By default it is false and represents old behaviour. When it is set to true, extended profile (bio,location,gender,birthday) get available to people who didn't log into diaspora and to people you don't share with (i.e. it is made public). In UI, a bootstrap-switch added on the profile-edit page in order to change the setting. This also changes wording from public/private profile to basic/extended. The latter could be public and limited.	2015-07-11 04:36:45 +03:00
Dennis Schubert	aa86003cf9	Keep the hacky scope workaround in comments.js ... because we still are supporting browsers without .bind() and I do not want to break the patterns here. Follow up to #6171 - I wanted to avoid feedback loop delays for that little change.	2015-07-09 03:24:15 +02:00
Spanti Nicola (RyDroid)	df440ed8d8	Very minor changes of some JS files	2015-07-08 19:09:08 +02:00
Dennis Schubert	c703cadf9b	Merge branch 'stable' into develop	2015-07-07 02:51:38 +02:00
Dennis Schubert	b5b5f1f028	Revert "Issue #6145: Set a fixed body-height" for global side effects ... This reverts commit 990c678cd3.	2015-07-07 02:50:30 +02:00
Dennis Schubert	eecceacd46	Merge branch 'stable' into develop	2015-07-07 02:46:39 +02:00
Haidy777	990c678cd3	Issue #6145: Set a fixed body-height ... closes #6169	2015-07-07 02:46:34 +02:00
Jonne Haß	69974bdc13	Merge pull request #6161 from svbergerem/fix-conversation-modal ... Fix two modal issues	2015-07-03 20:26:31 +02:00
Steffen van Bergerem	61edda0fca	Aspect creation modal now creates an aspect when pressing enter	2015-07-03 18:20:32 +02:00
Steffen van Bergerem	db00bd1b03	Fix conversation modal on contacts page	2015-07-03 17:44:12 +02:00
Steffen van Bergerem	aeda8e37e3	Remove aspects-dropdown.js	2015-07-03 16:56:25 +02:00
Steffen van Bergerem	9c4f80346b	Use entypo-rails mappings	2015-07-03 15:31:29 +02:00
Dennis Schubert	8b773c89e1	Merge pull request #6066 from theworldbright/5483-fix-mobile-stream-comments ... Fix for #5483 and #5757 (mobile stream comments)	2015-06-27 04:43:50 +02:00
Jonne Haß	a2d894cb39	Improve stability for manages_aspects.feature:79 ... page.execute_scripts looks to be asynchronous, .synced is already set by default, so the previous expectation would be fulfilled before the script got to run, running into the page reload in the next step which then aborts or hasen't seen the to be triggered request yet. The fix is to use Capybaras drag_to instead	2015-06-24 04:01:15 +02:00
Jonne Haß	0b6dc320cb	Merge pull request #6132 from svbergerem/fix-perfect-scrollbar ... Fix overflow with perfect scrollbar	2015-06-22 01:29:40 +02:00
Steffen van Bergerem	df12878371	Fix overflow with perfect scrollbar	2015-06-22 00:44:42 +02:00
Steffen van Bergerem	d6ddbbe4af	Navbar background color for autocomplete results	2015-06-21 21:13:57 +02:00
Jonne Haß	79c5202a5b	Merge pull request #6109 from svbergerem/bootstrap-header-rewrite ... Bootstrap header rewrite	2015-06-21 19:46:07 +02:00
SansPseudoFix	57ac37cd2d	Fix broken avatar getting start page ... Update add contact page BS3 Fix syntax	2015-06-21 16:38:12 +02:00
Steffen van Bergerem	8d5794a2a4	Fix autoresize default height for comment box	2015-06-21 04:40:56 +02:00
Steffen van Bergerem	b3c535bab4	Add color theme support for new header	2015-06-20 00:38:40 +02:00
Steffen van Bergerem	049c8eb384	Bootstrap header rewrite	2015-06-20 00:38:40 +02:00
fla	264f41a09d	Add Services and Privacy settings page to mobile	2015-06-18 17:26:31 +02:00
theworldbright	3ac66128ad	Restyle button and adjust position of back up arrow ... Squashed commits: [47c4a02] Remove styling for return to top of post button	2015-06-17 22:23:25 +09:00
theworldbright	5fa4519e93	Fix #5757 (+2 squashed commits) ... Squashed commits: [e10acde] Open reactions after commenting [aceea75] Fix hound remarks and reactions tests The ".comment_action" should be active when the user clicks on "a.show comments" [d1deae5] Fix hound remarks [f5db5dd] Keep current instead of scrolling to first comment [be63092] Remove unused evt parameter	2015-06-17 22:23:25 +09:00
theworldbright	7dc70c7311	Fix #5483 ... Please see https://github.com/diaspora/diaspora/issues/5483#issuecomment-109277476 (+5 squashed commits) Squashed commits: [62f38a6] Wrap all handlers with document.ready() Also add the copyright at the top of the file. [e861587] Split up show_comments handling Currently there are two classes that have the class show_comments. I renamed one to "back_to_stream_element_top" as it is responsible for scrolling the user all the way up to the top when clicked. The other which toggles the reactions will remain as "show_comments". [a8dbc4e] Remove unused "cancel new comment" action [db575cc] Move comment related js to mobile_comments.js [de44f81] Move add comment container to new comment partial	2015-06-17 22:23:25 +09:00
Jonne Haß	93281d283f	Merge branch 'stable' into develop	2015-06-17 12:40:27 +02:00
Pablo Cuadrado	c050c606c2	this was causing an empty element to be created ... closes #6111	2015-06-17 12:40:22 +02:00
Steffen van Bergerem	ae0209b49b	Merge branch 'stable' into develop	2015-06-16 23:43:32 +02:00
Jonne Haß	3a527d01da	Remove top margin for first heading in a post ... That is, if it's the first element in the post closes #6110	2015-06-16 23:43:14 +02:00
Steffen van Bergerem	b3a5e92eca	Remove all faceboxes	2015-06-15 14:09:24 +02:00
Steffen van Bergerem	ab60644aa0	Merge pull request #6087 from Flaburgan/improve-mobile-conversation-design ... Improve mobile conversation design	2015-06-15 13:26:49 +02:00
fla	44a12e74b1	Improve mobile conversation design	2015-06-15 12:32:03 +02:00
Jonne Haß	50dbe0db80	Merge pull request #6102 from svbergerem/close-account-regression ... Fix Bootstrap 3 regression: close account	2015-06-14 22:21:11 +02:00
Steffen van Bergerem	92a3dd53f0	Replace jquery.autoresize with autosize	2015-06-14 20:03:15 +02:00
Steffen van Bergerem	4534ba5de8	Fix Bootstrap3 regression: close account	2015-06-14 13:22:39 +02:00
Steffen van Bergerem	18a8211cc3	Add img-responsive to image class	2015-06-12 00:01:56 +02:00
Jonne Haß	72bb85eeba	Merge branch 'stable' into develop	2015-06-08 16:59:31 +02:00
Steffen van Bergerem	5516926b74	Update perfect-scrollbar ... closes #6085	2015-06-08 16:59:27 +02:00
Steffen van Bergerem	6c32fa7845	Fix Bootstrap 3 regression: add email visibility icon to settings page	2015-06-07 22:31:58 +02:00
efstrian	69c3a4100d	Issue #4297: Color themes can override bootstrap variables	2015-06-07 19:58:54 +03:00
dimana	31d760867c	Issue #4297: Updated color themes and testing	2015-06-07 19:57:37 +03:00
efstrian	57d766346c	Issue #4297: Enable color theme setup	2015-06-07 19:57:16 +03:00
Steffen van Bergerem	06a1a1c978	Fix Bootstrap3 regression: reshares in SPV	2015-06-07 12:01:13 +02:00
Jonne Haß	4ae032e61d	Merge pull request #6071 from svbergerem/upload-images-style ... Fix progress bar in publisher when uploading images	2015-06-07 11:26:39 +02:00
Augier	0d0d5d6aa1	Fixing infinite scroll and notif dropodown loaders	2015-06-07 10:28:22 +02:00
Steffen van Bergerem	a7446dd5cd	Fix progress bar in publisher when uploading images	2015-06-07 03:43:57 +02:00
Steffen van Bergerem	7b7700b317	Bootstrap3 regression fixes: avatars for likes, aspect dropdown on notification page, tag input	2015-06-05 12:09:42 +02:00
Steffen van Bergerem	fd3da0f0b3	Profile padding fixes	2015-06-05 02:37:43 +02:00
Steffen van Bergerem	0a0c3f48f2	Merge pull request #6057 from AugierLe42e/drawer-fix ... Fixed variable drawer width	2015-06-05 00:21:36 +02:00
Steffen van Bergerem	39fe6bfff2	Set max-width to 100% for images in post-content	2015-06-05 00:12:05 +02:00
Steffen van Bergerem	2da262a262	Bootstrap3: fix likes avatars and conversation participants	2015-06-04 22:49:42 +02:00
Augier	7d1bba4e44	Fixed variable drawer width	2015-06-04 22:35:19 +02:00
SansPseudoFix	f3938a173e	Fix pagination issue for mobile view	2015-06-04 18:08:00 +02:00
Steffen van Bergerem	3fdb8a2052	Fix mobile drawer	2015-06-04 18:05:45 +02:00
Steffen van Bergerem	93dd3a3a72	Use nav-tabs for ToS	2015-06-04 18:05:45 +02:00
Steffen van Bergerem	797ae8a918	Remove bootstrap-fix.scss	2015-06-04 18:05:45 +02:00
Steffen van Bergerem	20c63b20ba	Remove inline css, use font-size-small	2015-06-04 18:05:45 +02:00
SansPseudoFix	9f6d6a2e80	Fix for too long username in notification dropdown	2015-06-04 18:05:45 +02:00
Steffen van Bergerem	cc58c66e3d	Use media objects for mobile posts/comments/notifications	2015-06-04 18:05:44 +02:00
Steffen van Bergerem	700df9af23	Fix jasmine tests ... Fix notifications jasmine tests	2015-06-04 18:05:44 +02:00
Steffen van Bergerem	f64eb9ff41	Fix hound remarks	2015-06-04 18:05:44 +02:00
theworldbright	98f11b944a	Fix styleguide violations ... Fix hound remark 12 Remove unnecessary explicit div tag Rename el_**** to ****El (hound remark 2 and 3) Only find and replace operations were done with this commit Fix hound remark 4 and 8 Fix hound remark 6 Fix hound remark 7 Fix hound remark 9 Fix hound remark 10 and 11 Fix hound remark 13 Fix hound remark 1 Change single quotes to double quotes Change single quotes to double in publisher view Fix camelCase and missing {} in publisher view Change single quotes to double in bookmarklet view Use dot notation for serializedForm in publisher Change single quotes to double in bookmarklet spec Change single quotes to double in publisher spec Fix missing {} in publisher views Use ruby 1.9 hash syntax in invite_link Fix indentation in publisher view	2015-06-04 18:05:44 +02:00
Steffen van Bergerem	a3725599ef	Use darker version creation-blue and creation-green for brand-primary and brand-success	2015-06-04 18:05:44 +02:00
Steffen van Bergerem	f5bb4a4557	Refactor button colors	2015-06-04 18:05:44 +02:00
Augier	d7522d9498	corrected failing cuke and social buttons	2015-06-04 18:05:44 +02:00
theworldbright	5589dac108	Perform compositional styling to "getting started"	2015-06-04 18:05:44 +02:00
Steffen van Bergerem	46abdbdd1f	Style fixes for left navbar in notification view	2015-06-04 18:05:43 +02:00
Steffen van Bergerem	8e9ceb9a2b	Improve no message text and delete icon for conversations, fix regressions	2015-06-04 18:05:43 +02:00
Augier	0cbf581176	Better settings display	2015-06-04 18:05:43 +02:00
theworldbright	0e30c07903	Change line height to 20px for entypo form icons	2015-06-04 18:05:43 +02:00
Steffen van Bergerem	8a004ee02a	Overwrite Bootstrap variables and fix publisher	2015-06-04 18:05:43 +02:00
theworldbright	e372b4eb95	Remove some inline css and minor refactoring	2015-06-04 18:05:43 +02:00
Augier	207b6c6153	Port to Bootstrap 3 ... correcting images display on stream sidebar Corrections on profile page	2015-06-04 18:05:43 +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
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
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
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
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
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	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
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
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
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ß	2570d88cc3	Merge pull request #5904 from Raven24/JesseWeinstein-patch-1 ... prefill bookmarklet with markdown-formatted content	2015-05-04 04:10:03 +02:00
Steffen van Bergerem	0cffa00004	Add syntax highlighting for markdown content	2015-05-04 04:04:34 +02:00
Steffen van Bergerem	dd2e1ea29e	Use rails-assets for jquery.elastic.js	2015-05-04 03:51:20 +02:00
Steffen van Bergerem	a22127bfb1	Add ctrl+enter shortcut for conversations	2015-05-04 03:38:42 +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
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
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ß	37ec00f80b	Merge pull request #5854 from svbergerem/remove-managing-services-standalone ... Remove 'manage services' link in standalone mode	2015-04-20 22:36:11 +02:00
Jonne Haß	d959dd725b	Merge pull request #5850 from svbergerem/modal-for-new-aspect ... Use Bootstrap modal for new aspect form	2015-04-20 22:34:51 +02:00
Jonne Haß	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
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
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
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	cb04e40de7	Remove border from conversation stream	2015-04-01 01:03:15 +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
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	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
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
Steffen van Bergerem	4a7781f1e7	Unify invite code and contacts page link style	2015-03-19 02:46:25 +01: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
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
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	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
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
SansPseudoFix	8dd8daf37e	Change overflow-x to overflow for long tag button	2015-03-12 23:46:15 +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
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ß	add6dd3c50	Merge pull request #5749 from svbergerem/char-counter-fix ... Publisher: fix services char counter	2015-03-10 17:43:32 +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	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
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
SansPseudoFix	330ae471f1	Fix #5716 focus header link color	2015-03-04 11:03:44 +01: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	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	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	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	24fdf8fb84	rightbar invitations ported to bootstrap	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ß	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
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
Faldrian	8f3c03edfa	Added dropdown to add/remove people from/to aspects in mobile view	2015-02-15 22:08:15 +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
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	3312f97981	Fix timeago for notifications, add 'no notifications yet' message	2015-02-09 03:56:37 +01:00
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
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
Faldrian	db6464ed61	Fixed moderation-button-position when viewing reshare	2015-02-03 00:24:26 +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
Marco Colli	eccab62e32	Allow user to enable / disable notifications for a post from stream #5350	2015-01-25 18:40:47 +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
Steffen van Bergerem	b63d8fc679	Fix markdown-it linkify blocking Firefox	2015-01-19 02:09:10 +01:00
Jason Robinson	9282a4ea8f	Refactor mobile javascript to get rid of console errors. ... Fixes also mobile bookmarklet services.	2015-01-17 15:50:06 +02:00
Jason Robinson	5c810a8a2e	Merge pull request #5489 from collimarco/solved5482 ... Solved #5482	2015-01-17 03:39:03 +02:00
Steffen van Bergerem	61c17c7896	Add more markdown-it plugins ... activate sanitizer, sub and sup	2015-01-13 03:41:06 +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ß	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
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
Flaburgan	f9e9a0521d	Add followed tags to the mobile menu	2014-12-28 13:48:48 +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	1ac2e728f4	Solved #5482	2014-12-20 11:05:12 +01:00
Faldrian	710d03b1c2	Fixed growing number on events on hovercard dropdown container	2014-12-20 02:44:48 +01:00
Steffen van Bergerem	7612f5e939	Remove unused stream template	2014-12-17 16:45:51 +01:00
Steffen van Bergerem	a5068259bb	Improve wording for tagged people on tag page	2014-12-15 18:08:53 +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
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
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
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	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	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
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ß	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
Faldrian	db13811c2c	added scrollbar to bookmark publisher, fixed mention layout bugs	2014-11-07 19:17:54 +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ß	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
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ß	0419174570	Merge pull request #5334 from svbergerem/fix-bootstrap-poll ... Fix poll for Bootstrap publisher	2014-10-14 13:03:19 +02:00
Steffen van Bergerem	42a3e702e6	Fix poll for Bootstrap publisher	2014-10-11 19:18:13 +02:00
Steffen van Bergerem	715f451ed4	only collapse empty comment box	2014-10-10 20:05:28 +02: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
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
Steffen van Bergerem	65e9e1c744	Hidden overflow for long names on tag pages	2014-10-04 22:58:57 +02:00
Jonne Haß	1959f0d939	Merge branch 'hotfix/0.4.1.1' into develop ... Conflicts: Changelog.md config/defaults.yml	2014-10-03 17:14:55 +02:00
Jonne Haß	a5ca738e91	Fix XSS issue in poll questions ... closes #5274	2014-10-03 17:12:11 +02:00
Steffen van Bergerem	976ff0fcda	Redesign profile page and port to Bootstrap	2014-10-01 12:28:56 +02:00
jaideng123	2b6ac9261b	Notifications Dropdown now infinite scrolls	2014-09-29 16:30:36 -05: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	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ß	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ß	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ß	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
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ß	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ß	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
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
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	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ß	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ß	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ß	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
Steffen van Bergerem	c18df1c32f	Change mark read link on notifications page	2014-08-23 17:42:19 +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
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ß	dfa0245f4b	make assets:precompile work	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
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ß	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
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
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	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ß	ddb80ad366	Merge pull request #5077 from svbergerem/bootstrap-people-search ... Port people search to Bootstrap Conflicts: app/assets/stylesheets/application.css.sass	2014-07-30 19:07:35 +02:00
Jonne Haß	6c6efd6e9a	Merge pull request #5069 from TeamOmniaExtares/bugfix_remove_bootstrap_for_SPV_comments ... Bugfix remove bootstrap for spv comments Issue #4425	2014-07-30 19:02:10 +02:00
Steffen van Bergerem	f615ad3115	Port people search to Bootstrap	2014-07-20 18:21:13 +02:00
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
Błażej Pankowiak	a9b0412982	Remove text shadow from the button	2014-07-06 13:03:26 +02:00
Błażej Pankowiak	0d0ed4db28	Port Getting Started page to Bootstrap	2014-07-04 18:06:49 +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
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ß	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
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	126ced4383	Fix broken bookmarklet if params have encoded linefeeds. ... Closes #4994	2014-06-22 11:48:24 +03:00
Lukas Matt	c86b57fe8f	Fixed overridden interactions by re-initializing	2014-06-18 13:03:07 -04: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
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
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ß	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
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
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	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
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
flaburgan	a4886fa77b	SPV: Improve padding and interaction counts	2014-04-13 11:27:12 +02: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	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
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
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	8f9736a741	fixed poll js bug	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	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	c02414c36d	fixed wrong indenting and broken messages tab for polls	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
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
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
Steffen van Bergerem	0241d9c7db	use fixture	2014-03-10 17:21:54 +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
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	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	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
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ß	3a616469f4	Merge pull request #4707 from goobertron/improved_new_password ... New reset password form Conflicts: Changelog.md	2014-02-10 01:35:37 +01:00
Jonne Haß	3e3979cc28	Merge pull request #4656 from svbergerem/conversations-add-participants ... Add participants to conversations menu	2014-02-09 20:20:47 +01:00
Jonne Haß	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
flaburgan	119ed2d8f5	Fix nav in header empty with webkit browser	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	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ß	f64f55b567	Move help page initialization into backbone router	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
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
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
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
Lukas Matt	5c9a3aaf3e	Added post report feature ... You can report a single post by clicking the correct icon in the controler section Workflow: * Report a post as offensive * Trigger alerts to every pod-admin * Pod-admin can review it in the admin interface * Delete the post or mark it as reviewed	2014-01-14 15:00:55 -05:00
Steffen van Bergerem	580068ed7c	Remove background from badges in header	2014-01-14 15:00:36 +01:00
Jonne Haß	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
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
Jonne Haß	2734471feb	Merge pull request #4653 from svbergerem/3119-change-more-comments-link ... Change more comments link	2014-01-02 01:14:33 -08:00
Steffen van Bergerem	55b967caf9	remove participants popover + improve conversations menu	2014-01-01 21:58:56 +01:00
Steffen van Bergerem	ef128575ae	Change more comments link	2013-12-30 13:20:58 +01:00
arlogn	ae3b50080c	Fix spinner overlapping in webkit search box (#4446) and replace deprecated pseudo class :-moz-placeholder	2013-12-29 17:16:56 +01:00
Steffen van Bergerem	a96611c259	use bootstrap labels	2013-12-16 00:46:55 +01:00
Steffen van Bergerem	24310fe5a9	change layout	2013-12-15 20:14:55 +01:00
Steffen van Bergerem	5ab777f8cb	remove unused code	2013-12-15 18:01:32 +01:00
Steffen van Bergerem	c24cfb432d	fix facebox in conversations view	2013-12-15 14:20:47 +01:00
Steffen van Bergerem	c11b744a7f	port conversations view to bootstrap	2013-12-15 13:01:24 +01:00
flaburgan	c24d5193e4	Refactor conversations css + fix inconsistent height of conversations list bug	2013-12-15 01:15:44 +01:00
flaburgan	923a4f2ab4	Add indication about markdown formatting in the publisher	2013-12-13 16:02:39 +01:00
Jonne Haß	c660c90091	Merge pull request #4612 from diaspora/drop_spv_old_code ... Drop spv old code	2013-12-11 07:41:51 -08:00
Fabian Rodriguez	80015e7ba8	move everything under post-viewer/ to single-post-viewer/	2013-12-08 12:36:01 -02:00
Fabian Rodriguez	8cf4e4a7fb	remove old templates	2013-12-08 11:39:36 -02:00
Fabian Rodriguez	933c3b01ca	remove old styles	2013-12-07 12:03:26 -02:00
Fabian Rodriguez	f3f8d36b9d	remove wallpaper-mood template	2013-12-06 20:07:37 -02:00
Fabian Rodriguez	ea58324aa8	remove template picker	2013-12-04 20:08:54 -02:00
Jonne Haß	1ce027eb2c	Merge pull request #4605 from manwithtwowatches/feature/4509-image-upload-response-errors ... Feature/4509 image upload response errors	2013-12-02 00:10:25 +01:00
Jonne Haß	d18bbd8405	Merge pull request #4604 from Flaburgan/refactor-mobile-publisher ... Refactor mobile publisher	2013-12-02 00:07:08 +01:00
Fabian Rodriguez	cfc247db75	remove PostViewerFeedback	2013-12-01 20:55:49 -02:00
Fabian Rodriguez	9be780468d	remove PostViewerInteractions	2013-12-01 20:55:49 -02:00
Fabian Rodriguez	bf3ee8d7bb	remove PostViewer	2013-12-01 20:55:48 -02:00
Fabian Rodriguez	179cc9e8dd	remove PostViewerAuthor	2013-12-01 20:55:48 -02:00
Fabian Rodriguez	0702db137a	remove PostViewerNav	2013-12-01 20:55:48 -02:00
Fabian Rodriguez	6eed63807d	remove next and previous functionality from router	2013-12-01 20:55:48 -02:00
flaburgan	748599a9dd	Refactor mobile publisher	2013-11-29 12:30:20 +01:00
Richard	dbbead1587	removed double comment	2013-11-28 21:48:41 +11:00
Richard	1b83b6942b	Merge branch 'develop' into feature/4509-image-upload-response-errors	2013-11-28 21:46:01 +11:00
Richard	ff07bddd1b	using status messages instead of popup and updated specs for publisher view.	2013-11-28 16:08:03 +11:00
Richard	3671f09b1d	checking file upload response error and giving an error alert if there is one.	2013-11-28 12:26:30 +11:00
flaburgan	7a50e79cfa	Fix aspect dropdown on contacts page	2013-11-27 13:07:31 -08:00
Jonne Haß	478159f1cd	Merge pull request #4593 from Flaburgan/improve-mobile-design ... Improve notifications and conversations views design on mobile	2013-11-20 12:05:28 -08:00
Fabian Rodriguez	d8618f8700	Merge pull request #4591 from Flaburgan/avatar-profile-mobile ... Fix avatar display on mobile profile	2013-11-18 18:17:34 -08:00
flaburgan	e1fb8200dd	Move 'mark all as read' button under the title	2013-11-18 18:02:22 -08:00
flaburgan	58886a6b30	Improve notifications and conversations views design	2013-11-16 03:06:25 -08:00
flaburgan	76b151eb7d	Fix avatar display on mobile profile	2013-11-16 01:57:37 -08:00
flaburgan	1833edfd67	Add actions to contacts/index.html page	2013-11-12 19:10:00 -08:00
flaburgan	0f2773053e	refactor mobile header, close #4579	2013-11-09 23:21:32 -08:00
flaburgan	bee2c63762	Change icon when adding, fix #4568	2013-11-07 12:55:50 -08:00
flaburgan	3df0fdc09b	Improve the management of the contacts visibility settings in an aspect	2013-11-07 12:55:35 -08:00
Steffen van Bergerem	d5c3079623	refactor publisher css	2013-11-07 17:12:35 +01:00
flaburgan	47645dd985	Put the stream first in the left menu	2013-11-04 17:46:45 -08:00
Dennis Schubert	6e62a99732	Merge pull request #4542 from Raven24/empty_publishing ... avoid publishing empty posts	2013-09-25 13:49:52 -07:00
Florian Staudacher	e614562470	avoid publishing empty posts (fixes #4401) ... invalidate empty posts when created by a local user add changelog entry	2013-09-24 21:57:22 +02:00
Srihari Sriraman	c379fb351e	Removing the conflicting green in colors ... - This was a regression from pull request #4541 - Moved the red color to the section above to separate it from the rgb colors that aren't used	2013-09-23 09:48:45 +05:30
Srihari Sriraman	91d9d5aea5	Removing the comment regarding the source of the lines ... MrZyk pointed out that this information is preserved in git.	2013-09-22 15:31:27 +05:30
Srihari Sriraman	034361154f	Moving colors in variables.scss to colors.scss ... - Fixed the conflicting red color - Currently using the darker red	2013-09-22 14:40:56 +05:30
Florian Staudacher	39810e6196	decode URLs before processing them (fixes #4507)	2013-09-21 15:23:30 +02:00
Fabian Rodriguez	abc06686ce	Merge pull request #4523 from Flaburgan:improve-getting-started ... Conflicts: Changelog.md	2013-09-19 19:37:54 -03:00
Jonne Haß	ac13e79225	Merge pull request #4529 from Flaburgan/fix-timeago-color ... Change .timeago color and align notification, fix #4502	2013-09-19 23:32:32 +02:00
Jonne Haß	e6be888707	Merge pull request #4522 from fubik/transparent_background ... Add a white background to images displayed in the lightbox Conflicts: Changelog.md	2013-09-19 23:27:57 +02:00
Florian Staudacher	96f80c8cab	cleanup jasmine tests ... and added changelog entry for bugfix #4005	2013-09-19 23:22:49 +02:00
PallaviTS	5caa46cc83	fixing commenting ... Added jamisne tests for comments Added 2 jasmine tests for fixing commenting Bugfix: #4005 added changelog entry	2013-09-19 23:22:48 +02:00
flaburgan	126e7bdc9c	Refactor getting_started page, test if facebook is available, fix #4520	2013-09-18 22:06:47 -07:00
flaburgan	fcad95109f	Change .timeago color and align notification, fix #4502	2013-09-17 14:50:32 -07:00
Titouan Lorieul	b53c207477	Add a white background to ALL the images in the navigation bar of the lightbox	2013-09-16 18:35:38 +02:00
Titouan Lorieul	1aca1e1e51	Add a white background to the images shown in the navigation bar of the lightbox	2013-09-16 14:18:37 +02:00
Marek Marecki	0b37e9f736	Fix issue #4499: changed :width in .item_count to :min-width	2013-09-14 09:35:15 +02:00
Titouan Lorieul	8bad0673b3	Add a white background to images shown in the lightbox ... Fixes issue #4475	2013-09-13 09:47:57 +02:00
Jonne Haß	72e421b38f	Merge pull request #4480 from Raven24/publisher_backbone ... Publisher - now with even more Backbone	2013-09-04 16:52:30 +02:00
Florian Staudacher	b2ff1878e3	move ui feedback into success callback	2013-09-04 14:47:28 +02:00
sjain1107	5223a2d906	Adding ignore user icon ... Adding ignore user icon Added jquery Changed profile.js	2013-09-04 14:47:23 +02:00
Florian Staudacher	41c0880a9d	add jasmine specs for uploader, minor changes	2013-09-03 23:18:19 +02:00
Florian Staudacher	bedfacecfd	fix jasmine tests	2013-09-03 23:18:18 +02:00
Florian Staudacher	4da696253a	implement publisher uploader as backbone view	2013-09-03 23:18:18 +02:00
Florian Staudacher	4090f134f2	port 'getting started' to a backbone view, revert filename changes	2013-09-03 23:18:18 +02:00
Florian Staudacher	9560a8ec61	create actual backbone view for publisher aspect selection	2013-09-03 23:18:18 +02:00
Florian Staudacher	253ab23f5e	publisher: extract services into subview	2013-09-03 23:18:18 +02:00
Jonne Haß	5eb5057864	Merge pull request #4351 from netom/3711_fix_stream_render_time ... Batch insert new posts to stream	2013-09-01 19:36:07 +02:00
Srihari Sriraman	f53aa3e0e5	Highlighting the currently active stream in the leftNavBar ... - This gives the user the sense of what he/she is currently viewing - The hover/selected are the same right now. Needs to change. - Need to find a more meaningful place for `markSelected` Moved markSelected to app.views.Stream - Removes duplication - All streams create this view, and this seems to do some setup on initializing, which is a good place to markNavSelected Changing highlight on hover to 'black' instead of the blue - The blue was a little intruisive - Also fixes the vertical alignment issue Changing the background to bluebg on hover	2013-09-01 19:32:01 +02:00
Jonne Haß	99657947a9	Merge pull request #4487 from arlogn/word-wrap-on-single-post-view ... Prevent overflow of strings too long on single page view	2013-09-01 19:23:07 +02:00
Fábián Tamás László	18c22a5e4c	Batch insert new posts to stream	2013-09-01 10:16:09 +02:00
arlogn	1b295a88e5	Prevent overflow of strings too long on single page view	2013-09-01 01:41:37 +02:00
Jonne Haß	0cdfc7cfbd	Make I18n systems more robust against missing keys in pluralization data ... Should make situations like #4468 less frequent	2013-08-30 19:31:48 +02:00
Srihari Sriraman	5bd5f9198d	Refactored the colors palette a little more ... - Introduced text-dark-grey = #666666 - Converted text colors #777777 and #555555 to text-dark-grey - Removed header-grey in favor of text-grey - Included colors in a couple of files where it was missing - Categorized the colors in the palette based on the contexts of usage	2013-08-30 17:58:39 +05:30
Srihari Sriraman	4348fc070d	Add border-dark-grey ... Substituting -grey for #999 Moving #888 text color to -grey Adding border-dark-grey Removing border-dark-grey from places where it isn't appropriate	2013-08-30 10:32:02 +02:00
Jonne Haß	27f671814b	Merge pull request #4471 from svbergerem/fix-size-of-images-in-spv ... Fix size of images in the SPV	2013-08-29 21:37:10 +02:00
Steffen van Bergerem	6bc16bcdba	Fix preview with more than one mention	2013-08-29 20:36:49 +02:00
Steffen van Bergerem	642946bd5b	Fix size of images in the SPV	2013-08-29 20:05:12 +02:00
Srihari Sriraman	3131eb920b	Collapsing aspects_list and followed_tags when they aren't active ... - Each time a stream is rendered, other lists are emtied - Using Backbone.history.fragment to detect active stream - hideInactiveStreamLists is best pushed into a before/after filter Added tests for hideInactiveStreamLists	2013-08-29 14:51:54 +02:00
Srihari Sriraman	0bcc62f07f	Disable 'Mark all as read' for notifications when everything is read ... - This action needn't be performed when all notifications are read, hence disabling it is a good practice - Added a link-disabled-color - Used css pointer-events to disable clicking on the link Preventing default on click for the mark_all_read_link - avoiding the use of pointer-events - setting up disabled only for mark_all_read_link Moved disabling of the link to a global handler - Added disabled class to the button in /notifications when all are read - Styled the disabled button - Adding disabled class after completion of ajaxRequest	2013-08-29 12:12:26 +02:00
Jonne Haß	e194a07f18	Merge branch 'develop' of github.com:diaspora/diaspora into develop ... Conflicts: Changelog.md	2013-08-28 20:43:01 +02:00
Srihari Sriraman	cbaaf86bae	Single click selects the invite link ... - Earlier, triple-clicking or drag & select had to be performed to select - Should consider a copy button Moving away from the inline onClick handler It didn't feel right to be writing js in a helper. Refactoring setupInviteLinks into a sidebar Backbone View	2013-08-28 20:40:28 +02:00
svbergerem	fa7a03e9a7	Fix style in profile sidebar / contacts	2013-08-28 13:07:01 +02:00
Srihari Sriraman	a6dc845f59	First stab at extracting a color palette ... - Pulled out the existing palette in _mixins - Took a stab at naming greys after their usage count in contexts - Replaced #a40802 with #a80000, since they are very close and $red was already in the palette Missed importing 'colors' in a couple of places Removing a redefined in favor of in colors.css.scss Fixing missed imports #2 Renamed $background to $background-white Explicitly calling out the color of the background, since we have many background colors	2013-08-28 10:25:04 +02:00
Jonne Haß	c94ca826b2	Merge pull request #4448 from ssrihari/fix-invite-code-input-width ... Fixing Invite code input width to be same across browsers	2013-08-27 21:48:29 +02:00
Srihari Sriraman	623d517e89	Hightlighting the down-arrow next to user name on hover ... - the right-arrow wasn't highlighted on hover, which was inconsistent with the other header items - changed the user-menu items highlight color from #fff to #fafafa, which is consistent across the header - refactored the css to reduce specificity - refactored css to use nesting in class names instead of nesting in scss (as advocated by http://smacss.com) to reduce specificity and to enhance readability	2013-08-28 00:13:24 +05:30
Srihari Sriraman	5b41539985	Fixing Invite code input width to be same across browsers ... - It was wide on firefox and narrow on chrome - This fits it within the parent's padding on all browsers	2013-08-27 11:51:15 +05:30
flaburgan	3899e383ee	Re align check icon in aspect dropdown	2013-08-26 21:24:02 +02:00
Steffen van Bergerem	324b09a72a	add help page	2013-08-26 15:26:18 +02:00
Jonne Haß	e58019fe8e	Merge pull request #4440 from Flaburgan/fix-contacts-page ... Add aspect modification and fix check icon regression on contacts page, close #4397	2013-08-25 15:46:11 -07:00
flaburgan	96e18c6a7b	Add aspect modification and fix check icon regression on contacts page, close #4397	2013-08-25 21:42:32 +02:00
Jonne Haß	a07950b04a	add consistent spacing to paragraphs in the SPV	2013-08-25 18:10:30 +02:00
Srihari Sriraman	e8b00458d3	Adding hover icoons for notifications & conversations ... Added white versions of the icons on hover to match the hover of other header items. Changing the notifications hover icon to the regular notifications icon when active so it is visible with the white background. Fixing the hard coded background-position value for notifications_grey Can not depend on generated sprite background position as it will change with changes in icons Moving the $icons variable to a broader scope Since the variable is used in the header, the sprites now are imported before the header Using the default sprite map instead of the explicitly created sprite map	2013-08-25 11:49:34 +02:00
Steffen van Bergerem	0cf50838e1	Add 'no comments' message to SPV	2013-08-23 01:36:58 +02:00
Steffen van Bergerem	6c2267b9ac	fix photos in spv and always show visibility of post	2013-08-22 19:06:06 +02:00
Jonne Haß	1b7bc02eee	Merge pull request #4410 from rogerbraun/feature/spv-redesign ... New single post view Conflicts: app/assets/stylesheets/application.css.sass	2013-08-22 10:37:25 +02:00
Steffen van Bergerem	96436c5ca6	fix notification dropdown	2013-08-22 09:56:36 +02:00
Steffen van Bergerem	f337e4e9a0	add link to person and small fixes	2013-08-22 09:56:36 +02:00
Steffen van Bergerem	532ec72bcf	comment button style	2013-08-22 09:56:36 +02:00
Jonne Haß	796b6a805b	make sure flash messages are not hidden behind the header in the new SPV	2013-08-22 09:56:36 +02:00
Jonne Haß	0012a82f48	add the footer to the SPV	2013-08-22 09:56:36 +02:00
Steffen van Bergerem	a354745283	fix reshare button when already reshared	2013-08-22 09:56:36 +02:00
Steffen van Bergerem	0de0d8855c	fix weird bug with comment_box focus	2013-08-22 09:56:36 +02:00
Roger Braun	328fb7113f	Staying consistent	2013-08-22 09:56:36 +02:00
Jonne Haß	f0b68ff6d1	restyle informational section in the new SPV	2013-08-22 09:56:36 +02:00
Roger Braun	7c46a74582	Fix login page background.	2013-08-22 09:56:36 +02:00
Roger Braun	ee98cc2bab	sass -> scss	2013-08-22 09:56:36 +02:00
Steffen van Bergerem	51ee8b4e93	control icons just visible on hover	2013-08-22 09:56:36 +02:00
Jonne Haß	f9cb662ff7	enable tooltips in the new SPV	2013-08-22 09:56:36 +02:00
Steffen van Bergerem	e036525e8d	Add hover for single-post-actions and fix comment deletion links	2013-08-22 09:56:36 +02:00
Jonne Haß	ee960ae9fd	polish SPV a bit ... * Move lock icon to the timestamp * Add spacing around the interation icons * Increased size of the interaction icons * Pulled root post author next to reshare author	2013-08-22 09:56:36 +02:00
Roger Braun	059521b0aa	Actually scroll to the comment box.	2013-08-22 09:56:36 +02:00
Roger Braun	867efeb80f	Add comment focus button.	2013-08-22 09:56:35 +02:00
Roger Braun	9996cbaf15	Add divider between action buttons and content.	2013-08-22 09:56:35 +02:00
Roger Braun	c356e33f63	Fix text decoration for action buttons.	2013-08-22 09:56:35 +02:00
Roger Braun	690e47c946	Don't collapse comment content in the SPV.	2013-08-22 09:56:35 +02:00
Roger Braun	c6e2a91359	Deactivate content collapsing for SPV.	2013-08-22 09:56:35 +02:00
Roger Braun	44ee6b4892	User entypo font for large icons..	2013-08-22 09:56:35 +02:00
Roger Braun	a875ce7011	Fix typo.	2013-08-22 09:56:35 +02:00
Roger Braun	5bed6d8cf7	Implement a way to deactivate hovercards.	2013-08-22 09:56:35 +02:00
Roger Braun	79a849ad97	Revert "Import mixins." ... This reverts commit 1d6802bec43223606e1387d037658eb194c478fb.	2013-08-22 09:56:35 +02:00
Roger Braun	c911248340	Import mixins.	2013-08-22 09:56:35 +02:00
Jonne Haß	fa7b756d4d	improve new SPV ... * Hopefully fix OEmbed view * Fix OpenGraph view * Fix middle border * Add spacing at the bottom * Fix comment styles by not including old SPV styles for them (TODO: maybe rescue some stuff there, like the code tag styling) * Fix avatar size for default avatar * Remove border below comment pane * Fix overflow of post body with a lot of text * Fix stylesheet inclusion	2013-08-22 09:56:35 +02:00
Roger Braun	b8fb70d44e	Visual changes to the spv.	2013-08-22 09:56:35 +02:00
Roger Braun	8c695ecec2	Switch to new single post view.	2013-08-22 09:56:35 +02:00
Roger Braun	72f8d58c06	Questionable css for the new single post view.	2013-08-22 09:56:35 +02:00
Roger Braun	958793e338	Implement new single post view.	2013-08-22 09:56:34 +02:00
Roger Braun	46d2240ed4	Add hacky bootstrap header fix for single post view.	2013-08-22 09:56:34 +02:00
flaburgan	149c812d03	add missing sprite file	2013-08-22 09:56:34 +02:00
flaburgan	10e52f970c	improve design	2013-08-22 09:56:34 +02:00
flaburgan	d63dc9f0a5	Add images, fix layout rendering	2013-08-22 09:56:34 +02:00
flaburgan	abba8d8dfc	Add header to the single post view	2013-08-22 09:56:34 +02:00
Steffen van Bergerem	7fe972555a	profile message and mention icons	2013-08-21 23:05:42 +02:00
Steffen van Bergerem	e5e63b09a3	fix opacity of control icons	2013-08-20 12:20:24 +02:00
Steffen van Bergerem	d73da263d9	Unify profile sidebar	2013-08-19 14:57:42 +02:00
Jonne Haß	eea3818c45	streamline new profile sidebar elements ... * titlecase "Photos" * Pull "See all" to the left (to match up with "View all") * Replace "See all" with "View all"	2013-08-19 14:26:14 +02:00
Steffen van Bergerem	f22b4d7da7	Change contact list on profile page	2013-08-19 14:02:08 +02:00
mokus	44d76fc6da	rename contact_count to item_count	2013-08-19 12:49:38 +02:00
Jonne Haß	caae0d6af6	Merge pull request #4358 from arlogn/2943-fix-embedded-media-over-elements ... Fix the overlapping of youtube embedded videos	2013-08-19 09:23:42 +02:00
movilla	d1c679cc22	remove comments from the mobile site. Close #4225	2013-08-16 22:14:52 +02:00
movilla	73825ab94a	Remove post from the mobile site	2013-08-16 20:44:22 +02:00
flaburgan	96337ef7d4	Fix regression in header style	2013-08-11 23:23:15 +02:00
flaburgan	820fa4e9b2	Extract and factorize the header css in a new file, fix ugly registration header design	2013-08-11 20:18:40 +02:00
Sean Tilley	e7ea763ab5	Merge pull request #4373 from Flaburgan/patch-4 ... Make contacts visible in new aspect unchecked by default, close #4343	2013-08-10 15:00:16 -07:00
Jonne Haß	9d157670a4	Merge pull request #4386 from Faldrian/develop ... Fixed global search field, will search when a dropdown item is clicked	2013-08-10 14:03:39 -07:00
Jonne Haß	4354e9497a	Merge pull request #4376 from Flaburgan/fix-mobile-view ... fix mobile view	2013-08-10 12:39:09 -07:00
Faldrian	cc71ce4a2c	Fixed global search field, will search when a dropdown item is clicked	2013-08-10 19:59:05 +02:00
flaburgan	895a7c79a3	Remove overflow hidden on welcome banner, close #4377	2013-08-10 00:07:02 +02:00
flaburgan	2e36fd6c67	fix mobile view	2013-08-09 23:12:14 +02:00
Antoine D	ef24275f7c	Make contacts visible in new aspect unchecked by default, close #4343	2013-08-09 22:13:40 +02:00
Jonne Haß	a2e5f1f88e	Merge pull request #4335 from Team-D/feature/4169-tag_search_autocomplete ... #4169 tag search autocomplete	2013-08-06 13:29:12 -07:00
Jonne Haß	a267f2a4db	Merge pull request #4354 from Flaburgan/improve-mobile-view ... Improve mobile usability Conflicts: Changelog.md	2013-08-06 21:31:55 +02:00
Steffen van Bergerem	8a8fb10b18	auto expand post preview	2013-08-06 20:48:27 +02:00
Jonne Haß	1639ae2b31	Merge pull request #4316 from Flaburgan/feature/4271-refactor-left-side-bar ... Feature/4271 refactor left side bar	2013-08-06 11:45:15 -07:00
arlogn	81ebd05d6a	Fix the overlapping of youtube embedded videos	2013-08-06 20:34:46 +02:00
flaburgan	aa27b7a1f5	Resize preview button	2013-08-06 18:40:20 +02:00
flaburgan	ac533f8383	Refactor the left bar side menu, improve tag autosuggestion design, close #4271	2013-08-06 18:30:24 +02:00
flaburgan	086d512d83	Improve mobile usability	2013-08-06 17:05:35 +02:00
arlogn	0cccd87259	Cursor pointer on upload-photos button in webkit browsers	2013-08-05 15:07:11 +02:00
mokus	df9a42c397	update search controller + serch.js so that autocomplete works ... Added search_controller_spec, moved some tests from people_controller_spec to search_controller_spec Fixed merged conflict in Changelog update routes and search controller remove useless except from search controller Fix indentation in search_controller	2013-08-05 11:49:23 +02:00
Jonne Haß	6689f20710	Merge pull request #4321 from andrewcsmith/feature/4100-add-support-for-posting-to-wordpress-as-a-service ... Feature/4100 add support for posting to wordpress as a service Conflicts: Gemfile.lock	2013-08-04 17:15:39 +02:00
Jonne Haß	274faebdd1	another attempt at stabilizing features/signs_up.feature	2013-08-04 17:01:12 +02:00
Andrew Smith	2bb6bc8eef	Added Wordpress service functionality, ... for cross-posting to OAuth-enabled Wordpress.com or Jetpack-enabled Wordpress.org blogs. Added model for Wordpress service Added very very basic Wordpress cross-posting functionality. Added markdown support to post body Fixed Wordpress::MAX_CHARACTERS problem cleanup Added default settings for Wordpress OAuth Added default settings for Wordpress OAuth Added Wordpress to configured services spec. changelog changes	2013-08-04 07:46:56 -07:00
Fábián Tamás László	54b166bde9	Opengraph to mobile view	2013-08-04 15:47:10 +02:00
Fábián Tamás László	1a3ead3619	Og info appears only if oembed isn't available	2013-08-04 15:46:42 +02:00
Fábián Tamás László	6e4c1fe3c6	Improved opengraph data display ... Style fixup	2013-08-04 15:44:56 +02:00
Fábián Tamás László	c3a76fa886	Added opengraph content to mood page	2013-08-04 15:42:33 +02:00
Fábián Tamás László	176c6826e0	opengraph POC ... Fixed small-frame opengraph view Fixed incompletely saved OpenGraphCache bug	2013-08-04 15:42:29 +02:00
Steffen van Bergerem	f810e39f52	Change image to ajax-loader when closing lightbox	2013-08-02 14:46:15 +02:00
Jonne Haß	5026eccc6a	Refactor and reorder backbone app initialization, fixes hovercards ... Also added cucumber feature for hovercards	2013-08-01 12:52:16 +02:00
Jonne Haß	2916b8b216	hide other flash messages before showing a new one	2013-07-31 20:17:31 +02:00
carolina	f6fe74aeae	Migration to turn ActivityStreams::Photo to StatusMessage ... deletes ActivityStream model and all it's references update migration with the without_protection option to disable mass assignment protection	2013-07-31 15:15:08 +02:00
Jonne Haß	4710144b02	Merge pull request #4293 from Team-D/feature/4274-error_message_vanishes_too_fast ... fixes issue 4274 flash-messages stay longer	2013-07-31 15:12:44 +02:00
Sri Vishnu Totakura	f5c8ebcb90	publisher closes when clicked anywhere outside its division after opening ... fixed app.publisher undefined error app view removed and click event binder added in the publisher view initializer. removed unwanted console log attempted to fix this.el undefined error	2013-07-31 15:04:57 +02:00
Damien	f4b3f2fd1e	Consider Markdown header content as post title ... clarify regexp and correct some bad backtracking add specs rewrite regex convert mardown style title to plain text title fix bad indentation add jasmine test for post-viewer.js tries to fix bad jasmine test	2013-07-31 14:59:02 +02:00
Jonne Haß	300752fc87	bump capybara ... * removed wait_until where possible * replaced wait_until with DOM obersavtions * added match: :first to all finders that assumed getting the first element * replaced evaluate_script with execute_script where possible * replaced a few execute_script with DOM observations through Capybara * removed sleep where possible * replaced sleep with DOM obersvations * replaced "wait for ajax" with DOM obersavations * replaced alert confirmation with new selenium API * bump selenium webdriver * made any other fixes to get green again	2013-07-31 01:47:23 +02:00
Jonne Haß	cdc29e449d	Move facebox configuration into the initialization of the Backbone app ... Facebox is already called from some Backbone views very early, making its icons 404 otherwise.	2013-07-29 12:20:05 +02:00
J. Fleming	b75bb8dc0a	Change devise config and templates to make logout a delete request.	2013-07-17 21:00:18 +02:00
carolina	8ba60853e9	fixes issue 4274 flash-messages stay longer	2013-07-09 14:35:35 +02:00
rivendale	f2481b0f55	fix link to background image	2013-07-07 18:06:01 -03:00
Tamas Laszlo Fabian	37505c5ece	Fixed timago tooltip in conversations ... Fixed timeago errors Added cucumber stuff to test timeago at inbox Show localized date/time in tooltip Remove title attributes	2013-07-07 14:43:47 +02:00
Fábián Tamás László	aa472b25de	Put preloads into gon.preloads ... Fixed tagFollowing not getting into preloads	2013-07-06 12:45:23 +02:00
Fábián Tamás László	fb9b3e35c3	Put current user into gon ... Fixed bug in app.js, removed unnecessray test	2013-07-06 12:44:08 +02:00
kevivmatrix	6623e86a5a	private message sending changed to ajax ... added specs for change in controller one form of hash used in single line of code rendering create response on sending message redirect user to conversation page if message sent successfully removed deprecated way of rendering file conversations create for mobile fixed minor code style change updated changelog	2013-07-06 14:35:09 +05:30
Jonne Haß	30dff802d5	Merge pull request #4243 from davexunit/feature/2948 ... Show the user if a contact is sharing with them when viewing their profile page	2013-06-29 10:16:41 +02:00