diaspora

Author	SHA1	Message	Date
Steffen van Bergerem	9ca8005b27	Fix percentage on mobile polls	2015-07-25 04:34:52 +02:00
Jonne Haß	11a8ac614c	Merge pull request #6240 from svbergerem/contact-page-update-counts Update number of contacts on contact page when adding/removing contacts	2015-07-24 22:02:39 +02:00
Steffen van Bergerem	04191996a5	Add updates for 'only sharing' and 'all contacts'	2015-07-24 14:18:43 +02:00
Jonne Haß	d68b3f02bd	Expose whether chat is enabled as NodeInfo metadata related to #6211	2015-07-24 04:16:54 +02:00
Dennis Schubert	be8f920c29	Merge branch 'stable' into develop	2015-07-24 04:05:32 +02:00
Jonne Haß	b7064677ff	Collapse StatisticsController into NodeInfoController	2015-07-24 03:51:31 +02:00
Jonne Haß	c928d6c117	Expose whether chat is enabled as NodeInfo metadata related to #6211	2015-07-24 03:51:31 +02:00
Jonne Haß	487b0d90ca	Implement NodeInfo	2015-07-24 03:50:02 +02:00
Steffen van Bergerem	4a178e20e5	Update number of contacts on contact page when adding/removing contacts	2015-07-24 02:38:49 +02:00
Jonne Haß	5a5d595339	Merge pull request #6238 from svbergerem/mobile-location-polls Add location and polls to mobile website	2015-07-23 20:02:11 +02:00
Steffen van Bergerem	79dfdfa224	Add integration tests for mobile polls and locations	2015-07-23 17:30:53 +02:00
Jonne Haß	f4e0785e96	Merge branch 'stable' into develop	2015-07-23 17:02:55 +02:00
cmrd Senya	e30293b9c1	Enable the jasmine testsuite to work across LAN by setting its Host variable to "0.0.0.0" (instead of default 127.0.0.1) so you could test it with a foreign web browser. closes #6234	2015-07-23 17:02:52 +02:00
Steffen van Bergerem	44c370513e	Refactor publisher_view.js	2015-07-22 17:36:25 +02:00
Jonne Haß	0cbe7ec9a8	Merge branch 'stable' into develop	2015-07-22 10:05:46 +02:00
Steffen van Bergerem	f8bbe71f54	Remove correlations closes #6223	2015-07-22 09:46:52 +02:00
Steffen van Bergerem	c8f482064c	Remove rake_helpers	2015-07-22 09:41:53 +02:00
Steffen van Bergerem	8f27e8fae8	Improve wording for admin dashboard	2015-07-21 20:43:18 +02:00
Steffen van Bergerem	484e70a68f	Add dashboard to admin page	2015-07-21 14:36:41 +02:00
Jason Robinson	bdf6c71772	Implement social relay functionality * .well-known/social-relay - to serve subscription preferences to relays * Workers.deferred_dispatch relay carbon copy functionality for outbound sending See discussion here: https://www.loomio.org/d/9vpoe0UR/public-post-federation#comment-730911 and spec here: https://wiki.diasporafoundation.org/Relay_servers_for_public_posts	2015-07-18 21:29:31 +03:00
Jonne Haß	0e439f6c1c	Merge branch 'stable' into develop	2015-07-16 11:12:16 +02:00
JoeBew42	e21dad780d	Refactoring tests on photo saved with and without EXIF data closes #6183	2015-07-16 11:12:12 +02:00
Dennis Schubert	201a3ec1cf	Merge branch 'stable' into develop	2015-07-16 03:11:25 +02:00
realtin	d0b290ea4d	refactor hash indentation and add double quotes this is the suggested styling according to hound/pronto/rubocop (#6192)	2015-07-16 03:08:34 +02:00
zaziemo	c5a2334fbe	refactor tests to use let instead of before blocks creating instance variables pronto checked #6192	2015-07-16 03:05:21 +02:00
realtin	8823bb01a2	refactor test to use let and better indentation (#6192)	2015-07-16 03:05:20 +02:00
zaziemo	56e0d3d57d	Remove one comment and change hash syntax #6192	2015-07-16 03:05:20 +02:00
zaziemo	f52260ec68	Delete test because it didn't have an expectation and dipatch is also called in the following test #6192	2015-07-16 03:05:20 +02:00
realtin	62b375bb8e	refactor test to use let instead of instance variables (#6192)	2015-07-16 03:05:20 +02:00
realtin	1503376fa6	refactor test to not use send method since dispatch method is not private (#6192)	2015-07-16 03:05:20 +02:00
realtin	880886bbad	refactor test to use let instead of instance variables	2015-07-16 03:05:20 +02:00
zaziemo	5fba53a105	refactor even more tests	2015-07-16 03:05:20 +02:00
realtin	3ff33d355f	refactor test to use let	2015-07-16 03:05:20 +02:00
zaziemo	e1e8856e8d	refactor more specs	2015-07-16 03:05:20 +02:00
zaziemo	e3fe375849	correct indentation and use new hash syntax	2015-07-16 03:05:20 +02:00
zaziemo	fccb5dae23	refactor test: replacing instance variables in before blocks, renaming variables for easier understanding, simplify test set up with less different comments, correct two tests	2015-07-16 03:04:41 +02:00
realtin	a9919fabd1	refactor test to use let and rm unused variables	2015-07-16 03:00:08 +02:00
zaziemo	d86a768590	refactor test using let and subject instead of before	2015-07-16 03:00:08 +02:00
realtin	7f3737b13f	refactor test to use let rather then instance variables	2015-07-16 03:00:08 +02:00
zaziemo	abf87889a0	refactor test by using let instead of before block when creating instance variables	2015-07-16 03:00:08 +02:00
Benjamin Neff	e4ca9f01e2	fix jsxc_helper_spec and use new url_to in jsxc_helper closes #6151	2015-07-13 23:52:13 +02:00
Benjamin Neff	edc3ac6908	write tests for federation callbacks	2015-07-14 05:50:26 +02:00
Benjamin Neff	804784ed3f	fix @pod_uri/@pod_url and add url_to to AppConfig	2015-07-14 05:50:26 +02:00
Benjamin Neff	8bf54e32ae	create temporary fixture tests and remove old tests	2015-07-14 05:50:26 +02:00
Benjamin Neff	f875be8d5b	use federation-gem for webfinger/hcard generation remove old webfinger/hcard generation code this fixes #5143	2015-07-14 05:50:26 +02:00
Dennis Schubert	6b6bf84598	Merge pull request #6151 from SuperTux88/federation-gem Federation Gem Step 1: Webfinger/HCard generation	2015-07-12 17:02:23 +02:00
Benjamin Neff	0ffe513b40	fix jsxc_helper_spec and use new url_to in jsxc_helper	2015-07-11 11:19:42 +02:00
Benjamin Neff	1bf328d294	write tests for federation callbacks	2015-07-11 11:19:42 +02:00
Benjamin Neff	94fc378eb7	fix @pod_uri/@pod_url and add url_to to AppConfig	2015-07-11 11:19:42 +02:00
Jonne Haß	397845161f	Merge pull request #6162 from cmrd-senya/5684-public-additional-profile Allow additional profile fields (previously private profile) to be set public (new updated version)	2015-07-11 10:19:19 +02:00
cmrd Senya	7a5a0a909a	Allow extended profile fields (previously private profile) to be set public (#5684 ). This adds a new boolean field "public_details" to person model. By default it is false and represents old behaviour. When it is set to true, extended profile (bio,location,gender,birthday) get available to people who didn't log into diaspora and to people you don't share with (i.e. it is made public). In UI, a bootstrap-switch added on the profile-edit page in order to change the setting. This also changes wording from public/private profile to basic/extended. The latter could be public and limited.	2015-07-11 04:36:45 +03:00
Jonne Haß	84d5a13ce1	Merge branch 'stable' into develop	2015-07-11 00:17:19 +02:00
realtin	9eadc251ae	added post guid to the post_serializer closes #6185	2015-07-11 00:17:01 +02:00
zaziemo	787c1cfce9	add spec and code to include guid in comment's export #6115	2015-07-11 00:16:24 +02:00
Benjamin Neff	0fca8ceeaf	create temporary fixture tests and remove old tests	2015-07-10 01:46:48 +02:00
Benjamin Neff	46a22fefe9	use federation-gem for webfinger/hcard generation remove old webfinger/hcard generation code this fixes #5143	2015-07-10 01:46:48 +02:00
Spanti Nicola (RyDroid)	df440ed8d8	Very minor changes of some JS files	2015-07-08 19:09:08 +02:00
Jonne Haß	1e4224813e	Merge branch 'stable' into develop	2015-07-05 20:50:42 +02:00
Benjamin Neff	b0a9a6342f	add url_to closes #6168	2015-07-05 20:46:18 +02:00
Benjamin Neff	2294e59ee3	change public_url to atom_url and profile_url	2015-07-05 20:44:24 +02:00
Jonne Haß	202b6108e9	Merge branch 'stable' into develop [ci skip]	2015-07-05 12:22:35 +02:00
Mohammed Rashid	c652374787	typo in spec [ci skip] closes #6167	2015-07-05 12:22:23 +02:00
Steffen van Bergerem	61edda0fca	Aspect creation modal now creates an aspect when pressing enter	2015-07-03 18:20:32 +02:00
Steffen van Bergerem	9c4f80346b	Use entypo-rails mappings	2015-07-03 15:31:29 +02:00
Jonne Haß	1cd2562572	Merge branch 'stable' into develop	2015-07-02 11:12:16 +02:00
Jonne Haß	6601576149	Merge branch 'master' into stable	2015-07-02 11:11:58 +02:00
Dennis Schubert	e92c8000ba	Do not leak private profile fields in JSON format Signed-off-by: Dennis Schubert <mail@dennis-schubert.de>	2015-07-02 10:07:59 +02:00
Steffen van Bergerem	df12878371	Fix overflow with perfect scrollbar	2015-06-22 00:44:42 +02:00
Jonne Haß	188e554b7b	Merge branch 'stable' into develop	2015-06-21 20:48:57 +02:00
fap	1061e101fd	Adds welcome message on registration Welcome message is only send out if podmin account is defined and welcome message is enabled in the config. This also enables the podmin account to send messages to any local user. closes #6128	2015-06-21 20:48:48 +02:00
Steffen van Bergerem	049c8eb384	Bootstrap header rewrite	2015-06-20 00:38:40 +02:00
Steffen van Bergerem	92a3dd53f0	Replace jquery.autoresize with autosize	2015-06-14 20:03:15 +02:00
fla	7f6609d17b	Remove old service keys in statistics.json	2015-06-13 11:03:47 +02:00
Steffen van Bergerem	18a8211cc3	Add img-responsive to image class	2015-06-12 00:01:56 +02:00
Dennis Schubert	8a4ec1d4c6	Merge branch 'stable' into develop	2015-06-08 04:18:38 +02:00
Benjamin Neff	d42b5c128e	update photos when received over public path closes #6082	2015-06-08 04:18:31 +02:00
Benjamin Neff	e16b9af7e6	make public and private receiver work similar ...	2015-06-08 04:15:17 +02:00
Dennis Schubert	ad52eaf6d7	Merge branch 'stable' into develop	2015-06-08 04:09:57 +02:00
Benjamin Neff	97153ad08b	update tests for new twitter client closes #6083	2015-06-08 04:08:46 +02:00
Dennis Schubert	0c6ca1d235	Merge branch 'stable' into develop	2015-06-08 00:58:20 +02:00
Benjamin Neff	aa2297a8c0	retry receive share-visibility when failed while receiving parallel refactoring: - remove unused return-values (were used for caching, which was removed again) - remove transaction (doesn't help here, added in `2615126`) closes #6068	2015-06-08 00:58:00 +02:00
Dennis Schubert	e0420d733a	Merge branch 'stable' into develop	2015-06-08 00:49:55 +02:00
Benjamin Neff	010afa1019	refactor: iterate over visiblities closes #6060	2015-06-08 00:45:16 +02:00
efstrian	69c3a4100d	Issue #4297 : Color themes can override bootstrap variables	2015-06-07 19:58:54 +03:00
efstrian	d64ea15891	Issue #4297 : Style fixes - Default theme is configurable	2015-06-07 19:58:14 +03:00
dimana	31d760867c	Issue #4297 : Updated color themes and testing	2015-06-07 19:57:37 +03:00
efstrian	57d766346c	Issue #4297 : Enable color theme setup	2015-06-07 19:57:16 +03:00
Jonne Haß	7bfa0f857c	Merge branch 'stable' into develop	2015-06-06 15:23:44 +02:00
Jonne Haß	6c71d9f257	Only strip text direction markers around hashtags for now Fixes #6067	2015-06-06 15:23:12 +02:00
Jonne Haß	8df9cb9cd2	Merge branch 'stable' into develop	2015-06-05 09:40:39 +02:00
Benjamin Neff	214ce1cf6e	change path to uma.jpg to /assets closes #6064	2015-06-05 09:40:34 +02:00
Steffen van Bergerem	700df9af23	Fix jasmine tests Fix notifications jasmine tests	2015-06-04 18:05:44 +02:00
Steffen van Bergerem	f64eb9ff41	Fix hound remarks	2015-06-04 18:05:44 +02:00
theworldbright	98f11b944a	Fix styleguide violations Fix hound remark 12 Remove unnecessary explicit div tag Rename el_** to **El (hound remark 2 and 3) Only find and replace operations were done with this commit Fix hound remark 4 and 8 Fix hound remark 6 Fix hound remark 7 Fix hound remark 9 Fix hound remark 10 and 11 Fix hound remark 13 Fix hound remark 1 Change single quotes to double quotes Change single quotes to double in publisher view Fix camelCase and missing {} in publisher view Change single quotes to double in bookmarklet view Use dot notation for serializedForm in publisher Change single quotes to double in bookmarklet spec Change single quotes to double in publisher spec Fix missing {} in publisher views Use ruby 1.9 hash syntax in invite_link Fix indentation in publisher view	2015-06-04 18:05:44 +02:00
Steffen van Bergerem	f5bb4a4557	Refactor button colors	2015-06-04 18:05:44 +02:00
Augier	207b6c6153	Port to Bootstrap 3 correcting images display on stream sidebar Corrections on profile page	2015-06-04 18:05:43 +02:00
Jonne Haß	3850118e4e	Merge branch 'stable' into develop	2015-06-02 12:14:42 +02:00
Steffen van Bergerem	1b77258d0e	Set default for post title truncation to 70 characters closes #6022	2015-06-02 12:14:35 +02:00
Dennis Schubert	ffc3cb711f	Merge branch 'stable' into develop	2015-06-02 02:35:21 +02:00
Benjamin Neff	03dbb75dd5	don't save default avatars to the database	2015-06-02 02:32:01 +02:00
Dennis Schubert	8c4bcd8bd3	Merge branch 'stable' into develop	2015-05-31 01:47:09 +02:00
Steffen van Bergerem	fdad348898	Fix tag rendering in emails closes #6009	2015-05-31 01:47:05 +02:00
Dennis Schubert	b2dbdb3706	Merge branch 'stable' into develop	2015-05-30 03:08:30 +02:00
Jonne Haß	ac52cef546	Only return the current_users participation for post interactions closes #6007	2015-05-30 03:08:25 +02:00
Jonne Haß	351f54d74f	Merge branch 'stable' into develop	2015-05-28 11:24:34 +02:00
Sandip Trivedi	2ba2ef1b9c	Replaces the zipzip gem with the rubyzip gem	2015-05-28 11:23:57 +02:00
Dennis Schubert	44919233c0	Merge branch 'stable' into develop	2015-05-28 01:34:28 +02:00
Benjamin Neff	21ae93e658	handle when the diaspora xml parser returns nil closes #5991	2015-05-28 01:34:24 +02:00
Dennis Schubert	f9f73f56db	Merge branch 'stable' into develop	2015-05-25 04:18:46 +02:00
Jason Robinson	7c0e50c2c2	Introduce 'authorized' configuration option for services Since the Facebook API has changed and additional permissions are required for all users on a pod to cross-post, an additional 'authorized' flag is needed to be set for the Facebook service. This flag allows either all users, one user or no users to use the cross-posting service. Clarifies the situation for #5923, #5260 and #5085. closes #5985	2015-05-25 04:18:38 +02:00
Jonne Haß	3e35ef0b63	Merge branch 'stable' into develop	2015-05-24 11:16:09 +02:00
Benjamin Neff	986ad0df14	fix validation for status-message when the author is missing closes #5986	2015-05-24 11:16:05 +02:00
Dennis Schubert	2ca0a17ee0	Merge branch 'stable' into develop	2015-05-24 02:30:08 +02:00
Benjamin Neff	8531b160a6	gracefully handle when a like is already deleted again closes #5983	2015-05-24 02:30:02 +02:00
Dennis Schubert	ba9b947173	Merge branch 'stable' into develop	2015-05-23 01:24:14 +02:00
Benjamin Neff	68f7208ff5	use id from preloaded gon.post to fix broken liking with guid closes #5978	2015-05-23 01:24:09 +02:00
Jonne Haß	5a3b62d801	Merge branch 'stable' into develop	2015-05-19 10:42:44 +02:00
Benjamin Neff	9a4a7255e7	remove unused older and newer methods for posts last renamed in `8386179f16` closes #5970	2015-05-19 10:42:39 +02:00
Dennis Schubert	2549f44b7c	Merge branch 'stable' into develop	2015-05-19 03:00:56 +02:00
Benjamin Neff	289753e068	add "original post deleted" message on single post view closes #5968	2015-05-19 03:00:51 +02:00
Benjamin Neff	267a1df3c4	fix root_diaspora_id when root was deleted	2015-05-19 02:59:31 +02:00
Dennis Schubert	6a1ec27b3c	Merge branch 'stable' into develop	2015-05-19 02:58:41 +02:00
Steffen van Bergerem	ceec5084af	Use case insensitive unconfirmed email closes #5967	2015-05-19 02:58:37 +02:00
Dennis Schubert	3446cb2f3f	Merge branch 'stable' into develop	2015-05-18 03:31:17 +02:00
Benjamin Neff	a396a246ee	remove unused hasPhotos and hasText functions - added in `a836b06d3e` - removed in `49ea8c8563` closes #5969	2015-05-18 03:31:11 +02:00
Dennis Schubert	944c57f874	Merge branch 'stable' into develop	2015-05-18 03:23:43 +02:00
Benjamin Neff	7cccb6594f	remove security hax comment	2015-05-18 03:23:15 +02:00
Jonne Haß	13b69f81d1	Merge branch 'stable' into develop	2015-05-16 13:54:05 +02:00
Benjamin Neff	d74e20a790	fetch public posts when someone starts sharing with you closes #5960	2015-05-16 13:54:01 +02:00
Jonne Haß	ca33e984d3	Merge branch 'stable' into develop	2015-05-16 12:48:41 +02:00
Benjamin Neff	30cc330747	fix empty searchable in hcard, parse empty as false closes #5962	2015-05-16 12:48:33 +02:00
Dennis Schubert	42a408045e	Merge branch 'stable' into develop	2015-05-16 03:44:35 +02:00
Benjamin Neff	c01fdb6e1c	fix the url for the public-posts json closes #5958	2015-05-16 03:44:31 +02:00
Dennis Schubert	84dc40326a	Merge branch 'stable' into develop	2015-05-16 03:36:30 +02:00
Jason Robinson	aec2467e98	Fix inactive user removal not respecting configuration for daily limits It seems ActiveRecord ignores .limit() if .find_each() is used to iterate the query (http://stackoverflow.com/a/6680541/1489738). Using .each() instead. Added a test. closes #5953	2015-05-16 03:36:25 +02:00
Dennis Schubert	aac0a2582e	Merge branch 'stable' into develop	2015-05-12 04:00:12 +02:00
Steffen van Bergerem	40bb44eb96	Mobile: manage followed tags closes #5945	2015-05-12 04:00:07 +02:00
Dennis Schubert	3f3148af2c	Merge branch 'stable' into develop	2015-05-10 02:00:41 +02:00
Steffen van Bergerem	0c5443d543	Make js-routes use compact and camelcase function names closes #5941	2015-05-10 02:00:30 +02:00
Dennis Schubert	5477c7df96	Merge branch 'stable' into develop	2015-05-10 01:59:21 +02:00
Steffen van Bergerem	59e57c013b	Update jasmine-ajax closes #5937	2015-05-10 01:59:17 +02:00
Dennis Schubert	300376a854	Merge branch 'stable' into develop	2015-05-09 23:49:05 +02:00
Steffen van Bergerem	05ec235ea3	Pass along current_user in ContactPresenter#full_hash_with_person closes #5936	2015-05-09 23:48:59 +02:00
Dennis Schubert	b05d183f91	Merge branch 'stable' into develop	2015-05-07 04:10:28 +02:00
Steffen van Bergerem	06e6e1db78	Remove private post content of also commented mails merges #5931	2015-05-07 04:10:21 +02:00
Jonne Haß	4612937787	Merge branch 'stable' into develop	2015-05-06 23:56:23 +02:00
Jonne Haß	166a152dc0	Merge branch 'master' into stable	2015-05-06 23:53:52 +02:00
Dennis Schubert	d27061d5d6	Set captcha length correctly, fix #5932	2015-05-06 23:51:28 +02:00
Florian Staudacher	5c012e7871	limit the parameter length for the GET request to the bookmarklet to ~2000 chars	2015-05-05 18:25:01 +02:00
Jonne Haß	4a7c358be9	Merge branch 'stable' into develop	2015-05-05 01:39:52 +02:00
Steffen van Bergerem	399fdb2c7d	Check request.format :mobile in home controller	2015-05-05 01:39:48 +02:00
Jonne Haß	3fadcfa568	Merge branch 'stable' into develop	2015-05-04 15:14:41 +02:00
Jonne Haß	bb14128052	bump ruby-oembed	2015-05-04 14:22:57 +02:00
Jonne Haß	971a3dd021	Merge branch 'stable' into develop	2015-05-04 04:04:48 +02:00
Steffen van Bergerem	0cffa00004	Add syntax highlighting for markdown content	2015-05-04 04:04:34 +02:00
Jonne Haß	234e205602	Merge branch 'stable' into develop	2015-05-04 03:38:44 +02:00
Steffen van Bergerem	a22127bfb1	Add ctrl+enter shortcut for conversations	2015-05-04 03:38:42 +02:00
Jonne Haß	f257658e46	Revert "Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations"" This reverts commit `2c7848e3cb`.	2015-05-04 00:43:41 +02:00
Jonne Haß	2c7848e3cb	Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations" This reverts commit `096fa2ddbb`, reversing changes made to `f7d1105148`.	2015-05-04 00:36:27 +02:00
Jonne Haß	2382f9eb24	Merge pull request #5896 from Raven24/fix-db-seeds fix minor errors in db:seed task	2015-04-30 13:09:54 +02:00
Jonne Haß	78ea2c8204	Merge pull request #5878 from Flaburgan/chrome-frame Fix the IE version number extractor to work without space between MSIE and the version number	2015-04-30 13:04:29 +02:00
Benjamin Neff	28c9cfdfd4	write cucumber test and add order_id on create	2015-04-28 02:38:28 +02:00
Benjamin Neff	3c09756417	refactoring javascript and controller - move to contacts.js - use json - move to aspects_controller - add route - rewrite test - fix css in chrome	2015-04-28 01:57:43 +02:00
Florian Staudacher	913d3484a6	fix minor errors in spec helper scripts, remove db/seeeds.rb	2015-04-28 01:02:27 +02:00
Simon Wörner	cee4f1c3cd	fixed aspect sorting, added minimal jquery ui, added test	2015-04-26 01:57:00 +02:00
Dennis Schubert	c95dd68545	Merge pull request #5883 from SuperTux88/fix-camo-on-contacts-page use camo for medium and small avatars	2015-04-25 01:26:28 +02:00
Dennis Schubert	b06a699dd6	Merge pull request #5879 from SuperTux88/encode-urls encode unencoded urls and normalize IDN urls	2015-04-25 01:11:42 +02:00
Dennis Schubert	67a6c8be0c	Merge pull request #5877 from SuperTux88/fix-notification-mails fix notification mails for limited posts	2015-04-25 01:09:46 +02:00
Benjamin Neff	344b198900	use camo for medium and small avatars	2015-04-24 03:10:48 +02:00
Benjamin Neff	a863f3ebb2	encode unencoded urls and normalize IDN urls	2015-04-23 00:24:53 +02:00
Flaburgan	2b2c39eef3	Fix the IE version number extractor to work without space between MSIE and the version number, close #5858	2015-04-22 22:09:22 +02:00
Jonne Haß	0bad6dba88	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-22 20:58:54 +02:00
Jonne Haß	6e546ff2bf	Trigger exports through a POST request GET requests don't get any CSRF protection by Rails, thus these sensitive actions should be better protected. Thanks to @tomekr for the report.	2015-04-22 20:20:10 +02:00
Jonne Haß	0a70e51f74	Add a token the filename for exported user data Also redirect to it for download, for Amazon S3 compatibility. Prior to this patch an attacker could obtain an users export by guessing the filename with a high chance of success. Fully authenticating the download request is a lot harder due to our diverse deployment scenarios. This brings the used method in line with the photo export feature. Thanks to @tomekr for the report.	2015-04-22 20:19:17 +02:00
Benjamin Neff	84c3814b94	fix notification mails for limited posts	2015-04-22 19:59:08 +02:00
Steffen van Bergerem	8e2103e69b	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-21 22:26:22 +02:00
Benjamin Neff	6cbb959700	add mumble protocol to linkify also use double-quotes in the whole file	2015-04-21 21:16:55 +02:00
Jonne Haß	c8f990359d	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-21 20:50:27 +02:00
Steffen van Bergerem	a14713b985	Update markdown-it, disable fuzzy links	2015-04-21 20:50:16 +02:00
Jonne Haß	37ec00f80b	Merge pull request #5854 from svbergerem/remove-managing-services-standalone Remove 'manage services' link in standalone mode	2015-04-20 22:36:11 +02:00
Jonne Haß	d959dd725b	Merge pull request #5850 from svbergerem/modal-for-new-aspect Use Bootstrap modal for new aspect form	2015-04-20 22:34:51 +02:00
Marcelo Briones	6636a89118	Add participation counter	2015-04-11 14:41:17 -03:00
Steffen van Bergerem	b885b8583d	Remove 'manage services' link in standalone mode	2015-04-08 12:49:05 +02:00
Steffen van Bergerem	75ef9f47d0	Use Bootstrap modal for new aspect form	2015-04-07 10:45:09 +02:00
Steffen van Bergerem	a6b9c6c057	Return 406 on people/guid/contacts, format json	2015-04-04 03:48:44 +02:00
Jonne Haß	4b841ef076	Merge pull request #5843 from margori/private_post_subject_content Limited post content excluded from subject of comment email	2015-04-04 00:39:40 +02:00
Marcelo Briones	aa6b590b3c	Limited post content excluded from subject of comment email	2015-04-03 16:37:17 -03:00
Steffen van Bergerem	07a344d051	Disable auto follow back on aspect deletion	2015-04-03 14:10:14 +02:00
Steffen van Bergerem	1701bc30d0	Don't add mentions and reshares to all streams	2015-04-01 16:51:08 +02:00
Jonne Haß	548b0d8161	Rescue correct constant in Workers::ReceiveLocalBatch Fixes #5834	2015-04-01 04:01:40 +02:00
Steffen van Bergerem	adf9bcf8e8	Update markdown-it	2015-03-26 00:07:25 +01:00
Jonne Haß	65a738e604	bump rspec-rails	2015-03-25 02:33:56 +01:00
Jonne Haß	61461db913	fix jasmine spec for correct reshare behavior	2015-03-24 17:20:33 +01:00
Jonne Haß	73b6c75278	On reshare insert the reshare built from the response Also make sure comments_count and the like is always set in the response.	2015-03-23 23:02:23 +01:00
Jonne Haß	644fc46dee	Merge pull request #5792 from MothOnMars/4020-role-specs added specs and validations for Role model	2015-03-20 01:54:04 +01:00
Steffen van Bergerem	d9bf4a2fa6	Remove layout 'centered_with_header_with_footer'	2015-03-18 21:59:56 +01:00
Martha	d4f1a5dbe8	added specs and validations for Role model - added shoulda-matchers gem for one-line specs - added FactoryGirl syntax methods	2015-03-18 09:16:15 -07:00
Steffen van Bergerem	a161e4d3a7	Uncomment jasmine tests	2015-03-18 00:01:22 +01:00
Jonne Haß	256d7862b9	Merge pull request #5782 from svbergerem/reshared-poll Display reshared poll	2015-03-15 20:45:51 +01:00
Jonne Haß	5ea90016b3	Merge pull request #5783 from visualsayed/5737-too-long-tag-name 5737 too long tag name	2015-03-15 18:06:53 +01:00
Steffen van Bergerem	81cd1753e4	Improve link to original post in reshared polls	2015-03-15 17:07:16 +01:00
Hincu Petru	9589cb2e0f	disable poll voting for reshared post	2015-03-15 16:46:48 +01:00
Sayed	18a1958ef8	fix too long tag name #5737	2015-03-15 16:15:33 +02:00
Augier	322ee30005	Tests with Jasmine	2015-03-15 14:52:49 +01:00
Augier	f4534ec412	Refactor notification badge view (again)	2015-03-15 11:48:06 +01:00
Augier	673661b798	Ported searchbar	2015-03-15 11:48:06 +01:00
Augier	2a9fddf7a0	Port notifications to backbone part. 2	2015-03-15 11:48:06 +01:00
Steffen van Bergerem	2328f64d56	Merge pull request #5580 from MothOnMars/5549-password-reset-error display specific error messages for password change (issue #5549)	2015-03-14 03:25:08 +01:00
Martha	985141c0e8	display specific error messages for password change (issue #5549 )	2015-03-13 11:35:21 -07:00
Steffen van Bergerem	1ff644c13e	Fix mobile notifications	2015-03-12 22:45:04 +01:00
Steffen van Bergerem	52c2a73d83	Merge pull request #5707 from AugierLe42e/port-notifications-backbone [WIP] Port of notifications.js and notification-badge.js to Backbone part.1	2015-03-11 17:05:14 +01:00
Steffen van Bergerem	f5bf53a004	Refactor vendor javascript	2015-03-11 15:51:08 +01:00
Augier	95f4675ddf	Port of notifications to Backbone	2015-03-11 02:11:05 +01:00
Jonne Haß	8ab6f31e0a	Merge pull request #5751 from svbergerem/fix-photo-count-profile Fix photo count in the profile view	2015-03-10 17:45:12 +01:00
Steffen van Bergerem	d2222a97e5	Fix photo count in the profile view	2015-03-10 11:38:49 +01:00
Steffen van Bergerem	1b2b10877a	Fix services char counter	2015-03-09 21:18:10 +01:00
Steffen van Bergerem	73d04b706e	Use entypo icons for left navbar	2015-03-09 17:57:50 +01:00
Steffen van Bergerem	3298373a7f	Add missing http:// to urls	2015-03-09 01:42:40 +01:00
Jonne Haß	f525f9e34d	Merge pull request #5730 from Flaburgan/strip-markdown-from-title Strip markdown from the heading of a post	2015-03-06 23:43:13 +01:00
Steffen van Bergerem	2a52f65160	Bump markdown-it	2015-03-06 20:40:06 +01:00
flaburgan	5dc8642a99	Strip markdown from the heading of a post. Impact notifications, email subjects, SPV <title>, the Atom feed...	2015-03-04 19:30:00 +01:00
Marcelo Briones	b154d87070	Exports user photos as zip file	2015-03-03 19:45:57 -03:00
Jonne Haß	dd45b79a98	Drop Youtube oembed HTTPS hack upstream ships it now that way	2015-03-02 02:34:51 +01:00
Steffen van Bergerem	e188782a9a	Remove blueprint code	2015-03-02 00:04:57 +01:00
Steffen van Bergerem	c838389b67	Fix invitations and tests	2015-03-02 00:04:56 +01:00
Jonne Haß	987281270a	bump ruby-oembed	2015-02-28 02:36:13 +01:00
Jonne Haß	678033fa23	replace deprecated stub syntax in export user spec	2015-02-27 17:00:42 +01:00
Jonne Haß	7a741c6dce	Ensure deliveries are cleared after each example	2015-02-27 17:00:41 +01:00
Jonne Haß	3a90386303	deliver needs to be called on the return value of the mailer call	2015-02-27 16:58:39 +01:00
Jonne Haß	d295b5d5b5	ActiveRecord::Base::reflection returns strings now	2015-02-27 16:58:39 +01:00
Jonne Haß	9530f00bd6	Don't use a too large invalid id	2015-02-27 16:58:39 +01:00
Jonne Haß	1ec3f5caa6	Don't pass a model instance where an id is expected	2015-02-27 16:58:39 +01:00
Jonne Haß	290aded7f6	ActionMailer deliver -> deliver_now	2015-02-27 16:58:39 +01:00
Jonne Haß	ed44689670	Fix a spec for LikesController	2015-02-27 16:36:45 +01:00
Jonne Haß	99ea156e1c	Refactor User.total_users into a scope	2015-02-27 16:30:51 +01:00
Jonne Haß	6432bbe67b	fix	2015-02-27 16:29:49 +01:00
Jonne Haß	93c9ad6eba	Fix participations controller spec	2015-02-27 16:27:55 +01:00
Jonne Haß	95053ccbf2	Merge pull request #5351 from MarcBurt/5041-Total-user-statistic-shouldnt-include-closed-accounts 5041 total user statistic shouldnt include closed accounts	2015-02-27 16:02:35 +01:00
Jonne Haß	be1ab6c6a3	Merge branch 'collimarco-issue5350' into develop	2015-02-27 15:33:55 +01:00
Augier	168adae009	Adding help section for chat	2015-02-26 18:06:39 +01:00
PIOTR KLOSINSKI	b8be76be3c	changed reshare function, so it adds the object to the stream tests for reshares Changelog.md update fixing a style issue removed unnecessary semicolon	2015-02-23 15:44:31 +01:00
zachrab	f695b5d3e7	Set disable_mail to true Add #clear_account! disable mail spec Add migration for disabling mail for all closed accounts Change migration to use #update_all for disable_mail attribute Add #clear_account! false fields spec	2015-02-19 16:45:39 -08:00
Akash Agrawall	3bb5e78893	Lock account #5564	2015-02-19 05:45:04 +05:30
Jonne Haß	6a5a407e49	Strip Unicode format characters prior post processing	2015-02-17 23:29:05 +01:00
Steffen van Bergerem	eb7e2eac9d	Update jasmine-ajax	2015-02-17 04:03:42 +01:00
Steffen van Bergerem	9c22ed6aef	Add year to notifications page	2015-02-16 18:02:50 +01:00
Steffen van Bergerem	9373d5bd20	Fix jasmine tests for new help routes	2015-02-14 19:38:00 +01:00
Augier	aa62266376	Added routing system to open a section in help	2015-02-14 18:05:40 +01:00
Jonne Haß	84cfaa1cfb	Merge pull request #5659 from Zauberstuhl/link_to_remote_profile Add the ability to link remote user profiles	2015-02-13 20:35:14 +01:00
Lukas Matt	a475d5fb62	Add the ability to link to remote user profile related to diaspora/jsxc#77	2015-02-13 19:23:26 +01:00
Jonne Haß	b910adc52b	Merge pull request #5663 from svbergerem/pending-specs Green pending specs for evil query spec tag stream	2015-02-13 13:46:08 +01:00
Steffen van Bergerem	55cb2dd30a	Green pending specs for evil query spec tag stream	2015-02-13 12:30:53 +01:00
Steffen van Bergerem	d09e8a3758	Bump markdown-it-sanitizer	2015-02-13 02:58:31 +01:00
Jonne Haß	3c58cbeaee	Merge pull request #5646 from svbergerem/fix-conversation-scrolling Conversations: fix badge count and automatic scrolling	2015-02-11 14:19:48 +01:00
Steffen van Bergerem	7112cb112b	Add hovercards for mentions	2015-02-11 00:46:00 +01:00
Steffen van Bergerem	8962d75eb7	Conversations: fix badge count and automatic scrolling	2015-02-10 19:11:20 +01:00
Steffen van Bergerem	3312f97981	Fix timeago for notifications, add 'no notifications yet' message	2015-02-09 03:56:37 +01:00
Steffen van Bergerem	2ec093a54c	JSHint boss, evil, loopfunc and scripturl	2015-02-08 23:41:33 +01:00
Steffen van Bergerem	ab6732cac1	JSHint eqeqeq	2015-02-08 23:41:32 +01:00
Steffen van Bergerem	5fa6b8253e	JSHint unused and undefined variables	2015-02-08 23:41:32 +01:00
Steffen van Bergerem	a9a480da0a	JSHint semicolon errors	2015-02-08 23:41:31 +01:00
Steffen van Bergerem	6b0a5823e3	Add JSHint javascript linter	2015-02-08 23:41:31 +01:00
Marc Burt	9f5131b6ec	Fixed #5041 with new User method to find total accounts excluding closed and invitations	2015-02-08 13:49:12 +00:00
Steffen van Bergerem	c1d714d2c7	Remove unused files, fix syntax in jasmine tests	2015-02-07 21:17:51 +01:00
Steffen van Bergerem	8b33b9eb18	Merge pull request #5602 from Faldrian/more-shortcuts Add shortcuts for reshare, expand Post and open first link in a post Conflicts: config/locales/diaspora/en.yml	2015-02-07 14:41:56 +01:00
Sam Radhakrishnan	a12c0d83c0	Fixed Bug #5593 . Added length validation to location in profile model with maximum length 255.	2015-02-02 19:42:53 +05:30
goobertron	42cd2337be	Amend all text strings in en locales to use sentence case Adapt cukes to work with new capitalisation rules	2015-01-31 17:44:57 +00:00
Augier	55d258c5ac	Fix registrations displaying	2015-01-30 18:00:22 +01:00
Faldrian	099974ddef	Add shortcuts for reshare, expand Post and open first link in a post	2015-01-28 16:19:18 +01:00
Marco Colli	eccab62e32	Allow user to enable / disable notifications for a post from stream #5350	2015-01-25 18:40:47 +01:00
Sakshi Jain	8b1f0453a1	5560 Hide community spotlight setting if not enabled	2015-01-20 10:31:31 +05:30
Jonne Haß	6502000429	Merge pull request #5574 from svbergerem/fix-linkify Fix markdown-it linkify blocking Firefox	2015-01-19 15:02:00 +01:00
Steffen van Bergerem	b63d8fc679	Fix markdown-it linkify blocking Firefox	2015-01-19 02:09:10 +01:00
Marcelo Briones	63eca447d0	Strip EXIF data as user preference	2015-01-18 10:28:28 -03:00
Jason Robinson	6513053586	Merge pull request #5499 from gdpelican/feature/json-exporter-deux JSON Exporter, part deux	2015-01-17 00:51:38 +02:00
James Kiesel	1c69dd7752	Add contacts/posts, and GZipping JSON exporter output	2015-01-15 00:20:19 +13:00
Steffen van Bergerem	61c17c7896	Add more markdown-it plugins activate sanitizer, sub and sup	2015-01-13 03:41:06 +01:00
Steffen van Bergerem	d692e6df7d	Bump markdown-it to 3.0.3, markdown-it-hashtag to 0.2.2 and markdown-it-diaspora-mention to 0.1.2	2015-01-11 02:54:30 +01:00
flaburgan	46223a2dfc	Don't truncate notification emails anymore, close #4342	2015-01-10 22:10:11 +01:00
Steffen van Bergerem	026773194a	Replace pagedown by markdown-it	2015-01-10 18:56:20 +01:00
Jonne Haß	9c99ae357a	Merge pull request #5493 from collimarco/solved5341	2015-01-06 14:43:58 +01:00
Jonne Haß	f20020f06b	Merge pull request #5473 from svbergerem/contacts-backbonejs Port contacts page to backbonejs	2015-01-06 14:38:55 +01:00
Jonne Haß	3f49bc52f4	Merge pull request #5468 from Flaburgan/add-followed-tags-to-mobile-menu Add followed tags to the mobile menu Conflicts: Changelog.md	2015-01-06 14:35:37 +01:00
Steffen van Bergerem	99fd5712b2	Fix jasmine specs toBeTruethy and toBeFalsy don't test anything use toBeTruthy() and toBeFalsy() instead	2015-01-04 17:13:18 +01:00
Steffen van Bergerem	9de6a26a22	Port contacts page to backbonejs	2015-01-04 17:13:18 +01:00
François Lamontagne	4c33a6adeb	Replace %{third_party_tools} by the appropriate hyperlink in tags FAQ (issue #5273 )	2015-01-03 13:25:16 -05:00
Marcelo Briones	fe6052865c	Remove limited content from email notifications	2014-12-28 22:15:47 -03:00
flaburgan	3ff298606f	Add menu mobile and drawer navigation tests	2014-12-28 18:49:03 +01:00
Jonne Haß	45b385d694	Handle reshares of deleted posts in OpenGraph tags generation code	2014-12-27 15:07:16 +01:00
Marco Colli	f775d74cfd	Add failing test	2014-12-24 11:49:35 +01:00
Marco Colli	76cc5e2d5c	Add ActiveRecord::RecordNotFound catching. Add tests.	2014-12-22 12:36:09 +01:00
margori	27a1886834	Changes delete conversation button tooltip to 'hide' or 'delete'	2014-12-19 18:26:43 -03:00
Jonne Haß	6806b2daf8	Merge pull request #5354 from gdpelican/feature/json-exporter Feature/json exporter	2014-12-17 16:45:25 +01:00
margori	e6c605d92b	Destroy conversation when all participants leave it	2014-12-17 11:33:23 -03:00
James Kiesel	e174514d69	Add JSON exporter for user profile download	2014-12-16 08:55:35 +13:00
Marcelo Briones	4e83e4c7ed	BUG: new messages to person that is not sharing Conversation recipient validated - Conversation foreign recipient not required to be validated. - Added 'peter' as spec_helper user. - New fixture, new statistic values. - Clearer identifier names	2014-12-10 17:02:20 -03:00
Jonne Haß	f4c756cd34	use URI.join in the specs too	2014-12-09 17:27:27 +01:00
Dennis Schubert	cc0c19b482	Merge pull request #5462 from jhass/open_graph_reader Bye opengraph_parser, hi open_graph_reader	2014-12-09 04:42:20 +01:00
Jonne Haß	3a92efbfaf	drop deferred garbage collection	2014-12-08 04:51:06 +01:00
Jonne Haß	74a6f42501	Bye opengraph_parser, hi open_graph_reader opengraph_parser is basically unmainted, issues are ignored or deliberately closed without fixing. It pollutes the global namespace and has no verification of correctness. The opengraph gem has basically the same issues, not really maintained, unreleased patches on master since over a year, not really smart either. So I created my own version and while at it, why not strive try to be complete and robust, although it's still a work in progress. This also improves general URL detection by parsing them from the message after stripping markdown. An additional dependency was added to support fetching sites that require cookies to work at all. For the same reason Faraday's default redirect limit was bumped.	2014-12-08 02:01:31 +01:00
Steffen van Bergerem	8a50db76b1	Only show aspect chat control if chat is enabled	2014-12-05 13:07:17 +01:00
Jonne Haß	63e9d7b73f	Update aspect list checkmarks only after the stream was fetched	2014-12-05 03:18:30 +01:00
Jonne Haß	9d5e1f604d	Make app.helpers.truncate tolerant to null and undefined	2014-12-04 16:45:00 +01:00
Dennis Schubert	339111867e	Merge pull request #5443 from jhass/spring Replace spork with spring, update & use binstubs	2014-12-04 00:38:30 +01:00
Steffen van Bergerem	4c655d8c8b	Speed up notifications controller spec	2014-12-02 02:43:01 +01:00
Jonne Haß	a580171e32	Replace spork with spring, update & use binstubs Spring is the recommended application preloader for rails	2014-12-01 08:06:07 +01:00
Jonne Haß	d22f59d6bd	Merge pull request #5447 from svbergerem/try-to-improve-notifications-spec Try to improve the notifications controller spec	2014-12-01 08:02:38 +01:00
Steffen van Bergerem	7b17b78de7	Try to improve the notifications controller spec	2014-12-01 02:27:19 +01:00
Jonne Haß	5af0b1cbdd	don't use 666 as non-existant ID in report model spec	2014-11-30 21:56:27 +01:00
Faldrian	29f55f42b6	truncate long opengraph description to 250 chars in mobile and stream view	2014-11-29 17:18:01 +01:00
Steffen van Bergerem	55b60f7bde	Remove unused files in lib	2014-11-22 21:21:38 +01:00
Lukas Matt	2712b413c3	Fixed privilege spec; use correct container for trigger event	2014-11-13 12:28:45 +01:00
Lukas Matt	bb18c8e028	Test chat privilege option; should replace text/icon on trigger	2014-11-13 11:49:03 +01:00
Lukas Matt	32dcf8cabb	Test jsxc helper spec; should respond with correct url	2014-11-13 11:43:56 +01:00
Lukas Matt	46097ba8c8	Test token authentication; should allow it	2014-11-13 11:42:24 +01:00
Dennis Schubert	aec00f834f	Add Camo for <img>-tags inside Markdown contents	2014-11-10 02:19:45 +01:00
Jonne Haß	4be6dc208f	update maintenance mailer spec for new mail text	2014-11-09 19:47:37 +01:00
Dennis Schubert	6808150920	Method calling convention and doc improvements ... and a stealth-commit of an already introduced bug prevention system. ;)	2014-11-09 07:20:30 -08:00
Dennis Schubert	a4a63c4c85	A little bit of cleanup	2014-11-09 02:27:17 +01:00
Dennis Schubert	cca0c9eec4	Some refactorings, safer regex	2014-11-08 23:12:45 +01:00
Steffen van Bergerem	25e4e558c5	Ask for confirmation when leaving a submittable publisher	2014-11-02 01:49:33 +01:00
Jonne Haß	f361a0f885	Merge pull request #5288 from jaywink/remove-old-users Maintenance feature to remove old users, scheduled in settings	2014-10-17 01:00:51 +02:00
Augier	2ce98b49d7	Fix issue #4416 Conflicts: spec/helpers/notifier_helper_spec.rb	2014-10-16 23:27:48 +02:00
Jason Robinson	69c3566958	Maintenance feature to remove old users Add Sidetiq webview to the Sidekiq monitoring panel Add rake task maintenance:queue_users_for_removal This basically just triggers an immediate run of the normal maintenance remove old users functionality that is normally (if enabled) scheduled to run once a day via sidetiq Add extra safety when checking for user removal due to inactivity. Now also user.last_seen will also be checked to make sure a user will not be removed in the event that the Devise rememember me login functionality has stopped the users remove_after timestamp from being removed. Add initializer for maintenance job. Add warning about mail being disabled if remove_old_users maintenance is enabled.	2014-10-16 22:53:08 +03:00
Jonne Haß	7313bafe86	update notifier helper spec expecatations to redcarpet 3.2	2014-10-15 01:00:27 +02:00
Jonne Haß	f532efeac5	Merge pull request #5276 from svbergerem/reshare-absolute-root Reshare the absolute root of a post Conflicts: Changelog.md	2014-10-14 19:40:35 +02:00
Jonne Haß	e892b115ac	Merge pull request #5289 from svbergerem/convert-cukes-tags Convert some cukes to rspec tests	2014-10-14 13:26:53 +02:00
Jonne Haß	a7c702d631	Merge pull request #5308 from Flaburgan/add-network-key-to-statistics Add network key to statistics.json Conflicts: Changelog.md	2014-10-14 13:25:16 +02:00
Jonne Haß	0a20d6a2b7	Merge pull request #5316 from gdpelican/feature/allow-nil-http-agent Allow nil HTTP user agent	2014-10-14 13:22:28 +02:00
Jonne Haß	8a63f6f1f7	Merge pull request #5317 from gdpelican/feature/strip-search-query Feature/strip search query	2014-10-14 13:19:36 +02:00
flaburgan	20d2b8fc5e	Add a link to a reported comment in the admin panel	2014-10-13 14:11:51 +02:00
Steffen van Bergerem	a12ca511c3	Convert close mentioned account cuke	2014-10-10 03:49:56 +02:00
Steffen van Bergerem	226f1bbfc3	Convert activity stream cuke	2014-10-10 03:49:56 +02:00
Steffen van Bergerem	823316d7f7	Convert tag cukes to rspec tests	2014-10-10 03:49:41 +02:00
Steffen van Bergerem	8ca5ca7c92	Reshare the absolute root of a post	2014-10-10 03:12:07 +02:00
James Kiesel	206ec99f8f	Strip search query of leading & trailing whitespace	2014-10-09 23:34:11 +13:00
James Kiesel	2d44107b5d	Allow nil HTTP user agent	2014-10-09 23:08:33 +13:00
flaburgan	adc839d620	Add network key to statistics.json, close #5042	2014-10-08 01:16:54 +02:00
Florian Staudacher	4f87a47d0a	Merge pull request #4657 from svbergerem/bootstrap-people-view Redesign profile page and port to Bootstrap	2014-10-06 15:09:08 +02:00
Alex Nordlund	acc7377e5f	Removed setting for statistics, showing both instead.	2014-10-05 01:45:48 +02:00
Alex Nordlund	03f3c74cee	Moved services to a JSON list. Added AppConfig.privacy.statistics.deprecated_format to toggle showing the old style format.	2014-10-05 01:07:30 +02:00
Jonne Haß	eac3f042a4	Reset dynamic configuration after each example in the testsuite	2014-10-04 00:59:03 +02:00
Jonne Haß	66c2f7f869	Fix statistics_presenter_spec	2014-10-04 01:01:19 +03:00
Jason Robinson	309e690a66	Fix services in statistics.json. Currently there is a bug in configurate that reports incorrectly the services settings if they are set as ENV variables, instead of diaspora.yml settings. This commit works around that issue by changing the way the setting is fetched.	2014-10-03 23:54:42 +03:00
Jonne Haß	1959f0d939	Merge branch 'hotfix/0.4.1.1' into develop Conflicts: Changelog.md config/defaults.yml	2014-10-03 17:14:55 +02:00
Jonne Haß	a5ca738e91	Fix XSS issue in poll questions closes #5274	2014-10-03 17:12:11 +02:00
Steffen van Bergerem	976ff0fcda	Redesign profile page and port to Bootstrap	2014-10-01 12:28:56 +02:00
Florian Staudacher	c7b4b77ce8	Merge pull request #5209 from jhass/federation_improvements Federation improvements	2014-09-27 16:18:37 +02:00
Jonne Haß	d6f5368474	Handle already deleted photos gracefully in process photo job	2014-09-20 15:13:14 +02:00
Jonne Haß	499ff6e0f4	Fix receiving a relayable retraction through the public route	2014-09-20 15:03:53 +02:00
Jonne Haß	5ca1c1d295	Raise on 404 during Webfinger That's at least readable, return false just causes silly follow up errors	2014-09-20 13:47:52 +02:00
Jonne Haß	4b754b51f9	Discard dispatch jobs of already deleted records	2014-09-20 13:39:31 +02:00
Jonne Haß	5133458d30	Start converting IDN emails	2014-09-20 04:05:57 +02:00
Jonne Haß	7da6501602	let tags controller spec generate offending query for #5228	2014-09-18 12:39:16 +02:00
Florian Staudacher	6e1bd7216d	fix /u/[username] route	2014-09-18 00:23:43 +02:00
Florian Staudacher	a5da2ca48c	small fixes and more jasmine specs	2014-09-15 01:37:24 +02:00
Florian Staudacher	10609c3692	fix jasmine and add some specs for direction detection	2014-09-15 01:37:23 +02:00
Florian Staudacher	be86014540	rspec should now be running a green build	2014-09-15 01:37:23 +02:00
Florian Staudacher	89d468cdcc	first round of specs and code cleanups/fixes	2014-09-15 01:37:23 +02:00
jaideng123	d16eabae21	Added test for truncation to gather OG data spec	2014-09-07 20:28:02 -05:00
Jonne Haß	619bc3f537	A reshares root may be already gone when generating the notification	2014-09-07 10:47:47 +02:00
Jonne Haß	777e3123d6	Try fetching missing parent of relayables * Extract post fetching logic from Reshare into its own module * raise proper error message when fetching fails * raise proper error message when parent is still missing We can't skip fetch failures or missing parents and still need to retry them in case we're sent the parent later on	2014-09-07 10:47:47 +02:00
Jonne Haß	9c88fde821	Switch Faraday adapter to typhoeus It uses curl which has less problems connecting to a missconfigured IPv6 host (falls back to v4)	2014-09-07 10:47:47 +02:00
Jonne Haß	01e0127287	Ignore embedded photos if invalid For example if they're already present Also refactor StatusMessage XML specs	2014-09-06 04:52:18 +02:00
Steffen van Bergerem	ba0bccbef1	Redirect conversations/new to conversations	2014-09-01 17:11:56 +02:00
Jonne Haß	99de61fdfa	Merge branch 'release/0.4.1.0' into develop	2014-08-30 22:15:56 +02:00
Jonne Haß	6df79f6983	so turns out whether an id is serialized to a json integer or string depends on the DB backend	2014-08-30 22:15:05 +02:00
Jonne Haß	1515848120	Merge branch 'release/0.4.1.0' into develop Conflicts: app/controllers/conversations_controller.rb spec/controllers/conversations_controller_spec.rb	2014-08-30 20:09:08 +02:00
Jonne Haß	5d549f553b	Escape person name in contacts json jQuery autoSuggest uses .html to insert it into the DOM	2014-08-30 20:06:03 +02:00
Jonne Haß	79e1a9aafd	port notify local users worker spec to doubles	2014-08-29 01:42:16 +02:00
Steffen van Bergerem	3f3087c77f	Port tags page to Bootstrap	2014-08-28 18:02:02 +02:00
Jonne Haß	ccd7c670b3	Merge pull request #5170 from khall/issue_5149a Issue 5149a Conflicts: spec/controllers/aspects_controller_spec.rb spec/controllers/contacts_controller_spec.rb	2014-08-27 18:20:56 +02:00
Jonne Haß	f1ab434b18	Merge pull request #5153 from svbergerem/redesign-contacts-page Redesign contacts page	2014-08-27 10:01:41 +02:00
khall	fe492c6fb8	Fixing a .should test to expect(), adding suggested line to spec_helper to prevent the use of .should in the future	2014-08-26 17:39:13 -07:00
khall	b7c68031fa	Last rspec fix brought to you by jhass	2014-08-26 17:12:58 -07:00
khall	c27b38d69a	Merge branch 'develop' into issue_5149 Conflicts: spec/controllers/aspects_controller_spec.rb spec/controllers/conversations_controller_spec.rb spec/controllers/people_controller_spec.rb spec/controllers/photos_controller_spec.rb spec/integration/receiving_spec.rb spec/lib/postzord/receiver/public_spec.rb spec/models/post_spec.rb spec/models/user/querying_spec.rb	2014-08-26 17:11:39 -07:00
khall	4edd824d3c	No deprecation warnings, but one spec still fails (but only when I run all the specs, not when I run just the one spec)	2014-08-26 17:10:29 -07:00
khall	c42916df27	Two tests failing after rspec 2.99 => 3.0.0	2014-08-26 17:10:26 -07:00
khall	027bb9fcb0	Rspec version bump to 2.99	2014-08-26 17:00:21 -07:00
Flaburgan	2151b4f791	Add jasmine tests	2014-08-27 00:03:49 +02:00
Steffen van Bergerem	ff84ee0485	Small style changes, add tests	2014-08-26 22:45:43 +02:00
Jonne Haß	f772af86a6	Merge pull request #5156 from khall/issue_5040 Fix for issue 5040	2014-08-26 01:16:41 +02:00
Jonne Haß	ac998407b5	bump jasmine-core	2014-08-25 19:16:55 +02:00
Jonne Haß	42b08e8ab8	Update to Rails 4.1	2014-08-25 17:37:02 +02:00
khall	6d3528c539	Fix for issue 5040: Adds completed_at column to account_deletions and sets timestamp upon successful completion. Depends on uniqueness of diaspora_handle when combined with person_id	2014-08-24 17:06:33 -07:00
Jonne Haß	2619beb157	Merge pull request #4481 from diaspora/rails4 Port to Rails 4	2014-08-24 13:42:31 +02:00
Steffen van Bergerem	c18df1c32f	Change mark read link on notifications page	2014-08-23 17:42:19 +02:00
Jonne Haß	d070f19243	make rspec and jasmine pass with the new code	2014-08-23 16:47:57 +02:00
Florian Staudacher	b07f6cf1db	adapt rebased changes to jasmine 2	2014-08-23 16:47:48 +02:00
Florian Staudacher	037671f1b6	port remaining specs - jasmine is green again (non-CI)	2014-08-23 16:46:08 +02:00
Florian Staudacher	304e560e43	use new jasmine async code	2014-08-23 16:46:08 +02:00
Florian Staudacher	d4aca571ac	add jasmine-jquery gem and use it, port some more specs	2014-08-23 16:46:08 +02:00
Florian Staudacher	4d3874cc2e	port more specs, add aspect factory	2014-08-23 16:46:04 +02:00
Florian Staudacher	adf7aa98dd	port router specs, don't test backbone - our own code is enough	2014-08-23 16:38:58 +02:00
Florian Staudacher	c81379d38f	port some more JS specs to jasmine 2.0... still a lot to do	2014-08-23 16:38:57 +02:00
Florian Staudacher	43f156420d	update jasmine mock-ajax, port SpecHelper to jasmine 2.0 - some tests should be passing again now	2014-08-23 16:38:57 +02:00
Jonne Haß	b3e59dc3d5	fix PostsController specs by using explicit form of the sign_in helper	2014-08-23 16:38:57 +02:00
Jonne Haß	244388fcb5	make aspect membership controller specs green	2014-08-23 16:34:01 +02:00
Jonne Haß	21feb91d27	always pass desired format in specs unless it's html	2014-08-23 16:34:01 +02:00
Jonne Haß	7e7082a3bd	Fix expectations for changes in generated HTML Just a minor change, supplied attributes now go before the standard ones	2014-08-23 16:34:01 +02:00
Jonne Haß	659f0b96d4	do not pass relations to a method that expects a set of aspects ids or a single aspect	2014-08-23 16:34:01 +02:00
Jonne Haß	09f0665225	replace deprecated usages for all	2014-08-23 16:34:01 +02:00
Jonne Haß	a9e107364a	make status message controller spec pass and deprecation free	2014-08-23 16:34:00 +02:00
Jonne Haß	33c3b38f2f	replace deprecated finder and finder_options syntax	2014-08-23 16:34:00 +02:00
Jonne Haß	b582e1f707	i18n.js: Add interface to retrieve entire sections And make use of that in HelpView	2014-08-18 21:06:52 +02:00
Jonne Haß	ae24495c7d	Merge pull request #5127 from Raven24/hpetru-2875-ignore-user-posts Remove ignored peoples posts without refresh (II)	2014-08-18 11:35:56 +02:00
Jonne Haß	ec02f54613	Merge pull request #5122 from jaideng123/5113-mark-as-read-by-filter Added Mark all in filter as read feature	2014-08-18 11:30:18 +02:00
Jonne Haß	fa9c079955	Merge pull request #5121 from wegotcoders/4943-add-services-to-statistics-json Service have been added to /statistics.json	2014-08-18 11:20:26 +02:00
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

... 17 18 19 20 21 ...

4836 commits