diaspora

Author	SHA1	Message	Date
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
Steffen van Bergerem	71f03544e4	Don't focus comment form on 'show n more comments'	2013-06-28 20:40:24 +02:00
Antoine D	8e2633f8b3	Improve participants link style in conversation, close #4236 Move it to the right and replace the text by an image with the nice tooltip, modify the test.	2013-06-28 00:41:44 +02:00
David Thompson	2e83736f43	Add SASS for sharing message.	2013-06-20 07:39:56 -04:00
Steffen van Bergerem	21ef1c8e41	Remove alpha branding	2013-06-12 23:08:13 +02:00
Steffen van Bergerem	a02fdc6e45	unify ignore and hide #bugmash #monday	2013-06-12 14:11:06 +02:00
Steffen van Bergerem	bcd43cbfee	Don't show hovercards for current user in comments	2013-06-09 12:31:18 +02:00
Florian Staudacher	f694a40992	use tooltip plugin to display the name under the avatar (temporary solution until the proposed solution from the [pull request](https://github.com/diaspora/diaspora/pull/4149) is implemented)	2013-06-04 17:14:00 +02:00
Florian Staudacher	c2a9cb55ef	Merge branch 'add_conv_participants_preview' of https://github.com/marpo60/diaspora into marpo60-add_conv_participants_preview	2013-06-04 17:12:38 +02:00
Florian Staudacher	b7b4edeeb0	Merge branch 'reoponed_issue3897' of https://github.com/RoonyH/diaspora into RoonyH-reoponed_issue3897	2013-06-04 16:43:16 +02:00
Juan Azambuja	3f3fe3ecc7	Add participants preview con conversations	2013-06-01 12:14:16 -03:00
Juan Azambuja	e59066bd66	Fix icons-deletelabel styles	2013-05-27 10:25:04 -03:00
Aruna Herath	7803df5ecd	Changed post/comment submit keyboard shortcut to ctrl+enter from shift+enter Fixes reopened #3897	2013-05-27 17:08:39 +05:30
Fabián Rodríguez	aed81c1b3b	Fix tags ordering in chrome	2013-05-25 15:44:53 -03:00
Steffen van Bergerem	7f596cfd36	Fix #4157 : post preview from tag pages	2013-05-25 12:39:01 +02:00
Jonne Haß	aa60fac217	Merge branch 'error_404_mobile' of git://github.com/movilla/diaspora into movilla-error_404_mobile Conflicts: Changelog.md	2013-05-18 20:06:49 +02:00
Steffen van Bergerem	63040bb8cc	fix mentions at the end of a post	2013-05-17 19:27:08 +02:00
Steffen van Bergerem	da532e18bd	Fix preview with locator feature	2013-05-08 13:07:13 +02:00
Marco Gallardo	4aab8762fa	Locator feature added marker image for publisher, showing div for address, and added functionality to close it when clicking 'X' image showing marker image in publisher renamed map-marker to locator fixed style for map marker image in publisher added locator.js to get user's location loading google maps api removed unecessary append and showing location next to publisher moved location address inside div and added image to close location styled div location address an image to close location removing location when clicking close image cleaned code cleaned code showing loader while location is being obtained, translated normal js to backbone structure, created locations db stuff, and removing location div when clicking 'share' refactored code; started to move code to backbone refactored js code; moving functionality to backbone structure created address function to make accessible address variable value refactored locator.js showing and removing location div from dom created location; it belongs_to status_message added location model and created association with status_message added hidden field for location address and added respective code on js files to retrieve it on ajax call saving location for status_message (post) removing location when sharing renamed locator backbone view to location, added template, showing location, and saving lat and lng prepared and added template to show location added location to post model in order to have it accessible in backbone retrieving location to show it in template removed console.log XD fixes when removing location cleanind location_address hidden field when location is removed more fixes; showing location when sharing saving location just when it exists created method to retrieve location address just when location was created fixed issue about showing 'Near from' message when there was not any location added style for location cleaned code renamed locator view retrieving lat and lng from locator.js saving lat and lng in location_coords saving lat and lng added style for input location_address removed location_address hidden field; the value will be taken directly from input with the location replaced div with location for input; the user will be able to edit the place avoiding submitting the form when pressing Enter key on new input for location added missed spec file for location model refactored location_view code refactored location_view code cleaned code added sinon library for testing added describes for new publisher's view functions created test for destroyLocation function added test for showLocation publisher view function created test for avoidEnter publisher view function removed unnecessary div Created first test for locations view, added more specs, added Sinon.js, and fixed issue with assets loading locator.js for tests moved location stuff to app/assets moved locator.js and sinon.js to app/assets fixed route for images included locator.js to assets fixed issue when post object is different than StatusMessage; also fixed issue with lat and lng loading Sinon for specs refactoring locator errorGettingposition and start replacing google maps stuff with OSM added OpenLayers JS, osmlocator, and added them into the main js changing the locator from Google to OSM instance changing lat and lng value in the backbone view removing google javascript tag in application layout adding jasmine to locator test and removed locator.js adding jasmine to locator test using OSM adding Jasmine test to OSM locator removed locator.js removed require locator and updated schema fixed js response; added location since we are using OSM Locator we don't need locator-spec test fixed spec for location view; we are not using google maps anymore changed description of osmlocator-spec fixed issue with status-message-location template fixed style for location_address textbox fixed tests for locator moved split function to model created test for location model removed puts added effect for location marker added translations for locator removed conflicting-unnecessary lines that were loading files for specs removed sinon library; using sinon-rails gem removed useless code removed puts; added Rails.logger.error added sinon.js file added specific version of sinon-rails gem improving validations sintax using openlayers-rails gem removed 'google API' text using sinon gem isolating LocationStream view refactored validation getting location when post is a Reshare refactored code fixed aligment for elements under location message improved styling for location message refactored begin-rescue block getting absolute root instead of just the root added address method to retrive address of location removed code from Post model; also added descriptinon why it was removed removed validation when retrieving address; with latest refactorizations we dont need them any more interpolated location; using file in locales fixed width for div of location moved Sinon gem into development and test group fixed method's description added missed indexes updated schema with locations table removed openlayers-rails gem preventing location to be saved if there are not coordinates fixed spec; wrong closing tag	2013-05-02 17:31:53 -05:00
movilla	5839d304db	Fix reactions link on mobile broken	2013-04-25 13:55:57 +02:00
movilla	f17d16385f	mobile private post dont show error 404	2013-04-24 22:17:47 +02:00
Jonne Haß	25b3f6bcdc	Merge pull request #4127 from marpo60/fix_aspects_max_selection Fix select & deselect all aspects check image	2013-04-22 08:34:13 -07:00
Juan Manuel Azambuja	de7044c602	Fix select & deselect all aspects check image	2013-04-21 21:38:03 -03:00
Florian Staudacher	c1b680e51d	show username of the services in the publisher original work by @Ruxton rebased and extended to include feedback from the original PR #3959	2013-04-21 23:29:04 +02:00
Jonne Haß	3572ae8d2e	Merge branch 'remove_navbar' of git://github.com/movilla/diaspora into movilla-remove_navbar Conflicts: Changelog.md	2013-04-13 13:04:52 +02:00
Jonne Haß	fd069af2c6	Merge branch 'activity_more' of git://github.com/movilla/diaspora into movilla-activity_more Conflicts: Changelog.md	2013-04-13 12:53:31 +02:00
Jonne Haß	7a0d1c647a	Merge pull request #4096 from RoonyH/3897-submit_a_comment_by_shift+enter 3897 submit a comment by shift+enter	2013-04-13 03:49:40 -07:00
Jonne Haß	bef05c14d7	Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop Conflicts: Changelog.md	2013-04-10 18:24:47 +02:00
Jonne Haß	15418eae67	Merge pull request #4112 from marpo60/issues_4017_4107_fixes close issues #4017 and 4107 by including jquery.textchange	2013-04-10 07:58:30 -07:00
Braulio Martinez	c651cbab78	Always redirect user to downcase version of tags on UTF-8 encoding	2013-04-10 00:08:58 -03:00
Juan Manuel Azambuja	5a85fd71f1	close issues #4017 and 4107 by including jquery.textchange	2013-04-09 16:21:19 -03:00
Aruna Herath	b0879dd256	added same feature to publisher	2013-04-08 19:29:36 +05:30
Aruna Herath	5f6ce87a23	added shift+enter key from new comment box to submit the comment.	2013-04-08 19:08:29 +05:30
movilla	bc87b501f2	Fix show more post in my activity mobile page. Close #4108	2013-04-08 00:04:42 +02:00
Steffen van Bergerem	6e724fc1d4	preview posts in stream	2013-04-07 17:43:27 +02:00
Bruno Machado	1e50d1465a	Convert some stylesheets to SCSS #3796	2013-04-06 15:34:15 -03:00
movilla	33ecc50fbc	Mobile buttons are only clickable when scrolled to the top	2013-04-05 19:16:15 +02:00
Steffen van Bergerem	a693a0970b	added hotkeys to navigate in stream	2013-04-02 19:24:20 +02:00
Bruno Machado	29af94ce4e	Remove unnecessary dotted CSS borders. Closes #2940	2013-04-01 15:53:27 -03:00
movilla	8375433788	* Remove unnecessary navigation bar to access mobile site * Re-add flash warning to registrations mobile * Remove excess :css * Fix littles css errors	2013-03-30 23:09:45 +01:00
Tom Scott	cdc4e869d1	Merge pull request #3841 from tubbo/fix-close-buttons Align close button images Sorry this took so long to merge in guys, I had this weird feeling that I had already done so. Looks like the 'X' button is coming after the custom popover HTML so this looks OK to merge in.	2013-03-30 06:29:19 -07:00
movilla	b257939f7e	Add multiphoto for mobile post	2013-03-30 10:59:06 +01:00
Juan Manuel Azambuja	c10aefb30f	Fix email icon on right section	2013-03-28 11:16:18 -03:00
Juan Manuel Azambuja	d68aac88f8	Add inline-block directive to social_media_icons on publisher	2013-03-28 10:52:10 -03:00
Marcelo Casiraghi	b0f76f1764	Fix confirmation at getting_started page	2013-03-25 23:09:38 -03:00
Jonne Haß	e51443b3ef	Merge pull request #4059 from marpo60/remove_unnecessary_javascript_views delete unused javascript views	2013-03-15 11:45:22 -07:00
Juan Manuel Azambuja	06dc53749a	delete unused javascript views	2013-03-15 14:39:34 -03:00
Jonne Haß	8f6ae75423	Merge pull request #4039 from marpo60/diaspora_with_sprites Add Sprites to Diaspora!	2013-03-15 09:44:27 -07:00
Fabián Rodríguez	0a3e242e79	fix reshares in single post-view	2013-03-11 22:45:25 -03:00
Juan Manuel Azambuja	2556f08b89	[Sprites] update sprites after develop merge	2013-03-11 20:16:16 -03:00
Juan Manuel Azambuja	1115e10536	Merge branch 'develop' into diaspora_with_sprites Conflicts: Gemfile Gemfile.lock app/assets/stylesheets/application.css.sass app/assets/templates/comment_tpl.jst.hbs app/assets/templates/stream-element_tpl.jst.hbs app/helpers/aspects_helper.rb app/helpers/contacts_helper.rb app/views/aspects/_aspect_listings.haml app/views/aspects/toggle_contact_visibility.js.erb app/views/contacts/_aspect_listings.haml app/views/layouts/_header.html.haml app/views/shared/_footer.html.haml app/views/tags/_followed_tags_listings.haml	2013-03-11 20:10:55 -03:00
Juan Manuel Azambuja	8686cb4fcb	[Sprites] social media logos sprite usage	2013-03-11 19:27:35 -03:00
Juan Manuel Azambuja	8747e6601d	[Sprites] add sprites for branding	2013-03-11 19:26:57 -03:00
Juan Manuel Azambuja	f429cacd7a	[Sprites] add sprites for icon images	2013-03-11 19:26:11 -03:00
Florian Staudacher	0de68fb713	Merge pull request #4029 from MrZYX/4027-unicode-tags decode tag name before passing it into TagFollowingAction	2013-03-11 05:51:54 -07:00
movilla	7a8269ebf3	* Add test for mobile page: Edit profile mobile, Conversations mobile, Getting Started mobile * Complete the existing: Post mobile. * Complete some test for no mobile: Edit profile, Post main. * Fix little error css and js mobile. * Add file-upload-custom javascripts to mobile.js.	2013-03-10 15:02:18 +01:00
Jonne Haß	60bd29aa68	decode tag name before passing it into TagFollowingAction, fixes #4027	2013-03-08 13:47:55 +01:00
Florian Staudacher	f8513c2005	Merge pull request #3944 from MrZYX/modular_layouts Modular layouts	2013-03-08 02:50:43 -08:00
embs	e7daa978e3	Show timestamp when hovering on comment time-ago string. Closes #4042	2013-03-08 00:33:19 -03:00
pestrada	18aeeb052b	reset comment box height after posting a comment refactor create comment method	2013-03-07 12:55:03 -06:00
Jonne Haß	55cb070ac9	add header to sign up page	2013-03-06 19:01:07 +01:00
Jonne Haß	ad16451e1f	Merge pull request #4006 from afrerich/feature/3899-long-tags-break-the-layout fade long tag names - refs diaspora/diaspora#3899	2013-03-02 12:20:15 -08:00
aaronf	cd78aa5a65	fade long tag names - refs diaspora/diaspora#3899	2013-03-02 13:57:30 -06:00
Jonne Haß	df1abefc1c	Merge pull request #4015 from movilla/upload_photo_1 Fix css and js error with upload photo mobile	2013-02-27 17:11:04 -08:00
movilla	9b2d3c66bf	fix css and js error with upload photo mobile	2013-02-28 01:09:40 +01:00
Jonne Haß	b1cdc30367	Merge pull request #4004 from movilla/upload_photo Upload photo mobile. Close #3324	2013-02-26 15:30:09 -08:00
movilla	76b1e9b0dc	Add the ability to upload photos from the mobile site	2013-02-26 23:25:58 +01:00
pestrada	3f3409a0a5	avoid posting empty comments fix Jasmine test updated changelog with bugfix #3836 fix changelog update remove wrong bug fix line	2013-02-25 18:27:46 -06:00
Jonne Haß	0cf1c2d020	Sort tag followings alphabetically, not in reverse, fixes #3986	2013-02-24 16:22:01 +01:00
Fabián Rodríguez	e76935daaf	remove inline styles from views/people/show	2013-02-23 22:36:04 -02:00
movilla	c52a878e86	Wrap text if too long in mobile notifications	2013-02-22 16:15:25 +01:00
movilla	5769abcc32	Include our custom fileuploader on the mobile site too	2013-02-20 16:01:08 +01:00
Jonne Haß	35ba082ab5	Merge branch 'overflow_mobile_post' of git://github.com/movilla/diaspora into develop Conflicts: Changelog.md	2013-02-17 15:48:34 +01:00
Jonne Haß	40b10dc0d9	Merge branch 'overflow_author_infor' of git://github.com/movilla/diaspora into develop Conflicts: Changelog.md	2013-02-17 15:47:20 +01:00
Jonne Haß	4264804343	Merge pull request #3984 from movilla/frienliar_new_conversation Friendlier new conversation mobile	2013-02-17 06:44:59 -08:00
Florian Staudacher	4cbae601e8	[WIP] aspect membership dropdown Backbone.js rework * initial backbone port * changed AspectMembershipsController#destroy to use aspect_membership_id * included rudimentary jasmine specs * more specs, updating the list elements after de-/selection * update selected aspect count on button * don't even try to render html in AspectMembershipsController * more specs for button summary text * adapt aspect management on contacts page and in the popup boxes * adapt inline creation of aspects + memberships TODO * more tests	2013-02-17 13:40:10 +01:00
movilla	ce76f12591	friendlier new-conversation mobile	2013-02-16 22:53:43 +01:00
movilla	dfcc8e7c80	Overflow info_author mobile web	2013-02-16 14:51:51 +01:00
movilla	4d6110246e	Overflow name author mobile post	2013-02-15 17:44:54 +01:00
Lennart Prelle	2d0abe8309	added a id and a autoscroll to first unread message in conversation (Fix: #3216 )	2013-02-11 16:15:01 +01:00
movilla	63f1d1c197	friendlier mobile buttons	2013-02-09 15:23:04 +01:00
movilla	4343914cdb	Twitter/Facebook/Tumblr count down characters is hidden by the picture of the post	2013-02-04 21:31:48 +01:00
movilla	0ea7bc5258	Adapt css for search mobile page	2013-02-02 23:23:22 +01:00
Jonne Haß	865152be90	Merge pull request #3949 from movilla/gettins_started Add Getting_Started page mobile. Close #3854	2013-02-02 08:00:16 -08:00
movilla	27813ec5dd	Excessive padding with select aspect in mobile publisher	2013-02-02 16:41:14 +01:00
movilla	507e8ee199	Add Getting_Started page mobile	2013-02-02 16:02:19 +01:00
Jonne Haß	b8128d356b	Merge branch 'hotfix/0.0.2.4' into develop Conflicts: Changelog.md app/views/people/show.html.haml config/defaults.yml spec/helpers/layout_helper_spec.rb	2013-02-01 22:24:37 +01:00
Jonne Haß	7134513b28	Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. #3948 From a quick look at the for us available databases this was not actually used in the wild.	2013-02-01 22:20:31 +01:00
Asphyxia	6df84ed703	Fix wrong message on infinite scroll on contact page	2013-01-31 23:09:51 -03:00
Asphyxia	07ae4e618c	Repeated post on stream fails when content is the same	2013-01-31 22:01:09 -03:00
Asphyxia	1ed0318db7	Reshare alert box is appearing twice	2013-01-31 14:52:47 -03:00
Asphyxia	b91ed859a1	Hovering a Timeago-String should show the Timestamp	2013-01-31 13:43:37 -03:00
Asphyxia	389e93a3ae	Stream form on profile page	2013-01-31 00:15:27 -03:00
Jonne Haß	4eb98cd7dc	Merge branch 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile Conflicts: Changelog.md	2013-01-29 14:58:11 +01:00
movilla	0010819343	add settings web mobile	2013-01-27 20:38:19 +01:00
Ivan K	549aa29cf1	fix #2339 : set unicode-bidi property to prevent username to overlay the pubdate	2013-01-27 18:49:42 +06:00
Jonne Haß	946121f672	Merge pull request #3827 from diasp/feature/1338-links-sidebar Show links in sidebar #1338	2013-01-26 04:09:22 -08:00
Diaspora Europe	6d4e577676	show links in sidebar #1338	2013-01-26 11:59:15 +01:00
Diaspora Europe	e8d86f09bb	resize full scaled image to a specific width #3793	2013-01-26 11:36:01 +01:00
movilla	5d3e9f5c3d	Excesive padding with "user-controls" in single post view	2013-01-25 17:34:23 +01:00
Jonne Haß	cb640b91b3	Merge pull request #3880 from Ruxton/feature/oembed_providers Oembed Update - Added instagram, better display for rich/photo	2013-01-25 07:50:24 -08:00
Asphyxia	f2c67b0d8a	Overflow comment textarea	2013-01-24 22:52:14 -03:00
Ruxton	89042078ca	Oembed Update - Added instagram, better display for rich/photo	2013-01-22 22:37:36 +08:00
Asphyxia	7f34c7af7a	Issue #3874 : Distorted profile thumbnail	2013-01-21 22:43:48 -03:00
Asphyxia	1af0f4bf2d	Issue #3828 : Unify hide and ignore options	2013-01-18 16:08:02 -03:00
Asphyxia	d6a9818632	Issue #3851 : Profile pictures not centered	2013-01-18 15:51:59 -03:00
Asphyxia	284c40b4da	Issue #3840 : Fix extra blank on streams	2013-01-18 15:25:01 -03:00
Asphyxia	c0dd888e61	Issue #3832 : Logged-out users stream options	2013-01-18 15:10:13 -03:00
Fabián Rodríguez	d7574a9efb	add locale to aspects	2013-01-16 19:59:10 -02:00
Fabián Rodríguez	ed4020b9b3	Update stream's title and publisher's dropdown on aspect selection	2013-01-16 19:33:20 -02:00
Fabián Rodríguez	8d202e481b	fix aspect's select_all deselect_all	2013-01-16 19:33:20 -02:00
Fabián Rodríguez	53ba55c9ca	adds stream_aspect class	2013-01-16 19:33:20 -02:00
Fabián Rodríguez	3f314cc7bb	remove streams-aspects	2013-01-16 19:33:20 -02:00
Fabián Rodríguez	e9031a7bf3	add toSentence support in aspects	2013-01-16 19:33:20 -02:00
Fabián Rodríguez	30a2f0bc33	remove aspect-navigation.js	2013-01-16 19:33:20 -02:00
Fabián Rodríguez	29c48ca557	Add ability to toggle aspects	2013-01-16 19:33:19 -02:00
Fabián Rodríguez	4a07602ad3	add aspects route to backbone router	2013-01-16 19:33:19 -02:00
Fabián Rodríguez	572e6b5639	render aspects client side	2013-01-16 19:33:19 -02:00
Fabián Rodríguez	62fc9880f9	add aspects_list handlebar template	2013-01-16 19:33:19 -02:00
Fabián Rodríguez	00ef2ce1c0	add aspect\'s handlebar template	2013-01-16 19:33:19 -02:00
Fabián Rodríguez	28b3acf36e	add aspects_list_view	2013-01-16 19:33:19 -02:00
Fabián Rodríguez	a9d93beca8	Add aspect_view	2013-01-16 19:33:18 -02:00
Fabián Rodríguez	ae1317dbc0	Add Aspect model and collection to backbone	2013-01-16 19:33:18 -02:00
Tom Scott	51db25e333	Fix `.close img` looking off-center.	2013-01-13 23:47:15 -05:00
Tom Scott	e5d027e29e	Merge pull request #3839 from asphxia/feature/3837-hovercard-causes-horizontal-scrollbar Hovercard no longer causes horizontal scrollbar to appear. Fixes #3837.	2013-01-13 20:41:32 -08:00
Asphyxia	bcc11b3c41	Issue #3837 : Hovercard causes horizontal scrollbar to appear	2013-01-14 00:04:36 -03:00
Tom Scott	575e314cc4	Merge pull request #3834 from asphxia/3833-popups-overlap-header Fix popovers overlapping the header topbar on scroll.	2013-01-12 07:50:45 -08:00
Asphyxia	df8f46b5af	fix .popover overlapping header	2013-01-12 10:51:31 -03:00
Asphyxia	cd6bd0e28f	fix after sign-up popups overlaping header	2013-01-12 07:41:16 -03:00
Fabián Rodríguez	aabbea6ee2	fix issue #3671 reshare a post multiple times	2013-01-12 04:52:56 -02:00
Diaspora Europe	c8ddba6b3e	add images to notifications	2013-01-11 12:30:12 +01:00
Jonne Haß	beb32ce91f	hovercards everywhere (comments, likes, top left sidebar stream summary thingy...) Say a word if you think it's getting too much...	2013-01-01 22:59:12 +01:00
Jonne Haß	fde28e9bea	display hovercards in reshares and on the linked name	2012-12-30 15:17:48 +01:00
Florian Staudacher	0092acd492	re-add hovercards * added a presenter for hovercard json * added new backbone view for handling hovercard JS * refactoring of PeopleController * finished the backbone js version of hovercards * don't try to make people_controller more restfull, out of scope just add a new route and use that for hovercard json * added spec for people_controller#hovercard * add new exception for "AccountClosed" to be able to raise from anywhere * removed legacy code, since everything got ported to backbone (except the "cache" stuff, but that's not strictly necessary)	2012-12-28 22:37:13 +01:00
movilla	ceace52762	Add progress percentage to upload images	2012-12-20 21:24:09 +01:00
movilla	763a893829	Add flash warning to conversation mobile, unification of flash warning with login and register mobile, and add support for flash warning to Opera browser	2012-12-08 14:59:01 +01:00
Jonne Haß	0677459ff9	Merge branch 'css_mobi_notif' of git://github.com/movilla/diaspora into develop	2012-12-08 13:47:13 +01:00
Florian Staudacher	2c7f2d6fbb	Merge branch 'feature/3779-hide-post-icon-alignment' of https://github.com/Flaburgan/diaspora into Flaburgan-feature/3779-hide-post-icon-alignment [ci skip] Conflicts: Changelog.md	2012-12-07 17:47:19 +01:00
movilla	491c2a537c	Add feature contact pod admin	2012-12-06 15:26:49 +01:00
Flaburgan	aee6068412	Resize deletelabel and ignoreuser images to align them	2012-12-02 13:20:24 +01:00
Liam	c9559b93f5	Update cat image so it's secure - new image from khanb1 on flickr.	2012-12-02 10:31:45 +00:00
David McMullin	0873ae9ab7	improve behaviour of deselect all	2012-11-25 17:38:19 +00:00
David McMullin	f6b32fd13a	rename the JS so the magic can return	2012-11-25 17:38:19 +00:00
Jonne Haß	7b548fd571	Merge pull request #3713 from davecocoa/feature/3630-backbone-ify-followed-tags port tagFollowings to BackBone	2012-11-25 09:30:47 -08:00
Jonne Haß	5f6e03cfe5	Merge pull request #3714 from marpo60/refactor Housekeeping	2012-11-22 01:06:05 -08:00
movilla	3fa0254876	add simple background for unread messages/conversations mobile	2012-11-13 19:58:25 +01:00
David McMullin	97664cb880	port tagFollowings to BackBone	2012-11-12 21:37:00 +00:00
Sean Tilley	7dfa6299ec	Merge branch 'reshares_count_stream' of https://github.com/movilla/diaspora into movilla-reshares_count_stream Conflicts: Changelog.md	2012-11-07 21:04:52 -06:00
Braulio Martinez	36c7c00550	Remove unused posts#new action from Backbone	2012-11-07 23:15:38 -02:00
Fabián Rodríguez	3d061d92c6	remove unused templates	2012-11-06 21:39:35 -02:00
movilla	5a2b22ff0c	reshares_count come back!	2012-11-06 21:05:48 +01:00
Jonne Haß	a78cacb799	Merge pull request #3687 from movilla/add_icon_mobile_my_activity Add My Activity icon mobile. Close #3680	2012-11-06 09:02:46 -08:00
movilla	e943a1cab6	Fix overflow button in mobile reset password	2012-10-31 23:31:24 +01:00
movilla	880b16f530	Add My Activity icon mobile	2012-10-29 12:14:19 +01:00
movilla	c9b58c9ff6	Add My Activity icon mobile	2012-10-26 22:47:43 +02:00
Sean Tilley	4b372cfca9	Merge pull request #3669 from DeadSuperHero/feature/remove-alpha-logo Remove Alpha logo from branding [ci skip]	2012-10-19 11:49:38 -07:00
Sean Tilley	e2a2767a74	remove alpha from branding	2012-10-19 13:47:27 -05:00
Florian Staudacher	2694c930a5	Merge pull request #3645 from Raven24/fix-link-regex simplify link regex and fix #3553	2012-10-19 02:24:24 -07:00
Jonne Haß	107b7b1cba	let closelabel.png and loading.gif respect the asset host	2012-10-16 16:56:08 +02:00
movilla	ebd1b28b2d	Fix problem javascript with read-unread notifications on notifications popup	2012-10-13 15:16:06 +02:00
Fabián Rodríguez	40f5314184	adds password_confirmation field to registration page	2012-10-11 19:45:52 -02:00
Florian Staudacher	ded69477ba	replace the monstrous link regex with a slightly less complicated one, based on the one from the markdown parser, fixes #3553 adding a list of urls for testing the regex in the specs	2012-10-11 23:39:44 +02:00
Jonne Haß	8febcfac9c	Merge pull request #3635 from movilla/fix_checkbox_select_profiles Edit Profile issue with misaligned elements - Fix #3599	2012-10-08 06:51:04 -07:00
movilla	509aa3116d	Edit Profile issue with misaligned elements - Fix 3599	2012-10-08 15:25:17 +02:00
Florian Staudacher	a9bec8a4ee	Merge branch 'hotfix/oembed-selector' into develop fix for the click event handler on oembed-ed content	2012-10-03 19:12:48 +02:00
Florian Staudacher	bf82fc17fe	fix oembed onclick behavior + specs	2012-10-03 19:05:17 +02:00
movilla	aa8c89a0e4	css error in post-viewer after update bootstrap	2012-09-29 15:19:39 +02:00
Jonne Haß	0a1be1400d	Merge pull request #3603 from movilla/translation_ignore_user_popup traslation popup ignore user => /stream	2012-09-22 13:47:34 -07:00
movilla	812fce7181	traslation popup ignore user /stream	2012-09-22 22:07:17 +02:00
Jonne Haß	3e44808cb2	Merge pull request #3587 from movilla/image_profile_post images disappeared user profiles in the publication (/post/) for not having class in css	2012-09-17 15:43:00 -07:00
movilla	bacb99cd18	images disappeared user profiles in the publication (/ post) for not having class in css	2012-09-17 23:41:46 +02:00
Jonne Haß	42f97db42e	Merge branch 'select_aspects_dropdown_list' of git://github.com/movilla/diaspora into develop	2012-09-17 21:36:36 +02:00
Florian Staudacher	8193978fd2	in 'standalone' mode, the close button is hidden ... publisher is embedded into something, that has its own close button	2012-09-17 20:46:33 +02:00
Florian Staudacher	1002fe088d	split up the various parts of the publisher, should probably rather be backbone-subviews ... ?	2012-09-16 17:38:58 +02:00
movilla	ae0ac1c72d	css change when you choose aspects before posting -dropdown list-	2012-09-16 17:37:27 +02:00
Florian Staudacher	948b84eca1	WIP backbone-ify publisher, get rid of weird old POJsO	2012-09-16 14:35:59 +02:00
Jonne Haß	f1631084d3	Merge pull request #3579 from movilla/css_modification_counter_tw_fb_tmblr css modification on the number of characters twiter, facebook and tumblr...	2012-09-14 08:28:58 -07:00
movilla	426fe1ab7d	css modification on the number of characters twiter, facebook and tumblr -.counter-	2012-09-14 16:45:03 +02:00
Jonne Haß	3dbbbbe979	bump jasmine and handlebars_assets, postfix all handlebars templates with _tpl to avoid name clashes	2012-09-12 21:22:34 +02:00
Jonne Haß	2de0213d6f	Revert "Removed a couple missed "new_styles" assets." This reverts commit `e323d6134e`.	2012-09-12 12:55:57 +02:00
Jonne Haß	2b729059c9	was too long awake last commit, here are the files back we still need	2012-09-12 12:55:57 +02:00
Hans Fase	e323d6134e	Removed a couple missed "new_styles" assets.	2012-09-12 04:05:33 -04:00
Jonne Haß	7ec2f8f419	finish beta striping A lot of cleanup is still needed, refactoring the CSS to be consistent, removing all sorts of unused stuff etc	2012-09-12 07:51:19 +02:00
Jonne Haß	ab0ad630df	strip last beta leftovers and fix syntax errors, travis is kinda down, lets hope nothing breaks while I sleep	2012-09-12 05:48:12 +02:00
Jonne Haß	ffde639f4d	Merge branch 'betastrip' of git://github.com/DeadSuperHero/diaspora	2012-09-12 04:55:10 +02:00
Sean Tilley	49ea8c8563	Strip Beta Features	2012-09-11 21:52:53 -05:00
movilla	10eb26ad2d	With mobile click "show" in #nsfw-posts links to top of page Fix: #3564	2012-09-11 16:42:55 +02:00
Florian Staudacher	04a17fd508	Merge pull request #3561 from movilla/NSFW_mobile_will_come_back NSFW mobile come back	2012-09-10 13:08:51 -07:00
movilla	a4a483af90	NSFW mobile come back	2012-09-10 20:48:34 +02:00
Sean Tilley	3deff9327a	Merge pull request #3557 from movilla/web_mobile_login_second New web mobile login (Jonne suggestion) [ci skip]	2012-09-08 12:02:15 -07:00
movilla	a564cbff9d	New_login_mobile_web_	2012-09-08 15:30:59 +02:00
Jeremy Huffman	c8f8f6741a	let profile tag entry grow to size of input box use auto so line-breaks work better	2012-09-07 23:24:41 -04:00
movilla	b0ecc57631	Fix uncomfortable overflow mobile post	2012-09-05 16:51:27 +02:00
Florian Staudacher	45223fd634	Merge pull request #3520 from movilla/new_mobile_resgistrations_ New mobile page registrations, add an error message to registrations page, friendlier design, add placeholders and ().upcase	2012-08-31 01:17:20 -07:00
movilla	6c6be3e22a	New mobile_web registrations	2012-08-29 23:09:52 +02:00
Daniel Grippi	b8f7d025d5	update landing page	2012-08-24 13:45:05 -07:00
movilla	75402bdfa0	Add icons search & contacts mobile	2012-08-21 16:50:37 +02:00
movilla	e41ef3caa5	Small changes in mobile_style	2012-08-20 22:40:52 +02:00
Maxwell Salzberg	2b2e5f1739	Merge pull request #3501 from movilla/private_conversation_new_0 Added private conversation for mobile - #1397	2012-08-20 10:52:07 -07:00
movilla	9913f40a38	Added private conversation for mobile	2012-08-20 16:33:05 +02:00
Maxwell Salzberg	54a6ac0c6f	add poduptime asset	2012-08-19 17:34:33 -07:00
movilla	9931f39ce0	add mobile conversation	2012-08-12 05:01:42 +02:00
Maxwell Salzberg	f065ba624b	Merge pull request #3492 from movilla/footer_mobile add padding-top footer mobile [ci skip]	2012-08-09 11:43:22 -07:00
Movilla	30d5816ae5	add padding-top footer mobile	2012-08-09 17:12:49 +02:00
Florian Staudacher	1a94a24fde	fix autolinking links that start with just www... and not a complete http://... (fixes #3468)	2012-08-09 13:09:06 +02:00
Florian Staudacher	6613522097	implement "special symbols" (switch certain strings for utf-8 symbols), fixes #3140	2012-08-08 00:26:20 +02:00
Florian Staudacher	8d512c22ac	fix markdown linking of images, also improve tests grammatically + 1 js syntax error	2012-08-07 23:53:24 +02:00
Florian Staudacher	c6ff849eb9	stream 'reshare' link undeliberately got the same font-size as the container [ci skip]	2012-08-07 19:24:22 +02:00
Maxwell Salzberg	a841d3a839	derp, not everyone wants a cdn from google. if anyone who has this problem wants to fix it, you need to set cross origin headers for your fonts if they are hosted from another domain for FF to recognize them. You cant set said header on cloudfront. Revert "fix roboto in firefox"" This reverts commit `e87d9af52c`.	2012-08-03 10:46:41 -07:00
Maxwell Salzberg	e87d9af52c	fix roboto in firefox"	2012-08-02 23:01:05 -07:00
Florian Staudacher	b9c4e8a02f	let the 'toggle mobile' link show in the footer, refactored layout a bit	2012-07-22 15:25:51 +02:00
Florian Staudacher	629277502f	Merge pull request #3450 from despora/mobile_messages add messages/conversations to mobile	2012-07-16 15:10:00 -07:00
Florian Staudacher	6efcac48b5	fix flash messages	2012-07-15 19:33:32 +02:00
Lennart Prelle	00032a1649	add messages to mobile	2012-07-14 14:23:03 +02:00
Florian Staudacher	038599bf8f	update jquery.mentionsInput to latest version + make some tests a little nicer	2012-07-10 20:37:57 +02:00
Florian Staudacher	ea8f358a9a	use unminified jQuery textchange plugin	2012-07-10 17:58:34 +02:00
Maxwell Salzberg	c2bbe4e466	somehow some dirty state made it into my merge :(	2012-07-02 11:34:31 -07:00
Maxwell Salzberg	190fceaf5c	[SECURITY FIX] please update your pod ASAP This is a fix for public messages, where a malicious pod could spoof a message from someone a user was connected to, as the verified signatures were not checked that the object was also from said sender. This hole only affected public messages, and the private part of code had the correct checks THX to s-f-s(Stephan Schulz) for reporting and tracking down this issue, and props to Raven24(florian.staudacher@gmx.at) for helping me test the patch	2012-07-02 10:00:12 -07:00
Florian Staudacher	e19d73792d	oembed video info	2012-06-25 15:25:09 +02:00
Florian Staudacher	9588169019	fix oembed iframe/thumb width for reshares [ci skip]	2012-06-25 13:09:56 +02:00
Florian Staudacher	1fb016597d	remove leftover edges from spinner, remove red bg color (fixes #3338 ) [ci skip]	2012-06-18 23:40:55 +02:00
Florian Staudacher	64a20793ec	don't open comment pane on show page, if a modifier key is pressed	2012-06-18 20:04:20 +02:00
Maxwell Salzberg	d3487c8b7d	fix sa mall possible xss in personImage handlebar helpers if the attacker had access to your root domain. fixes #3392	2012-06-16 14:59:51 -07:00
Florian Staudacher	8ca39f5936	show a "post is not public" message when visitor is not logged in and tries to access a show page of a non-public post	2012-06-07 22:16:37 +02:00
Benjamin Neff	769836c221	remove border from reshare link	2012-06-03 18:42:55 +02:00
danielgrippi	9bf60d178a	Revert "consolidate mixpanel streams by making Profile one page [ci skip]" This reverts commit `5af37fd3da`.	2012-06-01 13:48:51 -07:00
danielgrippi	5af37fd3da	consolidate mixpanel streams by making Profile one page [ci skip]	2012-06-01 13:24:01 -07:00
danielgrippi	8e2657d26b	more instrumentation [ci skip]	2012-05-30 19:26:07 -07:00
danielgrippi	dac781cb4f	array woes. boo [ci skip]	2012-05-30 19:03:23 -07:00
Dennis Collinson	f3d1afcc96	memoize selected frame	2012-05-30 18:09:59 -07:00
Dennis Collinson	374ec73fa4	make it clearer which frame is active, and fixes for scrolling flow.	2012-05-30 18:06:12 -07:00
danielgrippi	1c81e4f587	app.track => app.instrument to be less confusing	2012-05-30 17:56:28 -07:00
Maxwell Salzberg	91db7859d8	Merge pull request #3340 from DeadSuperHero/YouTubeFix Fix for YouTube Embeds in Show Pages [ci skip]	2012-05-30 17:52:50 -07:00
danielgrippi	a836b06d3e	mixpanel on posting	2012-05-30 17:32:18 -07:00
Sean Tilley	dfa925c375	remove max-height for iframe in show pages, this gets rid of the Chromium bug where YouTube videos appear in strange, elongated dimensions	2012-05-30 19:11:27 -05:00
Dennis Collinson	a7ced3f77b	make stream infininte scroll view static method on the page	2012-05-30 16:58:21 -07:00
Dennis Collinson	a9288daf19	refactor stream page scroll spy	2012-05-30 16:58:21 -07:00
Dennis Collinson	1ac01cc156	add our changes back to bootstrap custom	2012-05-30 16:58:21 -07:00
Dennis Collinson	0c8146a069	adding vanilla bootsrap scrollspy	2012-05-30 16:58:21 -07:00
Maxwell Salzberg	d926529ad7	wip dennis	2012-05-30 16:58:21 -07:00
danielgrippi	51d71bf394	DG MS; added scrollspy wip Conflicts: app/assets/javascripts/app/pages/stream.js app/assets/templates/stream-frame.jst.hbs	2012-05-30 16:58:21 -07:00
danielgrippi	d8470d303a	simple mixtracking	2012-05-30 15:25:19 -07:00
Maxwell Salzberg	82c4e0d577	add a podname app config var, and use it throughout the app	2012-05-30 12:11:59 -07:00
danielgrippi	55cfc0a367	Revert "load small-res images initially in small frames and load full res asynchronously to cut down on inital network time. this should make masonry do its thing faster. [ci skip]" we don't process images with the same aspect ratio at smaller resolutions. This reverts commit `6d038d6225`.	2012-05-28 21:49:09 -07:00
danielgrippi	6d038d6225	load small-res images initially in small frames and load full res asynchronously to cut down on inital network time. this should make masonry do its thing faster. [ci skip]	2012-05-28 21:40:45 -07:00
Dennis Schubert	f68f14aa5b	Quickfix: replace slideAndRemove() with remove() to prevent the ugly javascript error and make the post go away after click on "hide". Fixes #3249	2012-05-29 01:57:52 +03:00
Sean Tilley	0fff23f233	Merge pull request #3319 from clavisound/patch-1 I hope it solves bug 3292 (inverted desktop colors) [ci skip]	2012-05-27 21:58:45 -07:00
clavisound	f8d20751df	I hope it solves bug 3292 https://github.com/diaspora/diaspora/issues/3292	2012-05-25 21:01:46 +03:00
Florian Staudacher	54c21f95f0	fix author box in FF (fixes #3278 ) [ci skip]	2012-05-25 14:26:09 +02:00
Maxwell Salzberg	f2a67bbcc0	more legacy styling for the stream [ci skip]	2012-05-24 20:27:44 -07:00
Maxwell Salzberg	fb1fd665de	Merge pull request #3313 from OhaiBBQ/master BMM #3, “Show x more comments” deletes text in comment box when clicked	2012-05-24 20:20:58 -07:00
Maxwell Salzberg	2f4f5e9449	Merge pull request #3315 from OhaiBBQ/bugmash-one BMM #1, Adding long text before @mention breaks mentioned name highlighting [ci skip]	2012-05-24 20:15:57 -07:00
Dan Hansen	e248526bef	bugmash #4 The Publisher doesn’t expand after writing more than 30 lines of text	2012-05-24 19:50:39 -07:00
Dan Hansen	1327e5a492	bugmash #1 Adding long text before @mention breaks mentioned name highlighting	2012-05-24 19:34:39 -07:00
Dan Hansen	d334097ee2	bugmash #3 persist unsaved comment value after expanding comments	2012-05-24 19:08:43 -07:00
Dennis Collinson	c4240154b1	back to profile works	2012-05-24 12:43:06 -07:00
Maxwell Salzberg	bc25ef2385	dont navigate to posts that dont exisit	2012-05-24 12:31:53 -07:00
danielgrippi	58ac040f8f	clicking a permalink on the new stream does not make an HTTP request to go to the post's page	2012-05-24 12:05:27 -07:00
Dennis Collinson	f3174941bd	fix the "has no posts" on back bug.	2012-05-24 11:40:27 -07:00
Maxwell Salzberg	bed07872f2	composer now prevents you from submitting an empty frame.	2012-05-24 11:36:43 -07:00
Maxwell Salzberg	d270910500	set the submit button to be disabled on the framer, and write a test	2012-05-24 11:36:43 -07:00
danielgrippi	ed9c57e7db	made loader transparent [ci skip]	2012-05-24 11:17:05 -07:00
danielgrippi	fd6a858f83	don't do big styling on frames with the has-media class [ci skip]	2012-05-24 11:04:12 -07:00
danielgrippi	a5f023354a	fixed the empty state styling on smallframe [ci skip]	2012-05-24 11:00:07 -07:00
danielgrippi	34d98a6d3c	fixed some styling during the framing process [ci skip]	2012-05-23 18:47:01 -07:00
danielgrippi	5b3fcd07f3	added texture directory to assets/images [ci skip]	2012-05-23 17:28:02 -07:00
Maxwell Salzberg	82218fd7cb	new stream now remembers how far you have scrolled. also, jasmine is really cool.	2012-05-23 17:25:40 -07:00
danielgrippi	b736741ab8	added better images to framer [ci skip]	2012-05-23 17:07:41 -07:00
danielgrippi	5d2ea71766	added EditbaleSmallFrame class; frame on framer second step is partially editable	2012-05-23 17:07:41 -07:00
Maxwell Salzberg	fbb0961762	make logo on new stream a link back to stream [ci skip]	2012-05-23 16:07:42 -07:00
Maxwell Salzberg	8046a59da9	new stream has a loader [ci skip]	2012-05-23 16:00:27 -07:00
danielgrippi	2a37491be0	changed service icons; icons for template picker [ci skip]	2012-05-23 15:09:57 -07:00
Maxwell Salzberg	c21bc14c78	center big text on frames [ci skip]	2012-05-23 15:03:38 -07:00
Maxwell Salzberg	f3af73efc2	make some text on some legacy posts readable in the new stream [ci skip]	2012-05-23 14:59:11 -07:00
danielgrippi	0e1c66f5b6	DG MS; only show applicable frames in the framer step	2012-05-23 12:59:27 -07:00
danielgrippi	92cbcae9c3	DG MS; moved framer controls into a subview & off to the side	2012-05-23 12:16:35 -07:00
danielgrippi	120c6b46e0	MS; Fix fake following, as we took it out so I nuked the tests	2012-05-22 19:04:04 -07:00
danielgrippi	c6b8d75313	DG MS; cool header with background in new stream	2012-05-22 19:00:22 -07:00
danielgrippi	0c7492b94d	DG MS; add hatched texture to new stream [ci skip]	2012-05-22 15:58:34 -07:00
danielgrippi	20360b5cc5	DG MS; added interactions & permalink in the new stream [ci skip]	2012-05-22 15:48:23 -07:00
danielgrippi	2e52def47a	DG MS; background colors for great justice (on the stream)	2012-05-22 15:47:09 -07:00
Dennis Collinson	1c342282b0	fixing event passing	2012-05-22 15:11:21 -07:00
danielgrippi	abc4843273	DG MS; got scroll working [ci skip]	2012-05-22 14:35:05 -07:00
danielgrippi	83fec811cc	DG MS; author attribution in the stream; cleaned up some new stream styling	2012-05-22 13:50:19 -07:00
Dennis Collinson	9f1d0b64b4	killing stream_object_view	2012-05-22 13:43:21 -07:00
Dennis Collinson	36ef010ed9	DG DC MS; stream has one interactions div	2012-05-22 12:38:48 -07:00
danielgrippi	64a73fb665	new post types. remove old ones. yeah.	2012-05-21 18:45:01 -07:00
Dennis Collinson	10201f2e40	more work on new stream interactions, hella refactorz.	2012-05-21 17:15:10 -07:00
Dennis Collinson	fe0156a18b	cuking out new stream, refactors.	2012-05-21 15:14:23 -07:00
danielgrippi	481160bdcb	move canvas-frame functionality into js sub-class for great justice	2012-05-21 12:58:25 -07:00
danielgrippi	777c037e16	kill rich-media type with fire	2012-05-21 12:33:28 -07:00
danielgrippi	0960a090fa	actually use the computed image height; remove unused presenter	2012-05-21 11:09:42 -07:00
danielgrippi	ff42f250ca	make a small-frame template folder; we're not going to want the same dom structure moving forward...	2012-05-21 11:09:42 -07:00
danielgrippi	72f718c8c3	new login page. kept the old one for safe keeping.	2012-05-19 11:10:17 -07:00
danielgrippi	f4c06c8f88	add rounded buttons to the composer flow; slay multi-photo option	2012-05-18 19:46:51 -07:00
danielgrippi	62ba75ad1b	DG DC; Move stuff to second page of framer	2012-05-17 19:02:58 -07:00
danielgrippi	27aff7fb1e	DG DC; GREEEEEEEEEN	2012-05-17 17:01:31 -07:00
Dennis Collinson	c66bd9d6d8	fix posting with services, fix cuke	2012-05-17 15:32:35 -07:00
Dennis Collinson	00f1adc8b2	Going back to the composer from the framer is happy via button	2012-05-17 15:32:35 -07:00
Maxwell Salzberg	f24b1f1550	remove a bunch of unused assets [ci skip]	2012-05-17 15:14:51 -07:00
danielgrippi	c8aa67360b	backfill some tests; jasmine green	2012-05-17 13:31:40 -07:00
danielgrippi	e48d57b19b	Revert "DC fix back button to profile with this.deferred reference" This reverts commit `e5206f3429`.	2012-05-17 12:05:45 -07:00
danielgrippi	e5206f3429	DC fix back button to profile with this.deferred reference	2012-05-17 11:47:17 -07:00
danielgrippi	ed6785d7cb	don't use an iframe for the composer anymore. yayyyyy	2012-05-16 18:55:25 -07:00
Dennis Collinson	6282450418	killing rich media styling, WE'LL DO IT LIVE	2012-05-14 19:13:33 -07:00
Dennis Collinson	a90968ea2d	basic experimental stream	2012-05-14 17:57:02 -07:00
Maxwell Salzberg	5968583857	Merge pull request #3253 from SuperTux88/fix-paragraph-margin fix paragraph margin for comments and posts [ci skip]	2012-05-14 15:39:25 -07:00
Maxwell Salzberg	641ead632b	Merge pull request #3254 from SuperTux88/fix-oembed-css fix oembed when empty [ci skip]	2012-05-14 15:17:46 -07:00
Dennis Collinson	ca1a61825d	make post load faster from profile to show using dirty preloads for now. I like it dirty.	2012-05-14 12:14:11 -07:00
danielgrippi	7a11e9fd37	full bleed the mobile images [ci skip]	2012-05-14 11:44:41 -07:00
danielgrippi	70b28105e7	fix a little padding and background image weirdness on ios [ci skip]	2012-05-12 22:56:18 -07:00
danielgrippi	f14907e64c	more responsive stuffs [ci skip]	2012-05-12 22:29:08 -07:00
danielgrippi	31049fe1c4	get a little responsive in our css [ci skip]	2012-05-12 22:04:12 -07:00
Daniel Grippi	4fc44f137f	Merge pull request #3255 from SuperTux88/fix-aspect-dropdown fix aspect dropdown on contacts page [ci skip]	2012-05-12 20:21:38 -07:00
Dennis Collinson	3b897f29d8	kill unused (i hope) participations collection	2012-05-12 18:11:21 -07:00
Dennis Collinson	ec8625746e	add counts to small frame presentercomment out entirity of post_view feature in the hopes it will stop making rake hang	2012-05-12 18:08:45 -07:00
Dennis Collinson	f6e3c1b88b	seperate interactions from posts Lazily load post interactions on show page hella refactorz	2012-05-12 17:41:58 -07:00
Benjamin Neff	0b5f611f19	fix aspect dropdown on contacts page [ci skip]	2012-05-13 01:44:28 +02:00
Benjamin Neff	dd949fa715	fix oembed when empty [ci skip]	2012-05-13 00:29:51 +02:00
Benjamin Neff	2ff98a1001	fix paragraph margin for comments and posts	2012-05-12 23:38:28 +02:00
danielgrippi	132bdd3bc5	change create and edit buttons on new profile; remove old press assets	2012-05-11 15:12:22 -07:00
danielgrippi	7423dd095f	landing fixes for moz [ci skip]	2012-05-11 02:19:46 -07:00
danielgrippi	4b8cd8eb23	whoopsies on landing [ci skip]	2012-05-11 01:30:15 -07:00
danielgrippi	608a15faf4	the landing page.	2012-05-11 01:06:51 -07:00
Dennis Collinson	9b9a64ffd0	fix reshares in interaction presenternavigate replace states on next or previous so back and forward work default user image	2012-05-10 15:28:27 -07:00
Dennis Collinson	51b1ade3bc	DC DG; added LastThreeComments decorator so we don't have to load those comments when not needed (i.e. new profile pages)	2012-05-10 13:53:00 -07:00
Dennis Collinson	efa79a4ad7	Refactor Post Presenter and comment presenter	2012-05-10 12:24:21 -07:00
Maxwell Salzberg	eaedfc9827	create a new publisher using the new composer. only for beta users	2012-05-09 16:55:33 -07:00
danielgrippi	1791d6b1b8	defer the optimistic loading of profile wallpaper and title (at least wait until the call stack is emptied) [ci skip]	2012-05-09 00:46:40 -07:00
danielgrippi	b641cddb65	eagerly call isotope before images are loaded; optimistically assume wallpaper is in the cache until we actually fix the issue [ci skip]	2012-05-09 00:36:14 -07:00
danielgrippi	62829aee85	remove obnoxious box-shadow transition on hover; transition on transform [ci skip]	2012-05-09 00:24:28 -07:00
danielgrippi	f053b71c87	add title to service icons. yay. [ci skip]	2012-05-08 18:28:31 -07:00
danielgrippi	0ec364e44c	DG MS; popup on services, inlined in the composer	2012-05-08 18:09:33 -07:00
Maxwell Salzberg	b375182e0c	let line breaks work but don't push everything down on the stream [ci skip]	2012-05-07 19:53:47 -07:00
Dennis Collinson	d1d99d5dd4	Jamie Cai DC refactor isOwnProfile, fix tests	2012-05-07 17:53:37 -07:00
danielgrippi	cb2c972cee	Merge branch 'master' of github.com:diaspora/diaspora	2012-05-07 16:41:29 -07:00
Dennis Collinson	1c135b61fd	Jamie Cai DC message in profile when user has no posts	2012-05-07 15:56:30 -07:00
danielgrippi	34819b4128	temp button instead of textbox for beta-limbo users	2012-05-07 15:40:13 -07:00
danielgrippi	6e16a748e7	unfix css styling in one place; fix it in another [ci skip]	2012-05-07 15:13:27 -07:00
danielgrippi	f3a51615af	min-height instead of height to fix background issues [ci skip]	2012-05-07 13:29:56 -07:00
danielgrippi	730886c082	MS DG; fix some styling for empty profile state	2012-05-07 12:15:43 -07:00
danielgrippi	9bbea232c4	don't fetch the composer if not on your own profile page	2012-05-07 01:18:06 -07:00
danielgrippi	6010579c39	md5 the user's diaspora id for wallpaper image filename; clean up photo_form.js a little (thx max)	2012-05-06 12:35:11 -07:00
danielgrippi	56913ffb80	upload wallpaper for great success.	2012-05-06 12:35:11 -07:00
danielgrippi	91ffe00de2	apple-style drop shadows (blur the crap out of them); isotope doesn't overflow: hidden; anymore (no shadow cutoff) [ci skip]	2012-05-06 12:35:10 -07:00
danielgrippi	b5fbefad4b	this changes profile background colors to be dark, and sets up the groundwork for uploading user-selected background images for their profiles. all the styling is in place; what remains is creating a new image uploader and (possibly) a new controller action. for information on what command to use to darken the background image that's uploaded, see line 11 in `_profile.scss`. the current image tests in the public folder are results of the convert command noted.	2012-05-06 12:35:10 -07:00
Maxwell Salzberg	2f618f6dde	Merge pull request #3230 from movilla/close-amparito Translation "[X] Close" photo-post [ci skip]	2012-05-06 10:09:04 -07:00
danielgrippi	e5bb4216f9	clean up dom on post viewer; use circles instead of weird semi-rounded boxes to be consistent	2012-05-05 19:55:38 -07:00
Dennis Collinson	d47785d957	next and previous should be faster unbind events on navigate, implimented for at least the single page view bind changed to on for backbone navigating	2012-05-05 18:35:58 -07:00
Dennis Collinson	ada91e8568	next and last post don't have obnoxious blink 1/2 the time. why not the rest, I don't know, time to start getting into event cleanup territory.	2012-05-05 17:45:43 -07:00
movilla	bca5d3ffa7	Translation "[X] Close" photo-post	2012-05-05 14:39:58 +02:00
Sean Tilley	96af3ed944	Merge pull request #3224 from SuperTux88/add-paragraph-margin Add small margin for paragraphs [ci skip]	2012-05-05 02:12:08 -07:00
danielgrippi	456da7844a	set profile name… no tests make me a sad boy, but i must run & will backfill this one tomorrow.	2012-05-04 22:09:40 -07:00
danielgrippi	a5f34e67c7	made favicon sexier; extracted form-block into its own custom class; made the title of pages less caps-lock.	2012-05-04 21:25:50 -07:00
Benjamin Neff	a47e239d8e	Add small margin for paragraphs [ci skip]	2012-05-05 03:47:54 +02:00
Dennis Collinson	0fc399243b	fix next post and previous post, more efficient make controller actions make the presenter reflect that it is instance data ;-p needs tests lol.	2012-05-04 18:25:09 -07:00
danielgrippi	5821a84024	validations and all that jazz [ci skip]	2012-05-04 17:38:08 -07:00
danielgrippi	31af414a04	actually use labels, html5 validations, etc [ci skip]	2012-05-04 17:38:08 -07:00
danielgrippi	bae47a10eb	use layout in our actual controller. derp. [ci skip]	2012-05-04 17:38:07 -07:00
danielgrippi	40347038f8	DG RY; mostly done, validations pending [ci skip]	2012-05-04 17:38:07 -07:00
Dennis Collinson	4253796f55	preload post on post show	2012-05-04 16:55:09 -07:00
Dennis Collinson	6fcba2dd4b	preload javascript vars using gon	2012-05-04 15:17:32 -07:00
Dennis Collinson	9f930a9ba8	change margin on sticky notes [ci skip]	2012-05-04 13:31:17 -07:00
Sean Tilley	5529b640dc	Adding a z-index to post interactions may have been totally premature	2012-05-03 19:36:29 -05:00
Sean Tilley	2d6a7b1da1	Fix show page CSS so that hashtags and links are clickable on wallpaper posts	2012-05-03 18:19:01 -05:00
danielgrippi	2d3edbf74f	pulsate control to add new post if no posts present	2012-05-02 22:05:40 -07:00
danielgrippi	bc81c6985a	hover state on info in profile [ci skip]	2012-05-02 21:06:55 -07:00
danielgrippi	1b92fe7e7f	use zoom-in / zoom-out cursors to signify favoriting [ci skip]	2012-05-02 21:02:10 -07:00
Florian Staudacher	d31ea8f2bd	use back-to-top initializer, fixes #2840	2012-05-02 00:03:07 +02:00
movilla	4d3ba4f274	Little traslation "HOME" /post	2012-05-01 17:43:51 +02:00
danielgrippi	2acc52375d	small css tweak with info shade box shadow grossness [ci skip]	2012-04-29 11:58:23 -07:00
danielgrippi	90919fa488	don't attempt to favorite with a save if you are not the post owner. in doing so, you will get logged out. also, update the gemfile.lock	2012-04-29 00:05:49 -07:00
danielgrippi	cfb52a7129	dg ms; little js cleanup [ci skip]	2012-04-28 23:52:54 -07:00
Maxwell Salzberg	a4bf4a40f2	slay reLayout suckage by reading	2012-04-28 17:58:53 -07:00
Maxwell Salzberg	fcc18fa776	use cover for background-image [ci skip]	2012-04-28 17:58:48 -07:00
danielgrippi	1b6c33aff5	show a user's full profile info if she's on her own page. duh.	2012-04-28 17:41:22 -07:00
danielgrippi	c3b0bbd425	show new profile pages for those who have it activated	2012-04-28 16:06:36 -07:00
movilla	57e6c3861e	Translation popup "Reshare author's post?" /stream	2012-04-28 23:42:37 +02:00
danielgrippi	52efb3710c	show a follow button for users with pre-existing contacts (legacy beta testers)	2012-04-28 14:13:43 -07:00
danielgrippi	4dea64fe9f	click entire white bar on post in profile to go to show page to make it easier to navigate (our icons are too small for my dumb mouse to click) [ci skip]	2012-04-28 11:52:11 -07:00
danielgrippi	accd507f36	logout button on your profile [ci skip]	2012-04-28 11:51:27 -07:00
danielgrippi	9a547b8161	follow links on profile page [ci skip]	2012-04-28 11:13:39 -07:00
danielgrippi	cf85f15fcc	add padding around the composer box [ci skip]	2012-04-28 11:09:28 -07:00
danielgrippi	699b0cff16	don't expose follow/unfollow to a user in the UI following is good for bookkeeping in the database, but provides confusion, and could limit likes and/or commenting to start receiving notifications in a conversation.	2012-04-28 11:07:18 -07:00
Florian Staudacher	462959fbcd	Merge pull request #3190 from diaspora/reshare-flash use flash message instead of just appending reshares to the current stream	2012-04-28 10:04:40 -07:00
danielgrippi	8d08f2604b	added a follow button on others' profile pages [ci skip]	2012-04-27 20:59:44 -07:00
danielgrippi	92f72bdcbe	remove duplicated home button on post show page [ci skip]	2012-04-27 20:48:36 -07:00
danielgrippi	7f4af0359f	add bootstrap tooltips for great justice (and clarity) [ci skip]	2012-04-27 20:45:26 -07:00
danielgrippi	889b86f9cb	implicitly expand / contract a post by clicking on it. use the permalink icon to go to the show page. (user tested, mother approved)	2012-04-27 19:38:06 -07:00
danielgrippi	05683de16b	removed some old assets; added a link to profile edit next to quick stats on a profile page	2012-04-27 17:41:59 -07:00
Maxwell Salzberg	6b115a7d22	update backgound-size declaration for skinny images	2012-04-27 16:19:13 -07:00
Maxwell Salzberg	592a3f99b5	Role system to replace the yml admins and community spotlight. we can also now add a beta role	2012-04-27 16:14:43 -07:00
danielgrippi	7fafb0e3b2	DG RY; publisher css tweaks	2012-04-27 14:58:07 -07:00
Maxwell Salzberg	b138c91466	fix cucumber	2012-04-27 14:55:44 -07:00
Maxwell Salzberg	0f15c3e0b0	add z-index to home button, and some small whitespace junk [ci skip]	2012-04-26 21:43:21 -07:00
Maxwell Salzberg	7309114136	adding magic to buttons on framer [ci skip]	2012-04-26 20:30:17 -07:00
Maxwell Salzberg	fb4ad72378	composer is much cooler	2012-04-26 20:30:17 -07:00
Maxwell Salzberg	c3ef944878	push publisher form box up [ci skip]	2012-04-26 20:30:17 -07:00
danielgrippi	c413a494d7	retina-ify icons; fix 404 scrolling issue; serif -> san-serif in some style [ci skip]	2012-04-26 20:25:25 -07:00
danielgrippi	e55b305bca	better 404 page. with kittens.	2012-04-26 19:52:41 -07:00
danielgrippi	c9d0879d3d	fav by clicking on something yeahhhh	2012-04-26 18:39:43 -07:00
Maxwell Salzberg	387e188905	make the edit message make sense [ci skip]	2012-04-26 18:02:11 -07:00
danielgrippi	f08a539c23	clicking the pin icon on the profile takes you to a map [ci skip]	2012-04-26 17:53:36 -07:00
Maxwell Salzberg	c6da8e74ad	background-size for fun and profit [ci skip]	2012-04-26 16:45:46 -07:00
Maxwell Salzberg	851282cbe4	adding home button to single post view	2012-04-26 16:45:46 -07:00
danielgrippi	2873cedd30	put dividers inside conditionals on profile-info [ci skip]	2012-04-26 16:09:26 -07:00
Florian Staudacher	0dee8aae36	[reshares] display flash message instead of just appending it to the stream (fixes #2094 )	2012-04-27 00:57:20 +02:00
danielgrippi	0b3926d810	fixed / removed some assets [ci skip]	2012-04-26 15:23:51 -07:00
danielgrippi	152101484c	updated some assets, THX RO. [ci skip]	2012-04-26 15:02:59 -07:00
Maxwell Salzberg	6d2cd31e73	disable framer button when you click it the first time.	2012-04-26 15:00:55 -07:00
danielgrippi	d3b874b020	add basic profile info to profile; remove random console.logs [ci skip]	2012-04-26 14:52:48 -07:00
Maxwell Salzberg	b387f89164	make composer not clip in both views [ci skip]	2012-04-26 12:46:04 -07:00
danielgrippi	164b1d716a	dont hardcode the url, yo	2012-04-26 12:46:04 -07:00
danielgrippi	828cc919d0	DG MS; proof of concept	2012-04-26 12:46:03 -07:00
danielgrippi	43518a9447	added home button nav on profile page [ci skip]	2012-04-26 12:29:22 -07:00
Maxwell Salzberg	adebdcbd2a	fix an incorrect size declaration in a mixing [ci skip]	2012-04-25 23:08:32 -07:00
Maxwell Salzberg	e9217931ce	only set the title when we have something nice to say	2012-04-25 23:08:11 -07:00
Maxwell Salzberg	87464b84d0	please do not set !important on a global link rule kthxbai	2012-04-25 23:07:56 -07:00
Maxwell Salzberg	3bce0be47c	simple hack to make bigtexts posts less sadface [ci skip]	2012-04-25 18:10:43 -07:00
danielgrippi	6933eeb675	show reshared people on hover [ci skip]	2012-04-25 17:23:16 -07:00
Maxwell Salzberg	7c9aaa0a68	fix some stray margin [ci skip]	2012-04-25 17:06:31 -07:00
danielgrippi	04abaf3523	don't show info in edit mode [ci skip]	2012-04-25 17:03:05 -07:00
danielgrippi	4e14dd2d01	info now comes from above; slightly fixed typography on single post view	2012-04-25 16:48:06 -07:00
Dennis Collinson	76ad02f2a5	hella spinners	2012-04-25 14:13:16 -07:00
Dennis Collinson	7346921473	MS DC; you can now kill a post on your profile.	2012-04-24 20:46:09 -07:00
danielgrippi	b2ab11944e	changed play button for videos [ci skip]	2012-04-24 19:54:09 -07:00
danielgrippi	c82e339640	follow button in [ci skip]	2012-04-24 19:40:33 -07:00
danielgrippi	9853197063	only show edit and new post controls if you're on your profile page	2012-04-24 19:24:45 -07:00
danielgrippi	ec096f8131	remove some opacity stuff; fix isotope pagination [ci skip]	2012-04-24 18:55:33 -07:00
danielgrippi	87fb922804	remove opacity and stuff from isotope [ci skip]	2012-04-24 18:05:40 -07:00
danielgrippi	570de98365	animate isotope! and inject image height in relation to ratio for quicker organization. [ci skip]	2012-04-24 16:38:17 -07:00
Dennis Collinson	8149648e5b	MS DC; youtube videos now display thumbnail, and sound cloud embeds are not total train wrecks;	2012-04-24 16:18:00 -07:00
Dennis Collinson	8cca2f028b	extract oembed view to seperate view	2012-04-24 15:38:38 -07:00
danielgrippi	44f28b8220	don't randomly fav things; fix wallpaper text on profile [ci skip]	2012-04-24 14:21:18 -07:00
danielgrippi	a659b4daf8	forgot about one other class case for font styling [ci skip]	2012-04-24 14:13:32 -07:00
danielgrippi	311afa7dc9	i guess my captions commit got lost somewhere [ci skip]	2012-04-24 13:56:37 -07:00
Dennis Collinson	6ac1c5bc21	images aren't darkened in wallpaper if they don't have text	2012-04-24 13:27:27 -07:00
Florian Staudacher	0dcb0f6446	attach handlers to a instead of img (rel #2950 )	2012-04-24 22:08:10 +02:00
danielgrippi	931dd2621b	fixed captions and stuff [ci skip]	2012-04-24 12:45:00 -07:00
danielgrippi	bff9d2d370	small css padding tweaks [ci skip]	2012-04-24 12:45:00 -07:00
danielgrippi	fe72c59ff7	make stars closer to the edges of posts [ci skip]	2012-04-24 01:04:49 -07:00
danielgrippi	91ebff75dd	added tests and stuff for own profile checking... for some reason something isn't getting triggered properly in the presenter call, though :(	2012-04-24 01:04:49 -07:00
Maxwell Salzberg	c667dac248	tweak single post css I kinda just fished thru @deadsuperhero's posts and try to make them look better	2012-04-23 23:57:02 -07:00
danielgrippi	84bd1fb1fc	return the person json response for profiles to get a correctly formatted name and expected avatar response; fix a jasmine spec around redirection	2012-04-23 23:31:39 -07:00
danielgrippi	dbe3b48aee	now you can click on an entire post to favorite / unfav it. yay. [ci skip]	2012-04-23 23:04:53 -07:00
danielgrippi	4be6f196cd	fix roboto; break long urls and stuff in sticky notes [ci skip]	2012-04-23 22:31:41 -07:00
Maxwell Salzberg	bf110f0818	make the default font size 2em [ci skip]	2012-04-23 19:18:39 -07:00
danielgrippi	3704170416	I <3 ROBOTO. [ci skip]	2012-04-23 19:17:31 -07:00
Dennis Collinson	6daafbd5a8	better stylings for markdown	2012-04-23 18:57:58 -07:00
danielgrippi	4bd1caa7fd	noteworthy typeface for big text [ci skip]	2012-04-23 18:51:59 -07:00
Dennis Collinson	43ed6dde46	fix width for markdown images [ci skip]	2012-04-23 18:19:34 -07:00
Dennis Collinson	40c04234bd	navigate to experimental profile on successful post	2012-04-23 18:08:02 -07:00
Dennis Collinson	044d03c12c	MS DC fix you tube videos on screen.	2012-04-23 18:08:02 -07:00
danielgrippi	8390756ddd	pop up stats on hover instead of always showing them [ci skip]	2012-04-23 17:57:04 -07:00
danielgrippi	51a6a3c8a3	added stars [ci skip]	2012-04-23 17:43:32 -07:00
Dennis Collinson	d64eb529d2	MS DC; text now overlays for wallpaper; ALSO. really sorry @danielgrippis stuff does not work in firefox. or safari. or konqueror. we will talk to him about it later	2012-04-23 17:30:23 -07:00
Dennis Collinson	88a17474f7	MS DC kill dead code in small Frame	2012-04-23 16:52:09 -07:00
Dennis Collinson	cfa518674f	MS DC MOAR profile tweaks, show cubbies posts	2012-04-23 16:45:16 -07:00
Dennis Collinson	0e8fd604e9	DC MS reworking newprofile grid WHOA	2012-04-23 16:44:39 -07:00
danielgrippi	affba80524	tweak profile top layout [ci skip]	2012-04-23 16:43:32 -07:00
Dennis Collinson	e8cfe01c8a	reLayouts when something is favorited, whoa	2012-04-23 12:35:13 -07:00
Maxwell Salzberg	85f2f13d79	more color [ci skip]	2012-04-23 12:23:10 -07:00
Maxwell Salzberg	bcdd03b4e9	markdownify profile in new profile view	2012-04-23 11:42:49 -07:00
Florian Staudacher	9562adaa10	put date formatting in a mixin	2012-04-23 14:34:20 +02:00
danielgrippi	f6a9fad9ad	make line height a bit better on yellow notes	2012-04-22 18:36:46 -07:00
danielgrippi	3eda2ca3a6	fix some pixels [ci skip]	2012-04-22 17:36:41 -07:00
danielgrippi	98e614bbe8	specifiy masonry width [ci skip]	2012-04-22 17:05:30 -07:00
Dennis Collinson	afc26c684b	DC MS infinite scroll with isotope on new profile page. boom!	2012-04-22 16:46:39 -07:00
danielgrippi	b6fc97a2a4	added styling & color to text posts [ci skip]	2012-04-22 16:21:22 -07:00
danielgrippi	85ab08035e	added stats on posts [ci skip]	2012-04-22 14:21:26 -07:00
danielgrippi	75d25e9475	users can now favorite posts	2012-04-22 12:06:15 -07:00
danielgrippi	494ba1f9b8	images that are single pane fill up the whole frame [ci skip]	2012-04-21 23:20:19 -07:00
danielgrippi	d38582c5de	youtube in canvas [ci skip]	2012-04-21 23:07:44 -07:00
danielgrippi	265e14fb13	remove some old small frame declarations [ci skip]	2012-04-21 22:25:37 -07:00
danielgrippi	ab7ac667d8	only focus on photos for now with ratios. one thing at a time, yo. i've temporarily removed all the arbitrary text switching for now (which is still in version control // which we will get to later) also moved photo dimensions into a dimensions hash in photo.rb.	2012-04-21 20:42:50 -07:00
Dennis Collinson	0279874e32	markdownify small frames, css for new profile.	2012-04-21 16:05:24 -07:00
Dennis Collinson	ca33070b9e	loader is background image of span fix tests	2012-04-21 15:21:52 -07:00
danielgrippi	e2adb8d26f	squares; how do they work	2012-04-21 13:12:57 -07:00
danielgrippi	b4ca14ade4	DG MS; clicking a post in the profile goes to the show page.	2012-04-21 13:12:57 -07:00
danielgrippi	aa4c554177	DG MS; added photos and more styling to the canvas view.	2012-04-21 13:12:57 -07:00
Dennis Collinson	3130bbad97	render template currently needs to be overridden WHOA junglist massiv	2012-04-21 13:12:57 -07:00
Dennis Collinson	f46dd08cb5	canvas view is infinite stream	2012-04-21 13:12:57 -07:00
Dennis Collinson	062de4c269	MDC DC New Profile shows users info Profile show json Profile backbone model	2012-04-21 13:12:56 -07:00
danielgrippi	f62b9f9698	wip.	2012-04-21 13:12:56 -07:00
danielgrippi	6d9dd1f4d3	skeleton in place.	2012-04-21 13:12:56 -07:00
Maxwell Salzberg	5f839aa26f	include modernizer in the mobile group so it works	2012-04-20 00:00:23 -07:00
Maxwell Salzberg	56312a3148	fix mobile modernizer with asset pipeline	2012-04-19 22:45:34 -07:00
Maxwell Salzberg	bfbae50e5a	update a few things for the asset pipeline, and fix a couple of other mobile bugs	2012-04-19 21:52:44 -07:00
Dennis Collinson	7253f190b5	rename css selector to MAGIC	2012-04-19 14:18:55 -07:00
Dennis Collinson	f7d320b622	MS DG; checkboxes are togglable, with tested css magick	2012-04-19 14:05:55 -07:00
Florian Staudacher	fe7de0544d	forgot to rename that ... (fixes #3169 )	2012-04-19 20:24:11 +02:00
Florian Staudacher	9f1713b8f9	bind to new eventname [ci skip]	2012-04-19 14:06:09 +02:00
danielgrippi	e379a6df0f	Merge branch 'master' into stream-for-photos Conflicts: app/assets/javascripts/app/views/stream_view.js	2012-04-18 18:30:54 -07:00
danielgrippi	a307b60dd2	DC DG extract infininte scroll to a mixin	2012-04-18 12:34:43 -07:00
Florian Staudacher	d8c42fde67	remove app.models.Photos	2012-04-18 20:21:16 +02:00
Florian Staudacher	8eb70c8a80	use app.models.Stream instead of app.models.Photos, change naming a bit to be more general since its posts+photos now (re #3158)	2012-04-18 20:20:56 +02:00
Florian Staudacher	4385027443	small js fixes closes #3106 - hardening url handling, fixes #2725 - backport from upstream	2012-04-18 19:59:34 +02:00
danielgrippi	3621576717	add/remove hidden class for pagination instead of manipulating HTML contents on every page load.	2012-04-18 10:27:22 -07:00
Maxwell Salzberg	b10aedb615	update the iframe route, fix a small styleing thing in newspaper style for iframe view	2012-04-17 22:43:47 -07:00
Maxwell Salzberg	90a2f05515	include an iframe route, for posts, and a magic body padding removal for screens with small widths (for some reason, smaller than 770	2012-04-17 22:28:01 -07:00
danielgrippi	3479cb7bdd	refactored stream and Stream View streamView no longer abuses render with fetching moved post collapsing into contentView subtle nicification.	2012-04-17 21:06:34 -07:00
danielgrippi	37cd6f616e	refactor stream fetching logic	2012-04-17 19:18:12 -07:00
Dennis Collinson	16223d003f	change new publisher to public by default to make testing easier	2012-04-17 16:43:42 -07:00
Florian Staudacher	fe130caf10	moved non-ascii url markdown tests to text_formatter_spec, added test case + fix	2012-04-16 23:41:05 +02:00
Florian Staudacher	d328cdaa96	"twipsy" is now "tooltip", "position" must be "placement" and "select" is not a valid trigger - should fix a few cukes...	2012-04-15 02:02:12 +02:00
Dennis Collinson	a0ea8c8542	Update aspects dropdown to say number of selected aspects	2012-04-13 17:49:49 -07:00
Maxwell Salzberg	c4b36a179e	Merge pull request #3138 from stevenh512/bootstrap-sass bootstrap-sass (w00t)	2012-04-13 17:44:08 -07:00
Steven Hancock	acf823ff1b	bootstrap-sass fixes * Update interim-bootstrap to use the partials from bootstrap-sass, since some of the names have been changed (and we're using the Bootstrap 2 javascript now). This should make it easy to keep the file up to date with the version of Bootstrap we're using. * Use interim-bootstrap instead of bootstrap-complete in default.css to avoid the little problem I ran into with Bootstrap + Blueprint grids not getting along. :) * Revert the CSS class change (from .span-24.last to .row) in layouts/application since interim-bootstrap works around that problem. * Get rid of .icon-black since it's not needed. * Remove the 60px padding on the page body since it isn't needed and causes problems with the single post view.	2012-04-13 17:37:38 -07:00
Dennis Collinson	9e50d0efb6	Newspaper theme selected by default, template picker object	2012-04-12 15:21:07 -07:00
Dennis Collinson	c1f2bbac88	Wallpaper frame selected when post has one photo	2012-04-12 11:56:27 -07:00
Dennis Collinson	d767410e6d	mentions are clickable in framer	2012-04-11 18:34:12 -07:00
Dennis Collinson	20da08408f	can mention in new composer	2012-04-11 17:07:53 -07:00
Steven Hancock	021cc99492	bootstrap-sass Upgrade our current Bootstrap 1 and 2 dependencies to use Bootstrap 2.0.2 from the bootstrap-sass gem. I had to modify layouts/application to get the stream page to render properly, looks like a slight conflict between Bootstrap and Blueprint grid systems, with .span-24 instead of .row I was seeing the whole right bar dropped to the bottom of the page below the left bar. I also modified two other templates since Bootstrap 2.0.2 includes a "badge" class that was making our navbar badges look funny. :)	2012-04-11 06:16:01 -07:00
Dennis Collinson	f610cdce17	tweak composer [ci skip]	2012-04-10 12:22:36 -07:00
Dennis Collinson	b543f8a3ca	fix display of service icons [ci-skip]	2012-04-10 12:12:40 -07:00
danielgrippi	a1d4ca9bec	Refactor composer and framer to user same layout composer touchup; added controls to the bottom; centered input area; removed forms.Base view Fix tests	2012-04-10 11:38:35 -07:00
Florian Staudacher	9c7103be1d	don't set publisher height on focus (already done in css), fixes #3109	2012-04-06 21:21:35 +02:00
Maxwell Salzberg	9c9562d0fd	fix http urls with 3 slashes	2012-04-04 19:08:36 -07:00
danielgrippi	39d688044d	DG DC; visual fixups	2012-04-04 18:59:19 -07:00
danielgrippi	6098890783	redirect to post show on create	2012-04-04 18:59:19 -07:00
danielgrippi	9b02633dff	framer has better styling	2012-04-04 18:59:19 -07:00
Dennis Collinson	06110b8732	newspaper template WIP	2012-04-04 18:59:19 -07:00
danielgrippi	59f092c26a	added bootstrap extensions to new-templates [ci skip]	2012-04-04 13:22:44 -07:00
Maxwell Salzberg	d755f03cd0	add two more images to the assets	2012-04-04 13:12:07 -07:00
Maxwell Salzberg	d616e902c9	add favicon back	2012-04-04 13:00:25 -07:00
danielgrippi	3bc3f13651	upgrade backbone, fix tests some cukes may be failing non deterministically, I think, do we bump the cuke timeout?	2012-04-03 16:31:52 -07:00
danielgrippi	e156947d0b	fix jasmine specs	2012-04-02 18:17:55 -07:00
Daniel Grippi	6f75fb4173	Merge pull request #3088 from Raven24/fix-bmm-2 show an error message when creating a comment failed [ci skip]	2012-04-01 18:24:54 -07:00
Daniel Grippi	a45eed13d5	Merge pull request #3086 from Raven24/fix-publisher-height reset publisher css height when "cleared" [ci skip]	2012-04-01 18:24:00 -07:00
Florian Staudacher	ef292c40eb	create a dummy-participation object, that the post appeas followed by self	2012-04-01 22:34:54 +02:00
Florian Staudacher	e6ebf4ad62	show error message when creating a comment failed (e.g. when the post got deleted in the meantime) bug mash 5.2	2012-03-30 19:42:14 +02:00
Florian Staudacher	859c0b93b5	reset publisher css height when "cleared" (fixes #2867 )	2012-03-30 16:09:41 +02:00
Maxwell Salzberg	b0a9e9ee59	the header background is not in the branding folder [ci skip]	2012-03-29 16:46:08 -07:00
Raven24	5ad38a5372	damn my brain!	2012-03-30 01:50:21 +03:00
Maxwell Salzberg	a08711c74e	Merge pull request #3083 from DeadSuperHero/branding-pack Branding Pack [ci skip]	2012-03-29 15:39:58 -07:00
Maxwell Salzberg	fe1c0d34d5	Merge pull request #3084 from Raven24/non-ascii-begone finally (hopefully) fix non-ascii urls + new & old tests	2012-03-29 15:35:48 -07:00
Florian Staudacher	ae3e225e28	finally (hopefully) fix non-ascii urls + new & old tests	2012-03-30 00:29:34 +02:00
Sean Tilley	19bf699b9f	Move branding assets to /images/branding for asset pipeline, update template files to point to new branding directory	2012-03-29 17:18:27 -05:00
Dennis Collinson	59f7f504e8	Wallpaper Mood	2012-03-29 15:14:09 -07:00
Dennis Collinson	6488cd004b	Disable Mentions in trumpeter to fix cukechange assertion of mood	2012-03-29 12:16:59 -07:00
Steven Hancock	77b107831b	punycode.js is required by our javascript The punycode.js file was somehow removed from the repo. This replaces it with the current version from github and adds it to our main.js manifest. Our javascript requires punycode for (at least) stream rendering.	2012-03-28 20:03:00 -07:00
Dennis Collinson	a9c0c4098b	add bootstrap dropdown	2012-03-28 19:13:51 -07:00
Dennis Collinson	755ff52452	turn asset pipeline debugging off there was a collision with the aspects-dropdown view in the new publisher, also it takes too much time with it on	2012-03-28 19:01:44 -07:00
Dennis Collinson	875ce68556	fixes for jasmine	2012-03-28 16:32:24 -07:00
Dennis Collinson	78a2ed28b9	User can select Night and Day Moods headline method on post extract headline and body from post, at first newline Night Mood	2012-03-28 16:22:05 -07:00
Dennis Collinson	f25effcafe	move handlebars templates for asset pipeline	2012-03-28 16:21:30 -07:00
Maxwell Salzberg	0ce0f3ca74	NOTE: DO NOT PULL THIS ON PRODUCTION TILL FURTHER NOTICE asset pipeline WIP Merge branch 'rebased-asset-pipeline'	2012-03-28 14:52:55 -07:00
Maxwell Salzberg	402694e516	fixing cukes	2012-03-28 14:47:28 -07:00
Maxwell Salzberg	5dbfd89d93	some more fixes for the show pages	2012-03-28 13:56:52 -07:00
Maxwell Salzberg	283e730430	AHHH CRAZY. stupid branchs. WIP	2012-03-27 18:40:02 -07:00
Maxwell Salzberg	e1bf6441fe	update new js files	2012-03-27 18:26:46 -07:00
Steven Hancock	8b92ed73a4	Remove jquery_ujs from main.js manifest Since jquery and jquery_ujs are now included by the jquery_include_tag helper (see commit 9e752585), they shouldn't be included by the asset pipeline in our javascript manifests. :)	2012-03-27 18:08:28 -07:00
Steven Hancock	b48d5fb9c1	Refactor sass/scss stylesheets to use Rails asset helpers Now that sass-rails and the asset pipeline work, we should use the asset helpers Rails gives us rather than hard-coding url("/assets/filename.png") for loading assets from sass/scss stylesheets.	2012-03-27 18:08:28 -07:00
Steven Hancock	95d5c9ca68	Fix Jasmine tests - first pass 193 specs \| 5 failing The 5 failing specs appear (according to Firebug) to be due to missing fixtures and/or missing routes in the Jasmine environment. Fixing these last 5 failures is a task probably best left to a more experienced Javascript/Jasmine developer. This commit also moves validation.js and clear-form.js into app/assets/javascripts and precompiles validation.js	2012-03-27 18:08:27 -07:00
Steven Hancock	1aa0b15c8c	Move Javascript to the asset pipeline * Move all Diaspora-specific javascripts to app/assets/javascripts * Move all vendored javascripts to vendor/assets/javascripts * Add the appropriate Sprockets require directives to make sure everything gets included in the right order * Remove Jammit dependencies * Fix all templates that were using Jammit's include_javascripts helper * Add handlebars_assets gem for compiling Handlebars templates * Move all Handlebars templates to app/assets/templates and rename from .handlebars to .jst.hbs (this is to keep them in the same global JST namespace that they were in under Jammit) * Add public/assets to .gitignore since these files can and should be re-generated by Heroku or Capistrano during each deploy * Fix a few Handlebars templates that were looking for images in the wrong location (I'm sure there are others, but it's late) * Configure application.rb to precompile all javascript and css assets that were compiled by Jammit in the Rails 3.0 code	2012-03-27 18:07:44 -07:00
danielgrippi	5b2716d2ef	MS DG; move images to assets	2012-03-27 18:07:22 -07:00
danielgrippi	06936bcdce	stylesheets are basically now being served from sprockets	2012-03-27 18:07:20 -07:00

... 13 14 15 16 17 ...

1375 commits