diaspora

Author	SHA1	Message	Date
Jonne Haß	24a3a42e90	Merge pull request #4880 from svbergerem/hovercard-bootstrap-style-fixes Improve hovercard style on Bootstrap pages	2014-03-30 22:34:31 +02:00
Jonne Haß	07aec2a630	Merge branch 'hpetru-4864-ui-bug-when-tag-is-long' into develop	2014-03-30 13:39:32 +02:00
Hincu Petru	699f327762	Long tags are no longer cut off in the post streams Fixed in streams	2014-03-30 13:37:31 +02:00
goobertron	57d796be1d	Fix indentation	2014-03-28 15:21:22 +00:00
Steffen van Bergerem	1fc38278bb	Improve hovercard style on Bootstrap pages	2014-03-28 14:00:16 +01:00
goobertron	1dfde65556	Alter link behaviour of OG previews	2014-03-26 19:24:06 +00:00
Jonne Haß	ab15bad53f	Merge pull request #4858 from hincupetru/4514-clicking-show-more-comments-empties-textarea Save textarea value before rendering comments when clicked 'show more....'	2014-03-24 14:56:45 +01:00
Steffen van Bergerem	cd241ee94d	Hovercards! Everywhere!	2014-03-23 01:15:26 +01:00
Steffen van Bergerem	d9857a3a10	Add separator between days, don't display grey zero	2014-03-20 00:23:38 +01:00
Steffen van Bergerem	4fc9c6416e	Port notifications to Bootstrap	2014-03-19 18:45:52 +01:00
Steffen van Bergerem	eabdc7390c	Port aspect membership dropdown and hovercards	2014-03-19 17:54:22 +01:00
Steffen van Bergerem	f217a5bc11	Add filters to notifications controller	2014-03-19 17:54:22 +01:00
Hincu Petru	1cef3e42ce	I save textarea value before rendering comments when clicked 'show more..'	2014-03-19 12:36:04 +00:00
Jonne Haß	835608f06f	Merge pull request #4856 from hincupetru/3692-hashtags-inside-markdown-link Check if the hashtag is a link in function .hashtagify	2014-03-16 14:39:20 +01:00
Hincu Petru	694dc7d80b	Check if the hashtag is a link in function .hashtagify	2014-03-16 11:59:49 +00:00
Jonne Haß	cfca0e88f1	Revert "Merge pull request #4847 from hincupetru/3692-hashtags-inside-markdown-link" This reverts commit `06ab498620`, reversing changes made to `3c4d8d95d3`. Conflicts: Changelog.md	2014-03-15 21:08:54 +01:00
Jonne Haß	f2fedea3db	Merge pull request #4853 from hincupetru/4693-notifications-hovercard-avatars-misaligned Fixed "hovercard avatars misaligned in notifications drop-down"	2014-03-15 19:15:08 +01:00
Jonne Haß	06ab498620	Merge pull request #4847 from hincupetru/3692-hashtags-inside-markdown-link Solved problem with hashtags inside markdown links	2014-03-15 19:12:37 +01:00
Jonne Haß	3c4d8d95d3	Merge pull request #4794 from Flaburgan/improve-search-page Add handle indication on search page, improve design	2014-03-15 19:09:42 +01:00
Jonne Haß	d4e046ecbc	Merge pull request #4787 from hincupetru/4726-infinite-photo-stream Added limit by max_time to photos#index for prevent "infinite photo stream"	2014-03-15 19:07:48 +01:00
Jonne Haß	8280556a47	Introduce message renderer This new class replaces all existing server side message rendering helpers and is the new global entry point for such needs. All models with relevant fields now expose an instance of MessageRenderer for those. MessageRenderer acts as gateway between the existing processing solutions for markdown, mentions and tags and provides a very flexible interface for all output needs. This makes the API to obtain a message in a certain format clear. As a result of centralizing the processing a lot of duplication is eliminated. Centralizing the message processing also makes it clear where to change its behaviour, add new representations and what options are already available.	2014-03-15 17:16:17 +01:00
Hincu Petru	638744b914	Fixed #4693	2014-03-15 15:25:18 +00:00
Hincu Petru	7c4d783d51	Check if the hashtag is a link in function .hashtagify	2014-03-14 15:49:41 +00:00
flaburgan	027650e856	Add handle indication on search page, improve design	2014-03-13 23:01:42 +01:00
Hincu Petru	e0b23b2dc4	Fixed #4726 infinite photo stream	2014-03-12 22:22:24 +00:00
flaburgan	1250973267	Fix publisher broken after jquery upgrade	2014-03-12 18:41:38 +01:00
Jonne Haß	11603f5496	Merge pull request #4843 from svbergerem/4228-hovercards-same-pod Show hovercards in the notification drop-down for users on the same pod Conflicts: Changelog.md	2014-03-11 21:50:33 +01:00
MatrixCrawler	3273028ed2	Fix atom feed for reshares of deleted posts. Propose for fix #4638 Added Changelog line Added Specs for testing if the reshared origin post is deleted and therefore not shown in the atom feed	2014-03-11 21:27:08 +01:00
Steffen van Bergerem	aefcfc7b30	Show hovercards in the notification drop-down for users on the same pod	2014-03-11 20:44:28 +01:00
Steffen van Bergerem	5d44a70e62	Fix different button sizes in new publisher	2014-03-11 17:32:07 +01:00
Steffen van Bergerem	0241d9c7db	use fixture	2014-03-10 17:21:54 +01:00
Steffen van Bergerem	6fc6474e98	Refactor publisher	2014-03-10 15:15:40 +01:00
Steffen van Bergerem	1b85d9d032	Use a button instead of input to submit, use smaller photos	2014-03-10 15:15:40 +01:00
Steffen van Bergerem	0cc3b10b1f	port publisher and bookmarklet to bootstrap	2014-03-10 15:15:40 +01:00
Faldrian	da0b305514	atom-feed content changed to html, use better post-title extractor Valid atom feed. Also these features are partially included: - http://activitystrea.ms/specs/atom/1.0/#activity.verb - http://portablecontacts.net/draft-spec.html#anchor16	2014-03-09 00:13:32 +01:00
Anton Ilin	88f502236a	Fix arguments for hevercardable helper We should pass person object to the hovecrardable helper. In the current case `this` is the status message, not the status author. So, let's pass `author` instead of `this`.	2014-03-07 11:20:45 +02:00
flaburgan	2c4dc830fc	Fix aspect renaming after a regression caused by jquery upgrade, close #4822	2014-03-06 00:04:48 +01:00
flaburgan	4cc8f1f76c	Fix avatar position in mobile notification	2014-03-03 23:21:31 +01:00
flaburgan	67d71e2280	Fix drawer in some mobile browsers. Remove the black background on menu badges. Fix body content on screen width > 768px. Start split of mobile css in different files in /mobile/	2014-02-24 23:30:57 +01:00
Florian Staudacher	a2aff720a2	clear locale on each spec run, fix indentation	2014-02-23 17:13:01 +01:00
Florian Staudacher	dc1c156175	try to appease CI	2014-02-23 16:48:48 +01:00
Florian Staudacher	b0502ef07e	don't depend on the order of events (focus has two variants in jQuery)	2014-02-23 16:48:48 +01:00
Florian Staudacher	e3b22ed95c	fix likes spec	2014-02-23 16:48:47 +01:00
Florian Staudacher	b27edcb2d1	fix search specs	2014-02-23 16:48:47 +01:00
Fabian Rodriguez	f0ae80b82f	add browser detection	2014-02-23 16:48:47 +01:00
Fabian Rodriguez	97ede99c0f	#toggle was removed	2014-02-23 16:48:47 +01:00
Fabian Rodriguez	4042e50289	Removes client_side_validations Conflicts: Gemfile Gemfile.lock	2014-02-23 16:48:47 +01:00
Fabian Rodriguez	1c09b75cc2	remove comment, for the record, it was an arbitrary number picked due to performance reasons	2014-02-23 16:48:47 +01:00
Fabian Rodriguez	9fc70a03a9	remove unused variable	2014-02-23 16:48:47 +01:00
Fabian Rodriguez	8d8d3c649a	remove aspect sorting logic	2014-02-23 16:48:47 +01:00
Fabian Rodriguez	d3921f1f2b	#live is no longer supported, use on instead	2014-02-23 16:48:46 +01:00
Fabian Rodriguez	cc9c6c780a	remove require if jquery-ui-1.8.9.custom.min	2014-02-23 16:48:46 +01:00
Jonne Haß	c3161943f9	Merge pull request #4787 from arlogn/new-wordpress-logo-icon New wordpress logo icon Conflicts: app/assets/stylesheets/application.css.sass	2014-02-23 15:55:19 +01:00
vcuculo	96fc16f9b5	Fixed heart icon height in right sidebar	2014-02-23 15:02:44 +01:00
Jason Robinson	5fe5507128	Add devise_lastseenable for user last seen tracking. Adds a timestamp to user model which is touched when user comes back. Statistics active users counts now use these more reliable timestamps. Fixes #4734	2014-02-22 23:22:46 +02:00
Jason Robinson	ea82a91085	Merge pull request #4799 from JannikStreek/feature/4778-comment_counters Added count of comments to statistics	2014-02-21 21:49:25 +02:00
Jason Robinson	d7748718f7	Merge pull request #4793 from Flaburgan/refactor-right-side-bar Refactor right side bar, see you, BRs.	2014-02-21 20:27:02 +02:00
Jannik Streek	d603ff818c	added comment count to statistic to calculate posts/comments ratios fixeds tests for comment count in statistics added changelog entry and default entry	2014-02-21 12:25:23 +01:00
flaburgan	16309dc832	Remove the limit to 8 pictures in the view	2014-02-21 01:31:12 +01:00
arlogn	d1aaf0acba	new wordpress icons	2014-02-20 20:36:08 +01:00
flaburgan	a7c7e4b1e3	Refactor right side bar, see you, BRs.	2014-02-20 13:01:07 +01:00
arlogn	659ee3ca82	align rightbar icon heart	2014-02-18 20:39:13 +01:00
Steffen van Bergerem	a51c4f0ddc	fix hovercards	2014-02-15 14:09:03 +01:00
Jonne Haß	3ed4467155	Merge pull request #4765 from goobertron/jquery_source Update JQuery source to jquery.com Conflicts: Changelog.md	2014-02-10 17:02:09 +01:00
Jonne Haß	3a616469f4	Merge pull request #4707 from goobertron/improved_new_password New reset password form Conflicts: Changelog.md	2014-02-10 01:35:37 +01:00
Steffen van Bergerem	29d524d836	fix image branding logo_caps	2014-02-09 20:31:01 +01:00
Jonne Haß	3e3979cc28	Merge pull request #4656 from svbergerem/conversations-add-participants Add participants to conversations menu	2014-02-09 20:20:47 +01:00
Jonne Haß	90784b3b38	Merge pull request #4768 from MrZYX/manwithtwowatches-feature/4455-make-help-view-backbone-view Make help pages a backbone view	2014-02-09 20:05:09 +01:00
Steffen van Bergerem	a2b3917505	Add participants to conversations menu	2014-02-09 19:55:10 +01:00
goobertron	23e8bfa082	Update JQuery source to jquery.com	2014-02-09 17:36:35 +00:00
flaburgan	119ed2d8f5	Fix nav in header empty with webkit browser	2014-02-09 17:42:29 +01:00
flaburgan	c7c1e874b9	Fix broken header on the settings page on webkit browsers	2014-02-09 17:42:29 +01:00
flaburgan	725fbbf85e	Toggle with jquery + link on the whole line of the menu	2014-02-09 17:42:29 +01:00
flaburgan	70f305958b	Polish the code	2014-02-09 17:42:29 +01:00
flaburgan	4d9d35cbfa	Add current user avatar in the drawer	2014-02-09 17:42:28 +01:00
flaburgan	8c6342170b	Add link on aspects and allow to show / hide them in the drawer	2014-02-09 17:42:28 +01:00
flaburgan	b8bb7ae857	Fix tests	2014-02-09 17:42:28 +01:00
flaburgan	e204a9a121	Add aspects list and mentions link	2014-02-09 17:42:28 +01:00
flaburgan	0a31d61ccc	Make the drawer scrollable	2014-02-09 17:42:28 +01:00
flaburgan	94888f70be	Compose_mobile icon	2014-02-09 17:42:28 +01:00
flaburgan	1a52631bd2	Remove margin of the nav elem	2014-02-09 17:42:28 +01:00
flaburgan	3c5d68dbb4	Fix mobile publisher	2014-02-09 17:42:28 +01:00
flaburgan	c53afe586b	Add new icons to the mobile version	2014-02-09 17:42:28 +01:00
Erwan Guyader	754bd8178d	add drawer to mobile - Functional drawer with menu icon	2014-02-09 17:42:28 +01:00
Erwan Guyader	1e159a027e	Add drawer menu to mobile version - Added basic drawer menu with JS code working on /stream	2014-02-09 17:42:28 +01:00
goobertron	2a145e67ab	Update design of forgot_password and change_password forms Fix redirect to stream, make labels lower-case Fix cuke	2014-02-09 15:48:06 +00:00
Jonne Haß	c20bc77535	Adjust help views to updated backbone, thanks @raven24	2014-02-09 16:45:21 +01:00
Jonne Haß	4a3869cda8	Merge pull request #4769 from Ruxton/feature/faster_stream_queries Updating queries for the stream to be faster	2014-02-09 16:25:59 +01:00
Jonne Haß	f64f55b567	Move help page initialization into backbone router	2014-02-09 16:00:16 +01:00
Jonne Haß	e402a4093d	Actually load a different section when requested in get_javascript_strings_for, add spec for changes in JS i18n helper	2014-02-09 16:00:16 +01:00
Richard	a132b6c1b5	refactored a bit in help section views. using backbone jquery selector shorthand and jquery each.	2014-02-09 16:00:16 +01:00
Richard	1561690303	moved call to help backbone view init to separate file included only on faq view. extending loaded js locales. cleaned up unused routes. removed some comments. loading help locales only on help view. removed afterRender from backbone views. extended load_javascript_locales method to take a section.	2014-02-09 16:00:15 +01:00
Richard	55efa82756	made a help view spec and cleaned up the views a bit.	2014-02-09 16:00:15 +01:00
Richard	da6b037f24	highlighting menu items when clicked. collapsing questions and answers on the static content help sections. removed unused help haml templates. put locales back to how they were and wrote a small js parser to swap in links to help views which have generated links in them. using locales text for help section headers.	2014-02-09 16:00:15 +01:00
Richard	afec5977e9	Started converting the help section into a backbone view. Things missing are: some urls which were calculated and inserted into the yml, all the pre-existing erb templates are still there, it's still at /faq/faq, nothing has been tested, some of the questions don't collapse and expand. changed the locales to have the hard coded urls in them because they can no longer be calculated server side. this is pretty crap because i'm going to have to change it for all the languages now so i might change my mind about this later. deleted some unused views.	2014-02-09 16:00:15 +01:00
Jonne Haß	41a4326993	Merge pull request #4770 from svbergerem/fix-spv-4754 Fix bugs introduced by #4754	2014-02-09 15:57:27 +01:00
Steffen van Bergerem	6c7dde1733	Fix bugs introduced by #4754	2014-02-09 15:54:22 +01:00
goobertron	7bcea07b99	Standardise - code refs to 'messages' to 'conversations'	2014-02-09 15:44:12 +01:00
Jonne Haß	17754f1da8	Merge pull request #4747 from Raven24/fix_aspect_stream fix regression caused by updating backbone.js in aspect stream	2014-02-09 15:38:35 +01:00
Jonne Haß	976b21ab05	Merge pull request #4702 from goobertron/new_logos Updated image branding (issue #4444)	2014-02-09 14:47:40 +01:00
Jonne Haß	ecd8a8200b	Merge pull request #4754 from svbergerem/small-improvements-spv SPV small improvements	2014-02-09 14:26:41 +01:00
Ruxton	c8a0c81b6a	Updating queries for the stream to be faster	2014-02-07 14:23:19 +08:00
Steffen van Bergerem	97f1c286f4	improve reshared posts	2014-01-31 22:48:40 +01:00
Steffen van Bergerem	318d190404	SPV small improvements	2014-01-30 22:12:51 +01:00
Steffen van Bergerem	655fbfcd79	Fix timeago on mobile devices. Fix missing space	2014-01-30 10:15:14 +01:00
Steffen van Bergerem	fe01734a3d	fix timeago	2014-01-29 03:24:10 +01:00
Raphael Sofaer	300a7c1c31	Merge pull request #4737 from rsofaer/no_retries_for_bad_cert Do not retry sending out posts on SSL errors. See #4728	2014-01-27 20:11:57 -08:00
Raphael Sofaer	de593f6e9f	Do not retry sending out posts on SSL errors. See #4728 Refactor HydraWrapper so the when-to-retry logic is in the worker	2014-01-27 15:45:45 -08:00
Dennis Schubert	1f76a9a354	Merge pull request #4739 from MrZYX/stabilize_cukes Stabilize cukes	2014-01-26 14:39:43 -08:00
Florian Staudacher	09a840ea41	fix regression caused by updating backbone.js without updating changed parameters	2014-01-26 19:51:12 +01:00
Steffen van Bergerem	763fb95947	Fix css for keyboard navigation	2014-01-26 04:31:11 +01:00
Jonne Haß	8b8071925d	Make toggle aspect call synchronous and bump capybaras wait timeout in features/desktop/aspect_navigation.feature:18 we quickly leave the page before waiting for the request to finish. By making the HTTP call synchronous we wait for it to finish before we reflect the change in the DOM, thus giving Capybara a chance to wait for it. Also let Capybara wait longer. This should random failures of the aforementioned cuke rarer.	2014-01-26 00:13:06 +01:00
Jonne Haß	f9c230dd31	Merge pull request #4738 from svbergerem/remove-unused-spv-files Remove unused beta code	2014-01-24 04:19:22 -08:00
Steffen van Bergerem	0f156cd9a4	Remove unused beta code	2014-01-24 09:01:30 +01:00
Steffen van Bergerem	7519fcc255	Remove unused cubbies code	2014-01-24 08:58:47 +01:00
Jonne Haß	0b15e66d06	Merge pull request #4577 from svbergerem/2302-permalink-comments [Ready to review & merge] Add permalinks for comments Conflicts: app/assets/stylesheets/application.css.sass	2014-01-22 11:24:42 +01:00
Steffen van Bergerem	3d4bdfb665	Drop number of followers from tags page	2014-01-21 14:49:05 +01:00
Florian Staudacher	5c059b2925	fix regression in conversations causing an infinite recursion (fix #4715 )	2014-01-20 22:00:26 +01:00
Jonne Haß	9ea6e9c166	Merge pull request #4517 from Zauberstuhl/report_post_feature Added post reporter feature Conflicts: Changelog.md app/assets/stylesheets/application.css.sass db/schema.rb	2014-01-20 10:03:45 +01:00
Ruxton	a3113cce7c	Switched to using rails-timeago to make keeping on top of new versions of plugin easier	2014-01-20 09:33:35 +08:00
goobertron	19c9c0f394	new version of white2x	2014-01-19 14:53:52 +00:00
goobertron	2fb5098be2	Submitted new images with blurred edges	2014-01-19 14:42:34 +00:00
goobertron	97b5c723af	Updated image branding and files with refs to them	2014-01-18 13:03:59 +00:00
Steffen van Bergerem	20e1626453	add permalinks for comments	2014-01-17 22:11:17 +01:00
Florian Staudacher	1924c40d38	replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem - updates underscore to 1.5.2 and backbone to 1.1.0 backbone had some breaking changes: - fix url/urlRoot handling in models & collections - options are no longer attached to the view by default - collections reset when 'fetch' is called, tell it to keep the existing models other changes: - fix some events triggering multiple times in connection with deleting a model - use document fragments instead of an element array for stream entries - adapt jasmine and cucumber specs to the changed code * no longer test the backbone router as part of our code * jasmine factory already returns model instances, no need to wrap that again	2014-01-16 23:23:30 +01:00
Dennis Schubert	6fc5ccb9f9	Merge pull request #4511 from MrZYX/bump_devise update devise to 3.2	2014-01-15 13:17:48 -08:00
Jonne Haß	d97fd8089b	Merge pull request #4688 from ivanzotov/develop Fix after_create to after_commit	2014-01-15 11:47:23 -08:00
Jonne Haß	15b1dae362	update devise to 3.2	2014-01-15 12:59:59 +01:00
Lukas Matt	5c9a3aaf3e	Added post report feature You can report a single post by clicking the correct icon in the controler section Workflow: * Report a post as offensive * Trigger alerts to every pod-admin * Pod-admin can review it in the admin interface * Delete the post or mark it as reviewed	2014-01-14 15:00:55 -05:00
Ivan Zotov	a4ce6e267a	Fix after_create to after_commit	2014-01-14 22:35:29 +04:00
Steffen van Bergerem	580068ed7c	Remove background from badges in header	2014-01-14 15:00:36 +01:00
goobertron	706b11b14d	Now with passing Cucumber tests	2014-01-13 18:14:43 +00:00
goobertron	a1ac848d62	Change NSFW explanation on profile settings page (and stop altering of text depending on NSFW setting)	2014-01-12 20:02:33 +00:00
Jonne Haß	42f790fa13	Merge pull request #4666 from jaywink/signup-form-error-redirect Instead of redirect on signup form validation, render new	2014-01-11 14:08:18 -08:00
Jonne Haß	7608319787	Merge pull request #4665 from svbergerem/fix-500-conversations fix bug in conversations view causing server error	2014-01-08 23:55:09 -08:00
arlogn	31177e6bdb	bookmarklet publisher more usable mobile	2014-01-09 02:33:47 +01:00
Jonne Haß	ca9e2e24ea	Merge pull request #4670 from arlogn/bookmarklet-publisher-more-usable bookmarklet publisher more usable	2014-01-07 11:29:50 -08:00
Jason Robinson	35ece9d65f	Instead of redirect on signup form validation, render new with submitted data.	2014-01-06 22:12:07 +02:00
Jason Robinson	db71c9c50b	Add mobile signup page captcha. Add test for user.sign_up method. Rewrite simple_captcha views to haml. Revert .rvmrc, fix indentation in config examp$	2014-01-06 22:00:53 +02:00
maruf	c17a474142	Simple captcha for signup page	2014-01-06 22:00:37 +02:00
Jonne Haß	7c9460d5b0	Merge pull request #4667 from Flaburgan/fix-markdown-display Fix markdown indication in the publisher when the user upload an image	2014-01-06 02:22:21 -08:00
arlogn	61bfbc82e0	bookmarklet publisher more usable	2014-01-06 01:07:05 +01:00
Damien Monet	b849d6c641	Fix: remove location when publisher is cleared by user	2014-01-05 11:09:03 +01:00
flaburgan	f758163f2e	Fix markdown indication in the publisher when the user upload an image	2014-01-04 15:58:20 +01:00
Steffen van Bergerem	2e50a16567	fix bug in conversations view causing server error	2014-01-04 01:54:45 +01:00
Jonne Haß	2734471feb	Merge pull request #4653 from svbergerem/3119-change-more-comments-link Change more comments link	2014-01-02 01:14:33 -08:00
Steffen van Bergerem	55b967caf9	remove participants popover + improve conversations menu	2014-01-01 21:58:56 +01:00
Steffen van Bergerem	ef128575ae	Change more comments link	2013-12-30 13:20:58 +01:00
arlogn	ae3b50080c	Fix spinner overlapping in webkit search box (#4446 ) and replace deprecated pseudo class :-moz-placeholder	2013-12-29 17:16:56 +01:00
Jonne Haß	5d83402dc3	Merge pull request #4628 from jaywink/4627-twitter-truncation-problem Fix posting to Twitter by correctly catching over limit exception	2013-12-22 14:14:30 -08:00
Steffen van Bergerem	a96611c259	use bootstrap labels	2013-12-16 00:46:55 +01:00
Steffen van Bergerem	206e3f9422	fix mobile	2013-12-15 23:40:08 +01:00
Jason Robinson	e665ebdab1	Fix posting to Twitter by correctly catching over limit exception (#4627 ). Also when doing a retry, make smaller cuts to max characters	2013-12-15 22:01:09 +02:00
Steffen van Bergerem	24310fe5a9	change layout	2013-12-15 20:14:55 +01:00
Steffen van Bergerem	5ab777f8cb	remove unused code	2013-12-15 18:01:32 +01:00
Steffen van Bergerem	c24cfb432d	fix facebox in conversations view	2013-12-15 14:20:47 +01:00
Steffen van Bergerem	c11b744a7f	port conversations view to bootstrap	2013-12-15 13:01:24 +01:00
flaburgan	c24d5193e4	Refactor conversations css + fix inconsistent height of conversations list bug	2013-12-15 01:15:44 +01:00
Fabian Rodriguez	c12a45556d	fix #2645 * refactor a bit #weekly_user_stats * pass 0 instead of "" to i18n * use the first week if none is provided	2013-12-13 19:32:04 -02:00
flaburgan	6aced29bb6	Add expand the publisher test	2013-12-13 17:55:33 +01:00
flaburgan	923a4f2ab4	Add indication about markdown formatting in the publisher	2013-12-13 16:02:39 +01:00
Jonne Haß	c660c90091	Merge pull request #4612 from diaspora/drop_spv_old_code Drop spv old code	2013-12-11 07:41:51 -08:00
Fabian Rodriguez	80015e7ba8	move everything under post-viewer/ to single-post-viewer/	2013-12-08 12:36:01 -02:00
Fabian Rodriguez	8cf4e4a7fb	remove old templates	2013-12-08 11:39:36 -02:00
Fabian Rodriguez	933c3b01ca	remove old styles	2013-12-07 12:03:26 -02:00
Fabian Rodriguez	f3f8d36b9d	remove wallpaper-mood template	2013-12-06 20:07:37 -02:00
Fabian Rodriguez	ea58324aa8	remove template picker	2013-12-04 20:08:54 -02:00
Fabian Rodriguez	6c8c4fc99e	remove template picker functionality	2013-12-03 20:53:00 -02:00
Jason Robinson	2c83d0e846	Statistics route with general info, some user and total posts stats. By default statistics off, enabled in settings.	2013-12-02 22:35:18 +02:00
Jonne Haß	1ce027eb2c	Merge pull request #4605 from manwithtwowatches/feature/4509-image-upload-response-errors Feature/4509 image upload response errors	2013-12-02 00:10:25 +01:00
Jonne Haß	d18bbd8405	Merge pull request #4604 from Flaburgan/refactor-mobile-publisher Refactor mobile publisher	2013-12-02 00:07:08 +01:00
Jonne Haß	4b1255fa8d	Merge pull request #4592 from Flaburgan/link-show-more-pictures-mobile [Ready to review] Fix "more picture" indication (+n) on mobile by adding a link on the indication Conflicts: Changelog.md	2013-12-02 00:04:37 +01:00
Jonne Haß	8baa06e477	Merge pull request #4590 from diaspora/4432-photo-lightbox-quickfix Add lightbox html to unauthenticated header Conflicts: Changelog.md	2013-12-01 23:58:00 +01:00
Fabian Rodriguez	cfc247db75	remove PostViewerFeedback	2013-12-01 20:55:49 -02:00
Fabian Rodriguez	9be780468d	remove PostViewerInteractions	2013-12-01 20:55:49 -02:00
Fabian Rodriguez	bf3ee8d7bb	remove PostViewer	2013-12-01 20:55:48 -02:00
Fabian Rodriguez	179cc9e8dd	remove PostViewerAuthor	2013-12-01 20:55:48 -02:00
Fabian Rodriguez	0702db137a	remove PostViewerNav	2013-12-01 20:55:48 -02:00
Fabian Rodriguez	d7b8cb2997	remove #next_post_path and #previous_post_path from postpresenter	2013-12-01 20:55:48 -02:00
Fabian Rodriguez	92db8cb929	remove #next and #previous from posts_controller	2013-12-01 20:55:48 -02:00
Fabian Rodriguez	6eed63807d	remove next and previous functionality from router	2013-12-01 20:55:48 -02:00
flaburgan	748599a9dd	Refactor mobile publisher	2013-11-29 12:30:20 +01:00
Richard	dbbead1587	removed double comment	2013-11-28 21:48:41 +11:00
Richard	1b83b6942b	Merge branch 'develop' into feature/4509-image-upload-response-errors	2013-11-28 21:46:01 +11:00
Richard	ff07bddd1b	using status messages instead of popup and updated specs for publisher view.	2013-11-28 16:08:03 +11:00
Richard	3671f09b1d	checking file upload response error and giving an error alert if there is one.	2013-11-28 12:26:30 +11:00
flaburgan	7a50e79cfa	Fix aspect dropdown on contacts page	2013-11-27 13:07:31 -08:00
Jonne Haß	05fa086caa	replace ugly 'followed by' grammar assumption at tags#show with proper version	2013-11-20 23:47:50 +01:00
Jonne Haß	478159f1cd	Merge pull request #4593 from Flaburgan/improve-mobile-design Improve notifications and conversations views design on mobile	2013-11-20 12:05:28 -08:00
Fabian Rodriguez	d8618f8700	Merge pull request #4591 from Flaburgan/avatar-profile-mobile Fix avatar display on mobile profile	2013-11-18 18:17:34 -08:00
flaburgan	e1fb8200dd	Move 'mark all as read' button under the title	2013-11-18 18:02:22 -08:00
flaburgan	85eb584e66	Remove useless :page_title indication from people/show	2013-11-16 15:40:03 -08:00
flaburgan	58886a6b30	Improve notifications and conversations views design	2013-11-16 03:06:25 -08:00
flaburgan	a02b0519c9	Fix "more picture" indication (+n) on mobile by adding a link on the indication	2013-11-16 02:06:45 -08:00
flaburgan	76b151eb7d	Fix avatar display on mobile profile	2013-11-16 01:57:37 -08:00
Raphael Sofaer	a07d3616a5	Add lightbox html to unauthenticated header	2013-11-15 14:33:46 -08:00
flaburgan	1833edfd67	Add actions to contacts/index.html page	2013-11-12 19:10:00 -08:00
Jonne Haß	859cd83e38	Merge pull request #4583 from Flaburgan/refactor-mobile-header Refactor mobile header, close #4579 Conflicts: Changelog.md	2013-11-10 23:55:55 +01:00
flaburgan	0f2773053e	refactor mobile header, close #4579	2013-11-09 23:21:32 -08:00
movilla	1fcd675b3e	getting started page mobile error 500. Fix #4534	2013-11-09 19:25:32 -02:00
Fabian Rodriguez	146044bd36	Merge pull request #4578 from taratatach/force-comments-sort-order-in-mobile-spv force comments sort order in mobile spv	2013-11-07 18:16:52 -08:00
Erwan Guyader	0afdb134f8	force comments sort order in mobile spv	2013-11-07 17:19:23 -08:00
flaburgan	bee2c63762	Change icon when adding, fix #4568	2013-11-07 12:55:50 -08:00
flaburgan	3df0fdc09b	Improve the management of the contacts visibility settings in an aspect	2013-11-07 12:55:35 -08:00
Steffen van Bergerem	d5c3079623	refactor publisher css	2013-11-07 17:12:35 +01:00
flaburgan	47645dd985	Put the stream first in the left menu	2013-11-04 17:46:45 -08:00
Florian Staudacher	1c4ad0986c	refactor message creation (conversations)	2013-10-20 22:46:53 +02:00
Florian Staudacher	830747a11e	refactor conversations_controller#create	2013-10-10 21:42:46 +02:00
Jonne Haß	eea9467846	refactor twitter service model	2013-09-30 10:13:14 +02:00
Florian Staudacher	260d86d501	refactor ConversationsController, move query builing to User model	2013-09-30 01:44:57 +02:00
Dennis Schubert	6e62a99732	Merge pull request #4542 from Raven24/empty_publishing avoid publishing empty posts	2013-09-25 13:49:52 -07:00
Florian Staudacher	e614562470	avoid publishing empty posts (fixes #4401 ) invalidate empty posts when created by a local user add changelog entry	2013-09-24 21:57:22 +02:00
Jonne Haß	5aa13adfb1	Do not fail when environment.sidekiq.retry is set to false, closes #4545	2013-09-24 13:59:07 +02:00
Srihari Sriraman	c379fb351e	Removing the conflicting green in colors - This was a regression from pull request #4541 - Moved the red color to the section above to separate it from the rgb colors that aren't used	2013-09-23 09:48:45 +05:30
Srihari Sriraman	91d9d5aea5	Removing the comment regarding the source of the lines MrZyk pointed out that this information is preserved in git.	2013-09-22 15:31:27 +05:30
Srihari Sriraman	034361154f	Moving colors in variables.scss to colors.scss - Fixed the conflicting red color - Currently using the darker red	2013-09-22 14:40:56 +05:30
Florian Staudacher	39810e6196	decode URLs before processing them (fixes #4507 )	2013-09-21 15:23:30 +02:00
flaburgan	02ef9e08f6	Remove the (now useless) last post link from the user profile.	2013-09-20 17:37:34 -07:00
Jonne Haß	a2b6740fed	pluralize admins.user_search.you_currently	2013-09-20 13:21:33 +02:00
Fabian Rodriguez	abc06686ce	Merge pull request #4523 from Flaburgan:improve-getting-started Conflicts: Changelog.md	2013-09-19 19:37:54 -03:00
Jonne Haß	2296489704	Merge pull request #4532 from Flaburgan/add-help-link Add help link	2013-09-19 14:33:39 -07:00
Jonne Haß	ac13e79225	Merge pull request #4529 from Flaburgan/fix-timeago-color Change .timeago color and align notification, fix #4502	2013-09-19 23:32:32 +02:00
Jonne Haß	e6be888707	Merge pull request #4522 from fubik/transparent_background Add a white background to images displayed in the lightbox Conflicts: Changelog.md	2013-09-19 23:27:57 +02:00
Florian Staudacher	96f80c8cab	cleanup jasmine tests and added changelog entry for bugfix #4005	2013-09-19 23:22:49 +02:00
PallaviTS	5caa46cc83	fixing commenting Added jamisne tests for comments Added 2 jasmine tests for fixing commenting Bugfix: #4005 added changelog entry	2013-09-19 23:22:48 +02:00
flaburgan	126e7bdc9c	Refactor getting_started page, test if facebook is available, fix #4520	2013-09-18 22:06:47 -07:00
flaburgan	0c8adb2070	Add link to the faq in the right panel	2013-09-18 15:53:04 -07:00
flaburgan	fcad95109f	Change .timeago color and align notification, fix #4502	2013-09-17 14:50:32 -07:00
Titouan Lorieul	b53c207477	Add a white background to ALL the images in the navigation bar of the lightbox	2013-09-16 18:35:38 +02:00
Titouan Lorieul	1aca1e1e51	Add a white background to the images shown in the navigation bar of the lightbox	2013-09-16 14:18:37 +02:00
Marek Marecki	0b37e9f736	Fix issue #4499 : changed :width in .item_count to :min-width	2013-09-14 09:35:15 +02:00
Titouan Lorieul	8bad0673b3	Add a white background to images shown in the lightbox Fixes issue #4475	2013-09-13 09:47:57 +02:00
Titouan Lorieul	26a3f56c22	Disables submit button in sign up form after submission to avoid email already exists error	2013-09-11 20:49:23 +02:00
Jonne Haß	1a8541ff1a	Fix another 500 in the mobile site for signed out browsing	2013-09-10 23:41:29 +02:00
Jonne Haß	72e421b38f	Merge pull request #4480 from Raven24/publisher_backbone Publisher - now with even more Backbone	2013-09-04 16:52:30 +02:00
Florian Staudacher	b2ff1878e3	move ui feedback into success callback	2013-09-04 14:47:28 +02:00
sjain1107	5223a2d906	Adding ignore user icon Adding ignore user icon Added jquery Changed profile.js	2013-09-04 14:47:23 +02:00
Florian Staudacher	306890445e	remove obsolete view	2013-09-03 23:18:19 +02:00
Florian Staudacher	41c0880a9d	add jasmine specs for uploader, minor changes	2013-09-03 23:18:19 +02:00
Florian Staudacher	bedfacecfd	fix jasmine tests	2013-09-03 23:18:18 +02:00
Florian Staudacher	4da696253a	implement publisher uploader as backbone view	2013-09-03 23:18:18 +02:00
Florian Staudacher	4090f134f2	port 'getting started' to a backbone view, revert filename changes	2013-09-03 23:18:18 +02:00
Florian Staudacher	9560a8ec61	create actual backbone view for publisher aspect selection	2013-09-03 23:18:18 +02:00
Florian Staudacher	253ab23f5e	publisher: extract services into subview	2013-09-03 23:18:18 +02:00
Jonne Haß	5eb5057864	Merge pull request #4351 from netom/3711_fix_stream_render_time Batch insert new posts to stream	2013-09-01 19:36:07 +02:00
Srihari Sriraman	f53aa3e0e5	Highlighting the currently active stream in the leftNavBar - This gives the user the sense of what he/she is currently viewing - The hover/selected are the same right now. Needs to change. - Need to find a more meaningful place for `markSelected` Moved markSelected to app.views.Stream - Removes duplication - All streams create this view, and this seems to do some setup on initializing, which is a good place to markNavSelected Changing highlight on hover to 'black' instead of the blue - The blue was a little intruisive - Also fixes the vertical alignment issue Changing the background to bluebg on hover	2013-09-01 19:32:01 +02:00
Jonne Haß	991a505439	Merge pull request #4485 from colindean/rename_bitcoin_wallet_id change bitcoin_wallet_id to bitcoin_address	2013-09-01 19:24:44 +02:00
Jonne Haß	99657947a9	Merge pull request #4487 from arlogn/word-wrap-on-single-post-view Prevent overflow of strings too long on single page view	2013-09-01 19:23:07 +02:00
Fábián Tamás László	18c22a5e4c	Batch insert new posts to stream	2013-09-01 10:16:09 +02:00
Colin Dean	a4ce4404ff	change bitcoin_wallet_id to bitcoin_address It is better to call it an address than a wallet ID, because the latter may confuse Bitcoin users who conflate the two. They are not the same. Also adds convenience method to handle the deprecated variable.	2013-08-31 20:16:23 -04: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
Jonne Haß	9d092c1b2f	Merge pull request #4479 from ssrihari/fix-colors-more Refactored the colors palette a little more	2013-08-30 15:23:05 +02:00
Nils Vogels	a3f3bcf6ef	Adjusting the description of the 404 message, in order to avoid having to specify why users got a 404, and possibly leaking information while doing this See discussion in #3717 for rationale on not implementing specific HTTP codes This solves around #3717 and #3728 Adjusting travis breakage	2013-08-30 14:42:19 +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
Jonne Haß	d40b09878a	Merge branch 'ssrihari-hide-inactive-streams' into develop	2013-08-29 14:53:24 +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
Jonne Haß	eda65f3258	Merge pull request #4464 from movilla/profile_mobile_500 Error 500 when visit probile mobile and logged out. Fix #4458	2013-08-29 05:19:18 -07:00
movilla	2b97f74015	error 500 when visit probile mobile and logged out. Fix #4458	2013-08-29 12:18:53 +02:00
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
Florian Staudacher	ba9e715c66	Merge branch '4239-move-federation-stuff-into-lib' of github.com:oliverbarnes/diaspora into oliverbarnes-4239-move-federation-stuff-into-lib	2013-08-27 22:05:27 +02:00
Jonne Haß	17580c123d	Merge pull request #4353 from netom/oembed_to_mobile_view Added oembed display to mobile stream view Conflicts: app/views/status_messages/_status_message.mobile.haml	2013-08-27 21:59:00 +02:00
Jonne Haß	c94ca826b2	Merge pull request #4448 from ssrihari/fix-invite-code-input-width Fixing Invite code input width to be same across browsers	2013-08-27 21:48:29 +02:00
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ß	1067d6a731	fix link to the tutorials in the sidebar [ci skip]	2013-08-26 10:54:27 +02:00
Jonne Haß	f9a3990562	do not leak photos through photos#show	2013-08-26 09:39:39 +02:00
Jonne Haß	e58019fe8e	Merge pull request #4440 from Flaburgan/fix-contacts-page Add aspect modification and fix check icon regression on contacts page, close #4397	2013-08-25 15:46:11 -07:00
flaburgan	96e18c6a7b	Add aspect modification and fix check icon regression on contacts page, close #4397	2013-08-25 21:42:32 +02:00
Fabian Rodriguez	f0c6f8b4a8	Merge pull request #4434 from MrZYX/links_and_branding Links and branding	2013-08-25 12:24:57 -07:00
Jonne Haß	348a7b6c5b	update branding	2013-08-25 18:21:14 +02:00
Jonne Haß	0d1bf85931	drop outdated hints from right sections	2013-08-25 18:21:14 +02:00
Jonne Haß	2124dba3e8	update header and footer links	2013-08-25 18:21:14 +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
Jonne Haß	d891bcb6e4	Merge pull request #4428 from svbergerem/4421-display-photos-inline Fix photos in spv and always show visibility of post	2013-08-22 11:35:31 -07: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ß	75d3b1598f	make sure comments are sorted in ascending order from oldest to newest in the SPV	2013-08-22 16:21:51 +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
flaburgan	ba886d127a	Valid meta elements, add pod personalization	2013-08-21 10:30:20 +02:00
Jonne Haß	554d0a93d0	Do not leak photos in the profile sidebar	2013-08-20 20:56:37 +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
carolina	f3817b996e	Modify photos unless condition and loop through thumbnails and test	2013-08-19 12:49:39 +02:00
mokus	8df8855ac0	remove the limit 3 for @photos in photo controller	2013-08-19 12:49:38 +02:00
mokus	44d76fc6da	rename contact_count to item_count	2013-08-19 12:49:38 +02:00
carolina	d7e6ec8a4c	Add photo count	2013-08-19 12:49:38 +02:00
carolina	a7bfc542e1	Add view_all link below photo thumbnails	2013-08-19 12:49:38 +02:00
carolina	9a5691c46a	Add to leftsidebar link to photos index + thumbnails from last 3 photos	2013-08-19 12:39:51 +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
movilla	795a7a5751	mobile error 500 if a reshared (original) post will be deleted.	2013-08-16 12:07:14 +02:00
Jonne Haß	2207069b86	Merge pull request #4396 from movilla/registration_mobile_width Fix layout on the registration page for mobile Conflicts: Changelog.md	2013-08-14 21:28:17 +02:00
movilla	77c4731157	fix layout on the registration page for mobile	2013-08-14 13:52:52 +02:00
Oliver Azevedo Barnes	c5a1078f45	Moved account_deleter as well, same tests break	2013-08-13 18:37:51 -05:00
Oliver Azevedo Barnes	7214dc184d	Remove namespacing from federation libs recently migrated from app/models/	2013-08-13 18:23:05 -05:00
flaburgan	485c0dae7f	Remove placeholders for name fields in settings (no more Sofaer)	2013-08-13 19:03:16 +02:00
Oliver Azevedo Barnes	4b516603f7	Fix #4361 twitter access level check breaking facebook addition to user Rewrite twitter access-level check Fixed tests, still working on getting facebook up Add heroku example to diaspora.example.yml	2013-08-12 13:17:18 -05:00
Oliver Azevedo Barnes	1c9d65e94c	WIP refactor namespacing for federation libs, into Diaspora::Federated	2013-08-12 13:10:38 -05:00
Oliver Azevedo Barnes	5564644306	WIP	2013-08-12 13:10:38 -05:00
Oliver Azevedo Barnes	689abfb49c	Move non-model federation stuff into lib/	2013-08-12 13:10:38 -05:00
movilla	152c08963a	fix mobile search tags	2013-08-12 16:01:26 +02:00
Sean Tilley	a5d7340129	Merge pull request #4388 from MrZYX/4378-reenable_getting_started whitelist getting_started as a user settable attribute	2013-08-12 01:22:51 -07: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
Jonne Haß	14c78da6cd	whitelist getting_started as a user settable attribute, fixes #4378	2013-08-11 16:52:54 +02:00
Bender Bending Rodríguez	7086055f4e	Bitcoin donations	2013-08-11 15:31:05 +02:00
Jonne Haß	f4169d7f30	Merge pull request #4384 from andrewcsmith/bug/4211-twitter-should-not-cut-links Fixed problem where the add_post_link method would truncate the status update in the middle of a link	2013-08-11 00:25:12 +02:00
Sean Tilley	e7ea763ab5	Merge pull request #4373 from Flaburgan/patch-4 Make contacts visible in new aspect unchecked by default, close #4343	2013-08-10 15:00:16 -07:00
Andrew Smith	65a14ccc2c	Fixed problem where the add_post_link method would truncate the status update in the middle of a link. This led to sending Twitter broken links. Refactored :extract_truncated_link method Removed complicated while loop in avoiding cutting off links, using refactoring from MrZYX	2013-08-10 14:40:53 -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ß	948939cd30	Merge pull request #4381 from goobertron/4380-facebook-count Updated Facebook character limit.	2013-08-10 21:40:44 +02: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
goobertron	8bffdb873a	Updated Facebook character limit.	2013-08-10 00:18:49 +01: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
Oliver Azevedo Barnes	452301b34d	Fix #4361 twitter access level check breaking facebook addition to user	2013-08-07 18:59:49 -05:00
Jonne Haß	a2e5f1f88e	Merge pull request #4335 from Team-D/feature/4169-tag_search_autocomplete #4169 tag search autocomplete	2013-08-06 13:29:12 -07:00
Jonne Haß	a267f2a4db	Merge pull request #4354 from Flaburgan/improve-mobile-view Improve mobile usability Conflicts: Changelog.md	2013-08-06 21:31:55 +02:00
Jonne Haß	efbd3c8605	Merge pull request #4344 from oliverbarnes/4124-check-twitter-write-access-before-auth Issue #4124 Check write access before authorizing Twitter	2013-08-06 21:21:56 +02:00
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
Fábián Tamás László	32d86254b5	Added oembed display to mobile stream view	2013-08-06 07:02:04 +02:00
Oliver Azevedo Barnes	55a58713a5	Issue #4124 Check write access before authorizing Twitter	2013-08-05 13:52:19 -05: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ó	ba3d60b00f	Only parse opengraph if oembed is not available	2013-08-04 15:55:09 +02: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ó	43363c13e5	Code style fixes, removed unneeded rescue	2013-08-04 15:47:07 +02:00
Tamas Laszlo Fabian	3cead93dbc	Load og data faster (after_save -> after_commit)	2013-08-04 15:46:44 +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
Tamas Laszlo Fabian	22c644c2ae	Replaced opengraph with opengraph_parser Code style fixes	2013-08-04 15:44:58 +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
Meitar Moscovitz	7d40fd1add	Delete cross-posted Tumblr posts when user deletes their Diaspora post.	2013-08-03 04:23:22 -04:00
Jonne Haß	c7eed23c61	Merge pull request #4223 from svbergerem/3229-change-src-on-closing-lightbox Change image to ajax-loader when closing lightbox	2013-08-02 06:26:49 -07:00
Steffen van Bergerem	f810e39f52	Change image to ajax-loader when closing lightbox	2013-08-02 14:46:15 +02:00
James Fleming	9ca9a6f310	Remove duplicates and bad code habits. Remove some blank line. Do not chain bang methods.	2013-08-02 11:39:24 +02:00
James Fleming	66a07bd938	Remove attributes protection. Use a blacklist approach instead of a blacklist approach in Profile#receive. Remove attr_accessible from models and make specs pass.	2013-08-02 11:39:06 +02:00
James Fleming	94e9fc5ac4	Use strong params in profiles_controller	2013-08-02 11:39:06 +02:00
James Fleming	d6ba6d1b02	Use strong params in photos_controller Add specs to check mass-assignment gotchas in PhotosController.	2013-08-02 11:39:05 +02:00
mokus	3ba63197e8	Fixes failing tests by changing user model	2013-08-02 11:39:05 +02:00
James Fleming	0e26a496b8	Strong parameters for User Fetch user params instead of require.	2013-08-02 11:39:04 +02:00
James Fleming	686d3baaad	Strong parameters for InvitationsController. Make InvitationsController#create spec pass	2013-08-02 11:39:01 +02:00
James Fleming	b86b409f7d	Strong parameters for Conversation	2013-08-02 11:39:01 +02:00
James Fleming	509a407286	Strong parameters for Block	2013-08-02 11:39:01 +02:00
James Fleming	938de466f8	Strong parameters for Aspect	2013-08-02 10:09:04 +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
Plurrtard	6900146852	fix #4163 - Now updating correct contact attribute on retraction Added test case for Issue #4163	2013-07-31 15:20:57 +02:00
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ß	d5fbeff03b	Merge branch 'Ruxton-develop' into develop	2013-07-31 14:27:08 +02:00
Ruxton	3c605c47e0	Fix error in facebook service delete_post Add spec coverage for FB delete_post	2013-07-31 14:23:13 +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
fabianfiorotto	3e5b29b289	Fix pagination for people list on the tag stream page Update _index.html.haml This params broken the pagination of the followers list in tags page To reproduce try to paginate in https://joindiaspora.com/tags/diaspora test for people pagination patch reducing the per page limit removing tabs	2013-07-06 13:10:29 +02:00
Ruxton	dce1531ba6	Changed follow_diasporahq to be configurable to auto follow any user on join. Fixing example config file Updated changelog	2013-07-06 13:02:27 +02:00
Fábián Tamás László	aa472b25de	Put preloads into gon.preloads Fixed tagFollowing not getting into preloads	2013-07-06 12:45:23 +02:00
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
Jonne Haß	3da9b1bf7f	Merge pull request #4259 from netom/4173-disable-invite-button Disable invite button after sending invite Conflicts: Changelog.md	2013-07-06 12:40:05 +02:00
Jonne Haß	9d4377dc23	Merge pull request #4251 from 0TWAIN0/feature/4182-render-markdown-in-mails Feature/4182 render markdown in mails Conflicts: Changelog.md	2013-07-06 12:20:09 +02:00
kevivmatrix	6623e86a5a	private message sending changed to ajax added specs for change in controller one form of hash used in single line of code rendering create response on sending message redirect user to conversation page if message sent successfully removed deprecated way of rendering file conversations create for mobile fixed minor code style change updated changelog	2013-07-06 14:35:09 +05:30
twain	e1ca8df15e	added strip_markdown to notification mails	2013-07-03 11:16:31 +02:00
David Thompson	0cc02fb512	Use InviteEmail worker in InvitationsController create action.	2013-07-01 21:10:56 -04:00
David Thompson	33f858b558	Create an InviteEmail worker.	2013-07-01 21:10:56 -04:00
Fábián Tamás László	6e178af551	Disable invite button after sending invite	2013-07-01 10:19:56 +02:00
Jonne Haß	30dff802d5	Merge pull request #4243 from davexunit/feature/2948 Show the user if a contact is sharing with them when viewing their profile page	2013-06-29 10:16:41 +02:00
Jonne Haß	521aaf894b	Merge pull request #4255 from netom/4194-mobile-photo-view 4194 mobile photo view	2013-06-29 10:06:46 +02:00
Jonne Haß	92d3bb9c69	Merge pull request #4252 from Raven24/diasp-feature/1283-coppa-admin Admin: find users under the age of 13 (COPPA)	2013-06-29 10:03:59 +02:00
Steffen van Bergerem	71f03544e4	Don't focus comment form on 'show n more comments'	2013-06-28 20:40:24 +02:00
Jonne Haß	837a1ba564	Merge pull request #4238 from Flaburgan/patch-4 Improve participants link style, close #4236	2013-06-27 23:09:40 -07: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
Jonne Haß	a6dfdf45e4	... and make the specs actually pass	2013-06-27 18:07:26 +02:00
Tamas Laszlo Fabian	175908e079	Return 404 for nonexistent photo on mobiles	2013-06-24 15:23:57 +02:00
Florian Staudacher	02be4a5335	make age search postgres compatible, add spec, changelog	2013-06-24 12:34:22 +02:00
Florian Staudacher	44fbb6472f	Merge branch 'feature/1283-coppa-admin' of https://github.com/diasp/diaspora into diasp-feature/1283-coppa-admin	2013-06-23 13:38:48 +02:00
Jonne Haß	9c7237ca1c	Merge pull request #4244 from svbergerem/4237-consistent-conversation-list Show avatar of recent user in conversation list Conflicts: Changelog.md	2013-06-22 02:38:54 +02:00
David Thompson	2e83736f43	Add SASS for sharing message.	2013-06-20 07:39:56 -04:00
David Thompson	1e5ef88d8c	Use PeopleHelper#sharing_message view helper method in the profile sidebar.	2013-06-19 22:04:07 -04:00
David Thompson	f7cceecb52	Add PeopleHelper#sharing_message method and english localized message text.	2013-06-19 22:03:37 -04:00
Jason Robinson	f30cee3b6e	Fix hashtags that start a line when posting to Facebook or Twitter, by applying all the same options to strip_markdown as applying to markdownify, fixes #3768 and #4154	2013-06-20 00:06:13 +03:00
Steffen van Bergerem	ffb150f227	Show avatar of recent user in conversation list	2013-06-19 22:59:05 +02:00
David Thompson	1109658e83	Show the user if a contact is sharing with them when viewing their profile page.	2013-06-19 07:38:14 -04:00
Jonne Haß	221c1bf959	update all wiki links	2013-06-17 20:00:48 +02:00
David Thompson	b3c859bcd5	Check for nil before splitting contact_ids param.	2013-06-15 17:14:30 -04:00
Jonne Haß	ed36786edc	Merge pull request #4217 from svbergerem/4041-loading-indicator Add loading indicator on tag pages, remove second one from profile page Conflicts: Changelog.md	2013-06-14 18:23:39 +02:00
Jonne Haß	69db16ab34	Merge pull request #4221 from svbergerem/4123-fix-login-short-password Fix login for short passwords	2013-06-14 09:21:43 -07:00
Jonne Haß	c6d2c714e9	never pass nil to image_tag In production that results in a not precompiled error	2013-06-14 14:47:54 +02:00
Steffen van Bergerem	4cbab628c9	Fix login for short passwords	2013-06-14 12:02:44 +02:00
Steffen van Bergerem	a8ade65e1a	Add loading indicator on tag pages, remove the second one from the profile page	2013-06-14 01:25:36 +02:00
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
Florian Staudacher	4ee5d5f19c	replace mentions of out-of-aspect people in limited posts with just a markdown link to their profile (fixes #2516) add failing spec for #4160 / #2516 extend the spec a bit more refactor mention handling in a status message add method for filtering mentions by aspects wire mention filtering into the status message model, adapt a few tests to work properly cosmetic changes shorten helper methods add changelog entry	2013-06-09 19:16:40 +02:00
Steffen van Bergerem	bcd43cbfee	Don't show hovercards for current user in comments	2013-06-09 12:31:18 +02:00
Jason Robinson	3fa9f6414d	Fix Twitter crossposting (#2758 ). Refactor some service posting related code.	2013-06-08 17:38:07 +03:00
Steffen van Bergerem	17876d1de6	show medium avatar in hovercard	2013-06-07 11:23:28 +02:00
Florian Staudacher	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
Steffen van Bergerem	272cf60788	Add back-to-top button on tag and user pages	2013-05-31 02:02:14 +02:00
Juan Azambuja	e59066bd66	Fix icons-deletelabel styles	2013-05-27 10:25:04 -03:00
Aruna Herath	7803df5ecd	Changed post/comment submit keyboard shortcut to ctrl+enter from shift+enter Fixes reopened #3897	2013-05-27 17:08:39 +05:30
Liane Nakamura	5f25a52676	Fix post iframe src url Add test for posts helper	2013-05-26 20:49:56 +02:00
Fabián Rodríguez	aed81c1b3b	Fix tags ordering in chrome	2013-05-25 15:44:53 -03:00
Jonne Haß	3b03a7cdde	strip trailing newlines from stripped markdown	2013-05-25 15:55:20 +02:00
Jonne Haß	d331242d94	Merge branch 'feature/retract_tweets_when_post_retracted' of git://github.com/Ruxton/diaspora into develop Conflicts: Changelog.md	2013-05-25 13:50:28 +02:00
Jonne Haß	272f405ab7	Merge pull request #4177 from svbergerem/4157-post-preview-tag-page Fix #4157: post preview from tag pages	2013-05-25 04:46:58 -07:00
Jonne Haß	f2f7800b30	drop fallback donation form	2013-05-25 13:37:17 +02:00
Steffen van Bergerem	7f596cfd36	Fix #4157 : post preview from tag pages	2013-05-25 12:39:01 +02:00
Dennis Schubert	cdb4be14ce	Merge branch 'hotfix/v0.1.0.1' into develop	2013-05-20 21:29:17 +02:00
Jonne Haß	286e948054	federate location	2013-05-20 21:26:04 +02:00
Dennis Schubert	e33f4e68a8	Fix 500 caused by deleted reshares	2013-05-20 21:25:58 +02:00
Ruxton	48b48470bc	Service.delete_post now more generic, for future implementations Service.delete_post now accepts post to be more generic and supports deleting post from any service that overrides delete_post(post)	2013-05-20 12:19:39 +08:00
Maxwell Salzberg	66911801f7	use ActiveRecord#find_each to prevent memory spikes in our workers	2013-05-19 20:33:04 -07:00
Ruxton	ba0e2509c9	Twitter service removes status from twitter when post is revoked	2013-05-20 11:00:49 +08:00
Jonne Haß	ac147cc9f4	Refactor config/ directory * Get rid of early pathname requirement * Use require_relative where approciate * Drop unused files * Imported new application.rb, environment.rb and environments/* from fresh Rails app * Cleaned up boot.rb * Load config in boot.rb * Deduplicate environments/integration.rb Move username blacklist into defaults.yml * Ruby 1.9 Hash syntax everywhere * Reorganize lib/diaspora/markdownify to match conventions * Get rid of full path requires where possible * Add dummy content to production section diaspora.yml.example to prevent warning * Drop sqlite? method * Move postgres? method into ConfigurationMethods * Drop token authentication from User	2013-05-19 18:54:54 +02:00
Jonne Haß	11eecc3d3a	404, not 500, if signed out user wants to see a non public/existing post Also add some specs for Post#find_by_guid_or_id_with_user	2013-05-18 20:55:22 +02:00
Jonne Haß	aa60fac217	Merge branch 'error_404_mobile' of git://github.com/movilla/diaspora into movilla-error_404_mobile Conflicts: Changelog.md	2013-05-18 20:06:49 +02:00
Jonne Haß	f5a4bc51c2	Merge branch 'patch-2' of git://github.com/rivendale2010/diaspora into develop Conflicts: Changelog.md app/views/layouts/_header.html.haml	2013-05-18 20:03:59 +02:00
Steffen van Bergerem	63040bb8cc	fix mentions at the end of a post	2013-05-17 19:27:08 +02:00
Steffen van Bergerem	da532e18bd	Fix preview with locator feature	2013-05-08 13:07:13 +02:00
Jonne Haß	6b1fdaafc0	Merge branch 'locator' of git://github.com/tangosource/diaspora into tangosource-locator	2013-05-06 17:33:10 +02:00
eloydegen	eb5bc379d1	Update _header.html.haml Change blog url, now there is no 301 required :)	2013-05-06 16:27:40 +03: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
Braulio Martinez	00a3332013	Remove unnecessary ruby187 hacks	2013-05-02 10:07:30 -03:00
movilla	19d22a8928	fix missing translation back to top	2013-05-01 19:22:53 +02:00
rivendale	b77c6f8a86	fix missing indent for correct header container relative positions	2013-04-29 01:27:54 -03:00
Jonne Haß	ea792246d0	bump sidekiq	2013-04-25 21:30:35 +02: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ß	322f4da4d8	Embed associated photos into the status message xml	2013-04-21 19:44:09 +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
Diaspora Europe	783d98745a	added to admin section: which users are under the age of 13 #1283	2013-04-08 16:50:33 +02:00
Aruna Herath	b0879dd256	added same feature to publisher	2013-04-08 19:29:36 +05:30
Aruna Herath	5f6ce87a23	added shift+enter key from new comment box to submit the comment.	2013-04-08 19:08:29 +05:30
movilla	bc87b501f2	Fix show more post in my activity mobile page. Close #4108	2013-04-08 00:04:42 +02:00
Steffen van Bergerem	6e724fc1d4	preview posts in stream	2013-04-07 17:43:27 +02:00
Jonne Haß	65ce91bbd1	Merge pull request #4106 from jaywink/4057-bookmarklet-post-cannot-be-edited Include missing javascript in bookmarklet to fix uneditable post content	2013-04-06 14:41:34 -07:00
Jason Robinson	9c0c5a7258	Include missing javascript in bookmarklet, regression introduced in commit `ffc6c1102e`. Fixes #4057	2013-04-07 00:06:02 +03: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
embs	4ef37c64be	Add explanation to services index page. Closes #3064	2013-04-04 15:51:11 -03:00
Dennis Schubert	f3b7d57b3a	Merge pull request #3993 from MrZYX/sidekiq Sidekiq (+ some cleanup)	2013-04-03 15:19:15 -07:00
Steffen van Bergerem	a693a0970b	added hotkeys to navigate in stream	2013-04-02 19:24:20 +02:00
Bruno Machado	29af94ce4e	Remove unnecessary dotted CSS borders. Closes #2940	2013-04-01 15:53:27 -03:00
Jonne Haß	704113f896	replace remaining Postzord::Dispatcher.build(self, profile).post with call to the new method	2013-03-31 16:52:18 +02: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
Tom Scott	8a7f6c9fdf	Merge pull request #4067 from movilla/multiphoto Add multiphoto for mobile post. Close #4053	2013-03-30 06:26:07 -07:00
Tom Scott	af8485f47f	Merge pull request #4074 from L3MNcakes/feature/3975-send-profile-update Issue #3976: Send a profile update alongside a sharing notification	2013-03-30 06:07:16 -07:00
movilla	b257939f7e	Add multiphoto for mobile post	2013-03-30 10:59:06 +01:00
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
L3MNcakes	8eed16c245	Issue #3976 : Send a profile update alongside a sharing notification Issue #3976: Send a profile update alongside a sharing notification	2013-03-24 06:04:47 +00:00
Jonne Haß	79a79d65d6	Bye Resque. Ohai Sidekiq. * Dropped all references to Resque * Moved all jobs under app/workers since that's the Sidekiq convention * Renamed Jobs module to Worker to match new location * Adapted all jobs to Sidekiq * Replaced all enqueue calls with perform_async * Dropped Resque hacks from specs and features, replaced with sidekig/testing in RSpec and sidekig/testing/inline in Cucumber * Updated scripts to start a Sidekiq server * Inline Sidekiq sinatra app * Let Sidekiq create the actual Redis instance * Workaround already initialized constant warnings in service models * Resolved ToDo in one job definition by creating proper exception clases for some errors in receiving posts * Added sidekiq section to configuration to make it completly configurable to the user * Add Sidekiq middleware for clean backtraces * Delay HttpMulti retry to give offline pods a chance to come back up * Do not retry on GUID already taken and alike errors * Be graceful about deleted posts in GatherOEmbedData	2013-03-21 23:39:07 +01:00
Jonne Haß	3fc3b249e7	End the require mess * Rename and reorganize post fetcher to fix autoloading, also let it use Faradays default connection so we get nice redirects * Add initializer to load libs at a central place * added lib dir to autoload_once paths to increase thread safety * Moved lib/exceptions.rb to lib/diaspora/ to conform namespacing	2013-03-21 23:37:53 +01:00
Jonne Haß	1a58f9cf29	Merge branch 'mobile_comment' of https://github.com/movilla/diaspora into develop Conflicts: Changelog.md	2013-03-18 20:59:39 +01:00
movilla	bf2bd5a97c	Hide comment button in the mobile view when not signed in	2013-03-18 20:15:55 +01:00
movilla	3990bebcf4	Fix mobile view of deleted reshares	2013-03-18 16:52:37 +01:00
Jonne Haß	e51443b3ef	Merge pull request #4059 from marpo60/remove_unnecessary_javascript_views delete unused javascript views	2013-03-15 11:45:22 -07:00
Juan Manuel Azambuja	06dc53749a	delete unused javascript views	2013-03-15 14:39:34 -03:00
Jonne Haß	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
Jonne Haß	1761fc35a7	Merge pull request #4031 from movilla/test_mobile Add some tests for mobile page	2013-03-10 09:14:06 -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
Jason Robinson	affa713616	If post has photos, always include url in post to Facebook to stay consistant with other servies, fixes #3706	2013-03-10 08:15:12 +02:00
Jonne Haß	3c29007c39	Merge pull request #4051 from Flaburgan/clean-delete-validation Remove duplicate sentence from delete account confirmation pop up	2013-03-09 05:50:19 -08:00
Flaburgan	98da6a3978	Remove duplicate sentence from delete account confirmation pop up	2013-03-09 14:15:11 +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ß	ffc6c1102e	dry up and modularize layouts	2013-03-06 19:00:34 +01:00
Marcelo Dominguez	88e76448b6	Avoid unnecessarily redirect	2013-03-03 23:10:53 -02:00
Marcelo Dominguez	e2ad0cbb81	Remove whitespaces	2013-03-03 23:10:31 -02: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ß	ccedb6eff0	delegate parent_author to the target of a RelayableRetraction	2013-02-28 17:01:58 +01: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
Jonne Haß	cf9659de4a	fix XSS vulnerability in conversations#new, closes #4010	2013-02-26 19:09:30 +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	c1eb986f5b	remove unnecessary code from people_controller#contacts and use #each in view	2013-02-23 22:36:04 -02:00
Fabián Rodríguez	e76935daaf	remove inline styles from views/people/show	2013-02-23 22:36:04 -02:00
Fabián Rodríguez	7472642bd1	Refactor: people_controller#show photos_controller#index *views/people/show both html and mobile	2013-02-23 22:36:03 -02:00
Jonne Haß	19b9b0edb8	Merge pull request #3990 from movilla/mismatch_author_name Wrap text if too long in mobile notifications	2013-02-22 07:51:20 -08:00
movilla	c52a878e86	Wrap text if too long in mobile notifications	2013-02-22 16:15:25 +01:00
Florian Staudacher	f788f3426a	Merge pull request #3946 from MrZYX/feature/1781-include-reshares-in-user-feed Include reshares in the public user feed, closes #1781	2013-02-21 13:37:29 -08:00
movilla	e0d0d0f668	Fixed removing images from publisher on the profile and tags pages	2013-02-21 22:19:24 +01:00
Jonne Haß	35350d1ceb	Include reshares in the public user feed, closes #1781	2013-02-21 14:32:28 +01:00
Jonne Haß	0fd3bcb397	move custom splash page login into the controller, fixes #3991	2013-02-21 13:46:04 +01:00
movilla	5769abcc32	Include our custom fileuploader on the mobile site too	2013-02-20 16:01:08 +01:00
Jonne Haß	1f4787aa6d	Merge pull request #3980 from L3MNcakes/feature/facebook_delete Feature/facebook delete	2013-02-18 11:17:51 -08:00
L3MNcakes	1120cba5f0	Issue #3939 : Posts to Facebook do not delete	2013-02-18 18:21:59 +00: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
Ruxton	60f5173c77	Spec coverage for changelog_url and adjustment to behaviour	2013-02-04 11:00:57 +08:00
Ruxton	ff7308685a	Add a changelog_url helper so that pods can report a more correct changelog	2013-02-04 09:45:36 +08:00
movilla	0ea7bc5258	Adapt css for search mobile page	2013-02-02 23:23:22 +01:00
Jonne Haß	865152be90	Merge pull request #3949 from movilla/gettins_started Add Getting_Started page mobile. Close #3854	2013-02-02 08:00:16 -08:00
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
Jonne Haß	baadb49ebf	Merge pull request #3844 from asphxia/feature/3672-reshare-alert-box-appearing-twice Issue #3672: Reshare alert box is appearing twice	2013-01-31 11:13:13 -08:00
Jonne Haß	1aa8b6e9f2	do not display the publisher on the profile photos page	2013-01-31 19:25:30 +01: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ß	d398365641	Merge branch 'movilla-settings_mobile' into develop	2013-01-29 15:13:19 +01: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
Fabián Rodríguez	8b4aab0780	change #count to #size in notifications_helper to reduce queries	2013-01-29 10:01:09 -02:00
Fabián Rodríguez	d4d3bf8af6	fix translation in contacts_helper	2013-01-29 10:01:08 -02:00
Fabián Rodríguez	649844ea6a	Refactor contacts/index	2013-01-29 10:01:08 -02:00
Fabián Rodríguez	4fa04e88ac	don't join the tags table here, it makes the query slower	2013-01-28 18:57:26 -02:00
movilla	0010819343	add settings web mobile	2013-01-27 20:38:19 +01:00
Jonne Haß	6653684f64	Merge pull request #3920 from asphxia/3906-left-side-panel-ui-changes Side panel ui changes	2013-01-27 08:24:47 -08: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
Asphyxia	6ee921235e	Side panel ui changes	2013-01-27 08:04:33 -03: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
Jonne Haß	ed2258a294	Merge pull request #3849 from asphxia/feature/3806-overflow-comment-textarea Issue #3806: Overflow comment textarea	2013-01-25 03:24:34 -08:00
malavbhavsar	4629afb1f5	Fix services index view.	2013-01-24 23:00:53 -05: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	5a6090a0fb	Issue #3846 : Wrong message on mobile	2013-01-18 15:40:00 -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	0f499e7c2e	make publisher work with backbone	2013-01-16 19:33:20 -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	f978a75b8c	bootstrap my_aspects data	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	a3162d76dd	little refactor in streams_controller	2013-01-16 19:33:19 -02:00
Fabián Rodríguez	2eba28266b	remove server side rendering of 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
Diaspora Europe	ac3b2bc99f	pod version in footer and updated link to changelog #3705	2013-01-15 16:45:10 +01: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	597ab20715	Show error and flash-notice when sending messages to non contacts	2012-12-26 12:23:37 +01:00
movilla	c1b858a877	Mark all unread post-related notifications as read, if one of this gets opened	2012-12-24 00:13:32 +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
Jonne Haß	459df9b735	Merge pull request #3791 from movilla/suggest_member Translation "suggest member" of Community Spotlight	2012-12-06 09:34:01 -08:00
movilla	491c2a537c	Add feature contact pod admin	2012-12-06 15:26:49 +01:00
movilla	65376a604b	Allow translation of "suggest member" of Community Spotlight	2012-12-06 13:15:34 +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	6e912adb88	add a necessary param, fix the retrieve limit	2012-12-01 11:18:13 +00:00
Jonne Haß	bf698f3882	Do not strip "markdown" in links when posting to services, fix #3765	2012-11-26 14:16:43 +01: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
rschaden	49d4079065	add email validation to invitations	2012-11-25 14:25:20 +01:00
Bobby Wilson	abd4e17daf	Fix #3750	2012-11-22 13:00:47 -07:00
Jonne Haß	c59bb35087	Merge pull request #3754 from marpo60/housekeeping Housekeeping2	2012-11-22 01:06:30 -08:00
Jonne Haß	5f6e03cfe5	Merge pull request #3714 from marpo60/refactor Housekeeping	2012-11-22 01:06:05 -08:00
Fabián Rodríguez	99abc22403	remove unused methods	2012-11-21 18:26:17 -02:00
Fabián Rodríguez	232539cdf9	remove unused helpers	2012-11-21 18:26:17 -02:00
Sean Tilley	a5050273ca	Merge pull request #3727 from jaywink/feature/2321-fix-message-notifications Fix notifications for private messages between local users, fixes #2321	2012-11-19 13:48:17 -08:00
Jonne Haß	e9bccb8afe	get rid of string concat of translatable strings in getting started	2012-11-18 17:24:43 +01:00
Fabián Rodríguez	f590abb343	fix 3682, use correct image path for padlocks	2012-11-15 18:17:15 -02:00
Dennis Schubert	ae53254259	Really remove Devises timeoutable... ... and force it to really remember the session by a hidden field.	2012-11-14 20:32:15 +01: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
Jason Robinson	6cf6f1dd7d	Fix notifications for private messages between local users, fixes #2321	2012-11-11 23:35:19 +02:00
movilla	764aa579cd	fix css error with intivation people block in search results	2012-11-11 15:38:03 +01:00
movilla	554fe40235	Web mobile notificacions count dont change to unread-read when click in link post	2012-11-11 14:45:07 +01:00
Jason Robinson	48a332f871	Remove by default markdown formatting from posts done via service, currently only used by Twitter. Remove markdown also from Facebook posts.	2012-11-09 00:04:49 +02: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
Braulio Martinez	3260bada38	Remove posts#new action from Rails and related tests	2012-11-07 23:14:35 -02:00
Fabián Rodríguez	75c943e876	remove app/views/aspects/update	2012-11-06 21:39:37 -02:00
Fabián Rodríguez	893c37004e	remove app/views/aspects/index	2012-11-06 21:39:37 -02:00
Fabián Rodríguez	ae2b459f0e	remove app/views/aspects/aspect_list_item	2012-11-06 21:39:36 -02:00
Fabián Rodríguez	3743eac10d	remove app/views/aspects/aspect_contacts	2012-11-06 21:39:36 -02:00
Fabián Rodríguez	1961ab3326	remove app/views/invitations/edit	2012-11-06 21:39:36 -02:00
Fabián Rodríguez	cf48d384a8	remove app/views/invitations/token_not_found	2012-11-06 21:39:36 -02:00
Fabián Rodríguez	f26d8fdf4c	remove app/views/people/profile_photo_upload	2012-11-06 21:39:36 -02:00
Fabián Rodríguez	8bc64bdf4f	remove app/views/people/aspect_list	2012-11-06 21:39:36 -02:00
Fabián Rodríguez	4056c0da9e	remove unused method #can_add?	2012-11-06 21:39:36 -02:00
Fabián Rodríguez	8cf8fae396	remove app/views/people/add_contact_small	2012-11-06 21:39:36 -02:00
Fabián Rodríguez	76c48f3c9c	privatize non-action controller method	2012-11-06 21:39:36 -02:00
Fabián Rodríguez	b7a6f8b3b2	remove app/views/likes/likes_container	2012-11-06 21:39:36 -02:00
Fabián Rodríguez	34c601bc41	remove app/views/notifications/popup	2012-11-06 21:39:36 -02:00
Fabián Rodríguez	3d061d92c6	remove unused templates	2012-11-06 21:39:35 -02:00
Fabián Rodríguez	48bb6ad25c	remove old experimental leftovers	2012-11-06 21:39:35 -02:00
Fabián Rodríguez	1d1b66f8cc	remove unused helper	2012-11-06 21:39:35 -02:00
Fabián Rodríguez	aa8b37f2be	remove app/views/requests/	2012-11-06 21:39:35 -02:00
Fabián Rodríguez	5d169a3d73	remove app/views/shared/mail_signup_form	2012-11-06 21:39:35 -02:00
Fabián Rodríguez	f22ec35989	remove app/views/shared/author_info	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
Jonne Haß	cc7f5d9626	Merge pull request #3708 from movilla/invitacion_search Fix Invite link box shows on search results page even if invites have been turden off - Fix #3707	2012-11-06 08:58:24 -08:00
movilla	f3ce1e6c66	Fix Invite link box shows on search results page even if invites have been turned off	2012-11-06 15:56:53 +01:00
Jason Robinson	7fafabdb60	Only include url to post for twitter when post exceeds maximum length or contains photos	2012-11-03 23:25:19 +02:00
Jonne Haß	2a45470232	Merge branch 'feature/fix-facebook-public-posts' of git://github.com/jaywink/diaspora into feature/fix_services Conflicts: Changelog.md app/models/services/facebook.rb spec/models/services/facebook_spec.rb	2012-11-02 11:31:47 +01:00
Jason Robinson	e974d2934f	Always use basic Facebook Graph API to post messages, fixes public posts. Remove unnecessary Facebook opengraph config items	2012-11-02 00:23:33 +02:00
Jason Robinson	b96fbb0676	Fix empty page after callback from service by redirecting to origin. Also make settings/services page use the same window when authenticating with other services instead of launching a popup.	2012-11-01 21:50:31 +02: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
Jonne Haß	5a70311fe7	update and fix services	2012-10-25 17:54:18 +02:00
Jonne Haß	1a93ccd548	don't error out if the root of a reshare of a reshare got deleted, fixes #3546	2012-10-24 19:51:31 +02:00
Dennis Schubert	5ea998a382	Change 'unless' to 'if' again because 'unless' is wrong here. Also, add some specs and add it to the changelog.	2012-10-24 00:27:45 +02:00
Jonne Haß	4b5b7fc77f	Revert "Merge pull request #3655 from denschub/feature/fix-followhq-setting" This reverts commit `b0fc95764d`, reversing changes made to `0057e9ed46`.	2012-10-21 22:12:36 +02:00
Sean Tilley	b0fc95764d	Merge pull request #3655 from denschub/feature/fix-followhq-setting Change 'unless' to 'if' because 'unless' is wrong here. [ci skip]	2012-10-21 12:55:01 -07: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
Gonzalo	7e0c8bdf68	Remove unreachable line of code	2012-10-15 20:25:10 -02:00
Gonzalo	e1756b5b3f	Privatize non-action controller methods	2012-10-14 19:32:53 -02:00
Gonzalo	83809c924a	Refactor MessagesController	2012-10-13 17:10:52 -02:00
movilla	ebd1b28b2d	Fix problem javascript with read-unread notifications on notifications popup	2012-10-13 15:16:06 +02:00
Dennis Schubert	7dc629179b	Change 'unless' to 'if' because 'unless' is wrong here.	2012-10-12 00:59:42 +02:00
Fabián Rodríguez	82082005ba	redirect users back on registration failure	2012-10-11 19:47:04 -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
movilla	928a8a02d8	Fix "if display_password_reset_link?" when diaspora.yml => enable_registrations: false	2012-10-10 16:49:45 +02:00
Sean Tilley	bbaf41aa8d	Merge pull request #3637 from movilla/dropdown_welcome_page Aspect dropdown on welcome page (after signup) - overflow hidden - Fix #3604 [ci skip]	2012-10-08 14:36:01 -07:00
movilla	7be7ac3176	Aspect dropdown on welcome page (after signup) - overflow hidden - fix 3604	2012-10-08 19:15:21 +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	83ab60ab9e	Merge branch 'hotfix/mobile-bookmarklet' into develop fix layout determination for mobile bookmarklet	2012-10-05 12:25:33 +02:00
Jason Robinson	a26dc34a7b	Fix broken mobile bookmarklet, isse #3613	2012-10-05 09:53:19 +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
Florian Staudacher	8678c14735	Merge pull request #3589 from MrZYX/refactor_config New configuration system, details: see changelog	2012-09-30 13:07:40 -07:00
David McMullin	586e23727c	add specs for chromeframe fix typo in ChromeFrame itself remove unneccessary chromeframe meta tags from layouts	2012-09-30 17:04:50 +01:00
Marek Lewandowski	125e45cdba	Force user to authenticate instead of raising error	2012-09-29 16:57:34 +02:00
Jonne Haß	531c5b0c32	Merge pull request #3616 from movilla/css_problem_viewer_post css error in post-viewer after update bootstrap	2012-09-29 06:44:20 -07:00
movilla	aa8c89a0e4	css error in post-viewer after update bootstrap	2012-09-29 15:19:39 +02:00
Jonne Haß	234b76a936	properly integrate asset_sync	2012-09-26 20:23:45 +02:00
Jonne Haß	89c1fd5f7f	query the set url only through #pod_uri in the app	2012-09-26 20:19:37 +02:00
Jonne Haß	2a4db54db9	New configuration system * Throw away old system * Add new system * Add new example files * Replace all calls * add the most important docs * Add Specs * rename disable_ssl_requirement to require_ssl * cloudfiles isn't used/called in our code * since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it * die if session secret is unset and on heroku * First basic infrastructure for version information	2012-09-26 20:19:37 +02:00
Jonne Haß	7a478704d5	just stop settingslogic from breaking rspec output for now	2012-09-26 18:54:14 +02:00
Jonne Haß	e70e48d6ca	some refactoring regarding the law of demeter	2012-09-23 19:33:19 +02:00
Florian Staudacher	9d391d5885	Merge pull request #3597 from devendram/diaspora-refactoring-1 refactored user model (using scope instead of class methods) + rspec tests for daily, monthly, yearly activities	2012-09-23 09:36:35 -07: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
Devendra	a2fa083c3e	added rspec tests and refactored user model to use scope, for daily, monthly, and yearly actives	2012-09-22 01:56:34 +05:30
Sean Tilley	48049d9b49	Merge pull request #3590 from movilla/reshares_mobile_2_the_revenge_absolute_root reshare mobile doesnt show the original author - absolute_root - Fix: #3368 [ci skip]	2012-09-19 20:54:18 -07:00
movilla	dc0b2d9e58	reshare mobile doesnt show the original author - absolute_root - Fix: 3368	2012-09-19 07:30:03 +02:00
Jonne Haß	8674f5aea2	Merge branch 'hotfix/redis_url' into develop	2012-09-18 15:55:32 +02:00
Jonne Haß	2f9dbdbd86	use self instead of AppConfig to query redis_url inside AppConfig	2012-09-18 15:52:57 +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	452de1b866	fix remaining cukes and some cleanup	2012-09-17 20:35:38 +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ß	6c1a1ec6d2	it's enviroNment	2012-09-15 18:52:12 +02:00
Jonne Haß	9e264b5258	hotfix typo, thanks david	2012-09-15 18:28:43 +02:00
Jonne Haß	48dcccf7b3	Unify redis initialization REDISTOGO_URL is now deprecated in favor of REDIS_URL which is supported by the redis gem too.	2012-09-15 18:23:22 +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ß	4bada36bf1	do not redirect admin to his profile upon sign in	2012-09-14 15:01:19 +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ß	142e38e78b	update devise	2012-09-12 13:29:57 +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	c6d24c61f9	404 page set for mobile	2012-09-08 19:43:10 +02: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
Jonne Haß	edc9d75df7	remove deprecation warning about outdated render call	2012-09-07 01:55:53 +02:00
Jonne Haß	81442f0f2a	Erb::Util.h now escapes ' which it didn't before this is what 3.2.8 actually fixes to prevent XSS iirc We're including the raw message in the atom feed so we should test for it	2012-09-06 21:12:49 +02:00
Florian Staudacher	9f27eba174	Merge pull request #3539 from movilla/404_blank_page_mobile Fix #3428 blank page 404 on mobile	2012-09-06 10:05:09 -07:00
movilla	b0ecc57631	Fix uncomfortable overflow mobile post	2012-09-05 16:51:27 +02:00
movilla	c0c568365a	Fix blank page 404 on mobile	2012-09-04 00:09:45 +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
Maxwell Salzberg	8b7934006e	Merge pull request #3491 from fermionic/issue-3420-remote-comments-dont-delete Give relayable retractions a chance to propagate locally before deleting the target	2012-08-30 13:04:59 -07:00
Sean Tilley	3775deb03f	Merge pull request #3525 from movilla/big_block_login_ Issue #3523: The text 'Gebruikersnaam' (unsername in Dutch) overlay the inputfield. [ci skip]	2012-08-30 10:13:44 -07:00
movilla	6a32bdd570	Issue #3523 : Overflow text username in Duych - maybe several language-_	2012-08-30 16:03:35 +02:00
movilla	94525f5e45	Issue #3523 : Overflow text username in Duych - maybe several language-	2012-08-30 15:55:54 +02:00
movilla	6c6be3e22a	New mobile_web registrations	2012-08-29 23:09:52 +02:00
Maxwell Salzberg	c3f073b520	Merge pull request #3511 from movilla/placeholder_friendly_mobile_search Add placeholder search mobile[ci skip]	2012-08-26 23:26:50 -07:00
movilla	b1815c8e9a	Add placeholder search mobile	2012-08-25 03:45:02 +02:00
Daniel Grippi	b8f7d025d5	update landing page	2012-08-24 13:45:05 -07:00
Maxwell Salzberg	ac9af24209	Merge pull request #3505 from movilla/add_header_mobile_icons Add icon to search & contacts via mobile	2012-08-22 10:40:02 -07:00
Maxwell Salzberg	4c9326eaf9	fix stupid sign up form	2012-08-21 15:42:07 -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	35937b24b7	dont beta0fiy users. going all in	2012-08-19 23:11:06 -07:00
Maxwell Salzberg	54a6ac0c6f	add poduptime asset	2012-08-19 17:34:33 -07:00
Maxwell Salzberg	329a37ef9a	Merge pull request #3493 from movilla/conversation_mobile Add file mobile conversation	2012-08-14 11:08:41 -07:00
movilla	783edaa327	Fix issue #3473 Wrong profile icon size in tag stream	2012-08-12 23:23:16 +02: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
Zach Prezkuta	0a396b16b1	only delete object of relayable retraction after it has been relayed or federated	2012-08-09 08:55:55 -06:00
Florian Staudacher	645fa76b20	make the "last post" link show ownly if the person has any posts (fixes #3437)	2012-08-09 15:12:22 +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	fb9da740bb	Merge pull request #3482 from Raven24/public-fetcher first working version of a 'post fetcher' for remote accounts	2012-08-08 06:42:45 -07: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
Jonne Haß	42b8e8f1ea	if you have a : in a translatable string and no %{} you already know you're doing it wrong [ci skip]	2012-08-04 19:46:29 +02:00
Florian Staudacher	932fb186e3	fix failing bookmarklet specs (wait for js to finish)	2012-08-04 16:10:11 +02:00
Florian Staudacher	9d11748486	added minimal layout for bookmarklet popup	2012-08-04 14:48:18 +02:00
Florian Staudacher	8f1204d05a	first working version of a 'post fetcher' for remote accounts	2012-08-04 13:22:03 +02:00
Florian Staudacher	50eed641fe	Merge pull request #3479 from movilla/little_translation little translation to send invitations	2012-08-03 13:49:48 -07: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
movilla	ef1e4fa318	little translation to send invitations	2012-08-03 15:31:34 +02:00
Maxwell Salzberg	e87d9af52c	fix roboto in firefox"	2012-08-02 23:01:05 -07:00
Dennis Schubert	15b7ee0cf8	Fix the bookmarklet when using paramters ... because setting values without waiting for the browser to finish the DOM rendering is evil ...	2012-07-26 23:57:28 +03: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	9bd7c6965f	Merge pull request #3464 from Raven24/invite-auth require authentication for invite actions	2012-07-22 04:06:44 -07:00
movilla	d45e53bb91	Link to post in the mobile	2012-07-22 13:32:02 +03:00
Florian Staudacher	fd6d41ddad	require authentication for invite actions	2012-07-22 02:42:39 +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
Jason Robinson	e644a70406	Mobile bookmarklet was not loading jQuery causing javascript to not execute, fixes #3204	2012-07-10 23:06:42 +03: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
movilla	5eab1226f6	Fix error admins/weekly_user_stats	2012-07-07 22:33:56 +03:00
movilla	2ff89ed33d	Change root_url to root_path	2012-07-06 20:08:41 +03:00
Florian Staudacher	1809897aa2	should fix the mobile toggle for the case: desktop --to--> mobile #3299 also, (possibly) fix tablet issue #3421, + tests	2012-07-04 01:47:55 +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	20948d5e93	Merge pull request #3418 from Raven24/nicer-oembed oembed video info box	2012-06-26 11:16:40 -07:00
Maxwell Salzberg	718f7e1dbb	Merge pull request #3260 from panckreous/twitter-conf check for existence of key instead of checking secret twice	2012-06-26 10:34:08 -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
Jonne Haß	c9e54700ff	string concatenation is still bad	2012-06-24 12:21:52 +02:00
movilla	1417cd5b0f	Last translation admin-panel (weekly user)	2012-06-24 02:34:49 +02:00
Steven Hancock	d36209ae4b	Merge pull request #3390 from stevenh512/fix_user_attributes User model - mass-assignable attributes fix	2012-06-20 11:41:28 -07:00
Zach Scott	82a47d0ba3	Fixed Issue #3382 - The comments under postings are missing when using the #tags -view	2012-06-18 22:46:01 -06:00
Maxwell Salzberg	fd748b8afb	Merge pull request #3396 from fermionic/auto-rotate-images #2322 -- rotate uploaded images based on the meta-data	2012-06-18 18:20:05 -07:00
Steven Hancock	a2f208b013	User model - mass-assignable attributes fix `:username`, `:email` and `:remember_me` should be mass-assignable. fixes #3377	2012-06-18 16:58:36 -07: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	d3b70a7f3a	small typo [ci skip]	2012-06-18 23:40:18 +02:00
Florian Staudacher	0596f5345d	use default format in case a tablet device is detected	2012-06-18 22:50:15 +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
Florian Staudacher	994bfd4a24	fix client-side validations in registration form + test	2012-06-18 18:57:44 +02:00
Florian Staudacher	f4d7196fb5	tell jQuery not to expect html when deleting photos in the publisher	2012-06-18 15:25:50 +02:00
Zach Prezkuta	ab9bd2f9e3	#2322 -- rotate uploaded images based on the meta-data	2012-06-17 19:47:34 -06:00
Maxwell Salzberg	d331a14dd2	limit the amount of people in a converasation to prevent hella spam	2012-06-17 15:51:18 -07: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
movilla	d5aefaa64c	Login with pod_name	2012-06-16 22:51:38 +02:00
Steven Hancock	9280753950	Fix deprecation warning, :confirm option on links is deprecated Use `:data => { :confirm => 'text' }` instead.	2012-06-14 01:56:51 -07:00
Steven Hancock	033e8e5cb6	Fix ActiveRecord queries - take two	2012-06-13 14:52:25 -07:00
Steven Hancock	79b7d38158	Fix ActiveRecord queries with nested hashes Rails 3.2.6 doesn't like them	2012-06-13 14:18:09 -07:00
Steven Hancock	a8de3a5a3f	Rails.root and File.join cleanup - `Rails.root` is a `Pathname`, so let's use `Rails.root.join` - Clean up most of the remaining `File.join`s	2012-06-11 03:13:20 -07:00
Florian Staudacher	e021fd821d	Merge pull request #3362 from diaspora/non-public-error-page show a "post is not public" message when visitor is not logged in	2012-06-11 02:35:48 -07:00
Zach Prezkuta	44e43158cc	add rspec test and make fix more rails-y	2012-06-08 22:51:16 -06:00
Zach Prezkuta	ed51f34ebb	strip comment text upon comment creation	2012-06-08 22:51:16 -06: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
Daniel Grippi	5b424e7d94	don't use quotes for chartbeat (it's picky) [ci skip]	2012-06-05 00:14:00 -07:00
Daniel Grippi	44f2b7ae44	Update master	2012-06-04 23:47:20 -07:00
Maxwell Salzberg	9cf946b20e	use a smaller thumb on the home stream	2012-06-04 15:19:05 -07:00
Maxwell Salzberg	9071540400	use pod name helper in emails	2012-06-04 14:04:39 -07:00
Maxwell Salzberg	4eb95a1b6b	Merge pull request #3353 from SuperTux88/fix-reshare-link-border remove border from reshare link [ci skip]	2012-06-03 23:09:22 -07:00
David Morley	d3b5e330b3	allow interactions to be viewed on public posts when not logged in	2012-06-03 21:49:08 -03:00
Benjamin Neff	769836c221	remove border from reshare link	2012-06-03 18:42:55 +02:00
Maxwell Salzberg	64bf4a1f48	adding the ability to customize your open graph namespace	2012-06-01 17:31:34 -07:00
Maxwell Salzberg	018e513130	remove disable_with depreciation warning.	2012-05-31 22:35:07 -07:00
Maxwell Salzberg	cf6974b898	fix photo uploader loading image	2012-05-31 11:58:11 -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	ee27764816	missing quotes. ugh. [ci skip]	2012-05-30 16:50:31 -07:00
danielgrippi	9e42d4386f	actually add the guid into the layouts [ci skip]	2012-05-30 16:34:29 -07:00
danielgrippi	ca492b407c	add guid to mixpanel	2012-05-30 16:31:26 -07:00
danielgrippi	de680216f0	add mixstuff to post.haml layout [ci skip]	2012-05-30 15:33:40 -07:00
danielgrippi	d8470d303a	simple mixtracking	2012-05-30 15:25:19 -07:00
danielgrippi	cf884fb1c9	finally fixed teh analytics helper [ci skip]	2012-05-30 14:56:02 -07:00
danielgrippi	7e544167f3	finally fixed analytics helper [ci skip]	2012-05-30 14:40:08 -07:00
danielgrippi	786a0be8b3	forgot one [ci skip]	2012-05-30 14:19:48 -07:00
danielgrippi	de8d7770fe	don't use double quotes in javascript tag helper for mixpanel [ci skip]	2012-05-30 14:11:45 -07:00
danielgrippi	f3e568d3c1	actually include mixpanel. durr [ci skip]	2012-05-30 14:00:25 -07:00
danielgrippi	72d2f619fc	added GA back into rack; added mixpanel configuration options	2012-05-30 13:30:28 -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
Maxwell Salzberg	234bb4cb56	Merge pull request #3302 from movilla/new_login Translation new make something /stream [ci skip]	2012-05-29 11:45:24 -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	687fd7a6a5	Merge pull request #3328 from caarlos0/master set cursor into username field on login page [ci skip]	2012-05-28 00:04:45 -07: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
Carlos Alexandro Becker	22103ffe65	set cursor into username field on login page - fixes #3305	2012-05-28 01:40:30 -03:00
movilla	13c16af5ad	Fix Translation missing Email_link	2012-05-26 21:49:54 +02: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
danielgrippi	3e09d4ed14	Revert "don't seed beta users with default aspects" This reverts commit `946f78b025`.	2012-05-24 11:42:52 -07:00
Dennis Collinson	f3174941bd	fix the "has no posts" on back bug.	2012-05-24 11:40:27 -07:00
danielgrippi	946f78b025	don't seed beta users with default aspects	2012-05-24 11:37:34 -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
Maxwell Salzberg	de499ba276	new bookmarklet needs to be ridic wide to deal with bootstrap responsive :( [ci skip]	2012-05-23 18:06:50 -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
Dan Hansen	cf847d61ba	bug mash #5 fix NoMethodError on InvitationsController	2012-05-23 13:05:01 -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
Dennis Schubert	348c5ac522	Extend usernames pattern to allow '@', '.' and '"' to not lock out old users with dots in their username or users using their email address to sign in...	2012-05-23 20:52:43 +03: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
movilla	a7f967c2c5	Translation new make something /stream	2012-05-23 00:43:45 +02: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
Jonne Haß	5c534521cc	top level email is a noun, not a verb [ci skip]	2012-05-22 10:26:21 +02:00
danielgrippi	64a73fb665	new post types. remove old ones. yeah.	2012-05-21 18:45:01 -07:00
Dennis Collinson	2059fea656	put stream.haml back as it is still used in mobile	2012-05-21 17:43:49 -07:00
Dennis Collinson	17dc5eab18	can't remove these yet, cause of mobile Revert "do you like old views, because I don't.Kill the old stream views" This reverts commit `370d8b0482`.	2012-05-21 17:40:23 -07:00
Dennis Collinson	370d8b0482	do you like old views, because I don't.Kill the old stream views	2012-05-21 17:20:08 -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
Florian Staudacher	d815cf5d82	take acts-as-taggable-on gem from git, solve tag case-sensitivity	2012-05-21 17:20:04 +02:00
Alex Connor	fe984eb426	#3287 using reorder instead of order for newer, older	2012-05-20 18:21:34 -05:00
Maxwell Salzberg	bde23f8ab8	use image_tag for asset_pipeline goodness	2012-05-19 18:19:50 -07:00
danielgrippi	72f718c8c3	new login page. kept the old one for safe keeping.	2012-05-19 11:10:17 -07:00
Steven Hancock	125b013c10	AppsController no longer exists Remove the AppsController check from the next_page_path helper, since AppsController no longer exists. fixes #3280 I'd like to write a helper spec for this, but it'll probably require some stubbing/mocking and I'm a little too tired to deal with that at the moment.. so for now let's just fix the problem. :)	2012-05-18 23:42:29 -07:00
danielgrippi	f4c06c8f88	add rounded buttons to the composer flow; slay multi-photo option	2012-05-18 19:46:51 -07:00
Maxwell Salzberg	593fa0ed8e	stupid hack for photos	2012-05-17 21:49:04 -07:00
danielgrippi	62ba75ad1b	DG DC; Move stuff to second page of framer	2012-05-17 19:02:58 -07:00
Maxwell Salzberg	133c9ee0c3	remove deprecation warnings about the template handler in rails 3.2	2012-05-17 18:23:39 -07:00
Steven Hancock	2ae366ad19	Render invitation email without a layout Ideally, we'll probably want to add a layout for this email at some point, but this simplifies it to the bare minimum and gets rid of the "click here to change your notification settings" link. fixes #3270	2012-05-17 17:51:20 -07:00
danielgrippi	27aff7fb1e	DG DC; GREEEEEEEEEN	2012-05-17 17:01:31 -07:00

... 18 19 20 21 22 ...

7934 commits