4380 commits

Author	SHA1	Message	Date
Jonne Haß	ec02f54613	Merge pull request #5122 from jaideng123/5113-mark-as-read-by-filter ... Added Mark all in filter as read feature	2014-08-18 11:30:18 +02:00
Jonne Haß	fa9c079955	Merge pull request #5121 from wegotcoders/4943-add-services-to-statistics-json ... Service have been added to /statistics.json	2014-08-18 11:20:26 +02:00
jaideng123	6456a441fe	Modified behavior of mark all as read button	2014-08-17 10:12:23 -05:00
Florian Staudacher	4fd9bae056	refactor global event broker and user blocking from stream posts	2014-08-17 14:05:56 +02:00
Steffen van Bergerem	022bc1007d	Remove unused code	2014-08-16 11:47:31 +02:00
damzcodes	de069962b3	Service have been added to /statistics.json ... Services have been added to /statistics.json tidying up edits	2014-08-15 14:02:03 +01:00
Jonne Haß	92a6fc9eb5	Add fallback system to frontend I18n system ... Load the default locale and fall back to it on missing key and interpolation errors	2014-08-15 13:53:28 +02:00
Florian Staudacher	163b76ae3d	Merge branch '2875-ignore-user-posts' of https://github.com/hpetru/diaspora into hpetru-2875-ignore-user-posts ... Conflicts: Changelog.md	2014-08-13 14:30:28 +02:00
Jonne Haß	0421d9336a	Merge pull request #5100 from Faldrian/feature/add_help_keyboard_shortcuts ... added keyboard shortcut help topic	2014-08-03 20:12:15 +02:00
Faldrian	9636f372a4	inserted line breaks and wrote a test for app.views.Content.smallPhotos	2014-08-03 17:17:12 +02:00
Faldrian	207b351049	added test for help section keyboard shortcuts	2014-08-02 10:30:17 +02:00
arlogn	2394c3df39	flexible font-size for sign_in podname huge text	2014-07-06 19:18:21 +02:00
Florian Staudacher	13b716a449	allow admins to close user accounts from the backend ... * thanks to @maxwell for the initial work on this port admin pages to bootstrap * improve user view on admin search page * add 'close account' link to each user in the search results * keep the same blue color for the admin menu some refactoring of the routes and the admin code * try to be more RESTful (possibly) * use a 'UserSearch' model for search parameters and querying add changelog entry	2014-07-01 23:33:15 +02:00
Maxwell Salzberg	cc53e1762b	A podmin can now disable a spam account from the interface.	2014-07-01 17:51:39 +02:00
Jason Robinson	831af6507d	Merge pull request #5006 from taratatach/4940-mention-notification-not-marked-as-read-when-viewing-post ... Set mention notification as read when viewing post	2014-06-27 10:17:01 +03:00
Jason Robinson	c6f2691cc3	Merge pull request #5009 from taratatach/4951-sharing-notification-not-marked-as-read-when-visiting-profile ... Set sharing notification as read	2014-06-27 10:16:17 +03:00
Hincu Petru	653612b74d	Remove posts for ignored person	2014-06-25 08:56:12 +00:00
Lukas Matt	01a45ccf40	Reports email notification; wrong recipient ... The mailer uses the person_id to find a user which cannot work on a production environment. I haven't used a remote user on my test setup.	2014-06-23 15:54:25 -04:00
Jason Robinson	126ced4383	Fix broken bookmarklet if params have encoded linefeeds. ... Closes #4994	2014-06-22 11:48:24 +03:00
Erwan Guyader	f92dd85748	Set sharing notification as read ... Fix issue #4951 If the displayed user (on her profile) started sharing with the current user, mark the notification as read	2014-06-20 10:55:17 +02:00
Erwan Guyader	126252d47a	Add test for mention notifications	2014-06-20 01:23:53 +02:00
Erwan Guyader	3ebc0f0387	Test returned path for Show More on mobile ... - Added test when the currant page is Aspects Stream - Modified test for the Stream page to account for the new possibility (i.e current page is Aspects Stream)	2014-06-17 21:36:38 +02:00
Jonne Haß	fc1f249129	Harden account deletion ... * Wrap it into a transaction * Use destroy over delete so dependent destroys get triggered and we thus don't fail on the foreign key constraits * Check if a photos status message actually exists before accessing it * Add missing dependent destroys	2014-05-27 00:15:15 +02:00
Erwan Guyader	24d2ac0ec2	4967 Use https to load the location form OSM	2014-05-26 11:34:01 +02:00
Jonne Haß	5f0a11dfa6	Remove debug puts	2014-05-25 09:48:45 +02:00
Jonne Haß	e6348aa705	Use toggle() to hide the poll creator	2014-05-24 21:40:48 +02:00
Jonne Haß	9537c45d2a	Merge pull request #4916 from hpetru/validate-poll-answer ... I added the validation to poll question and poll answer Conflicts: app/assets/javascripts/app/views/publisher_view.js	2014-05-24 17:42:18 +02:00
Jonne Haß	cbd9c56a7a	Merge pull request #4919 from hpetru/4776-mention-on-mobile ... Unescape text before add mention, this commit solve #4776 Conflicts: Changelog.md	2014-05-24 17:34:29 +02:00
Jonne Haß	0c5cc216c6	Replace vaild with valid ... Thanks to Josias for the hint	2014-05-24 17:24:36 +02:00
Jonne Haß	d36589e05b	Remove hack from exporter ... I couldn't reproduce what the comment states anymore, so I just removed it. This fixes a minor issue where html wouldn't be escaped in the export. Thanks to A Kai (@sixhundredns) for reporting.	2014-05-24 15:27:13 +02:00
Florian Staudacher	693ded8298	unset any stream that might be left over from earlier specs	2014-05-20 20:52:25 +02:00
Florian Staudacher	46e3c5a870	add 'loginAs' to bookmarklet spec	2014-05-18 23:37:59 +02:00
Lukas Matt	8170ef8363	Validate on report that post or comment does exist	2014-05-16 09:48:14 -04:00
Jason Robinson	01381ddf25	Merge pull request #4957 from MrZYX/4956_deleted_reshare ... Use absolute_root more consistently in Reshare	2014-05-16 10:00:31 +03:00
Lukas Matt	218845d5b4	Changed and renamed database columns ... * changed user_id type to integer * renamed post_id to item_id * renamed post_type to item_type	2014-05-15 07:23:44 -04:00
Lukas Matt	8ae89a443b	Replaced fake post/comment with existing one ... That fixed the correct validation whether a post/comment is gone after the report was marked as deleted	2014-05-15 07:23:43 -04:00
Lukas Matt	e667a785ed	Assert that valid post/comment are gone	2014-05-15 07:23:43 -04:00
Lukas Matt	f6eba7966d	Added destroy_reported_item to report model spec	2014-05-15 07:23:43 -04:00
Lukas Matt	1a4ab274a3	Changed report spec ... * Removed ActiveRecord tests (that is handled in the controller spec) * Added Mailer tests * Added validation tests	2014-05-15 07:23:43 -04:00
Lukas Matt	435f659467	Added report model spec	2014-05-15 07:23:43 -04:00
Lukas Matt	8b8a232b17	Added diaspora copyright	2014-05-15 07:23:43 -04:00
Lukas Matt	ed9cd81504	Fixed put request for Report controller	2014-05-15 07:23:43 -04:00
Lukas Matt	1748d3b940	It is now possible to report comments ... * Renamed PostReport to Report * Added report button to SPV * Updated rspec refs diaspora/diaspora#4732 refs diaspora/diaspora#4710 refs diaspora/diaspora#4711 refs diaspora/diaspora#4517	2014-05-15 07:23:43 -04:00
Jonne Haß	8a599e1c1d	Use absolute_root more consistently in Reshare ... Closes #4956	2014-05-14 22:41:24 +02:00
Hincu Petru	e699a682f4	Unescape text before add mention, this commit solve #4776	2014-05-06 12:13:43 +00:00
Florian Staudacher	9da3bc347b	disable publisher after successfully posting in standalone mode	2014-04-25 19:51:45 +02:00
Florian Staudacher	0d51bba959	port bookmarklet to Backbone.js, use gon for params (fixes #4931)	2014-04-19 17:41:21 +02:00
Gabriel Lima	f6c0648a55	bug #4832 - send the rspec test and changelog	2014-04-15 09:23:58 -03:00
Jason Robinson	356096a7eb	Merge pull request #4836 from MrZYX/message_renderer ... Introduce message renderer	2014-04-13 15:00:46 +03:00
Hincu Petru	2311b761e1	Redirect to stream_path if is destkop	2014-04-08 09:34:14 +00:00
Hincu Petru	57de031f6b	I added the validation for blank to poll question and poll answer	2014-04-07 17:17:41 +00:00
Jonne Haß	682a49605e	Merge pull request #4910 from hpetru/rewrite-poll-creator ... Rewrite poll creation inputs	2014-04-06 22:27:01 +02:00
Jannik Streek	095d616198	fixed federation issue due to missing delegation + test + some minor tweaks ... fixed indenting renamed test	2014-04-06 20:58:58 +02:00
Hincu Petru	2d3933ccd8	Rewrite poll creation inputs	2014-04-06 15:01:18 +00:00
Hincu Petru	2ae4d41db3	Fixed 4903 and not render vote form when user is not logged	2014-04-05 14:29:07 +00:00
Hincu Petru	6c00db23cd	I update design for poll in post stream	2014-04-03 20:57:14 +00:00
Hincu Petru	cee90e737c	Make poll to be compatible with bootstrap	2014-04-03 09:03:54 +00:00
Hincu Petru	fed5ea8cda	Refactored poll_view.js	2014-04-02 16:19:07 +00:00
Jonne Haß	211963d320	Merge pull request #4889 from hpetru/4874-malformed-url ... Catch error from decodeURI for prevent crash in posts parsing	2014-04-01 00:49:27 +02:00
Hincu Petru	552310796c	Catch error from decodeURI for prevent crash in posts parsing	2014-03-31 20:24:47 +00:00
Jannik Streek	2d0abbae23	added jasmine test for poll view	2014-03-31 18:14:07 +02:00
Jannik Streek	dde39aa1bb	added jasmine publisher tests	2014-03-31 18:14:07 +02:00
Jannik Streek	a9843ae996	added cucumber tests, updated spec with xml class test	2014-03-31 18:14:07 +02:00
Jannik Streek	95d98ff2b6	improved code for poll participation	2014-03-31 18:14:06 +02:00
Jannik Streek	c02414c36d	fixed wrong indenting and broken messages tab for polls	2014-03-31 18:14:06 +02:00
Jannik Streek	8a4f833d1d	added more tests for the poll federation + fixed broken rspec tests	2014-03-31 18:14:06 +02:00
Jannik Streek	5d560609e4	poll_participation_spec no longer fails, added poll_participation factory	2014-03-31 18:14:06 +02:00
Jannik Streek	fe67bdf2e7	added tests for poll federation and impl for the federation itself. Still in progess	2014-03-31 18:14:06 +02:00
Jannik Streek	dfbe17d046	Poll input fields and data model now available ... question field of poll now in db fixed merge issues	2014-03-31 18:14:06 +02:00
Jonne Haß	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	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ß	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ß	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	7c4d783d51	Check if the hashtag is a link in function .hashtagify	2014-03-14 15:49:41 +00:00
Hincu Petru	e0b23b2dc4	Fixed #4726 infinite photo stream	2014-03-12 22:22:24 +00: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	0241d9c7db	use fixture	2014-03-10 17:21:54 +01:00
Steffen van Bergerem	0cc3b10b1f	port publisher and bookmarklet to bootstrap	2014-03-10 15:15:40 +01:00
Jonne Haß	bd24cb71a4	Fix plaintext mode for mentionable ... Also slight refactors to it.	2014-03-09 14:02:15 +01:00
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	69a1718d08	fix comment spec, jasmine should be ok now	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
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
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
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ß	2e8dc8fb61	move PasswordsController specs to the new appropiate location	2014-02-10 10:18:20 +01:00
goobertron	23e8bfa082	Update JQuery source to jquery.com	2014-02-09 17:36:35 +00: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	55efa82756	made a help view spec and cleaned up the views a bit.	2014-02-09 16:00:15 +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
Florian Staudacher	6c9cce7cda	Merge branch '4264-embed-youtube-on-https' of https://github.com/arlogn/diaspora into arlogn-4264-embed-youtube-on-https	2014-02-09 13:05:39 +01:00
arlogn	1563d088bc	embedding youtube videos over https	2014-01-30 18:01:27 +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
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	0f156cd9a4	Remove unused beta code	2014-01-24 09:01:30 +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
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
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
Jonne Haß	c11ddaa770	remove not_to raise_error deprecations	2014-01-13 12:25:38 +01:00
Jonne Haß	32b9caa08c	replace stub and mock deprecations with doubles	2014-01-13 12:25:38 +01:00
Jonne Haß	b5854d3172	remove outer (deprecated) describe blocks from shared examples	2014-01-13 12:25:38 +01:00
Jonne Haß	a0bbd899de	replace rspec_reset with obscure reset line stolen from rspec-mocks	2014-01-13 12:25:38 +01:00
Jonne Haß	7bb055932a	replace =~ array matching with match_array	2014-01-13 12:25:37 +01:00
Jonne Haß	525cd4cc02	fix stream helper spec for new rspec	2014-01-13 12:25:37 +01:00
Jonne Haß	01ecd9d054	do not overwrite rspec methods (receive)	2014-01-13 12:25:37 +01:00
Jonne Haß	df0bff6537	replace stub! with stub	2014-01-13 12:25:37 +01:00
Fabian Rodriguez	08acd6e5bf	bump Timecop ... Time.now remains the same inside the block, outside of the block it returns	2014-01-12 23:27:15 +01:00
Jonne Haß	42f790fa13	Merge pull request #4666 from jaywink/signup-form-error-redirect ... Instead of redirect on signup form validation, render new	2014-01-11 14:08:18 -08:00
Jason Robinson	35ece9d65f	Instead of redirect on signup form validation, render new with submitted data.	2014-01-06 22:12:07 +02:00
Jason Robinson	db71c9c50b	Add mobile signup page captcha. Add test for user.sign_up method. Rewrite simple_captcha views to haml. Revert .rvmrc, fix indentation in config examp$	2014-01-06 22:00:53 +02:00
Damien Monet	b849d6c641	Fix: remove location when publisher is cleared by user	2014-01-05 11:09:03 +01:00
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
Steffen van Bergerem	db382f6929	fix typo in lightbox spec	2013-12-08 15:02:41 +01:00
Fabian Rodriguez	d700c66deb	remove useless specs	2013-12-06 20:07:35 -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
Fabian Rodriguez	cfc247db75	remove PostViewerFeedback	2013-12-01 20:55:49 -02:00
Fabian Rodriguez	bf3ee8d7bb	remove PostViewer	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
Richard	ff07bddd1b	using status messages instead of popup and updated specs for publisher view.	2013-11-28 16:08:03 +11:00
Jonne Haß	eea9467846	refactor twitter service model	2013-09-30 10:13:14 +02:00
Florian Staudacher	260d86d501	refactor ConversationsController, move query builing to User model	2013-09-30 01:44:57 +02:00
Florian Staudacher	e614562470	avoid publishing empty posts (fixes #4401) ... invalidate empty posts when created by a local user add changelog entry	2013-09-24 21:57:22 +02:00
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ß	363103cdaf	Make sure there always was a call to Diaspora.I18n.loadLocale before running a jasmine spec	2013-09-20 00:21:16 +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
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
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
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ß	f9a3990562	do not leak photos through photos#show	2013-08-26 09:39:39 +02:00
Jonne Haß	348a7b6c5b	update branding	2013-08-25 18:21:14 +02:00
Steffen van Bergerem	7fe972555a	profile message and mention icons	2013-08-21 23:05:42 +02:00
Jonne Haß	554d0a93d0	Do not leak photos in the profile sidebar	2013-08-20 20:56:37 +02:00
Roger Braun	e9977af7b1	Fix specs for TemplatePicker	2013-08-16 11:08:22 +02:00
Oliver Azevedo Barnes	8ee26f43e5	Remove commented requires	2013-08-14 15:08:47 -05: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
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
Jonne Haß	14c78da6cd	whitelist getting_started as a user settable attribute, fixes #4378	2013-08-11 16:52:54 +02: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
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ß	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
flaburgan	ac533f8383	Refactor the left bar side menu, improve tag autosuggestion design, close #4271	2013-08-06 18:30:24 +02:00
Oliver Azevedo Barnes	55a58713a5	Issue #4124 Check write access before authorizing Twitter	2013-08-05 13:52:19 -05:00
mokus	df9a42c397	update search controller + serch.js so that autocomplete works ... Added search_controller_spec, moved some tests from people_controller_spec to search_controller_spec Fixed merged conflict in Changelog update routes and search controller remove useless except from search controller Fix indentation in search_controller	2013-08-05 11:49:23 +02:00
Jonne Haß	6689f20710	Merge pull request #4321 from andrewcsmith/feature/4100-add-support-for-posting-to-wordpress-as-a-service ... Feature/4100 add support for posting to wordpress as a service Conflicts: Gemfile.lock	2013-08-04 17:15:39 +02:00
Andrew Smith	2bb6bc8eef	Added Wordpress service functionality, ... for cross-posting to OAuth-enabled Wordpress.com or Jetpack-enabled Wordpress.org blogs. Added model for Wordpress service Added very very basic Wordpress cross-posting functionality. Added markdown support to post body Fixed Wordpress::MAX_CHARACTERS problem cleanup Added default settings for Wordpress OAuth Added default settings for Wordpress OAuth Added Wordpress to configured services spec. changelog changes	2013-08-04 07:46:56 -07:00
Fábián Tamás László	ba3d60b00f	Only parse opengraph if oembed is not available	2013-08-04 15:55:09 +02:00
Fábián Tamás László	0a4b58ac12	rspec test for GatherOpenGraphData worker ... Added rspec test for og in status_message model Added rspec test for og_html helper Improved tests for opengraph embedding	2013-08-04 15:47:09 +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ß	2055a0aef8	Merge branch 'jflemingprod-feature/4143-port_to_strong_parameters' into develop	2013-08-02 11:44:55 +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	e8db2804cb	Fix ProfilesController#update spec for tags.	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
James Fleming	a0a9f01be1	Remove tests for strong parameters ... Remove a duplicated test.	2013-08-02 11:38:56 +02:00
James Fleming	938de466f8	Strong parameters for Aspect	2013-08-02 10:09:04 +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
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
Ruxton	3c605c47e0	Fix error in facebook service delete_post ... Add spec coverage for FB delete_post	2013-07-31 14:23:13 +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ß	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
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
Jonne Haß	94207e844c	Drop weird stop in conversations controller spec	2013-06-27 17:50:44 +02:00
Tamas Laszlo Fabian	d59648504d	Added test to avoid regression	2013-06-24 15:37:17 +02:00
Florian Staudacher	02be4a5335	make age search postgres compatible, add spec, changelog	2013-06-24 12:34:22 +02: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
David Thompson	b3c859bcd5	Check for nil before splitting contact_ids param.	2013-06-15 17:14:30 -04: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
Jason Robinson	3fa9f6414d	Fix Twitter crossposting (#2758). Refactor some service posting related code.	2013-06-08 17:38:07 +03:00
Jonne Haß	9cbfee9408	bump configurate	2013-06-04 22:58:20 +02:00
Florian Staudacher	b7b4edeeb0	Merge branch 'reoponed_issue3897' of https://github.com/RoonyH/diaspora into RoonyH-reoponed_issue3897	2013-06-04 16:43:16 +02:00
Florian Staudacher	bcb1214f99	Merge pull request #4162 from MrZYX/typhoeus ... bump Typhoeus and refactor HydraWrapper	2013-06-04 03:36:39 -07:00
Florian Staudacher	608a316bdd	remove ["a", "b", "C"] from the void of nothingness [wtf]	2013-05-30 17:24:49 +02:00
Aruna Herath	7803df5ecd	Changed post/comment submit keyboard shortcut to ctrl+enter from shift+enter ... Fixes reopened #3897	2013-05-27 17:08:39 +05:30
Liane Nakamura	5f25a52676	Fix post iframe src url ... Add test for posts helper	2013-05-26 20:49:56 +02:00
Fabián Rodríguez	aed81c1b3b	Fix tags ordering in chrome	2013-05-25 15:44:53 -03:00
Jonne Haß	d331242d94	Merge branch 'feature/retract_tweets_when_post_retracted' of git://github.com/Ruxton/diaspora into develop ... Conflicts: Changelog.md	2013-05-25 13:50:28 +02:00
Jonne Haß	009209d939	bump Typhoeus and refactor HydraWrapper	2013-05-25 13:45:37 +02:00
Jonne Haß	286e948054	federate location	2013-05-20 21:26:04 +02:00
Ruxton	48b48470bc	Service.delete_post now more generic, for future implementations ... Service.delete_post now accepts post to be more generic and supports deleting post from any service that overrides delete_post(post)	2013-05-20 12:19:39 +08:00
Ruxton	20c38a0489	Fix dispatcher_spec to depend on Tumblr which isn't retracting	2013-05-20 11:00:49 +08:00
Ruxton	ba0e2509c9	Twitter service removes status from twitter when post is revoked	2013-05-20 11:00:49 +08: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
Steffen van Bergerem	63040bb8cc	fix mentions at the end of a post	2013-05-17 19:27:08 +02:00
Jonne Haß	848e5d2a57	try to fix Jasmine failure on CI by not overwriting app.views.Location in spec	2013-05-16 23:33:54 +02:00
Marco Gallardo	4aab8762fa	Locator feature ... added marker image for publisher, showing div for address, and added functionality to close it when clicking 'X' image showing marker image in publisher renamed map-marker to locator fixed style for map marker image in publisher added locator.js to get user's location loading google maps api removed unecessary append and showing location next to publisher moved location address inside div and added image to close location styled div location address an image to close location removing location when clicking close image cleaned code cleaned code showing loader while location is being obtained, translated normal js to backbone structure, created locations db stuff, and removing location div when clicking 'share' refactored code; started to move code to backbone refactored js code; moving functionality to backbone structure created address function to make accessible address variable value refactored locator.js showing and removing location div from dom created location; it belongs_to status_message added location model and created association with status_message added hidden field for location address and added respective code on js files to retrieve it on ajax call saving location for status_message (post) removing location when sharing renamed locator backbone view to location, added template, showing location, and saving lat and lng prepared and added template to show location added location to post model in order to have it accessible in backbone retrieving location to show it in template removed console.log XD fixes when removing location cleanind location_address hidden field when location is removed more fixes; showing location when sharing saving location just when it exists created method to retrieve location address just when location was created fixed issue about showing 'Near from' message when there was not any location added style for location cleaned code renamed locator view retrieving lat and lng from locator.js saving lat and lng in location_coords saving lat and lng added style for input location_address removed location_address hidden field; the value will be taken directly from input with the location replaced div with location for input; the user will be able to edit the place avoiding submitting the form when pressing Enter key on new input for location added missed spec file for location model refactored location_view code refactored location_view code cleaned code added sinon library for testing added describes for new publisher's view functions created test for destroyLocation function added test for showLocation publisher view function created test for avoidEnter publisher view function removed unnecessary div Created first test for locations view, added more specs, added Sinon.js, and fixed issue with assets loading locator.js for tests moved location stuff to app/assets moved locator.js and sinon.js to app/assets fixed route for images included locator.js to assets fixed issue when post object is different than StatusMessage; also fixed issue with lat and lng loading Sinon for specs refactoring locator errorGettingposition and start replacing google maps stuff with OSM added OpenLayers JS, osmlocator, and added them into the main js changing the locator from Google to OSM instance changing lat and lng value in the backbone view removing google javascript tag in application layout adding jasmine to locator test and removed locator.js adding jasmine to locator test using OSM adding Jasmine test to OSM locator removed locator.js removed require locator and updated schema fixed js response; added location since we are using OSM Locator we don't need locator-spec test fixed spec for location view; we are not using google maps anymore changed description of osmlocator-spec fixed issue with status-message-location template fixed style for location_address textbox fixed tests for locator moved split function to model created test for location model removed puts added effect for location marker added translations for locator removed conflicting-unnecessary lines that were loading files for specs removed sinon library; using sinon-rails gem removed useless code removed puts; added Rails.logger.error added sinon.js file added specific version of sinon-rails gem improving validations sintax using openlayers-rails gem removed 'google API' text using sinon gem isolating LocationStream view refactored validation getting location when post is a Reshare refactored code fixed aligment for elements under location message improved styling for location message refactored begin-rescue block getting absolute root instead of just the root added address method to retrive address of location removed code from Post model; also added descriptinon why it was removed removed validation when retrieving address; with latest refactorizations we dont need them any more interpolated location; using file in locales fixed width for div of location moved Sinon gem into development and test group fixed method's description added missed indexes updated schema with locations table removed openlayers-rails gem preventing location to be saved if there are not coordinates fixed spec; wrong closing tag	2013-05-02 17:31:53 -05:00
Braulio Martinez	00a3332013	Remove unnecessary ruby187 hacks	2013-05-02 10:07:30 -03:00
Jonne Haß	322f4da4d8	Embed associated photos into the status message xml	2013-04-21 19:44:09 +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
Braulio Martinez	c651cbab78	Always redirect user to downcase version of tags on UTF-8 encoding	2013-04-10 00:08:58 -03:00
Aruna Herath	b0879dd256	added same feature to publisher	2013-04-08 19:29:36 +05:30
Aruna Herath	5f6ce87a23	added shift+enter key from new comment box to submit the comment.	2013-04-08 19:08:29 +05:30
movilla	bc87b501f2	Fix show more post in my activity mobile page. Close #4108	2013-04-08 00:04:42 +02:00
Steffen van Bergerem	6e724fc1d4	preview posts in stream	2013-04-07 17:43:27 +02:00
Jason Robinson	9c0c5a7258	Include missing javascript in bookmarklet, regression introduced in commit ffc6c1102e. Fixes #4057	2013-04-07 00:06:02 +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
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
Florian Staudacher	47046013ae	Merge pull request #4061 from MrZYX/gemfile_rework ... rework Gemfile	2013-03-16 05:02:35 -07:00
Jonne Haß	2afa2899c5	rework Gemfile	2013-03-15 21:00:27 +01:00
Juan Manuel Azambuja	06dc53749a	delete unused javascript views	2013-03-15 14:39:34 -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
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ß	60bd29aa68	decode tag name before passing it into TagFollowingAction, fixes #4027	2013-03-08 13:47:55 +01:00
pestrada	18aeeb052b	reset comment box height after posting a comment ... refactor create comment method	2013-03-07 12:55:03 -06:00
Marcelo Dominguez	88e76448b6	Avoid unnecessarily redirect	2013-03-03 23:10:53 -02:00
Jonne Haß	7a89d8b161	only try to delete a post from a service if we're able to	2013-03-01 18:54:01 +01:00
Jonne Haß	1256fda24b	make randomly on postgres failing spec pending for now	2013-03-01 03:54:44 +01:00
Jonne Haß	7b56c2dd52	Do not fail on receiving a SignedRetraction via the public route	2013-03-01 03:38:36 +01:00
Jonne Haß	c5ecc872ce	add integration spec for retracting a comment	2013-02-28 17:20:33 +01:00
Jonne Haß	ccedb6eff0	delegate parent_author to the target of a RelayableRetraction	2013-02-28 17:01: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
Jonne Haß	35350d1ceb	Include reshares in the public user feed, closes #1781	2013-02-21 14:32:28 +01:00
Jonne Haß	ba9aee5902	update changelog; replace "pre" releases with a plain "head"	2013-02-18 20:20:50 +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ß	f3093ca8ae	Merge pull request #3864 from Raven24/aspect_memberships ... [WIP] aspect membership dropdown Backbone.js rework	2013-02-17 05:54:12 -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
Jonne Haß	0a124acdf0	Revert "fix regression from #3968" ... Revert "Merge pull request #3968 from marpo60/limit_shareable_from_person_queries" This reverts commit ddfc558a9b. This reverts commit 30ed4b4e70, reversing changes made to f50ce2cb1d. limiting the fetch of the IDs breaks paginating, there's no quick way to fix that I left the spec in for future use.	2013-02-16 23:48:10 +01:00
Jonne Haß	ddfc558a9b	fix regression from #3968 ... Not ordering the IDs caused incorret ones returned The spec is totally at the wrong level but I couldn't make something up that exposed the bug at a deeper level :(	2013-02-16 23:22:14 +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
Ruxton	60f5173c77	Spec coverage for changelog_url and adjustment to behaviour	2013-02-04 11:00:57 +08: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
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ß	01299ee8e8	update spec to match overriden translation	2013-01-31 19:25:30 +01:00
Asphyxia	1ed0318db7	Reshare alert box is appearing twice	2013-01-31 14:52:47 -03:00
Jonne Haß	4eb98cd7dc	Merge branch 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile ... Conflicts: Changelog.md	2013-01-29 14:58:11 +01:00
movilla	0010819343	add settings web mobile	2013-01-27 20:38:19 +01:00
Ruxton	e8decc200e	Adding jasmine coverage for oEmbed updates	2013-01-25 23:47:49 +08:00
Ruxton	60024d7e20	Someone isn't a StarWars fan.	2013-01-25 22:43:56 +08:00
Jonne Haß	64b86b27c1	bump rspec-rails and rspec ... fix two specs by not checking for object identity	2013-01-17 02:00:03 +01:00
Fabián Rodríguez	d7574a9efb	add locale to aspects	2013-01-16 19:59:10 -02:00
Fabián Rodríguez	f978a75b8c	bootstrap my_aspects data	2013-01-16 19:33:20 -02:00
Fabián Rodríguez	c0417fab93	add specs for the aspects	2013-01-16 19:33:20 -02:00
Diaspora Europe	ac3b2bc99f	pod version in footer and updated link to changelog #3705	2013-01-15 16:45:10 +01: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
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
Florian Staudacher	94760f4c04	update jasmine gem, removed useless spec, + changelog)	2012-12-07 21:21:27 +01:00
Jonne Haß	669dd87b11	extract configruation system to a gem	2012-11-30 13:35:59 +01:00
Jonne Haß	bf698f3882	Do not strip "markdown" in links when posting to services, fix #3765	2012-11-26 14:16:43 +01: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	be2db47f02	remove unnecesary stuff from specs	2012-11-21 18:26:17 -02:00
Fabián Rodríguez	99abc22403	remove unused methods	2012-11-21 18:26:17 -02:00
David McMullin	97664cb880	port tagFollowings to BackBone	2012-11-12 21:37:00 +00:00
Jason Robinson	c437636131	Fix message_spec test and add tests for private message notification unread count. Update changelog	2012-11-12 22:00:13 +02:00
Jonne Haß	63f2d335a4	Merge branch 'notifications_count' of git://github.com/movilla/diaspora into develop	2012-11-11 15:00:46 +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
Jonne Haß	4fc2cb1cba	bump carrierwave	2012-11-11 13:29:40 +01:00
movilla	10aea3ebce	add test :unread => true	2012-11-10 23:23:08 +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	ab3a7d991c	Remove ugly whitespaces	2012-11-07 23:16:25 -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	4056c0da9e	remove unused method #can_add?	2012-11-06 21:39:36 -02:00
movilla	5a2b22ff0c	reshares_count come back!	2012-11-06 21:05:48 +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
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
Florian Staudacher	0057e9ed46	some small code style changes + final fix for postgres (milliseconds) ... + updated changelog	2012-10-21 16:10:27 +02:00
Ruxton	25b57cdd2a	trying to stabilize issue with datetime in test suite	2012-10-21 16:08:57 +02:00
Ruxton	a78cb352e6	updated spec to fix to_datetime issue ... Conflicts: spec/lib/diaspora/fetcher/public_spec.rb	2012-10-21 16:08:57 +02: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
Gonzalo	e1756b5b3f	Privatize non-action controller methods	2012-10-14 19:32:53 -02:00
Gonzalo	78953fe2bf	Move ApplicationController specs to application_controllers_spec	2012-10-14 19:32:53 -02:00
Jonne Haß	92e4cd34ae	--amend cause I've no time	2012-10-14 01:11:53 +02:00
Jonne Haß	894af48579	add spec to ensure include_community_spotlight? is correctly passed into EvilQuery::MultiStream.new	2012-10-14 01:09:00 +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
Fabián Rodríguez	82082005ba	redirect users back on registration failure	2012-10-11 19:47:04 -02:00
Florian Staudacher	ded69477ba	replace the monstrous link regex with a slightly less complicated one, ... based on the one from the markdown parser, fixes #3553 adding a list of urls for testing the regex in the specs	2012-10-11 23:39:44 +02:00
Jonne Haß	3eb628c2a3	fix french javascript pluralization rule and add specs for locale loading	2012-10-09 22:36:30 +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
Jonne Haß	5c7a9c1ce6	Release cleanup, closes #3620 ... * remove un-/underused gems * remove their associated files * remove some parallel_tests leftovers	2012-09-30 22:26:23 +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ß	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
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
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
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	200887ca45	adapt jasmine specs to the new structure	2012-09-17 15:33:52 +02:00
Jonne Haß	6c1a1ec6d2	it's enviroNment	2012-09-15 18:52:12 +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ß	358ed79f99	Merge branch 'update_devise' ... Conflicts: Gemfile.lock	2012-09-12 15:11:34 +02:00
Jonne Haß	142e38e78b	update devise	2012-09-12 13:29:57 +02:00
Jonne Haß	58d1448085	update factory girl	2012-09-12 13:24:23 +02: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ß	088446e86e	bump rspec-rails, remove deprecated rspec syntax	2012-09-11 00:46:36 +02:00
Jonne Haß	8a759c3aca	Use Builder::XChar.encode instead of to_xs in spec	2012-09-07 00:09:43 +02:00
Jonne Haß	a488dd50c4	follow up of last commit fixing remaining specs ... changed spec since it didn't actually test what it said	2012-09-06 22:11:04 +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
Jonne Haß	60e8107763	remove percent memory/swap usage info in testsuites	2012-09-06 20:36:56 +02:00
Florian Staudacher	2e3da0cf05	fix date and guid assignment for fetched posts	2012-09-06 18:16:40 +02:00
Florian Staudacher	99c6b8bf45	don't test for actually deleted likes, ... instead check whether the `retract` method was called, everything else should be tested there.	2012-09-05 23:48:23 +02:00
Maxwell Salzberg	e0408e6fae	dont auto beta flag anyone	2012-08-20 10:39:14 -07: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	932fb186e3	fix failing bookmarklet specs (wait for js to finish)	2012-08-04 16:10:11 +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	c7f66ee647	add specs for #3464	2012-07-25 15:22:53 +02: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	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
Jonne Haß	8434b25e56	do not bypass pluralization in test	2012-06-24 13:03:22 +02:00
Steven Hancock	ee6941fa18	Get Spork running again ... Use Rails.root.join in `spec/spec_helper.rb` to help Spork find `helper_methods.rb` and `spec_doc.rb`.	2012-06-14 00:53:10 -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	9f6d84141c	fix incorrect comment on RSpec text	2012-06-09 09:34:06 -06:00
Zach Prezkuta	44e43158cc	add rspec test and make fix more rails-y	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
Maxwell Salzberg	1da029a22f	this stopped working because there is a new way to render views by default in spec_helper.rb	2012-06-04 12:49:24 -07:00
Maxwell Salzberg	304c33f19e	explicitly render_views in publics controller	2012-06-04 12:49:24 -07:00
danielgrippi	a836b06d3e	mixpanel on posting	2012-05-30 17:32:18 -07:00
Dennis Collinson	a9288daf19	refactor stream page scroll spy	2012-05-30 16:58:21 -07:00
danielgrippi	d8470d303a	simple mixtracking	2012-05-30 15:25:19 -07:00
Maxwell Salzberg	6dba7fe9a9	fix case sensitivity	2012-05-30 12:44:39 -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
Steven Hancock	99a2865e23	Make hashtags clickable in emails ... Refactor the Redcarpet renderer created in c2bc7272f to parse hashtags into clickable links (for HTML emails only).	2012-05-29 10:01:58 -07:00
Steven Hancock	c2bc7272fb	Escape hashtags in emails ... Custom Redcarpet renderer to escape hashtags (but not legitimate headers) in emails before Markdown processing. Prevents hashtags from being rendered as H1 headers. This also leaves open the possibility of parsing hashtags into clickable links in the future. fixes #3325	2012-05-28 21:31:27 -07:00
Dan Hansen	d334097ee2	bugmash #3 ... persist unsaved comment value after expanding comments	2012-05-24 19:08:43 -07:00
Florian Staudacher	f19f6110b1	match tag arrays by what they actually contain, not by order	2012-05-24 22:18:10 +02:00
Dennis Collinson	c4240154b1	back to profile works	2012-05-24 12:43:06 -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
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
Maxwell Salzberg	92c0fa0163	backfill some stream.js specs	2012-05-23 17:25:40 -07:00
danielgrippi	5d2ea71766	added EditbaleSmallFrame class; frame on framer second step is partially editable	2012-05-23 17:07:41 -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
danielgrippi	120c6b46e0	MS; Fix fake following, as we took it out so I nuked the tests	2012-05-22 19:04:04 -07:00
Dennis Collinson	1c342282b0	fixing event passing	2012-05-22 15:11:21 -07:00
Dennis Collinson	36ef010ed9	DG DC MS; stream has one interactions div	2012-05-22 12:38:48 -07:00
danielgrippi	64a73fb665	new post types. remove old ones. yeah.	2012-05-21 18:45:01 -07:00
Dennis Collinson	10201f2e40	more work on new stream interactions, hella refactorz.	2012-05-21 17:15:10 -07:00
Dennis Collinson	fe0156a18b	cuking out new stream, refactors.	2012-05-21 15:14:23 -07:00
danielgrippi	777c037e16	kill rich-media type with fire	2012-05-21 12:33:28 -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
Maxwell Salzberg	e007b39f0d	make newhere test less dumb [ci skip]	2012-05-20 23:42:40 -07:00
danielgrippi	f4c06c8f88	add rounded buttons to the composer flow; slay multi-photo option	2012-05-18 19:46:51 -07:00
danielgrippi	62ba75ad1b	DG DC; Move stuff to second page of framer	2012-05-17 19:02:58 -07:00
Maxwell Salzberg	64dae868fe	fix some tests around pubsubhubub	2012-05-17 18:23:40 -07:00
Maxwell Salzberg	af1109dcf7	remove a couple more stray files we dont use anymore, and remove rest-client	2012-05-17 18:23:39 -07:00
Florian Staudacher	788f328a77	resolve reshare root posts to the first one	2012-05-18 01:45:41 +02:00
Dennis Collinson	00f1adc8b2	Going back to the composer from the framer is happy via button	2012-05-17 15:32:35 -07:00
Florian Staudacher	fd5aedeb01	updated webmock, hopefully fix cucumber	2012-05-18 00:21:04 +02:00
Maxwell Salzberg	471ce309ea	kill your darlings; remove diaspora_client with fire	2012-05-17 14:55:53 -07:00
Maxwell Salzberg	69d81951a5	wip	2012-05-17 14:55:22 -07:00
danielgrippi	c8aa67360b	backfill some tests; jasmine green	2012-05-17 13:31:40 -07:00
danielgrippi	ed6785d7cb	don't use an iframe for the composer anymore. yayyyyy	2012-05-16 18:55:25 -07:00
Maxwell Salzberg	b124d3e5a1	Revert "update factory girl" new version does not support 1.8.7 :( ... This reverts commit c52342b7cb.	2012-05-16 17:43:56 -07:00
Maxwell Salzberg	c52342b7cb	update factory girl	2012-05-16 17:17:14 -07:00
Maxwell Salzberg	ab2e740ca2	upgrade to Rails 3.2.3	2012-05-14 21:53:16 -07:00
Dennis Collinson	a90968ea2d	basic experimental stream	2012-05-14 17:57:02 -07:00
Maxwell Salzberg	06f389231a	kill services users with fire. we need this feature, but we need to just start from scratch because this is redonkalonk	2012-05-14 16:25:19 -07:00
Maxwell Salzberg	7a256d7810	window.preloads is always set to at least a empty json object	2012-05-14 16:24:55 -07:00
Dennis Collinson	f6e3c1b88b	seperate interactions from posts ... Lazily load post interactions on show page hella refactorz	2012-05-12 17:41:58 -07:00
Jonne Haß	7a6d325f64	looks like there are sometimes objects passed into post presenter that respond to root while root is nil	2012-05-11 14:23:05 +02:00
Dennis Collinson	51b1ade3bc	DC DG; added LastThreeComments decorator so we don't have to load those comments when not needed (i.e. new profile pages)	2012-05-10 13:53:00 -07:00
Dennis Collinson	efa79a4ad7	Refactor Post Presenter ... and comment presenter	2012-05-10 12:24:21 -07:00
Maxwell Salzberg	eaedfc9827	create a new publisher using the new composer. only for beta users	2012-05-09 16:55:33 -07:00
Florian Staudacher	b1dac3e216	don't test for opacity but for the selector	2012-05-09 22:16:40 +02:00
Florian Staudacher	0aa845f87e	hopefully fix another weirdly fluctuating test failure	2012-05-09 21:25:06 +02:00
danielgrippi	0ec364e44c	DG MS; popup on services, inlined in the composer	2012-05-08 18:09:33 -07:00
Steven Hancock	605b418d42	Reshares delegate nsfw to the root post ... fixes #3120	2012-05-08 03:20:01 -07:00
Maxwell Salzberg	3e78dd702b	be really pedantic about the stupid service selector spec	2012-05-07 19:28:14 -07:00
Dennis Collinson	d1d99d5dd4	Jamie Cai DC refactor isOwnProfile, fix tests	2012-05-07 17:53:37 -07:00
Dennis Collinson	1c135b61fd	Jamie Cai DC message in profile when user has no posts	2012-05-07 15:56:30 -07:00
Maxwell Salzberg	7d0f79c29b	fix pg rspec	2012-05-07 15:43:53 -07:00
danielgrippi	c31413e73c	green build = happy dan	2012-05-07 14:30:30 -07:00
danielgrippi	01d5c0473a	DG MS; don't redirect to legacy getting started if you're a beta user	2012-05-07 12:05:36 -07:00
danielgrippi	92230383a7	added controller test; put wallpaper into separate wallpaper/ directory	2012-05-06 12:35:11 -07:00
Dennis Collinson	bd6a9cfe00	next and previous now return post as json ... clean up controller	2012-05-05 16:41:16 -07:00
Maxwell Salzberg	e79d78302e	when a user is invited from a beta user, they are also beta	2012-05-04 17:38:08 -07:00
Dennis Collinson	6fcba2dd4b	preload javascript vars using gon	2012-05-04 15:17:32 -07:00
Maxwell Salzberg	273470e6ed	include url in all twitter posts ... also fix a homecontroller spec	2012-05-03 20:07:56 -07:00
danielgrippi	a52d8f221a	don't post to feed; post to joindiaspora OG tag. also, whoever has the diaspora OG tag, can i haz?	2012-05-03 00:02:00 -07:00
danielgrippi	8cecedc53b	TIMELINE TIME.	2012-05-02 23:28:56 -07:00
danielgrippi	1b6c33aff5	show a user's full profile info if she's on her own page. duh.	2012-04-28 17:41:22 -07:00
danielgrippi	d5f511c325	hitting profiles.json publically displays only public stuff; if you're connected to a user, it shows that user's complete profile response	2012-04-28 17:05:25 -07:00
danielgrippi	c3b0bbd425	show new profile pages for those who have it activated	2012-04-28 16:06:36 -07:00
danielgrippi	bbd4ee5738	correctly redirect for beta and admin users (profile vs stream homepages)	2012-04-28 15:09:02 -07:00
danielgrippi	52efb3710c	show a follow button for users with pre-existing contacts (legacy beta testers)	2012-04-28 14:13:43 -07:00
danielgrippi	699b0cff16	don't expose follow/unfollow to a user in the UI ... following is good for bookkeeping in the database, but provides confusion, and could limit likes and/or commenting to start receiving notifications in a conversation.	2012-04-28 11:07:18 -07:00
Jonne Haß	008ed32e9e	unambigousify community spotlight query in the multi stream, fix #3196	2012-04-28 12:28:07 +02:00
danielgrippi	7f4af0359f	add bootstrap tooltips for great justice (and clarity) [ci skip]	2012-04-27 20:45:26 -07:00
danielgrippi	889b86f9cb	implicitly expand / contract a post by clicking on it. use the permalink icon to go to the show page. (user tested, mother approved)	2012-04-27 19:38:06 -07:00
Maxwell Salzberg	592a3f99b5	Role system to replace the yml admins and community spotlight. we can ... also now add a beta role	2012-04-27 16:14:43 -07:00
danielgrippi	562e6641e1	fix jasmine	2012-04-27 16:02:44 -07:00
Jonne Haß	9cb803831f	improve webfinger failure handling ... * do not raise if profile xrd isn't found * error out on a ssl error rather than on the unexpected nil value later * be more verbose about failed xrd fetches	2012-04-27 16:53:26 +02:00
danielgrippi	c9d0879d3d	fav by clicking on something yeahhhh	2012-04-26 18:39:43 -07:00
Maxwell Salzberg	2b3bc5a0f0	fix profile json birthday response with some tests.	2012-04-26 16:00:23 -07:00
Jonne Haß	2357d9b0f1	update xrd fixture to include namespace and remove namespace before trying to set fields in webfinger profile	2012-04-27 00:05:28 +02:00
Dennis Collinson	c3c3d57d69	huge basketball shorts	2012-04-25 16:59:06 -07:00
Maxwell Salzberg	d22a98cd96	monkey patch to_xs for ruby 1.8, and fix a test as a result	2012-04-25 11:38:42 -07:00
Dennis Collinson	7346921473	MS DC; you can now kill a post on your profile.	2012-04-24 20:46:09 -07:00
danielgrippi	9853197063	only show edit and new post controls if you're on your profile page	2012-04-24 19:24:45 -07:00
danielgrippi	570de98365	animate isotope! and inject image height in relation to ratio for quicker organization. [ci skip]	2012-04-24 16:38:17 -07:00
Dennis Collinson	8149648e5b	MS DC; youtube videos now display thumbnail, and sound cloud embeds are not total train wrecks;	2012-04-24 16:18:00 -07:00
Dennis Collinson	8cca2f028b	extract oembed view to seperate view	2012-04-24 15:38:38 -07:00
danielgrippi	91ebff75dd	added tests and stuff for own profile checking... for some reason something isn't getting triggered properly in the presenter call, though :(	2012-04-24 01:04:49 -07:00
danielgrippi	84bd1fb1fc	return the person json response for profiles to get a correctly formatted name and expected avatar response; fix a jasmine spec around redirection	2012-04-23 23:31:39 -07:00
danielgrippi	dbe3b48aee	now you can click on an entire post to favorite / unfav it. yay. [ci skip]	2012-04-23 23:04:53 -07:00
Dennis Collinson	e8cfe01c8a	reLayouts when something is favorited, whoa	2012-04-23 12:35:13 -07:00
Dennis Collinson	afc26c684b	DC MS infinite scroll with isotope on new profile page. boom!	2012-04-22 16:46:39 -07:00
danielgrippi	75d25e9475	users can now favorite posts	2012-04-22 12:06:15 -07:00
danielgrippi	ab7ac667d8	only focus on photos for now with ratios. one thing at a time, yo. ... i've temporarily removed all the arbitrary text switching for now (which is still in version control // which we will get to later) also moved photo dimensions into a dimensions hash in photo.rb.	2012-04-21 20:42:50 -07:00
Dennis Collinson	ca33070b9e	loader is background image of span ... fix tests	2012-04-21 15:21:52 -07:00
danielgrippi	aa4c554177	DG MS; added photos and more styling to the canvas view.	2012-04-21 13:12:57 -07:00
danielgrippi	32d8cfd48d	MS DG; basic style enumeration for profile	2012-04-21 13:12:57 -07:00
Dennis Collinson	f46dd08cb5	canvas view is infinite stream	2012-04-21 13:12:57 -07:00
Dennis Collinson	062de4c269	MDC DC New Profile shows users info ... Profile show json Profile backbone model	2012-04-21 13:12:56 -07:00
danielgrippi	f62b9f9698	wip.	2012-04-21 13:12:56 -07:00
Maxwell Salzberg	63a0a37171	width and height should now federate	2012-04-20 12:53:02 -07:00
Maxwell Salzberg	1b2440f68a	we now store image height and width locally; still need to federate the values	2012-04-20 12:22:12 -07:00
Maxwell Salzberg	6d7f6129fe	remove puts in spec [ci skip]	2012-04-19 17:47:32 -07:00
Dennis Collinson	7f3c4c209e	fix post spec	2012-04-19 14:37:46 -07:00
Dennis Collinson	f7d320b622	MS DG; checkboxes are togglable, with tested css magick	2012-04-19 14:05:55 -07:00
Dennis Collinson	8386179f16	max, you're a princess, WIP	2012-04-19 11:15:59 -07:00
danielgrippi	e379a6df0f	Merge branch 'master' into stream-for-photos ... Conflicts: app/assets/javascripts/app/views/stream_view.js	2012-04-18 18:30:54 -07:00
Maxwell Salzberg	ab48ca260b	kinda ugly hack for ports in url with iframes	2012-04-18 16:12:57 -07:00
Maxwell Salzberg	c9e3852de8	oembed mostly works	2012-04-18 16:12:56 -07:00
Maxwell Salzberg	31172a9959	basic oembed provider set up... too tried to finish this now	2012-04-18 16:12:56 -07:00
danielgrippi	a307b60dd2	DC DG extract infininte scroll to a mixin	2012-04-18 12:34:43 -07:00
Florian Staudacher	8eb70c8a80	use app.models.Stream instead of app.models.Photos, ... change naming a bit to be more general since its posts+photos now (re #3158)	2012-04-18 20:20:56 +02:00
danielgrippi	3621576717	add/remove hidden class for pagination instead of manipulating HTML contents on every page load.	2012-04-18 10:27:22 -07:00
Maxwell Salzberg	90a2f05515	include an iframe route, for posts, and a magic body padding removal for screens with small widths (for some reason, smaller than 770	2012-04-17 22:28:01 -07:00
danielgrippi	3479cb7bdd	refactored stream and Stream View ... streamView no longer abuses render with fetching moved post collapsing into contentView subtle nicification.	2012-04-17 21:06:34 -07:00
danielgrippi	37cd6f616e	refactor stream fetching logic	2012-04-17 19:18:12 -07:00
Dennis Collinson	16223d003f	change new publisher to public by default to make testing easier	2012-04-17 16:43:42 -07:00
Florian Staudacher	fe130caf10	moved non-ascii url markdown tests to text_formatter_spec, added test case + fix	2012-04-16 23:41:05 +02:00
Florian Staudacher	6c34207e01	freeze at a valid time, not 0000-01-01 ...	2012-04-15 13:03:33 +02:00
Florian Staudacher	d9d7bbb74b	using timecop for interactions + whitespaces removed	2012-04-15 03:10:18 +02:00
Maxwell Salzberg	9f6ad65d73	update schema, views spec	2012-04-13 18:32:35 -07:00
Dennis Collinson	a0ea8c8542	Update aspects dropdown to say number of selected aspects	2012-04-13 17:49:49 -07:00
Dennis Collinson	9e50d0efb6	Newspaper theme selected by default, template picker object	2012-04-12 15:21:07 -07:00
Dennis Collinson	c1f2bbac88	Wallpaper frame selected when post has one photo	2012-04-12 11:56:27 -07:00
Jonne Haß	83103c4761	deterministic stream order take 2, this time with spec	2012-04-12 16:33:02 +02:00
Dennis Collinson	d767410e6d	mentions are clickable in framer	2012-04-11 18:34:12 -07:00
Dennis Collinson	20da08408f	can mention in new composer	2012-04-11 17:07:53 -07:00
danielgrippi	a1d4ca9bec	Refactor composer and framer to user same layout ... composer touchup; added controls to the bottom; centered input area; removed forms.Base view Fix tests	2012-04-10 11:38:35 -07:00
Florian Staudacher	0bd4d63640	fix jasmine test for publisher textarea "resets height on close"	2012-04-06 22:24:13 +02:00
Florian Staudacher	d7eb4b242f	this seems to be in fact a bug in ruby 1.9.2, disabled for now ... ... when running with 1.9.3 everything's peachy :/	2012-04-06 03:42:37 +02:00
Florian Staudacher	518346deab	try setting a higher swappiness, take other val for mem calculation	2012-04-06 01:55:07 +02:00
Florian Staudacher	248e9d9ae7	add more output (swapping), increase swapfile size ... MY FIRST COMMIT <3 (it would be so awesome if this would make travis green) :P	2012-04-06 01:16:37 +02:00
Maxwell Salzberg	e1d86bddcf	some tweaks so it fails gracefully on systems that do not have free command	2012-04-05 14:29:41 -07:00
Florian Staudacher	fc941fa88b	try monitoring used memory an GC by that	2012-04-05 22:21:30 +02:00
Maxwell Salzberg	20fee66eee	dont do speedup magic on travis	2012-04-05 12:28:07 -07:00
Maxwell Salzberg	2e86d069b8	try two seconds	2012-04-05 12:15:17 -07:00
Maxwell Salzberg	f65a3d760e	defer gc for half as long to prevent travis dying	2012-04-05 12:08:15 -07:00
Florian Staudacher	4051651737	speeding up rspec by deferring garbage collection ... -> https://makandracards.com/makandra/950-speed-up-rspec-by-deferring-garbage-collection on my machine the rspec tests went from taking 5min 02sec to 3min 29sec :O (31% improvement)	2012-04-05 15:59:23 +02:00
Maxwell Salzberg	9c9562d0fd	fix http urls with 3 slashes	2012-04-04 19:08:36 -07:00
danielgrippi	39d688044d	DG DC; visual fixups	2012-04-04 18:59:19 -07:00
danielgrippi	6098890783	redirect to post show on create	2012-04-04 18:59:19 -07:00
danielgrippi	9b02633dff	framer has better styling	2012-04-04 18:59:19 -07:00
Dennis Collinson	06110b8732	newspaper template WIP	2012-04-04 18:59:19 -07:00
Maxwell Salzberg	f5754d2b71	small fix for jasmie that works in chrome and ff	2012-04-03 17:26:13 -07:00
Maxwell Salzberg	e521ac92f9	make a test slightly dumber for travis	2012-04-03 16:52:34 -07:00
danielgrippi	3bc3f13651	upgrade backbone, fix tests ... some cukes may be failing non deterministically, I think, do we bump the cuke timeout?	2012-04-03 16:31:52 -07:00
Steven Hancock	a8843c1036	Fix JSON caching regression ... Disable jQuery's AJAX caching to prevent the browser's back button from dumping the stream in JSON format. Includes a test for the jquery_include_tag helper to ensure that the necessary line of javascript doesn't go missing again. closes #3094	2012-04-02 21:40:16 -07:00
danielgrippi	e156947d0b	fix jasmine specs	2012-04-02 18:17:55 -07:00
Florian Staudacher	1709036764	fix jasmine unhappiness I introduced with #3088	2012-04-02 21:25:01 +02:00
Daniel Grippi	a45eed13d5	Merge pull request #3086 from Raven24/fix-publisher-height ... reset publisher css height when "cleared" [ci skip]	2012-04-01 18:24:00 -07:00
Florian Staudacher	2a4bc32eb5	make wallpaper-post spec pass	2012-04-01 17:43:33 +02:00
Maxwell Salzberg	adf85e1ec6	adding a bit to tubbo's spork branch	2012-03-31 01:22:46 -04:00
Maxwell Salzberg	98b41d8f1d	update seeds.rb to reflect asset pipeline, and a lil bit of refactoring	2012-03-31 00:15:56 -04:00
Florian Staudacher	0629f4fd9c	added tests for resetting height on close	2012-03-30 16:40:08 +02:00
Steven Hancock	125be41868	Test for mobile UI single post view ... Verify that the correct layout is rendered (rather than no layout at all) in the mobile UI single post view. This is a test I forgot to write at 5am when I was so excited about having the mobile UI working on my Blackberry again (bad me!), so here it is before it slips my mind. 😁 This tests the change made to posts_controller in 6abe718227	2012-03-29 21:07:21 -07:00
Maxwell Salzberg	033bf637cd	Merge pull request #3070 from SuperTux88/fix-invite-mail ... Fix invite mail NOTICE: MIGRATION ON USERS INCLUDED!	2012-03-29 15:41:23 -07:00
Maxwell Salzberg	fe1c0d34d5	Merge pull request #3084 from Raven24/non-ascii-begone ... finally (hopefully) fix non-ascii urls + new & old tests	2012-03-29 15:35:48 -07:00
Florian Staudacher	ae3e225e28	finally (hopefully) fix non-ascii urls + new & old tests	2012-03-30 00:29:34 +02:00
Dennis Collinson	59f7f504e8	Wallpaper Mood	2012-03-29 15:14:09 -07:00
Diaspora Europe	9fdca1adf8	make URL clickable in RSS #2176	2012-03-29 13:43:04 +02:00
Steven Hancock	731446e078	Stylesheet naming issue (new-templates.css) ... Replace all references to new_templates.css with the correct filename, new-templates.css	2012-03-29 01:29:07 -07:00
Benjamin Neff	e57d3672cd	add rspec controller test	2012-03-29 03:29:41 +02:00
Dennis Collinson	875ce68556	fixes for jasmine	2012-03-28 16:32:24 -07:00
Dennis Collinson	78a2ed28b9	User can select Night and Day Moods ... headline method on post extract headline and body from post, at first newline Night Mood	2012-03-28 16:22:05 -07:00
Dennis Collinson	f25effcafe	move handlebars templates for asset pipeline	2012-03-28 16:21:30 -07:00
Maxwell Salzberg	e1bf6441fe	update new js files	2012-03-27 18:26:46 -07:00
Steven Hancock	95d5c9ca68	Fix Jasmine tests - first pass ... 193 specs | 5 failing The 5 failing specs appear (according to Firebug) to be due to missing fixtures and/or missing routes in the Jasmine environment. Fixing these last 5 failures is a task probably best left to a more experienced Javascript/Jasmine developer. This commit also moves validation.js and clear-form.js into app/assets/javascripts and precompiles validation.js	2012-03-27 18:08:27 -07:00
Steven Hancock	e1607baff4	jquery_include_tag helper ... Implement the jquery_include_tag helper, which is used in several views but was not implemented in the code. This helper attempts to load jQuery from the Google CDN (matching the version of the vendored jquery.js in jquery-rails), falling back to the vendored copy if the google CDN fails. The helper also loads jquery_ujs.js from jquery-rails. A jquery_cdn setting is added to application.yml to enable or disable serving jQuery from the Google CDN (for those podmins who would rather not use Google's services). Update app/views/application.html.haml to use the jquery_include_tag helper since it was the only view that was including the vendored copy of jquery directly with jquery_include_tag.	2012-03-27 18:07:44 -07:00
Maxwell Salzberg	0e4f9ae98d	fix chubbies by expliciting setting the view path	2012-03-27 17:54:27 -07:00
Maxwell Salzberg	ba917ec80b	some sad fixes to try and appease travis :(	2012-03-27 16:31:56 -07:00
Dennis Collinson	6288eff599	day mood for a post responds to content ... extract creating a post with templates to a static post view method. Legacy templates extracted, day view day mood shows photos and has variable text size	2012-03-27 14:54:27 -07:00
Dennis Collinson	663abcb0aa	MS DC Pull out stream post logic into own class	2012-03-27 14:54:27 -07:00
Dennis Collinson	775eca0026	MS DC You can has choose a template	2012-03-27 14:52:53 -07:00
Dennis Collinson	11eb1eb7d8	MS DC fix tests	2012-03-27 14:52:53 -07:00
Dennis Collinson	e0b18f5d6c	MS DC template picker override	2012-03-27 14:52:52 -07:00
Dennis Collinson	358414371e	MS DC framer shows rudimentary version of post	2012-03-27 14:52:52 -07:00
Dennis Collinson	7ec1ef87c2	MS DC Post framer process init	2012-03-27 14:52:52 -07:00
Dennis Collinson	60420f1061	DG DC form autosubmits on file field change	2012-03-27 14:52:51 -07:00
Dennis Collinson	426f0278f9	DG DC uploading a photo shows up in the stream	2012-03-27 14:52:51 -07:00
Dennis Collinson	7a5841a1e1	Select multiple aspects	2012-03-27 14:52:51 -07:00
danielgrippi	4c46cc4246	MS DG; mentions work in new publisher	2012-03-27 14:52:50 -07:00
danielgrippi	fd0065598c	DG MS; posting to services now works, updated form serializer to handle array attributes.	2012-03-27 14:52:50 -07:00
danielgrippi	74e9cd6ca8	DG MS; added checkboxes for services in the new publisher (currently not working) / user presenter contains services	2012-03-27 14:52:50 -07:00
Dennis Collinson	680e7f6637	select one aspect	2012-03-27 14:52:50 -07:00
Dennis Collinson	a3ecd32264	DG DC Change dropdown text on select	2012-03-27 14:52:50 -07:00
Dennis Collinson	e77d7608cd	DC DGtoggle between public an private	2012-03-27 14:52:50 -07:00
Dennis Collinson	3a47590d06	DG DC OMG FORMZ	2012-03-27 14:52:50 -07:00
Dennis Collinson	cc04f492f2	MS DC added aspect presenter, and include the data on the user	2012-03-27 14:51:40 -07:00
Dennis Collinson	bf4dabc4f4	MS DC posting from post/new werks	2012-03-27 14:51:40 -07:00
Dennis Collinson	ab35f2bf3d	MS DC posts/new page init	2012-03-27 14:51:40 -07:00
Florian Staudacher	49801644cc	also handle images and links without sub-domain	2012-03-24 02:57:32 +01:00
Florian Staudacher	c5139c9a71	improve behaviour, add more tests	2012-03-24 01:51:41 +01:00
Florian Staudacher	b7b8a11551	fix #2665 - allow umlauts and other non-ascii characters in url	2012-03-24 00:10:36 +01:00
Stephan Schulz	716315409a	Limit allowed contacts for sending messages to, to the ones that are sharing with you.	2012-03-23 01:21:04 +01:00
Diaspora Europe	88bb3403d8	added 3 invalid status message specs	2012-03-22 17:24:30 +01:00
Diaspora Europe	e8933fa1da	added status message html and mobile spec	2012-03-22 16:59:14 +01:00
Diaspora Europe	97233851df	added status message spec, fix render nothing	2012-03-22 16:52:19 +01:00
danielgrippi	9c0ed946a7	no more rspec failures; and suppress a warning with a backported ... monkeypatch	2012-03-21 13:50:24 -07:00
danielgrippi	5c431d933f	MS DG down to four failures	2012-03-21 13:50:24 -07:00
Maxwell Salzberg	835f808e5a	more progress	2012-03-21 13:50:24 -07:00
Maxwell Salzberg	a2aabeb599	remove ActiveSupport::SecureRandom	2012-03-21 13:49:34 -07:00
Maxwell Salzberg	ba01d3a7af	some sad fixes for webmock in the facebook service spec	2012-03-19 20:07:36 -07:00
Maxwell Salzberg	3cb7003361	remove the swallowing of generic messages from facebook and twitter postiing. I want to know why sometimes these things are failing	2012-03-19 19:17:46 -07:00
Maxwell Salzberg	2e1f353ac4	Merge branch 'show-more' of https://github.com/Raven24/diaspora into Raven24-show-more ... Conflicts: public/javascripts/app/views/content_view.js	2012-03-19 19:11:57 -07:00
Maxwell Salzberg	39c7478b4a	Revert "freeze time in conversations show spec to make ree travis happy" ... as it did not work :/ This reverts commit d668b21cd4.	2012-03-17 19:21:24 -07:00
Maxwell Salzberg	d668b21cd4	freeze time in conversations show spec to make ree travis happy	2012-03-17 19:06:26 -07:00
danielgrippi	852687b31c	MS DG fix a few final tests	2012-03-16 17:56:35 -07:00
Maxwell Salzberg	319b3c4d3b	fixed rspec tests, more fit and finish around how the invite code works, ... and improving admin functionality	2012-03-16 17:56:35 -07:00
Maxwell Salzberg	6b97b8044b	small updates, and it looks like we are mostly working	2012-03-16 17:56:35 -07:00
Maxwell Salzberg	7bac633987	invite_link functionailty mostly works	2012-03-16 17:56:35 -07:00
Florian Staudacher	5dae27c170	finally some working tests for "show more"	2012-03-16 02:00:50 +01:00
Florian Staudacher	7b4c377df1	make tests happy	2012-03-15 19:44:18 +01:00
danielgrippi	5c90b0d5e7	comment out a jasmine spec for now to make travis happy	2012-03-14 17:33:08 -07:00
danielgrippi	5e75c6d675	fix jasmine around contact-list.js	2012-03-14 16:26:30 -07:00
Maxwell Salzberg	1d5bc6be70	Merge branch 'fix-comment-jasmine' of https://github.com/Raven24/diaspora into Raven24-fix-comment-jasmine	2012-03-14 11:09:32 -07:00
Maxwell Salzberg	36f9ca6b1a	resolve merge in notifications controller	2012-03-14 10:46:59 -07:00
Florian Staudacher	cd965e32fa	fix comment stream jasmine - bind function after spy has been defined	2012-03-14 18:43:06 +01:00
Diaspora Europe	05f2be40e1	added test for notification dropdown #2998	2012-03-14 17:02:18 +01:00
Diaspora Europe	7fd39b2896	mobile: added index and read all tests to notification spec #2997	2012-03-14 15:58:07 +01:00
Maxwell Salzberg	56a7da530f	small js test fixes	2012-03-13 19:30:34 -07:00
Florian Staudacher	9aa0a7ed58	extracted "show more" part from #2941, tests still WIP	2012-03-14 02:09:27 +01:00
Maxwell Salzberg	b8b6557379	adding an ajax loader, and pull out the js from the middle of the view	2012-03-13 17:10:23 -07:00
Maxwell Salzberg	2a30e60fe0	Merge branch 'search-repeatedly' of https://github.com/stwf/diaspora into stwf-search-repeatedly	2012-03-13 16:41:16 -07:00
Diaspora Europe	97d6b8dab8	notifications update spec and cleanup json response	2012-03-13 11:46:14 +01:00
Steven Fuchs	73fd96d439	this file should have never been added...	2012-03-10 14:21:13 -05:00
Maxwell Salzberg	0d5c518630	Merge pull request #2976 from jbivins/legacy-browser-support ... Legacy browser support	2012-03-09 16:51:34 -08:00
Steven Fuchs	9de477cf5a	jasmine spec up and working. code out of (no longer called) contacts info page object. Fixed namespaces and created jasmine fixture for empty and pending searches.	2012-03-07 23:19:51 -05:00
Steven Fuchs	ee237c6c5f	jasmine spec for stimulating deferred searches	2012-03-07 23:19:51 -05:00
Steven Fuchs	7d3a6a061c	add spec to ake sure background query is only set when a full diaspora id is given.	2012-03-07 23:19:51 -05:00
Steven Fuchs	ac8cd8368e	fixing conflicts in merge	2012-03-07 23:19:51 -05:00
Steven Fuchs	7048fa6d50	fixing conflicts in merge	2012-03-07 23:19:50 -05:00
Steven Fuchs	23aff2af5e	run second search ajaxily when no results are found from remote pod.	2012-03-07 23:19:50 -05:00
Maxwell Salzberg	db0859a83c	bug fix: you can now mention and post a photo at the same time	2012-03-07 14:42:46 -08:00
Maxwell Salzberg	f81a6ced01	Merge pull request #2886 from diasp/2823-fix-unlike-unfollow ... #2823 fix unlike and unfollow update	2012-03-06 12:22:20 -08:00
Maxwell Salzberg	5a7c8d8ea4	make the hash in oembed cache dynamic as to try to fix travis	2012-03-05 11:09:51 -08:00
Joe Bivins	7b47edff14	Move date parsing to a helper.	2012-03-04 13:36:35 -05:00
Maxwell Salzberg	9e249bb7ef	small refactor of helper method [ci skip]	2012-03-03 17:53:50 -08:00
Maxwell Salzberg	e6b1111fd1	AHHHH refactor attack_vectors_spec; hopefully it now borders on understandiablity. this deffy needs another pass from another human, as I had to make tons of spec helper methods to make the crazy setup make sense, but I think we are bordering on something that would let us write new tests in a sane way. whether all of these tests now make sense to test in the first place, that is another question all togther, as it was outside the scope of this refactor	2012-03-03 17:50:51 -08:00
Maxwell Salzberg	bd021bbd91	Correct our general exception handling. ... thanks @mperham! see: http://t.co/Jyt7vV4I	2012-03-03 16:26:06 -08:00
Maxwell Salzberg	67e4f9e159	remove puts and fix a conversationscontroller spec to be a bit more predictable	2012-03-03 16:25:10 -08:00
Joe Bivins	e26fcf836a	Correct JS error in app_spec.js	2012-03-03 12:20:31 -05:00
Joe Bivins	4769a25d59	Add ISO 8601 timestamp parsing for legacy browsers. ... Would cause legacy browsers (e.g. Safari 4.1.3) to show posts in the reverse order and the infinite scroll would not be triggered when scrolling down to the end of the page.	2012-03-03 12:14:43 -05:00
Daniel Grippi	7a774661bb	Merge pull request #2777 from stwf/tweak-twitter-truncation ... take url shortening into effect before truncating twitter posts	2012-02-29 22:49:46 -08:00
Diaspora Europe	e2776420bc	added likes specs to post view	2012-02-29 12:12:32 +01:00
Maxwell Salzberg	0d93227f07	hopefully make travis happy:	2012-02-28 17:52:13 -08:00
danielgrippi	61b4e77bde	Merge branch 'profiles'	2012-02-28 10:29:17 -08:00
danielgrippi	74cdc91bb1	fix likes and comment loading in the stream	2012-02-27 20:38:59 -08:00
Maxwell Salzberg	22cda15aa8	presenter now has a title	2012-02-27 18:11:41 -08:00
danielgrippi	0df179c514	fix specs	2012-02-27 17:56:52 -08:00
Dennis Collective	7abbe4a642	Merge pull request #2925 from diasp/2833-conversations-should-return-json ... Conversations should return json #2833	2012-02-27 17:34:10 -08:00
Dennis Collective	f5ef1e8c14	Merge pull request #2814 from stwf/aspects-javascript-fixes ... update aspect name in aspects listing after editing.	2012-02-27 17:19:05 -08:00
danielgrippi	0112285985	Merge branch 'master' into profiles ... Conflicts: lib/diaspora/shareable.rb	2012-02-27 14:27:05 -08:00
Steven Fuchs	66afb7baff	use a stub instead of creating a post to simpy supply text	2012-02-25 23:59:02 -05:00
Maxwell Salzberg	42a93f9490	remove weird monkey patch in sessions controller #wtf	2012-02-25 17:41:46 -08:00
Maxwell Salzberg	27a4c1bf2d	introduce the idea of Federated::Base. this is mostly just renaming and collasping of different federation modules, but also starting a direct hiearchy of these federation classes to make everything easier to refactor	2012-02-25 16:57:14 -08:00
Maxwell Salzberg	49b0a44738	removing estates builder, as we are now using a template	2012-02-25 16:55:26 -08:00
Maxwell Salzberg	a1f39398be	Merge pull request #2902 from JMSilla/master ... Fix atom feed bug (bug mash 7) [ci skip]	2012-02-25 16:47:13 -08:00
JMSilla	8178e0712c	Users controller small fix; removed the to_activity method and the corresponding tests for status_message model	2012-02-25 22:24:43 +00:00
danielgrippi	73f224e690	don't render page-viewer twice; last_post should actually get the last post posted, not the first one	2012-02-24 21:48:37 -08:00
danielgrippi	dc0b5db0ac	Merge branch 'profiles' of github.com:diaspora/diaspora into profiles	2012-02-24 20:14:26 -08:00
Dennis Collinson	b28508ecbc	MS DC show last post and show page works unauthenticated ... phasing out app.user() for app.currentUser	2012-02-24 19:09:00 -08:00
danielgrippi	39d31d5888	Merge branch 'master' of github.com:diaspora/diaspora into profiles	2012-02-24 14:36:18 -08:00
danielgrippi	2c0cfa53dc	don't show left-right nav when idle	2012-02-24 13:31:17 -08:00
Diaspora Europe	57de352238	added some specs for json response	2012-02-24 10:22:16 +01:00
Dennis Collinson	9769dfb303	cukes passing	2012-02-23 17:24:19 -08:00
danielgrippi	806487a5ff	namespace view folder with folders	2012-02-23 11:12:20 -08:00
danielgrippi	8f3cc6769c	update reshare count when resharing; return PostPresenter for reshare root in the success response	2012-02-22 18:02:08 -08:00
danielgrippi	8f4fed8c0e	add participants to info pane on post viewer	2012-02-22 13:15:54 -08:00
Florian Staudacher	412853bfcc	make lightbox work for photos page (+tests)	2012-02-22 14:45:43 +01:00
Maxwell Salzberg	7755c254fb	some basic tests for post presenter; added user.reshare!	2012-02-21 21:56:11 -08:00
danielgrippi	899136d0e5	display proper counts after feedback actions; modified destroy responses to return PostPresenter objects	2012-02-21 21:44:44 -08:00
danielgrippi	37981b71fe	MS; DG; adding cucumbers for post templates	2012-02-21 17:31:26 -08:00
danielgrippi	b1cbd0f4a9	fix all but 2 jasmine specs	2012-02-21 15:23:30 -08:00
danielgrippi	3db133a3a7	be less agressive when re-rendering on feedback actions	2012-02-21 15:23:30 -08:00
Maxwell Salzberg	0ab8ef1d08	basic support for activity streams photos	2012-02-21 15:23:28 -08:00
Maxwell Salzberg	25cf776059	the previous and next posts are now supplied in json of the presenter; give the template creator a default value	2012-02-21 15:23:28 -08:00
danielgrippi	ff875a5b3c	DG MS; determine what template to use on the client from the server	2012-02-21 15:23:27 -08:00
Maxwell Salzberg	0a49cfd866	Merge pull request #2876 from jbivins/2354-empty-post-page-redirect-3 ... Go to root page if deleting post from the show page	2012-02-18 17:14:42 -08:00
Maxwell Salzberg	7aba1ce1f7	Merge branch 'Raven24-user-photos' ... Conflicts: public/javascripts/app/router.js public/stylesheets/sass/application.sass	2012-02-18 17:12:14 -08:00
Joe Bivins	76c11b8d37	Add test case for when a user removes their own post from the show page. ... Adjust redirection logic.	2012-02-18 19:47:25 -05:00
Maxwell Salzberg	1e2b912bd6	remove multi server spec files	2012-02-18 16:26:18 -08:00
danielgrippi	a0e8f161f5	fix notifications controller. yay.	2012-02-18 16:26:18 -08:00
danielgrippi	ceb8497e49	Revert "attempt to make travis happy" [ci skip] ... This reverts commit 8507dc864f.	2012-02-18 16:26:17 -08:00
danielgrippi	5fd0ab7951	attempt to make travis happy	2012-02-18 16:26:17 -08:00
Dennis Collinson	32d58e8a9b	toggle all nsfw posts	2012-02-18 16:26:17 -08:00
danielgrippi	debdd6cb6b	change routes to properly reflect page names (activity/stream).	2012-02-18 16:26:16 -08:00
Florian Staudacher	8249847e9c	bookmarklet now is a complete html document (+test) ... it auto-expands to the size of the text that was selected it self-closes after posting again	2012-02-18 16:26:15 -08:00
danielgrippi	2f7465450e	you can now follow / unfollow a post from the stream; fixed cukes.	2012-02-18 16:26:15 -08:00
danielgrippi	431a04b0a8	made nsfw shield nicer and more condensed [ci skip]	2012-02-18 16:26:14 -08:00
Dennis Collinson	d6fd5cdb20	federated generators take a user	2012-02-18 16:26:12 -08:00
Dennis Collinson	a0ca983c57	Participate stream query uses participations	2012-02-18 16:26:12 -08:00
Dennis Collinson	c9487ee12f	move user modules into user namespace.	2012-02-18 16:26:12 -08:00
Dennis Collinson	b0e81af1fa	Refactor Relayable Creation	2012-02-18 16:26:12 -08:00
Dennis Collinson	8ae6303a91	Participations are a federated, relayable model :)	2012-02-18 16:26:12 -08:00
danielgrippi	a1df9fe8db	fix jasmine	2012-02-18 16:26:11 -08:00
Maxwell Salzberg	10bdf52ef7	mock out slow things that our tests dont need for speed	2012-02-18 16:26:10 -08:00
Maxwell Salzberg	ebeff6c8e6	fix for some crazy lack-of-stubbing on some http requests...	2012-02-18 16:26:10 -08:00
danielgrippi	173894d926	stubbornella media and img dom structure FTW! major css deletion <3	2012-02-18 16:26:10 -08:00
Diaspora Europe	92b29d31db	added user_is_following method, added 2 model specs	2012-02-18 16:26:10 -08:00
Diaspora Europe	55cb328fe2	tags should be case insensitive	2012-02-18 16:26:10 -08:00
Florian Staudacher	0222e4b2ee	added intentionally failing specs, because dirty input breaks bookmarklet ... see also #2741 #2751 #2800	2012-02-18 16:26:09 -08:00
Maxwell Salzberg	4f2783487d	Merge pull request #2881 from beardedninja/master ... Added a post conversion hook to PageDown + amended test for autolinking, fixes #2792	2012-02-18 16:12:39 -08:00
Florian Staudacher	dc01515aac	a little too much copy&paste...	2012-02-18 18:59:52 +01:00
Maxwell Salzberg	326103adb6	remove multi server spec files	2012-02-14 16:40:11 -08:00
danielgrippi	a5debd795d	fix notifications controller. yay.	2012-02-14 15:59:51 -08:00
danielgrippi	52c8540091	Revert "attempt to make travis happy" [ci skip] ... This reverts commit 8507dc864f.	2012-02-14 15:05:28 -08:00
danielgrippi	8507dc864f	attempt to make travis happy	2012-02-14 15:00:59 -08:00
Dennis Collinson	e16a20e18c	toggle all nsfw posts	2012-02-14 14:15:24 -08:00
danielgrippi	f3f2b8ca44	change routes to properly reflect page names (activity/stream).	2012-02-14 11:16:41 -08:00
Florian Staudacher	4263797099	bookmarklet now is a complete html document (+test) ... it auto-expands to the size of the text that was selected it self-closes after posting again	2012-02-14 18:57:30 +01:00
Daniel Grippi	1638f32042	Merge pull request #2841 from Raven24/bookmarklet-specs ... intentionally failing specs - dirty input breaks bookmarklet (+fix)	2012-02-13 21:14:56 -08:00
danielgrippi	32f93a0391	you can now follow / unfollow a post from the stream; fixed cukes.	2012-02-13 19:13:43 -08:00
danielgrippi	f1c119452a	made nsfw shield nicer and more condensed [ci skip]	2012-02-13 14:12:14 -08:00
Alex Harrison	763f8465eb	Added test for adding target=_blank to autolinks	2012-02-12 22:43:52 +01:00
Dennis Collinson	04bd507025	federated generators take a user	2012-02-09 19:01:01 -08:00
Dennis Collinson	5e26a7e6bb	Participate stream query uses participations	2012-02-09 19:01:01 -08:00
Dennis Collinson	14b9f5dc5b	move user modules into user namespace.	2012-02-09 19:01:01 -08:00
Dennis Collinson	f3c1eff3e9	Refactor Relayable Creation	2012-02-09 19:01:00 -08:00
Dennis Collinson	9e1816dc12	Participations are a federated, relayable model :)	2012-02-09 19:01:00 -08:00
danielgrippi	535c39ae7b	fix jasmine	2012-02-09 18:21:51 -08:00
Maxwell Salzberg	7109cf6c67	mock out slow things that our tests dont need for speed	2012-02-09 17:44:32 -08:00
Maxwell Salzberg	3d569cc4bc	fix for some crazy lack-of-stubbing on some http requests...	2012-02-09 16:20:22 -08:00
danielgrippi	e6e49bbf1f	stubbornella media and img dom structure FTW! major css deletion <3	2012-02-09 14:29:01 -08:00
Florian Staudacher	cab953848f	added tests for photos page	2012-02-09 23:12:39 +01:00
Diaspora Europe	8eda9aaf52	added user_is_following method, added 2 model specs	2012-02-09 14:17:43 +01:00
Diaspora Europe	47f7e10860	tags should be case insensitive	2012-02-09 14:17:43 +01:00
Maxwell Salzberg	062204e963	Merge pull request #2848 from beardedninja/master ... #2847 Users can now toggle nsfw on and off	2012-02-08 17:21:29 -08:00
Maxwell Salzberg	a9b6426323	Merge pull request #2839 from diasp/2036-fix-private-messages-navigation ... #2036 Fix private messages are sometimes displayed without navigation	2012-02-08 16:59:50 -08:00
danielgrippi	84eb313e20	updated routes to reflect page titles (explore/participate)	2012-02-08 14:40:28 -08:00
Alex Harrison	0cbdf51e6a	#2847 Users can now toggle nsfw on and off	2012-02-08 23:01:02 +01:00
danielgrippi	8fb3ad710f	fix jasmine	2012-02-08 10:34:21 -08:00
Diaspora Europe	e4e1362ff5	added spec for redirect to conversations_controller_spec	2012-02-08 16:53:48 +01:00
danielgrippi	a819f38b99	touch interacted_at on Post#after_create	2012-02-07 21:32:10 -08:00
Dennis Collinson	a72a09a24c	posts made by nsfw people are marked nsfw by default	2012-02-07 19:37:38 -08:00
Dennis Collinson	558ceec92a	a user can mark themselves as nsfw	2012-02-07 19:03:20 -08:00
Maxwell Salzberg	cb23b2d5b7	make jasmine happy, by just refrencing the template package we already create	2012-02-07 15:35:42 -08:00
Maxwell Salzberg	f141537d0d	jasmine ci does not need to re-load jammit, so we can rescue out of any failures in the auto-reload patch	2012-02-07 14:07:50 -08:00
Florian Staudacher	d965016cf6	added intentionally failing specs, because dirty input breaks bookmarklet ... see also #2741 #2751 #2800	2012-02-07 21:47:53 +01:00
danielgrippi	fafa74a222	fix spec, mustache scoping issue in partial.	2012-02-05 21:23:45 -08:00
danielgrippi	7d60d96132	set handlebars compiler in jammit config.yml (handlebars worries about maintaining a compilation cache, we don't have to do this manually.) [ci skip]	2012-02-05 21:18:34 -08:00
danielgrippi	39ff47150b	allow jammit to serve up our handlebars templates, making them cacheable! added bonus: changing a handlebars template now doesn't involve re-running rspec to regenerate them. zing.	2012-02-04 15:50:36 -08:00
Dennis Collinson	3991903b56	MS DG DC Participate stream that has things bubble to the top	2012-02-03 17:23:57 -08:00
danielgrippi	a3e13e3c0e	User#like! method.	2012-02-03 14:42:03 -08:00
Steven Fuchs	ef7dc1c017	update aspect name in page listing after editing.	2012-02-03 08:37:35 -05:00
Dennis Collective	6dbd644b01	Merge pull request #2719 from stwf/return-contact-popup-to-notify ... aspects popup menu missing from 'started sharing' notifications	2012-02-03 00:42:10 -08:00
danielgrippi	4f7dda6012	bang! kill redis cache.	2012-02-02 12:45:43 -08:00
Steven Fuchs	882853415b	commit test for new code that keeps count from going negative.	2012-02-02 11:26:58 -05:00
Steven Fuchs	532a49a56d	no need to generate notification fixtures at this point.	2012-02-02 10:45:42 -05:00
Sarah Mei	5c393e9e4f	Refactor relayable specs and add one for retracting the object. Is pending - not complete yet.	2012-02-01 19:46:31 -08:00
Sarah Mei	085d6552b3	Drop comments, likes, and PMs from people who the (post/conversation) owner is ignoring.	2012-02-01 17:52:11 -08:00
danielgrippi	310a0679f1	particpate stream, yo!	2012-02-01 16:05:16 -08:00
danielgrippi	02021584a7	EvilQuery for Participation, refactor comment creation ... you can now create a comment with User#comment!(post, text)	2012-02-01 15:09:31 -08:00
Sarah Mei	7389b895d6	Fix #2799 - bullet points in a post that has 'read more'	2012-02-01 14:31:07 -08:00
Steven Fuchs	77fc4b6cab	moved tests from jasmine to controller specs	2012-01-31 13:58:41 -05:00
Jonne Haß	7a8bd7595b	do not auto follow back if already sharing	2012-01-31 14:34:09 +01:00
Steven Fuchs	487c404d0d	incorporated suggested improvements to spec.	2012-01-29 19:51:18 -05:00
Steven Fuchs	62dd2fc642	moved notifications view tests out of backbone area.	2012-01-29 19:29:51 -05:00
Steven Fuchs	5ea4bc0a1b	Merge remote branch 'upstream/master' into return-contact-popup-to-notify	2012-01-29 18:13:30 -05:00
Steven Fuchs	5d15fa43b5	take url shortening into effect before truncating twitter posts	2012-01-29 17:42:17 -05:00
Sarah Mei	e4fa8d8466	Fix tags_helper, add specs	2012-01-29 11:46:51 -08:00
Jonne Haß	f674494d2a	todo better id/guid switching hack needed	2012-01-29 15:15:24 +01:00
Jonne Haß	0e7b084713	fix 500 in PostsController#show for non existing post	2012-01-29 14:47:51 +01:00
Sarah Mei	38908396f5	Fix stream view spec to look for different things on FF and on webkit. Sigh.	2012-01-29 00:09:56 -08:00
Maxwell Salzberg	13d1e68540	refactor people#index	2012-01-28 23:48:37 -08:00
Sarah Mei	0e242c3e0a	Fix one spec on FF; pendingify the other until I can figure out what's going on. Seems to be different behavior of the expander plugin across chrome and FF.	2012-01-28 23:35:26 -08:00
Sarah Mei	1f710232d8	Clicking 'read more' now removes the link and collapses the adjacent paragraphs. Also: hella semicolons. Fixes #2766	2012-01-28 22:29:43 -08:00
Sarah Mei	0e0d40d00e	Remove pagination from json format of contacts#index; add explanatory comments. I KNOW. But it's super confusing and I can't find a way to rewrite the code to be more clear. Soloing FTL.	2012-01-28 15:31:11 -08:00
Jonne Haß	2d98c57cf1	[ci skip] The real issue with GnuTLS is actually a flaw in OpenSSL ... which accepts several server misconfigurations OpenSSL is very liberal about the order and content of the supplied cert chain. GnuTLS however is very crucial about it. So to support GnuTLS we need to tell our community to fix their servers (joindiaspora.com is broken too). You can check it with gnutls-cli -V --x506cafile=/etc/ssl/ca-certificates.crt $domain It will print the certs in the order received and say at the end if it could be verifed. Note that not only the order is important but also the content. Many example configurations, especially for Nginx, include the root cert of the CA in the chain which is wrong. Note from a GnuTLS maintainer: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%23573736#29 Revert "Fix federation with GnuTLS by passing the ca_file to Typhoeus" This reverts commit 640a0181ab.	2012-01-29 00:08:28 +01:00
Sarah Mei	3ec09930fe	Refactor contacts#index specs. json requests now paginate correctly, but infinite scroll is still broken.	2012-01-28 14:43:47 -08:00
Sarah Mei	d40746bff7	Fixes #2713 - searching for punctuation now doesn't throw a 500. Refactored people#index specs.	2012-01-28 13:45:39 -08:00
danielgrippi	f250b79105	post owners can now delete any comments on their own posts. fixes #2652	2012-01-27 18:24:46 -08:00
Jonne Haß	640a0181ab	Fix federation with GnuTLS by passing the ca_file to Typhoeus ... How did this ever work? Anyway Diaspora now works with libcurl4-gnutls-dev which already supports SNI in most distributions and is also the default for many distros. Everybody should switch to it. Do so by installing it and then do a gem uninstall typhoeus followed by a bundle to compile it with GnuTLS	2012-01-28 01:41:53 +01:00
danielgrippi	410f2d436f	fix jasmine	2012-01-27 16:09:45 -08:00
danielgrippi	31bfef9dd2	pass in service_type strings instead of objects to deferred_dispatcher.	2012-01-27 16:05:38 -08:00
Maxwell Salzberg	c69df0fb29	fix photos controller test	2012-01-27 13:06:27 -08:00
Maxwell Salzberg	c100f8bfdd	clean up Person scopes, and re-use one in contact controller to deprecate a controller method	2012-01-27 02:23:38 -08:00
danielgrippi	a3d596a853	DG MS; only fetch contacts when focused in on Publisher.input(); limit autocomplete; added uma back; fixed jasmine tests.	2012-01-26 18:51:02 -08:00
danielgrippi	005b165e87	defer dispatching to help app processes not bloat in memory	2012-01-26 13:24:53 -08:00
Jonne Haß	e1658f8d8b	switch PhotosController#index over to guid, fix #2729	2012-01-25 12:45:02 +01:00
Jonne Haß	9c67cd7eb9	collapse Post#last_three_comments and Commentable#last_three_comments, do not double query comments in CommentsController#index for a JSON response, remove spec that tests ordering as it's not deterministic on psql without specified order	2012-01-25 12:44:50 +01:00
Steven Fuchs	5f705775cd	spec to generate some notification fixtures and jasmine specs to test them. Notably making sure that start sharing items have an aspects popup menu.	2012-01-24 23:04:35 -05:00
danielgrippi	eaed3505e4	Don't create share_visibilities for public posts, sans migration of deleting old data.	2012-01-24 16:49:07 -08:00
Jonne Haß	100625d18c	fix people and person specs for the guid stuff on psql	2012-01-24 23:02:07 +01:00
Daniel Grippi	89472992cc	Merge pull request #2720 from MrZYX/people_slash_guid ... use guid instead of id for /people/ urls	2012-01-24 13:14:08 -08:00
Jonne Haß	6f283632c5	fix resharing a reshare, javascript isn't ruby :P	2012-01-24 19:44:45 +01:00
Jonne Haß	19785d909b	ensure services is an array in StatusMessagesController#create ... This fixes posting to a single service for Ruby 1.9 For some reason Rails doesn't convert a single foo[]=bar not to the expected :foo => ["bar"] but to :foo => "bar" On Ruby 1.8 String#map exists and just yields self, on Ruby 1.9 String#map got removed	2012-01-24 18:54:36 +01:00
Jonne Haß	51d1bbbd70	app.user returns false instead of undefined if logged out, fix #2723	2012-01-24 11:56:48 +01:00
Dennis Collinson	870ad3d9f7	DC DG; some fixes, mentioning works.	2012-01-23 19:32:15 -08:00
Jonne Haß	7aaaf4f43b	use guid instead of id for /people/ urls	2012-01-23 23:35:31 +01:00
danielgrippi	3a76490640	window.app.user() doesn't return attributes nested in a key; added a comment_view spec	2012-01-22 23:37:13 -08:00
Daniel Grippi	2c50de0726	Merge pull request #2714 from stwf/im-sorry-bye-vanna ... Remove Vanna Controller from app and fix up notifications controller, views, scripts, specs	2012-01-22 22:15:14 -08:00
danielgrippi	5d15c53f6b	Revert "Revert "now using handlebars for client side templates" for now" ... This reverts commit 5f9c469b12.	2012-01-22 22:01:57 -08:00
Dennis Collinson	5f9c469b12	Revert "now using handlebars for client side templates" for now ... This reverts commit 4692055d8a.	2012-01-22 17:16:22 -08:00
Dennis Collinson	4692055d8a	now using handlebars for client side templates	2012-01-22 16:59:44 -08:00
Steven Fuchs	e882dedd33	remove vanna controller from app, adjust scripts, specs, views and controllers to work.	2012-01-22 17:39:35 -05:00
Sarah Mei	872a96dc71	Refactor services controller spec	2012-01-22 08:28:23 -08:00
Maxwell Salzberg	49f18d435a	upgrade factory girl there are 3 failing cukes.	2012-01-21 21:58:50 -08:00
danielgrippi	cc1ac843cc	re-added widget; fixed tests; use _.throttle instead of depricated custom debounce	2012-01-21 20:23:00 -08:00
danielgrippi	c3b9bb9a9a	expanding likes works again	2012-01-21 18:55:07 -08:00
danielgrippi	9e3521396d	clear new comment on submit; include the newer autoexpander in jasmine	2012-01-20 21:58:07 -08:00
danielgrippi	25d0f0d87f	updated jquery autoResize; comment boxes now expand	2012-01-20 21:45:55 -08:00
Steven Fuchs	9836860ca3	Merge remote branch 'upstream/master' into im-sorry-bye-vanna	2012-01-20 12:23:45 -05:00
danielgrippi	356494b78b	DG DC; $("window") doesn't actually work in the binding scenario	2012-01-19 17:16:58 -08:00
danielgrippi	750e26e8fb	Merge branch 'stream-js-cleanup' ... Conflicts: public/javascripts/app/models/stream.js	2012-01-19 17:07:17 -08:00
danielgrippi	b583a7a444	Put dennis's changes back in ... Revert "Revert "refactoring backbone urls"" This reverts commit 838da1fd52. Revert "revert 9b1d64bb76 as it is causing inf. scroll to break (stream model now has a post collection)" This reverts commit 2a69c0ebd4.	2012-01-19 17:05:30 -08:00
danielgrippi	c219cee97d	fix inf scroll issues in stream view	2012-01-19 17:01:45 -08:00
Maxwell Salzberg	0ce0e47ff8	fix #2698; allow a user to delete a reshare of a deleted post	2012-01-19 15:24:07 -08:00
Maxwell Salzberg	838da1fd52	Revert "refactoring backbone urls" ... This reverts commit 4ad58bdf2f.	2012-01-19 14:20:31 -08:00
Maxwell Salzberg	2a69c0ebd4	revert 9b1d64bb76 as it is causing inf. scroll to break (stream model now has a post collection)	2012-01-19 11:18:13 -08:00
Dennis Collinson	9b1d64bb76	stream model has a posts collection	2012-01-18 19:08:36 -08:00
Dennis Collinson	4ad58bdf2f	refactoring backbone urls	2012-01-18 19:08:36 -08:00
danielgrippi	5721c9e512	remove depricated methods	2012-01-18 13:29:43 -08:00
Maxwell Salzberg	38ad76d9c7	rewrite webfinger client and specs; now this is much easier to maintain.	2012-01-18 01:21:28 -08:00
Maxwell Salzberg	392e317962	fix person spec	2012-01-17 22:10:03 -08:00
Maxwell Salzberg	bfde0514bf	fix webfinger specs	2012-01-17 21:43:46 -08:00
Maxwell Salzberg	22bd70664f	fix post spec	2012-01-17 21:12:47 -08:00
Maxwell Salzberg	254860bddc	SM MS; Read email sent to diaspora-dev for more information about this ... commit. Add migration and rake task to copy hidden information from share_visibilities to users. see: http://devblog.joindiaspora.com/?p=44	2012-01-17 19:29:01 -08:00
Maxwell Salzberg	b09e76a0ce	introduce base_pod_uri, so we can support domains that use www and [bare] with webfinger	2012-01-17 17:34:42 -08:00
Dennis Collinson	9cde06a628	You can now like "reshares", stream is polymorphic	2012-01-17 17:22:56 -08:00
Steven Fuchs	36fd43db4c	incorporated improvements from @maxwell from last pull request.	2012-01-17 19:27:48 -05:00
Steven Fuchs	a11c8d8a96	javascripts for marking notifications items as unread on both the notifications page and popup menu.	2012-01-17 19:20:42 -05:00
danielgrippi	fdc0b681eb	remove unused api serializers (cruft)	2012-01-17 16:03:24 -08:00
danielgrippi	339c47d782	moved stream logic into its own controller (StreamsController)	2012-01-17 15:53:06 -08:00
danielgrippi	bfe0b7129c	move all stream actions into PostController	2012-01-17 15:53:06 -08:00
Maxwell Salzberg	6e02f61395	MS remove custom resque job logging as it is making heroku very sad	2012-01-16 20:25:56 -08:00
Dennis Collinson	66d71a217e	you should be able to reshare reshares again, first pass	2012-01-16 19:56:52 -08:00
Maxwell Salzberg	d5563d8802	TT MS; fix a bug when the mention string is not actually in the mentions	2012-01-16 15:59:40 -08:00
danielgrippi	8150d32b86	using pageDown Markdown library, fixing autolinking. created app.helpers.textFormatter, which takes care of text formatting; functions can be called individually throughout the app	2012-01-15 18:28:58 -08:00
danielgrippi	177f608276	fix oembed issues in backbone land	2012-01-15 15:56:34 -08:00
danielgrippi	9d2b1e9415	actually clear photos from the publisher. also, i hate the photo uploader we're using.	2012-01-14 15:40:44 -08:00
danielgrippi	91e3f5f6ff	remove cache counter for photos, as it was causing too many edge-case errors & added complexity across models	2012-01-14 15:40:43 -08:00
Jonne Haß	5d0223601b	fallback to english pluralization rule if none is found	2012-01-14 21:26:01 +01:00
Maxwell Salzberg	35676cddac	fix #2627 (webfinger produces 500 error, and refactor a little to encapsulate into Webfinger object a bit more	2012-01-14 00:40:42 -08:00
danielgrippi	240d595714	removing photos_count method from StatusMessage in hopes of fixing the counter (still a bit confused, though...)	2012-01-13 23:33:59 -08:00
Maxwell Salzberg	a955f06762	try loading app config in spec_helper to prevent bad fixtures from being generated	2012-01-13 23:15:32 -08:00
Maxwell Salzberg	9dbe644b25	fix app_config spec	2012-01-13 15:03:44 -08:00
danielgrippi	efe55f395d	remove ajax_stream? logic from streams now that we're using backbone & never ajaxing on mobile; remove unreferenced community_spotlight stream & controller	2012-01-13 13:50:52 -08:00
Jonne Haß	9a9cc8d826	remove spec for aspect_memberships#update too (move_contact)	2012-01-13 22:46:32 +01:00
danielgrippi	aed413b463	remove unused method and controller action (move_contact)	2012-01-13 12:15:32 -08:00
Dennis Collinson	9b8afba9cf	metaprogram template addition	2012-01-12 19:41:39 -08:00
Dennis Collinson	dec3006b50	DH DC don't render feedback view on public posts	2012-01-12 17:47:03 -08:00
Dennis Collinson	33772a27d9	cleanup alert spec	2012-01-12 17:47:03 -08:00
Dennis Collinson	7b1d7b8ac9	small refactor	2012-01-12 17:47:02 -08:00
Maxwell Salzberg	258d55df51	fully reset app_config spec to prevent test polution	2012-01-12 16:11:41 -08:00
Maxwell Salzberg	408bafca09	add/refactor normalize_pod_services so configured services is always defined regardless if SERVICES are set up	2012-01-12 15:04:14 -08:00
danielgrippi	1efce2cede	Revert "Merge pull request #2547 from stwf/unread_notifications" ... This reverts commit c61e84bc50, reversing changes made to b88899ff2a.	2012-01-11 12:11:00 -08:00
danielgrippi	bee8aa8bcd	remove unused files/methods	2012-01-11 02:26:12 -08:00
danielgrippi	0e5bb81d66	remove all references to the websocket. bang bang.	2012-01-10 12:28:19 -08:00
Daniel Grippi	c61e84bc50	Merge pull request #2547 from stwf/unread_notifications ... Allow users to click on read notifications to mark them as unread	2012-01-10 10:46:26 -08:00
Steven Fuchs	176797628e	javascript tests for the notification click callback routine.	2012-01-10 00:07:42 -05:00
danielgrippi	c11fdb0459	put 'Admin' back in #user_menu for admins. this fixes #2595 [ci skip]	2012-01-08 23:43:17 -08:00
danielgrippi	a1cf279226	support twitter hashbangs in urls for url parsing [ci skip]	2012-01-08 17:35:56 -08:00
danielgrippi	5e65c88bd8	better regex for capturing urls (sensitive to urls in tags) [ci skip]	2012-01-08 17:06:25 -08:00
Maxwell Salzberg	232c4b7931	fix for mobile multi stream [ci skip]	2012-01-07 23:31:17 -08:00
danielgrippi	b5dea63774	larger buffer for autoscroll	2012-01-07 21:25:02 -08:00
danielgrippi	a899e71ce5	switch order of auto-linking	2012-01-07 21:19:13 -08:00
danielgrippi	ad2e6a414f	autolink urls in content view	2012-01-07 20:47:30 -08:00
danielgrippi	c9c7cff479	don't fetch more posts from the stream if only one post has been returned	2012-01-07 19:59:33 -08:00
danielgrippi	e928cc805a	fixed markdown issues with reshares; removed puts from specs	2012-01-07 17:33:16 -08:00
Dennis Collinson	8fa6c46de2	DG DC more hashtag fixes, throw in mention clearing cowboy style	2012-01-07 14:24:28 -08:00
Dennis Collinson	daba42c857	mentions now render client side, wow	2012-01-07 14:24:28 -08:00
Dennis Collinson	b13e72bc00	spec fix for markdown	2012-01-07 14:24:28 -08:00
danielgrippi	0fb1bf5d4b	hash tags are linked on the front end, adding markdown.js file	2012-01-07 14:24:27 -08:00
danielgrippi	fd6e3bae62	move timeago and tooltip logic to the base View	2012-01-07 14:24:27 -08:00
danielgrippi	d2807b5202	markdown for posts on front end, tags broken	2012-01-07 14:24:27 -08:00
danielgrippi	2024716c2c	remove unusued javascript files; GC clearing from application/vanna controller	2012-01-07 14:24:27 -08:00
danielgrippi	24950bd364	restored ability to 'unlike'	2012-01-07 14:23:28 -08:00
danielgrippi	f72edbc039	added notification and unread mesasge count back to the header	2012-01-07 14:23:28 -08:00
danielgrippi	933299e31c	added translations to templates; mock out the locale file in jasmine	2012-01-07 14:23:28 -08:00
danielgrippi	a92401f157	prevent further pagination if user has fetched all posts for a given stream	2012-01-07 14:23:28 -08:00
Dennis Collinson	d5e9c5eebc	DG DC add stream faces to page party	2012-01-07 14:23:28 -08:00
Dennis Collinson	b582f45452	green jasmine, yo	2012-01-07 14:23:28 -08:00
Dennis Collinson	9d24b518f5	DC DG; correctly populate the stream jasmine fixture	2012-01-07 14:23:28 -08:00
danielgrippi	dbfb18e249	display reshare counts; test inf scroll & reshare counter in jasmine instead of cucumber	2012-01-07 14:23:27 -08:00
danielgrippi	31fac53969	added blocks js model; load app.models.Post before any other model when loading assets	2012-01-07 14:23:27 -08:00
danielgrippi	5e88ca846a	remove jquery-debounce in lieu of _.debounce; remove web_socket vendor libs	2012-01-07 14:23:27 -08:00
danielgrippi	5bbe8bfccd	remove Mustache.js, use _.template as a replacement (we only want to use one js templating library)	2012-01-07 14:23:27 -08:00
danielgrippi	1e20ca0cf5	remove old js files, specs; remove stream references in page js initializers	2012-01-07 14:23:27 -08:00
danielgrippi	85b5974fa9	removed top-level element delcarations from app templates	2012-01-07 14:23:27 -08:00
danielgrippi	64a90a30ef	only load photos for a post if photos_count > 0; display 'limited' or 'public' in stream elements; fix small like bug in stream	2012-01-07 14:23:27 -08:00
danielgrippi	71bae10317	fixed notification specs; removed a cuke around reshares already tested in jasmine	2012-01-07 14:23:27 -08:00
danielgrippi	565a0b21f7	fix .avatar declaration in the header template; make socketing always return nil straight away (we are not using the websocket in this branch, and it makes everything faster when it's off)	2012-01-07 14:23:26 -08:00
danielgrippi	3268726a9a	added LikesInfo view; simplified Feedback view (not sure how to mock the jasmine specs correctly... ugh)	2012-01-07 14:23:26 -08:00
danielgrippi	4fabbe93a5	fix ResharesController / StatusMessage controller spec; remove another js response	2012-01-07 14:23:26 -08:00
danielgrippi	719e265b68	modified app to return a hash if current_user is not present; removed view specs in postsController specs & moved logic to js/jasmine	2012-01-07 14:23:26 -08:00
danielgrippi	0a4b4fb344	remove duplication in jasmine tests (Post view / Feedback view); one correclty failing jasmine spec for Feedback view; created a StatusMessage model for the publisher	2012-01-07 14:23:26 -08:00
danielgrippi	02ca7a32f0	added reshare logic back (doesn't append it to the stream...)	2012-01-07 14:23:25 -08:00
danielgrippi	027bb3dee7	removed content-updater widget; better tests around likes on feedback widget; extend the defaultPresenter return value instead of passing the function in Feedback view	2012-01-07 14:23:25 -08:00
danielgrippi	4029b26c03	created publisher view; wip	2012-01-07 14:23:25 -08:00
danielgrippi	1a5e493b22	downcase namespacing of app	2012-01-07 14:23:25 -08:00
danielgrippi	21eba82e76	moved all jasmine fixture building into spec/controllers/jasmine_fixtures/	2012-01-07 14:23:25 -08:00
Dennis Collinson	f5609f2182	App views base renders subviews like magic	2012-01-07 14:23:24 -08:00
danielgrippi	31d24c60c7	added spec for .like_action link being rendered; added comments div back to stream_element for now	2012-01-07 14:23:24 -08:00
danielgrippi	1b8f78e006	remove sort order logic from controllers; backbone stream does not support it; was to be depricated anyway	2012-01-07 14:23:24 -08:00
danielgrippi	734f01402a	remove double fixture rendering	2012-01-07 14:23:24 -08:00
danielgrippi	1ffdfa8465	DC DG; created feedback view; moved jasmine fixtures; modified jasmine spec helper; jasmine is green	2012-01-07 14:23:24 -08:00
danielgrippi	67e56dce2c	backbone view for header; moved user dropdown logic in there; moved jasmine specs over; removed old widget	2012-01-07 14:23:23 -08:00
danielgrippi	c6e4172926	fixed likes_controller; half of the failing jasmine tests	2012-01-07 14:23:23 -08:00
Dennis Collinson	a7627fabea	pulling more view logic into superclass	2012-01-07 14:23:23 -08:00
danielgrippi	ae6fa5bebb	don't use Diaspora widget system or stream.js when backbone is active; ... migrating like actions over to backbone; some cleanup; bump jquery to 1.7.1	2012-01-07 14:23:22 -08:00
danielgrippi	525fd3c4e4	make views associated in stream inherit from App.Views.StreamObject (location of shared deletion function)	2012-01-07 14:23:22 -08:00
danielgrippi	ffae0f8e85	added more jasmine spec; NSFW wip	2012-01-07 14:23:22 -08:00
danielgrippi	cec2d27204	ported likes logic for the stream over from old branch	2012-01-07 14:23:22 -08:00
danielgrippi	bc1ffd317e	reference 'el' explicitly (render methods now return this instead of this.el); comment area focusing working again	2012-01-07 14:23:22 -08:00
danielgrippi	9e4e58e002	fix facebook specs; comment controller specs	2012-01-07 14:23:22 -08:00
danielgrippi	34e3403e2e	jasmine green again; template switching in place, defaulting to displaying post text	2012-01-07 14:23:21 -08:00
Dennis Collinson	8e3db3aebe	make jasmine view tests work, load templates, party	2012-01-07 14:23:21 -08:00
danielgrippi	52e3f1b240	DC DG; test stream view WIP	2012-01-07 14:23:21 -08:00
danielgrippi	1d178116e9	DC DG; jasmine green	2012-01-07 14:23:21 -08:00
Dan Hansen	80f797a581	introduce comments	2012-01-07 14:23:21 -08:00
Dan Hansen	ba9ece0014	Use routers, remove some hacks	2012-01-07 14:23:21 -08:00
Maxwell Salzberg	68f25c8d4e	fix app_config spec as we broke out setup into its own method	2012-01-05 19:05:13 -08:00
Jonne Haß	52c75a7ad4	Revert "Revert "auto follow back feature"" ... This reverts commit 6408105917. Conflicts: db/schema.rb	2012-01-04 13:49:56 +01:00
Maxwell Salzberg	71b58fa6fc	only queue process_photo jobs if the owner is local. this should cut down on some resque errors	2012-01-04 00:08:29 -08:00
Maxwell Salzberg	63cdd93afc	the websocket has been completely removed, and replaced for a stub until ... we find a better way to reimpliment it in a more sane way	2012-01-03 18:39:54 -08:00
Maxwell Salzberg	43090d38eb	AppConfig in heroku can now read array variables	2012-01-03 16:18:51 -08:00
robhogg	6571ec2fa9	Added test for nsfw?	2012-01-02 21:24:44 +00:00
danielgrippi	176a33880f	fix all specs minus one from o_embed_data_spec	2011-12-31 14:19:54 -05:00
Daniel Grippi	27f580f241	Merge pull request #2560 from memarko/patch-3 ... Update spec/controllers/tag_followings_controller_spec.rb	2011-12-30 18:21:51 -08:00
Sarah Mei	6236fd22a0	Found 3 spec files that were never getting run because they didn't have the _spec at the end of the filename. This commit renames them, so that they are now included in rake spec. Unsurprisingly, they all fail. Since they represent actual changing code that isn't tested, I'm checking them in anyway. Thx Pistos for pointer to the first file, which prompted me to look for others.	2011-12-27 14:48:39 -08:00
memarko	399bdb885e	Update spec/controllers/tag_followings_controller_spec.rb	2011-12-26 21:51:02 +01:00
memarko	360e041bf6	Update spec/controllers/tag_followings_controller_spec.rb	2011-12-26 19:01:27 +01:00