8790 commits

Author	SHA1	Message	Date
Steffen van Bergerem	eaf012c82c	Fix style regressions and code style for sidebar polishing PR	2015-08-23 13:15:01 +02:00
Steffen van Bergerem	eddfa7cb5c	Merge pull request #6309 from AugierLe42e/left-navbar-polishing ... Left and right navbar polishing	2015-08-23 11:29:51 +02:00
augier	450bf4f4ba	Refactor and minor styling	2015-08-23 09:59:12 +02:00
Steffen van Bergerem	a76b228478	Merge pull request #6321 from AugierLe42e/admin-use-bs-forms ... [Quickfix] Admin panel use 'form-control' class for selects	2015-08-22 03:56:39 +02:00
Steffen van Bergerem	36eb283546	Merge pull request #6302 from AugierLe42e/comment-button-misbehaving ... [Quickfix] Fixing comment button misbehaving	2015-08-22 02:07:14 +02:00
Steffen van Bergerem	40ef382a6e	Merge branch 'stable' into develop	2015-08-22 01:35:32 +02:00
Anton Tkachov	ef6c8a5448	Issue #6180: Update stream faces block if somebody was blocked ... closes #6320	2015-08-22 01:35:23 +02:00
augier	38f811f9fd	Admin panel use 'form-control' class for selects	2015-08-22 01:20:33 +02:00
Steffen van Bergerem	51bfc6e114	Merge pull request #6319 from AugierLe42e/body-padding-use-variable ... [Quickfix] Body padding-top use BS' SCSS variable	2015-08-22 01:19:36 +02:00
Jonne Haß	d396d5555f	Merge branch 'stable' into develop	2015-08-21 14:23:46 +02:00
Benjamin Neff	663835ed3a	remove old webfinger/hcard code ... closes #6310	2015-08-21 14:23:08 +02:00
Benjamin Neff	d28e03f053	use discovery from diaspora_federation gem	2015-08-21 14:21:43 +02:00
Lukas Matt	dbc57d9371	Load bower dependencies on jsxc initialization ... We moved the libraries from jsxc.deb.js Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>	2015-08-21 12:43:50 +02:00
Jonne Haß	b4923cc17c	Merge pull request #6276 from Zauberstuhl/fix_broken_jsxc ... bump diaspora_jsxc to v0.1.2	2015-08-19 10:18:22 +02:00
augier	95c3d9694b	Body padding-top use BS' SCSS variable	2015-08-15 11:31:25 +02:00
Augier	75b317895d	Fixing comment button misbehaving	2015-08-14 16:18:42 +02:00
augier	281d1a9161	Rebasing and fixing tests	2015-08-11 18:12:02 +02:00
Pablo Cuadrado	bc1b6bd44d	polishing the sidebar on large (lg on BS3) screens	2015-08-11 18:08:26 +02:00
Pablo Cuadrado	37e3a2749f	- left background to the far left of the screen ... - large screen breakpoints from BS3 - hover color is the same of link color (variable $blue)	2015-08-11 18:08:26 +02:00
Pablo Cuadrado	b787db13ba	minor css polishing for the username ... trying a new set of responsive grid rules	2015-08-11 18:08:26 +02:00
Pablo Cuadrado	b34f0e792f	followed tags selected state was missing	2015-08-11 18:08:26 +02:00
Pablo Cuadrado	267d98f132	leftnavbar with full sized clickable anchors, better padding, weight font reduced, overall looks polished ... fixed background added for contrast, hideable on SM or XS bootstrap-based sizes.	2015-08-11 18:08:26 +02:00
Pablo Cuadrado	c38da4c787	controlling right sidebar behaviour on large screens	2015-08-11 18:08:13 +02:00
Pablo Cuadrado	754d8107a8	reasonable max-width for right sidebar	2015-08-11 18:08:12 +02:00
Pablo Cuadrado	9bd7ceb722	removing uppercase to prevent l18n issues	2015-08-11 18:08:12 +02:00
Pablo Cuadrado	c8ba4f061e	polishing of the right sidebar	2015-08-11 18:08:12 +02:00
Steffen van Bergerem	e8acaa08ad	Remove browser detection	2015-08-10 22:55:05 +02:00
Steffen van Bergerem	8bc86eb98b	Replace jquery.autocomplete with typeahead.js	2015-08-10 22:55:05 +02:00
Jonne Haß	25be9ecfd2	Merge branch 'stable' into develop	2015-08-09 18:35:44 +02:00
theworldbright	d7c92431ae	Extract service from comments controller ... closes #6307	2015-08-09 18:35:11 +02:00
Jason Robinson	cb909c0d70	Strip leading/trailing whitespace from pod tags list in social relay well known ... Closes #6303	2015-08-09 00:33:35 +03:00
Jonne Haß	480384a077	Merge branch 'stable' into develop	2015-08-06 22:56:30 +02:00
Steffen van Bergerem	dc576fb0d6	Check if person is nil in person_image_tag ... closes #6286	2015-08-06 22:55:41 +02:00
Steffen van Bergerem	0aa453e437	Merge pull request #6291 from AugierLe42e/change-actions-icons-mobile ... Use entypo icons on mobile posts	2015-08-06 18:00:03 +02:00
augier	f917757b5b	Use entypo icons on mobile posts	2015-08-06 15:56:58 +02:00
Steffen van Bergerem	633d65fe27	Merge branch 'stable' into develop	2015-08-06 14:42:28 +02:00
Anton Tkachov	f1d6e9440b	Issue #6281: add url to hovercard avatar ... closes #6297	2015-08-06 14:42:14 +02:00
Jonne Haß	85f9a0eaa9	Merge branch 'stable' into develop	2015-08-04 10:41:43 +02:00
Mikica Ivosevic	78b0fbbee6	Refactor HomeController#toggle_mobile ... closes #6260	2015-08-04 10:41:21 +02:00
augier	5087f47e44	Suppress useless images	2015-08-02 21:42:09 +02:00
Jonne Haß	b7864a9976	Merge branch 'stable' into develop	2015-08-02 16:58:07 +02:00
theworldbright	cae5f94af0	Refactor status messages controller ... closes #6280	2015-08-02 16:58:01 +02:00
Steffen van Bergerem	8e99a240c9	Use css spinner instead of gif	2015-08-01 13:00:48 +02:00
Lukas Matt	fbc88ab56f	Adjusting chat implementation into diaspora container ... Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>	2015-07-30 22:42:33 +02:00
Lukas Matt	524a0bdaf0	Obsolete with diaspora/jsxc#113 ... Using the logout element caused some trouble in the past Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>	2015-07-30 22:41:47 +02:00
Lukas Matt	9a96836594	Load bower dependencies on jsxc initialization ... We moved the libraries from jsxc.deb.js Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>	2015-07-30 22:40:19 +02:00
Steffen van Bergerem	bc89f73179	Add Bootstrap classes to mobile getting started input fields	2015-07-30 14:44:14 +02:00
Jonne Haß	4442616b0d	Merge branch 'stable' into develop	2015-07-30 12:01:35 +02:00
Steffen van Bergerem	536d1fe0e7	Move nsfw-shield to status-message ... closes #6270	2015-07-30 12:00:48 +02:00
Steffen van Bergerem	bdfbbdc3eb	Merge branch 'stable' into develop	2015-07-30 04:20:26 +02:00
Mohammed Rashid	dd42635442	Issue #6235: Add hoverable class inside the a tag ... closes #6267	2015-07-30 04:18:06 +02:00
Steffen van Bergerem	e402bbdd3d	Merge pull request #6245 from AugierLe42e/fix-nsfw-author ... Fix nsfw author	2015-07-30 00:28:15 +02:00
augier	9a23c92f8e	Show author of NSFW post	2015-07-29 21:13:41 +02:00
fla	4aef8de571	Improve mobile drawer	2015-07-29 14:22:19 +02:00
Dennis Schubert	23c83b9447	Merge branch 'stable' into develop	2015-07-29 12:10:36 +02:00
Steffen van Bergerem	d8505b2ae0	Fix conversations view with no contacts ... closes #6266	2015-07-29 12:08:35 +02:00
Jonne Haß	4abc0c5988	Merge branch 'stable' into develop	2015-07-29 10:06:04 +02:00
Steffen van Bergerem	67653cf465	Update backbone.js ... closes #6262	2015-07-29 10:04:18 +02:00
Jonne Haß	4094fb260d	Merge pull request #6263 from svbergerem/remove-remaining-span ... Remove remaining span-* and improve mobile photos page	2015-07-29 01:35:05 +02:00
Steffen van Bergerem	816092c477	Remove remaining span-* and improve mobile photos page	2015-07-28 23:36:47 +02:00
Steffen van Bergerem	a2349052f4	Use autosize for mobile publisher	2015-07-28 20:15:11 +02:00
Steffen van Bergerem	1c11b374bf	Remove mbp-helper	2015-07-28 19:50:17 +02:00
Jonne Haß	602ad2d209	Merge branch 'stable' into develop	2015-07-28 18:35:18 +02:00
Mikica Ivosevic	c8b01cb62c	application_controller.rb ... refactor method after_sign_out_path_for closes #6258	2015-07-28 18:35:13 +02:00
Jonne Haß	d62c4387f3	Merge branch 'stable' into develop	2015-07-28 18:24:19 +02:00
cmrd Senya	fa411c73a7	Remove unused minified js files mbp-respond.min.js and mbp-modernizr-custom.js (#5939). ... closes #6257	2015-07-28 18:24:10 +02:00
SansPseudoFix	a0eb2f065c	Fix capitalize for powered by diaspora - translation	2015-07-27 13:47:34 +02:00
Dennis Schubert	04135d7b28	Merge branch 'stable' into develop	2015-07-27 02:05:14 +02:00
Steffen van Bergerem	6fea450777	Fix mobile photos index page ... closes #6243	2015-07-27 01:59:26 +02:00
Jonne Haß	6ee3843449	Merge branch 'stable' into develop	2015-07-26 13:11:49 +02:00
theworldbright	2a3dde1ae5	Refactor PostService and extract its tests ... Squashed commits: [ada0f09] Remove favorites from Posts table closes #6208	2015-07-26 13:10:24 +02:00
theworldbright	d724397168	Refactor posts controller	2015-07-26 12:58:42 +02:00
Steffen van Bergerem	1aebf74a3f	Merge pull request #6247 from AugierLe42e/bs3-regression-profile-stream ... Fix page width on people view (BS3 regression)	2015-07-26 12:38:20 +02:00
Steffen van Bergerem	7f28c79156	Merge pull request #6246 from AugierLe42e/spv-align-icons ... Better alignement of interaction icons	2015-07-26 01:46:37 +02:00
Dennis Schubert	e8297f8d6b	Merge pull request #6207 from jaywink/social-relay ... Implement social relay requirements	2015-07-25 23:01:45 +02:00
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
augier	00674fee74	Fix page width on people view (BS3 regression)	2015-07-24 21:08:54 +02:00
augier	1423ba73b8	Better alignement of interaction icons	2015-07-24 20:08:29 +02:00
Steffen van Bergerem	04191996a5	Add updates for 'only sharing' and 'all contacts'	2015-07-24 14:18:43 +02:00
Jonne Haß	97c9561ab7	Merge branch 'stable' into develop	2015-07-24 11:33:47 +02:00
Jonne Haß	b9bc20c7ce	Backport statistics page to Bootstrap 2	2015-07-24 11:30:34 +02:00
Jonne Haß	c76cf90b62	Readd legacy services to statistics.json	2015-07-24 10:57:37 +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
Dennis Schubert	929248c112	Merge pull request #6230 from Flaburgan/add-viewport ... Add viewport to desktop view	2015-07-23 23:46: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	6fafa731e6	Display locations on mobile devices	2015-07-23 16:06:28 +02:00
Steffen van Bergerem	5d39461443	Display polls on mobile devices	2015-07-23 14:09:38 +02:00
Steffen van Bergerem	853dc093cd	Fix poll design (show result)	2015-07-23 12:59:29 +02:00
Steffen van Bergerem	031faeece5	Fix regression for default.html	2015-07-22 22:00:37 +02:00
Jonne Haß	2cede713b1	Merge pull request #6228 from svbergerem/refactor-publisher-js ... Refactor publisher_view.js	2015-07-22 20:59:35 +02:00
fla	2090b5f909	Add viewport to desktop view	2015-07-22 19:27:30 +02:00
Steffen van Bergerem	3d6918646e	Add js for aria-labelledby in conversations	2015-07-22 18:37:02 +02:00
Steffen van Bergerem	44c370513e	Refactor publisher_view.js	2015-07-22 17:36:25 +02:00
Jonne Haß	5ecafa2bb0	Merge pull request #6227 from svbergerem/accessibility ... Improve accessibility of signin/signup/password and conversation pages	2015-07-22 15:09:21 +02:00
Steffen van Bergerem	5fd89961c4	Use aria-labelledby for conversations	2015-07-22 13:02:16 +02:00
Steffen van Bergerem	4819544030	Use sr-only and aria-labelledby on signup/signin/password pages	2015-07-22 12:24:09 +02:00
Jonne Haß	3af30718f9	Merge branch 'stable' into develop	2015-07-22 11:55:59 +02:00
Steffen van Bergerem	aa53763b98	Fix peeping tom on 404 error page ... closes #6226	2015-07-22 11:55:24 +02:00
Jonne Haß	6e2a2d420c	Merge branch 'develop' of github.com:diaspora/diaspora into develop	2015-07-22 10:07: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
Dennis Schubert	3210fb3835	Merge pull request #6224 from svbergerem/sticky-footer ... Sticky footer	2015-07-22 04:21:18 +02:00
Steffen van Bergerem	37352b1b10	Sticky footer	2015-07-22 02:40:23 +02:00
Steffen van Bergerem	839d76c15e	Moar entypo on mobile website	2015-07-21 21:16:46 +02:00
Steffen van Bergerem	484e70a68f	Add dashboard to admin page	2015-07-21 14:36:41 +02:00
Dennis Schubert	b4bc7d8198	Merge branch 'stable' into develop	2015-07-20 03:56:59 +02:00
Dennis Schubert	53c3ef1d2b	Merge branch 'release/0.5.2.0' into stable	2015-07-20 03:52:22 +02:00
Steffen van Bergerem	cf4143f4a1	Remove jquery-idletimer	2015-07-20 03:51:03 +02:00
Steffen van Bergerem	94b745d5c8	Merge branch 'stable' into develop	2015-07-20 01:31:33 +02:00
Ivan Korunkov	5ca9ca9844	Default home page: fix wiki link title; GitHub wiki is obsolete, because it has been moved from GitHub to independent resource. ... closes #6212	2015-07-20 01:31:22 +02:00
Ivan Korunkov	c98dacdfab	Default home page: fix indent level; fix indentation level for configuration message block to make it looks like other blocks.	2015-07-20 01:29:00 +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ß	3a4815996f	Merge branch 'stable' into develop	2015-07-17 20:21:19 +02:00
Rich**	48f5aed63e	Make default conversation subject translatable and properly capitalize it ... closes #6206, closes #6205	2015-07-17 20:20:00 +02:00
Steffen van Bergerem	295c8533a1	Fix profile visibility icon	2015-07-17 14:37:22 +02:00
Dennis Schubert	0f51d89ba5	Merge pull request #6200 from AugierLe42e/fix-stream-faces ... Better display for stream faces	2015-07-16 03:39:21 +02:00
Augier	adef7ee37c	Better display for stream faces	2015-07-15 20:31:40 +02:00
Jonne Haß	9229f1dfd2	Merge branch 'stable' into develop	2015-07-14 09:58:59 +02:00
Alex Chvatal	634aa7b09a	capitalize Wiki in the links sidebar. closes #6188 ... closes #6193	2015-07-14 09:58:43 +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	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
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	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
Dennis Schubert	aa86003cf9	Keep the hacky scope workaround in comments.js ... because we still are supporting browsers without .bind() and I do not want to break the patterns here. Follow up to #6171 - I wanted to avoid feedback loop delays for that little change.	2015-07-09 03:24:15 +02:00
Spanti Nicola (RyDroid)	df440ed8d8	Very minor changes of some JS files	2015-07-08 19:09:08 +02:00
Dennis Schubert	c703cadf9b	Merge branch 'stable' into develop	2015-07-07 02:51:38 +02:00
Dennis Schubert	b5b5f1f028	Revert "Issue #6145: Set a fixed body-height" for global side effects ... This reverts commit 990c678cd3.	2015-07-07 02:50:30 +02:00
Dennis Schubert	eecceacd46	Merge branch 'stable' into develop	2015-07-07 02:46:39 +02:00
Haidy777	990c678cd3	Issue #6145: Set a fixed body-height ... closes #6169	2015-07-07 02:46:34 +02:00
Jonne Haß	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	f45e053316	remove unused publics_helper ... the Subscriber stuff was removed in 2010: f97218c005	2015-07-05 20:44:24 +02:00
Benjamin Neff	540b8df1b8	don't get url from hcard, is already set from webfinger ... prepare for federation refactoring	2015-07-05 20:44:24 +02:00
Benjamin Neff	2294e59ee3	change public_url to atom_url and profile_url	2015-07-05 20:44:24 +02:00
Jonne Haß	69974bdc13	Merge pull request #6161 from svbergerem/fix-conversation-modal ... Fix two modal issues	2015-07-03 20:26:31 +02:00
Steffen van Bergerem	61edda0fca	Aspect creation modal now creates an aspect when pressing enter	2015-07-03 18:20:32 +02:00
Steffen van Bergerem	db00bd1b03	Fix conversation modal on contacts page	2015-07-03 17:44:12 +02:00
Steffen van Bergerem	aeda8e37e3	Remove aspects-dropdown.js	2015-07-03 16:56:25 +02:00
Jonne Haß	7d32000bd0	Merge branch 'stable' into develop	2015-07-03 16:34:18 +02:00
cmrd Senya	fe3ff10e07	Add new daily job to clean cache in public/tmp (as suggested in #5946).	2015-07-03 16:34:01 +02:00
Steffen van Bergerem	9c4f80346b	Use entypo-rails mappings	2015-07-03 15:31:29 +02:00
Dennis Schubert	e0782437b8	Merge branch 'stable' into develop	2015-07-03 05:26:01 +02:00
theworldbright	d410d2ee76	Fix bug where flash error reappeared #6136 ... closes #6146 closes #6136	2015-07-03 05:25:22 +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
Dennis Schubert	8b773c89e1	Merge pull request #6066 from theworldbright/5483-fix-mobile-stream-comments ... Fix for #5483 and #5757 (mobile stream comments)	2015-06-27 04:43:50 +02:00
Jonne Haß	a2d894cb39	Improve stability for manages_aspects.feature:79 ... page.execute_scripts looks to be asynchronous, .synced is already set by default, so the previous expectation would be fulfilled before the script got to run, running into the page reload in the next step which then aborts or hasen't seen the to be triggered request yet. The fix is to use Capybaras drag_to instead	2015-06-24 04:01:15 +02:00
Jonne Haß	0b6dc320cb	Merge pull request #6132 from svbergerem/fix-perfect-scrollbar ... Fix overflow with perfect scrollbar	2015-06-22 01:29:40 +02:00
Steffen van Bergerem	df12878371	Fix overflow with perfect scrollbar	2015-06-22 00:44:42 +02:00
Steffen van Bergerem	d6ddbbe4af	Navbar background color for autocomplete results	2015-06-21 21:13:57 +02:00
Jonne Haß	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
Jonne Haß	79c5202a5b	Merge pull request #6109 from svbergerem/bootstrap-header-rewrite ... Bootstrap header rewrite	2015-06-21 19:46:07 +02:00
SansPseudoFix	57ac37cd2d	Fix broken avatar getting start page ... Update add contact page BS3 Fix syntax	2015-06-21 16:38:12 +02:00
Steffen van Bergerem	8d5794a2a4	Fix autoresize default height for comment box	2015-06-21 04:40:56 +02:00
Steffen van Bergerem	b3c535bab4	Add color theme support for new header	2015-06-20 00:38:40 +02:00
Steffen van Bergerem	049c8eb384	Bootstrap header rewrite	2015-06-20 00:38:40 +02:00
Steffen van Bergerem	e890ffa698	Merge branch 'stable' into develop	2015-06-19 22:20:57 +02:00
Faldrian	0fa571d5e4	Fixed more-button wording when there are <15 posts	2015-06-19 22:17:21 +02:00
Steffen van Bergerem	078e7a722f	Merge branch 'stable' into develop	2015-06-19 21:30:15 +02:00
SansPseudoFix	cce5a98537	Add link to pod statistics in right navigation ... closes #6117	2015-06-19 21:29:25 +02:00
Flaburgan	3e4b8500a4	Refactor Account settings page with bootstrap grid	2015-06-18 17:26:31 +02:00
fla	5537e8687b	Extract privacy_settings content in a partial	2015-06-18 17:26:31 +02:00
fla	264f41a09d	Add Services and Privacy settings page to mobile	2015-06-18 17:26:31 +02:00
theworldbright	3ac66128ad	Restyle button and adjust position of back up arrow ... Squashed commits: [47c4a02] Remove styling for return to top of post button	2015-06-17 22:23:25 +09:00
theworldbright	5fa4519e93	Fix #5757 (+2 squashed commits) ... Squashed commits: [e10acde] Open reactions after commenting [aceea75] Fix hound remarks and reactions tests The ".comment_action" should be active when the user clicks on "a.show comments" [d1deae5] Fix hound remarks [f5db5dd] Keep current instead of scrolling to first comment [be63092] Remove unused evt parameter	2015-06-17 22:23:25 +09:00
theworldbright	7dc70c7311	Fix #5483 ... Please see https://github.com/diaspora/diaspora/issues/5483#issuecomment-109277476 (+5 squashed commits) Squashed commits: [62f38a6] Wrap all handlers with document.ready() Also add the copyright at the top of the file. [e861587] Split up show_comments handling Currently there are two classes that have the class show_comments. I renamed one to "back_to_stream_element_top" as it is responsible for scrolling the user all the way up to the top when clicked. The other which toggles the reactions will remain as "show_comments". [a8dbc4e] Remove unused "cancel new comment" action [db575cc] Move comment related js to mobile_comments.js [de44f81] Move add comment container to new comment partial	2015-06-17 22:23:25 +09:00
Jonne Haß	93281d283f	Merge branch 'stable' into develop	2015-06-17 12:40:27 +02:00
Pablo Cuadrado	c050c606c2	this was causing an empty element to be created ... closes #6111	2015-06-17 12:40:22 +02:00
Steffen van Bergerem	ae0209b49b	Merge branch 'stable' into develop	2015-06-16 23:43:32 +02:00
Jonne Haß	3a527d01da	Remove top margin for first heading in a post ... That is, if it's the first element in the post closes #6110	2015-06-16 23:43:14 +02:00
Steffen van Bergerem	b3a5e92eca	Remove all faceboxes	2015-06-15 14:09:24 +02:00
Steffen van Bergerem	ab60644aa0	Merge pull request #6087 from Flaburgan/improve-mobile-conversation-design ... Improve mobile conversation design	2015-06-15 13:26:49 +02:00
fla	44a12e74b1	Improve mobile conversation design	2015-06-15 12:32:03 +02:00
Jonne Haß	50dbe0db80	Merge pull request #6102 from svbergerem/close-account-regression ... Fix Bootstrap 3 regression: close account	2015-06-14 22:21:11 +02:00
Steffen van Bergerem	92a3dd53f0	Replace jquery.autoresize with autosize	2015-06-14 20:03:15 +02:00
Steffen van Bergerem	4534ba5de8	Fix Bootstrap3 regression: close account	2015-06-14 13:22:39 +02:00
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
Jonne Haß	72bb85eeba	Merge branch 'stable' into develop	2015-06-08 16:59:31 +02:00
Steffen van Bergerem	5516926b74	Update perfect-scrollbar ... closes #6085	2015-06-08 16:59:27 +02:00
Dennis Schubert	8a4ec1d4c6	Merge branch 'stable' into develop	2015-06-08 04:18:38 +02:00
Benjamin Neff	ed10bea21f	don't dispatch photos twice ...	2015-06-08 04:15:17 +02:00
Dennis Schubert	ad52eaf6d7	Merge branch 'stable' into develop	2015-06-08 04:09:57 +02:00
Jan Berdajs	ec4e7b4a69	upgrade Twitter gem - fixes Faraday deprecation warning	2015-06-08 04:08:02 +02:00
Jonne Haß	67de83f325	Merge pull request #6080 from svbergerem/user-edit-remove-cancel-button ... Remove cancel button from user edit	2015-06-08 01:07:51 +02:00
Jonne Haß	3975f02f2c	Merge pull request #6081 from svbergerem/email-visibility ... Fix Bootstrap 3 regression: add email visibility icon to settings page	2015-06-08 01:07:35 +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
Benjamin Neff	0ffb83d351	load conversations and visibilities in one query with correct order	2015-06-08 00:44:41 +02:00
Steffen van Bergerem	6c32fa7845	Fix Bootstrap 3 regression: add email visibility icon to settings page	2015-06-07 22:31:58 +02:00
Steffen van Bergerem	9ad58c94a1	Remove cancel button from user edit	2015-06-07 21:49:11 +02:00
Jonne Haß	1c834d49d8	Merge branch 'stable' into develop	2015-06-07 21:14:51 +02:00
Benjamin Neff	735d692ac0	fix selected week on weekly stats page ... closes #6079	2015-06-07 21:14:47 +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ß	c054d17bbb	Merge pull request #6074 from svbergerem/mobile-notification-padding ... Fix some Bootstrap 3 regressions	2015-06-07 17:23:08 +02:00
Jonne Haß	fe8b06bb36	Merge pull request #6073 from svbergerem/mobile-contacts ... Bootstrap 3 regression: Fix mobile contacts view	2015-06-07 15:08:25 +02:00
Steffen van Bergerem	4f9ac8dd96	Fix Bootstrap 3 regressions ... * mobile notification padding * width of mobile notifications and stream page	2015-06-07 12:48:12 +02:00
Steffen van Bergerem	fcb9b001a2	Bootstrap 3 regression: Fix mobile contacts view	2015-06-07 12:13:21 +02:00
Steffen van Bergerem	06a1a1c978	Fix Bootstrap3 regression: reshares in SPV	2015-06-07 12:01:13 +02:00
Jonne Haß	4ae032e61d	Merge pull request #6071 from svbergerem/upload-images-style ... Fix progress bar in publisher when uploading images	2015-06-07 11:26:39 +02:00
Augier	0d0d5d6aa1	Fixing infinite scroll and notif dropodown loaders	2015-06-07 10:28:22 +02:00
Steffen van Bergerem	a7446dd5cd	Fix progress bar in publisher when uploading images	2015-06-07 03:43:57 +02:00
Steffen van Bergerem	7b7700b317	Bootstrap3 regression fixes: avatars for likes, aspect dropdown on notification page, tag input	2015-06-05 12:09:42 +02:00
Steffen van Bergerem	fd3da0f0b3	Profile padding fixes	2015-06-05 02:37:43 +02:00
Steffen van Bergerem	0a0c3f48f2	Merge pull request #6057 from AugierLe42e/drawer-fix ... Fixed variable drawer width	2015-06-05 00:21:36 +02:00
Steffen van Bergerem	39fe6bfff2	Set max-width to 100% for images in post-content	2015-06-05 00:12:05 +02:00
Steffen van Bergerem	2da262a262	Bootstrap3: fix likes avatars and conversation participants	2015-06-04 22:49:42 +02:00
Augier	7d1bba4e44	Fixed variable drawer width	2015-06-04 22:35:19 +02:00
SansPseudoFix	f3938a173e	Fix pagination issue for mobile view	2015-06-04 18:08:00 +02:00
Steffen van Bergerem	3fdb8a2052	Fix mobile drawer	2015-06-04 18:05:45 +02:00
Steffen van Bergerem	93dd3a3a72	Use nav-tabs for ToS	2015-06-04 18:05:45 +02:00
Steffen van Bergerem	797ae8a918	Remove bootstrap-fix.scss	2015-06-04 18:05:45 +02:00
Steffen van Bergerem	20c63b20ba	Remove inline css, use font-size-small	2015-06-04 18:05:45 +02:00
SansPseudoFix	9f6d6a2e80	Fix for too long username in notification dropdown	2015-06-04 18:05:45 +02:00
Steffen van Bergerem	cc58c66e3d	Use media objects for mobile posts/comments/notifications	2015-06-04 18:05:44 +02:00
Steffen van Bergerem	700df9af23	Fix jasmine tests ... Fix notifications jasmine tests	2015-06-04 18:05:44 +02:00
Steffen van Bergerem	f64eb9ff41	Fix hound remarks	2015-06-04 18:05:44 +02:00
theworldbright	98f11b944a	Fix styleguide violations ... Fix hound remark 12 Remove unnecessary explicit div tag Rename el_**** to ****El (hound remark 2 and 3) Only find and replace operations were done with this commit Fix hound remark 4 and 8 Fix hound remark 6 Fix hound remark 7 Fix hound remark 9 Fix hound remark 10 and 11 Fix hound remark 13 Fix hound remark 1 Change single quotes to double quotes Change single quotes to double in publisher view Fix camelCase and missing {} in publisher view Change single quotes to double in bookmarklet view Use dot notation for serializedForm in publisher Change single quotes to double in bookmarklet spec Change single quotes to double in publisher spec Fix missing {} in publisher views Use ruby 1.9 hash syntax in invite_link Fix indentation in publisher view	2015-06-04 18:05:44 +02:00
Steffen van Bergerem	a3725599ef	Use darker version creation-blue and creation-green for brand-primary and brand-success	2015-06-04 18:05:44 +02:00
Steffen van Bergerem	f5bb4a4557	Refactor button colors	2015-06-04 18:05:44 +02:00
Augier	d7522d9498	corrected failing cuke and social buttons	2015-06-04 18:05:44 +02:00
Jonne Haß	e3bff1f20b	Fix syntax error in shared/_modal.haml ... Also can't use quoted keys there yet because of Ruby 2.1	2015-06-04 18:05:44 +02:00
theworldbright	5589dac108	Perform compositional styling to "getting started"	2015-06-04 18:05:44 +02:00
theworldbright	ed5f7837b5	Fix styleguide violations ... Fix hash syntax 3 Fix hash syntax 1 and 2	2015-06-04 18:05:43 +02:00
Steffen van Bergerem	46abdbdd1f	Style fixes for left navbar in notification view	2015-06-04 18:05:43 +02:00
Steffen van Bergerem	8e9ceb9a2b	Improve no message text and delete icon for conversations, fix regressions	2015-06-04 18:05:43 +02:00
Augier	0cbf581176	Better settings display	2015-06-04 18:05:43 +02:00
theworldbright	0e30c07903	Change line height to 20px for entypo form icons	2015-06-04 18:05:43 +02:00
Steffen van Bergerem	8a004ee02a	Overwrite Bootstrap variables and fix publisher	2015-06-04 18:05:43 +02:00
theworldbright	e372b4eb95	Remove some inline css and minor refactoring	2015-06-04 18:05:43 +02:00
Augier	207b6c6153	Port to Bootstrap 3 ... correcting images display on stream sidebar Corrections on profile page	2015-06-04 18:05:43 +02:00
Dennis Schubert	b41007fae7	Merge branch 'stable' into develop	2015-06-04 04:18:34 +02:00
Benjamin Neff	27b4a44e4a	replace Rails.logger with logging-logger ... closes #6041	2015-06-04 04:17:15 +02:00
Benjamin Neff	b6c46b3fc4	add logging mixin and replace federation-logger	2015-06-04 04:16:03 +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
Jonne Haß	b722a75a44	Merge branch 'stable' into develop	2015-06-02 00:44:56 +02:00
Benjamin Neff	a7fa3eabcb	Disable autocorrect/autocapitalize for the username ... and cleanup the code so it follows the code guidelines closes #5955 closes #6028	2015-06-02 00:44:47 +02:00
Dennis Schubert	70da822d69	Merge branch 'stable' into develop	2015-06-01 04:55:32 +02:00
Steffen van Bergerem	35e75b3c64	Atom feed: set post title length to 50 and use configured pod name in the feed title ... closes #6020	2015-06-01 04:55:27 +02:00
Jonne Haß	c196ef11bb	Merge branch 'stable' into develop	2015-05-31 20:40:18 +02:00
theworldbright	45a5e3d1c5	Change markdown-content hr style #5987 ... The <hr> tag in the markdown-content was #eee, and thus almost invisible. It has been changed to $border-gray (currently #ddd) to be consistent with the other <hr> tags. Adjust markdown-content hr style further The hr tag is now centered at 85% width. It also adds a default vertical margin that is equivalent to the 0.8em the paragraph tags provide. Refactor scss for markdown-content hr Closes #6016	2015-05-31 20:39:55 +02:00
Dennis Schubert	7401808e3f	Merge branch 'stable' into develop	2015-05-31 01:49:43 +02:00
Benjamin Neff	76ca4fdc70	use image_url for the logo in mails ... closes #6013	2015-05-31 01:49:38 +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ß	146f7eea52	Merge branch 'stable' into develop	2015-05-29 11:42:03 +02:00
Sandip Trivedi	b026a2afe8	Replaces facebox vendored asset with rails gem #5194 ... closes #6005	2015-05-29 11:41:57 +02:00
Jonne Haß	6581c580f8	Merge branch 'stable' into develop	2015-05-29 11:39:36 +02:00
Benjamin Neff	604ffb445a	optimized sprites ... - move mobile icons to mobile-folder, so they aren't included in the icons-sprite - move logos to branding/logos, and create a logos-sprite without the big other branding-images - delete duplicate images closes #6004	2015-05-29 11:39:30 +02:00
Benjamin Neff	247e9efe49	remove unused branding images	2015-05-29 11:39:01 +02:00
Benjamin Neff	bd8888291d	remove more old assets	2015-05-29 11:39:01 +02:00
Benjamin Neff	a22be8a4cb	remove unused social media logos and add attribution	2015-05-29 11:39:01 +02:00
Benjamin Neff	36b1568d32	remove old unused icons (mostly replaced by entypo)	2015-05-29 11:39:00 +02:00
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	8c408a57ae	Merge branch 'stable' into develop	2015-05-26 05:25:43 +02:00
Dennis Schubert	62e8f87f2c	Do not mute ActiveRecord::RecordNotUnique for now see #5971, regression from #5938 ... closes #5992	2015-05-26 05:25:39 +02:00
Dennis Schubert	aae11e07ae	Merge branch 'stable' into develop	2015-05-25 04:23:33 +02:00
Benjamin Neff	b491ecac31	wrap the sidekiq logger to add the context info again ... closes #5988	2015-05-25 04:23:28 +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
Dennis Schubert	70dc4fcab1	Merge branch 'stable' into develop	2015-05-22 02:53:55 +02:00
Benjamin Neff	be3b2852be	use logging-logger for sidekiq ... closes #5975	2015-05-22 02:53:50 +02:00
Jonne Haß	9b7a3c86e6	Merge branch 'stable' into develop	2015-05-21 00:46:59 +02:00
Benjamin Neff	9cc0faa4e6	fixes reshares with no text but with photo ... regression from 1da1c53f203e6eb9dad50872e573a4965219ef92 closes #5976	2015-05-21 00:46:50 +02:00
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	cde9b24476	fix margin/padding for "original post deleted"-message	2015-05-19 02:59:31 +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	494c03a3fd	re add user atom feed on profile-page	2015-05-18 03:23:15 +02:00
Benjamin Neff	196e438286	remove some hardcoded diasporahq hax	2015-05-18 03:23:14 +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
Dennis Schubert	3ae370780c	Merge branch 'stable' into develop	2015-05-16 03:42:18 +02:00
Steffen van Bergerem	716952dc0d	Put 'email not visible' text into popover/tooltip ... closes #5956	2015-05-16 03:42:14 +02:00
Akash Agrawall	8c7aa38aba	Indicates in the setting that the email is not visibile to the other users #5315	2015-05-16 03:41:52 +02:00
Dennis Schubert	1f084c28a8	Merge branch 'stable' into develop	2015-05-16 03:40:24 +02:00
Jason Robinson	ce16a122fc	Fix missing localization of inactive user removal warning emails. ... Fixes #5950	2015-05-16 03:40:06 +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
Jonne Haß	890029b19e	Merge branch 'stable' into develop	2015-05-10 14:26:26 +02:00
Dennis Schubert	1a4e3cef48	Mute ActiveRecord::RecordInvalid due to ignores ... closes #5943	2015-05-10 14:26:21 +02:00
Dennis Schubert	32f95a860c	We don't always have invalid record messages ... so log the exception message instead.	2015-05-10 14:25:50 +02:00
Dennis Schubert	3f3148af2c	Merge branch 'stable' into develop	2015-05-10 02:00:41 +02:00
Steffen van Bergerem	0c5443d543	Make js-routes use compact and camelcase function names ... closes #5941	2015-05-10 02:00:30 +02:00
Steffen van Bergerem	1428369849	Mobile: Add button to follow/unfollow tags	2015-05-10 01:59:50 +02:00
Jonne Haß	59e77675ce	Merge branch 'stable' into develop	2015-05-10 00:10:19 +02:00
Dennis Schubert	6273c2959a	Rescue from private objects sent to the public api ... closes #5938	2015-05-10 00:10:12 +02:00
Dennis Schubert	915dee3c4b	Mute some ActiveRecord::RecordNotUnique exceptions	2015-05-10 00:09:25 +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ß	abeb99bb7c	Merge pull request #5930 from Raven24/fix3076 ... limit the GET request to the bookmarklet to ~2000 chars	2015-05-05 21:32:44 +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ß	bd17c528e1	Merge branch 'stable' into develop	2015-05-05 18:02:26 +02:00
Rich	2ce0e8045b	Change <subtitle> branding on atom feeds ... Minor consistency change ( from Diaspora to diaspora* ) closes #5929	2015-05-05 18:02:14 +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
Dennis Schubert	9db8cea504	Merge branch 'stable' into develop	2015-05-04 04:42:20 +02:00
efstrian	63be9d57b6	Issue #5884: Added link to diasporafoundation.org to invitation email (en)	2015-05-04 04:42:08 +02:00
Jonne Haß	2570d88cc3	Merge pull request #5904 from Raven24/JesseWeinstein-patch-1 ... prefill bookmarklet with markdown-formatted content	2015-05-04 04:10:03 +02:00
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ß	2dc7f4c2b5	Merge branch 'stable' into develop	2015-05-04 03:51:38 +02:00
Steffen van Bergerem	dd2e1ea29e	Use rails-assets for jquery.elastic.js	2015-05-04 03:51:20 +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ß	8172eee43c	Merge branch 'stable' into develop	2015-05-04 03:31:34 +02:00
Steffen van Bergerem	1fc31cc313	Fix close account for mobile view ... and use Bootstrap modal for desktop close account	2015-05-04 03:31:28 +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
Florian Staudacher	0bb316e893	update bookmarklet ... * snippet now in a separate JS file - compiled and uglified with the other assets * popup gets centered in opening browser window * publisher gets pre-filled with markdown-styled content	2015-05-01 20:20:46 +02:00
Florian Staudacher	9479be6360	Merge branch 'patch-1' of git://github.com/JesseWeinstein/diaspora into JesseWeinstein-patch-1	2015-05-01 13:18:46 +02:00
Jonne Haß	59e8fc93a2	Merge pull request #5559 from SWW13/aspect_sort ... Readd aspect sorting	2015-04-30 13:02:24 +02:00
Steffen van Bergerem	31bbfe8eab	Merge pull request #5887 from szlend/5874-fix-bold-links ... Issue #5874 Fix styled links	2015-04-30 11:05:24 +02:00
Benjamin Neff	28c9cfdfd4	write cucumber test and add order_id on create	2015-04-28 02:38:28 +02:00
Benjamin Neff	3c09756417	refactoring javascript and controller ... - move to contacts.js - use json - move to aspects_controller - add route - rewrite test - fix css in chrome	2015-04-28 01:57:43 +02:00
Simon Wörner	cee4f1c3cd	fixed aspect sorting, added minimal jquery ui, added test	2015-04-26 01:57:00 +02:00
Simon Žlender	f5ce612299	Issue #5874 Fix styled links	2015-04-25 16:51:11 +02:00
Martin Artnik	283f22fc84	Fix unconventional image asset inclusion in css asset	2015-04-25 16:18:27 +02:00
Simon Wörner	4c13fd2b42	Revert "remove aspect sorting logic" ... This reverts commit 8d8d3c649a. Conflicts: app/assets/javascripts/main.js	2015-04-25 02:16:54 +02:00
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	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
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
Steffen van Bergerem	7648b58c15	Merge pull request #5875 from SuperTux88/add-mumble-protocol ... add mumble protocol to linkify	2015-04-21 22:17:43 +02:00
Jonne Haß	61c890f274	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-21 22:02:28 +02:00
Steffen van Bergerem	6bb5e0a29b	Only render hovercard if the mouse is still on the username	2015-04-21 22:02:18 +02:00
Benjamin Neff	6cbb959700	add mumble protocol to linkify ... also use double-quotes in the whole file	2015-04-21 21:16:55 +02:00
Jonne Haß	c8f990359d	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-21 20:50:27 +02:00
Steffen van Bergerem	a14713b985	Update markdown-it, disable fuzzy links	2015-04-21 20:50:16 +02:00
Jonne Haß	9a9cf6f6a5	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-21 20:48:41 +02:00
Steffen van Bergerem	2d3c0680ea	Fix uppercase registration/login labels and btn style	2015-04-21 20:48:30 +02:00
Jonne Haß	9d4916709b	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-20 22:40:12 +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
Benjamin Neff	128cfb247c	fix not_public page ... body was rendered in the head	2015-04-20 22:32:32 +02:00
Jonne Haß	e996bd7e36	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-20 21:49:55 +02:00
Jonne Haß	6fe06f6d3c	Merge pull request #5868 from SuperTux88/fix-service-icons ... fixed service-icons in sidebar	2015-04-20 21:49:46 +02:00
Benjamin Neff	13a6b1389d	fixed service-icons in sidebar ... recovered css from old application.scss was removed in e188782a9a	2015-04-20 21:49:36 +02:00
Jonne Haß	a06448447a	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-20 21:19:49 +02:00
Benjamin Neff	0211da4116	fix control icon alignment in chromium browser	2015-04-20 21:06:17 +02:00
Jonne Haß	85c376e591	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-19 15:58:41 +02:00
goobertron	a75ec75ec7	Update aspect edits text, reorder posting section ... First iteration to update Help section Changes from Fla	2015-04-19 15:57:21 +02:00
Marcelo Briones	6636a89118	Add participation counter	2015-04-11 14:41:17 -03:00
Asphyxia	5fb328864e	Activity stream keeping retracted participations	2015-04-10 21:46:42 -03:00
Jonne Haß	5481ddb540	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-10 19:23:00 +02:00
Jonne Haß	ec2a209b68	Lazily initialize Contact proxy in service helper ... This prevents connecting to the database on rake assets:precompile, which fails in certain build environments. Running git blame on this and figuring out what in gods name this is for, is for another time.	2015-04-10 19:19:16 +02:00
Steffen van Bergerem	895d38de21	Refactor available services settings	2015-04-08 18:43:35 +02:00
Steffen van Bergerem	b885b8583d	Remove 'manage services' link in standalone mode	2015-04-08 12:49:05 +02:00
Steffen van Bergerem	75ef9f47d0	Use Bootstrap modal for new aspect form	2015-04-07 10:45:09 +02:00
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
Jonne Haß	bec2508545	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-03 02:21:59 +02:00
Steffen van Bergerem	3e5eb350ae	Notification dropdown: 'mark all as read' link scroll fix	2015-04-03 02:21:06 +02:00
Jonne Haß	0155d8972a	Merge pull request #5839 from svbergerem/use-test-instead-of-match ... Use test instead of match wherever possible	2015-04-01 23:54:42 +02:00
Steffen van Bergerem	f8707e0e1a	Use test instead of match wherever possible	2015-04-01 18:35:20 +02:00
Jonne Haß	099bb01005	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-01 18:28:08 +02:00
Jonne Haß	2dd4bf0acf	Merge pull request #5838 from svbergerem/check-stream-before-adding-posts ... Don't add mentions and reshares to all streams	2015-04-01 18:27:06 +02:00
Steffen van Bergerem	1701bc30d0	Don't add mentions and reshares to all streams	2015-04-01 16:51:08 +02:00
SansPseudoFix	5b90e1a060	Fix tag overflow mobile page ... modified: app/assets/stylesheets/mobile/mobile.scss modified: app/assets/stylesheets/mobile/mobile.scss	2015-04-01 14:55:45 +02:00
Steffen van Bergerem	6b024dcd45	Fix missing button styles in donate and admin sections	2015-04-01 13:34:56 +02:00
Jonne Haß	548b0d8161	Rescue correct constant in Workers::ReceiveLocalBatch ... Fixes #5834	2015-04-01 04:01:40 +02:00
Jonne Haß	5c78ab6838	Merge pull request #5832 from svbergerem/remove-border-conversations ... Remove border from conversation stream	2015-04-01 03:07:07 +02:00
Steffen van Bergerem	cb04e40de7	Remove border from conversation stream	2015-04-01 01:03:15 +02:00
Steffen van Bergerem	7870f3b127	Contacts page: remove broken title from 'Start a conversation' button	2015-04-01 00:47:31 +02:00
Jonne Haß	e274470d55	Replace default.html with a regular view ... So we can correctly reference the images	2015-03-28 23:12:07 +01:00
Dennis Schubert	61c2fbf5ef	Merge pull request #5817 from jhass/generated_error_pages ... Generate error pages on assets:precompile	2015-03-28 21:46:35 +01:00
Steffen van Bergerem	176938c486	Fix layout regression: missing header on search page	2015-03-28 13:54:52 +01:00
Jonne Haß	e7d0a978ba	Generate error pages on assets:precompile ... This allows us to reuse any CSS we have, unify their look and unify their look with the regular page design. This works by instantiating ActionView and rendering templates in a rake task. Inspired by the errgent gem.	2015-03-27 11:15:59 +01:00
Dennis Schubert	b07ad67946	Merge pull request #5819 from svbergerem/no-contacts-in-aspect-message ... Add 'no contacts in this aspect yet' message	2015-03-27 03:50:42 +01:00
Steffen van Bergerem	9069fd235d	Add 'no contacts in this aspect yet' message	2015-03-27 03:20:42 +01:00
Steffen van Bergerem	c9457ffd86	Add missing .container to admin pages, add note to changelog	2015-03-26 23:51:41 +01:00
Steffen van Bergerem	6f7f820ff4	Fix oembed style regression	2015-03-26 23:51:08 +01:00
Steffen van Bergerem	b69239ed2f	Merge pull request #5791 from SansPseudoFix/5745-Conversation-pagination-design-is-broken ... Fix for 5745 - conversation pagination design is broken	2015-03-26 20:05:24 +01:00
SansPseudoFix	a97bfec39c	add option pagination ... center pagination Fix pagination css Symbols for previous and next modified: app/assets/stylesheets/conversations.scss modified: app/views/conversations/index.haml Add responsive pagination Fix broken pagination modified: app/assets/stylesheets/conversations.scss modified: app/views/conversations/index.haml Fix broken pagination for mobile Mobile pagination Unify desktop and mobile background change background color	2015-03-26 19:53:23 +01:00
Steffen van Bergerem	3a202d8fa9	Remove footer from stream and profile pages	2015-03-26 16:28:01 +01:00
Jonne Haß	b047013dd0	Merge pull request #5814 from svbergerem/update-markdown-it ... Update markdown-it	2015-03-26 10:16:22 +01:00
Steffen van Bergerem	153efe7d7a	Change url to image-url in registration.css, added in #5743	2015-03-26 01:13:11 +01:00
flaburgan	ef977a170f	Replace Make Something text by the diaspora ball logo on registration page ... Add ball.svg to /graphics	2015-03-26 00:32:41 +01:00
Steffen van Bergerem	adf9bcf8e8	Update markdown-it	2015-03-26 00:07:25 +01:00
Jonne Haß	73b6c75278	On reshare insert the reshare built from the response ... Also make sure comments_count and the like is always set in the response.	2015-03-23 23:02:23 +01:00
Steffen van Bergerem	4d6c513b8e	Refactor post content css, fix margin-bottom for lists in comments	2015-03-22 02:19:36 +01:00
Steffen van Bergerem	50c187537d	Merge pull request #5721 from sam09/fixissue5626 ... Added margin top to lists. Fixes issue #5626	2015-03-22 00:38:51 +01:00
Sam Radhakrishnan	af410ef4e5	Added margin top to lists. Fixes issue5626	2015-03-22 02:43:01 +05:30
Sayed	e21afc6636	order-of-comments-on-the-mobile-version-is-reversed #5804	2015-03-21 15:20:57 +02: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
Jonne Haß	496a16d14d	Merge pull request #5799 from svbergerem/invitation-input ... Unify invite code and contacts page link style	2015-03-20 01:52:00 +01:00
Steffen van Bergerem	4a7781f1e7	Unify invite code and contacts page link style	2015-03-19 02:46:25 +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
Jonne Haß	5115582c55	Merge pull request #5790 from visualsayed/5693-reshare-count-broken-on-mobile-stream ... fix missing reshares count on mobile stream #5693	2015-03-17 21:27:44 +01:00
Sayed	bf3d903c11	refactor mobile stream post_stats	2015-03-17 20:37:16 +02:00
Sayed	99f42cb643	fix missing reshares count on mobile stream	2015-03-17 01:14:22 +02:00
Steffen van Bergerem	0856eb8f86	Merge pull request #5788 from AugierLe42e/fix-search-element-selection ... Fixes #5787	2015-03-16 23:36:51 +01:00
Augier	571685d590	Fix the broken searchbar (#5787)	2015-03-16 22:07:51 +01:00
Steffen van Bergerem	e7ec3d495f	Refactor and improve sidebar css	2015-03-16 02:03:53 +01:00
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
Jonne Haß	25e80fddc8	Merge pull request #5781 from svbergerem/various-style-fixes ... Various style fixes	2015-03-15 04:20:47 +01:00
Steffen van Bergerem	caf7470e8e	Various style fixes	2015-03-15 01:58:29 +01:00
Steffen van Bergerem	ca087d6b26	Conversations: Add rounded corners to participants count and improve readability	2015-03-14 18:16:21 +01:00
Lisa Passing	a11322fd5d	make css nicer ... update Changelog remove weird merge thing think of the padding and margin	2015-03-14 17:00:14 +01:00
Christophe	e2a591249a	Replace JQuery slide with transition ... Conflicts: app/assets/javascripts/inbox.js app/assets/stylesheets/conversations.css.scss	2015-03-14 14:30:59 +01:00
Steffen van Bergerem	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
Steffen van Bergerem	d7d9891293	Merge pull request #5722 from AugierLe42e/add-notif-unsubscribe-single-post-view ... Add a notification subscribtion to the single post view	2015-03-14 00:52:03 +01:00
Augier	0887137262	Add a notification subscribtion to the single post view	2015-03-13 23:27:49 +01:00
Martha	985141c0e8	display specific error messages for password change (issue #5549)	2015-03-13 11:35:21 -07:00
Giniouxe	efcff444fd	Refactor registrations #5670 - Partial form	2015-03-13 16:16:45 +01:00
Jonne Haß	2c2b47eae2	Merge pull request #5769 from svbergerem/remove-unused-css ... Remove unused css and reduce blockquote font-size	2015-03-13 10:44:44 +01:00
Steffen van Bergerem	6dc18ac317	Reduce blockquote font-size	2015-03-13 01:41:14 +01:00
Steffen van Bergerem	84a5992a42	Refactor css code, remove unused code	2015-03-13 01:41:14 +01:00
Steffen van Bergerem	992c75da55	Merge pull request #5767 from SansPseudoFix/overflow-button-tag-too-long ... Change overflow-x to overflow for long tag button	2015-03-13 01:19:11 +01:00
SansPseudoFix	8dd8daf37e	Change overflow-x to overflow for long tag button	2015-03-12 23:46:15 +01:00
Steffen van Bergerem	1ff644c13e	Fix mobile notifications	2015-03-12 22:45:04 +01:00
Jonne Haß	cc585805ad	Merge pull request #5762 from svbergerem/entypo-controls ... Use entypo for control icons	2015-03-12 19:29:40 +01:00
Steffen van Bergerem	af9d6ddab3	Use handlebars helpers wherever possible	2015-03-12 16:20:32 +01:00
Steffen van Bergerem	0715107735	Remove stream frame template	2015-03-12 14:43:20 +01:00
Marcelo Briones	7be56849d9	DRY on avatars	2015-03-12 09:52:36 -03:00
goobertron	b04a2638a5	Add box shadow and radius to avatars	2015-03-12 09:52:36 -03:00
Steffen van Bergerem	cb30ffc368	Use entypo for post control icons	2015-03-12 13:08:23 +01:00
Steffen van Bergerem	e99fe86ca0	Merge pull request #5752 from SansPseudoFix/fix-tag-button-overflow ... fix tag button overflow	2015-03-12 10:43:56 +01:00
SansPseudoFix	26ad537a18	fix tag button overflow ... fix tag button overflow modified: app/assets/stylesheets/tag.scss modified: app/assets/templates/tag_following_action_tpl.jst.hbs	2015-03-12 00:28:31 +01:00
Jonne Haß	2c7b7bb0dc	bump open_graph_reader	2015-03-11 21:59:02 +01:00
Steffen van Bergerem	4f4dfc7554	Fix missing assets bug	2015-03-11 19:18:05 +01:00
Steffen van Bergerem	52c2a73d83	Merge pull request #5707 from AugierLe42e/port-notifications-backbone ... [WIP] Port of notifications.js and notification-badge.js to Backbone part.1	2015-03-11 17:05:14 +01:00
Steffen van Bergerem	f5bf53a004	Refactor vendor javascript	2015-03-11 15:51:08 +01:00
Steffen van Bergerem	be175e969e	Fix mobile sign up with invitation	2015-03-11 10:52:42 +01:00
Augier	95f4675ddf	Port of notifications to Backbone	2015-03-11 02:11:05 +01:00
Jonne Haß	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
Jonne Haß	add6dd3c50	Merge pull request #5749 from svbergerem/char-counter-fix ... Publisher: fix services char counter	2015-03-10 17:43:32 +01:00
Steffen van Bergerem	d2222a97e5	Fix photo count in the profile view	2015-03-10 11:38:49 +01:00
SansPseudoFix	6cf509454c	fix overflow blockquote stream ... change word-break to wrap-wrap modified: app/assets/stylesheets/stream_element.scss remove useless word-wrap global prevent for overflow global overflow fix Remove useless word-wrap modified: app/assets/stylesheets/conversations.scss modified: app/assets/stylesheets/new_styles/_base.scss modified: app/assets/stylesheets/new_styles/_code.scss modified: app/assets/stylesheets/single-post-view.scss modified: app/assets/stylesheets/stream_element.scss indent	2015-03-09 23:59:52 +01:00
Steffen van Bergerem	1b2b10877a	Fix services char counter	2015-03-09 21:18:10 +01:00
Steffen van Bergerem	73d04b706e	Use entypo icons for left navbar	2015-03-09 17:57:50 +01:00
Steffen van Bergerem	d3c0259026	Remove unused aspect files	2015-03-09 17:57:50 +01:00
Steffen van Bergerem	31d7904701	Remove unused blueprint invitations view	2015-03-09 17:57:49 +01:00
Steffen van Bergerem	3298373a7f	Add missing http:// to urls	2015-03-09 01:42:40 +01:00
Steffen van Bergerem	9d6fc0a671	Merge pull request #5744 from Flaburgan/conversation-design ... Fix conversaton publisher trailing border	2015-03-08 22:49:44 +01:00
flaburgan	ab4467954b	Fix conversaton publisher border	2015-03-08 21:59:23 +01:00
Steffen van Bergerem	49894ec05d	Merge pull request #5740 from jhass/publisher_margin ... Reduce gap between publisher and stream	2015-03-08 16:08:51 +01:00
Jonne Haß	e6444cea67	Reduce gap between publisher and stream [ci skip]	2015-03-08 14:27:07 +01:00
Jonne Haß	00817c8583	Merge pull request #5728 from SansPseudoFix/5716-focus-link-color-bootstrap-header ... Fix #5716 focus header link color	2015-03-06 23:44:03 +01:00
Jonne Haß	2dafe8554c	Merge pull request #5735 from svbergerem/improve-bootstrap-stream-style ... Improve Bootstrap stream style	2015-03-06 23:40:24 +01:00
Steffen van Bergerem	b083560266	Improve Bootstrap stream style	2015-03-06 21:59:36 +01:00
Steffen van Bergerem	2a52f65160	Bump markdown-it	2015-03-06 20:40:06 +01:00
Steffen van Bergerem	96fcae3532	Remove unused (vendor) css	2015-03-06 07:58:13 +01:00
Steffen van Bergerem	0f9ba4885c	Import chat.scss and change container to container-fluid	2015-03-06 01:18:37 +01:00
Jonne Haß	c2dab008ab	We may no longer have a file for an unprocessed photo	2015-03-06 00:52:17 +01:00
Jonne Haß	e7b92c15e2	Replace export_photos and export_users by export queue	2015-03-06 00:38:16 +01:00
SansPseudoFix	53ac63cafa	refactoring - grey link with dark grey dots for focus	2015-03-04 23:46:52 +01:00
SansPseudoFix	f8b69ae7d7	grey link with black grey dots border	2015-03-04 18:35:59 +01:00
SansPseudoFix	2b29bfe403	focus link grey with grey dots	2015-03-04 15:00:39 +01:00
Jonne Haß	26cda1b1c5	Merge pull request #5724 from AugierLe42e/comment-design ... Changed color border on active text	2015-03-04 11:52:09 +01:00
SansPseudoFix	330ae471f1	Fix #5716 focus header link color	2015-03-04 11:03:44 +01:00
Marcelo Briones	b154d87070	Exports user photos as zip file	2015-03-03 19:45:57 -03:00
Augier	5be2fbafab	Changed color border on active text"	2015-03-03 21:18:53 +01:00
Selman Ercan	35fe6bda68	Issue #5631. Made top and left coordinates of hovercards match those of their parents. ... Added line to changelog for bug fix of issue #5631. Processing the 'mouseleave' event only if we've left both the parent and the hovercard. Fixed indentation. Replaced issue id with pull request id and fixed indentation.	2015-03-02 09:41:29 +01:00
Steffen van Bergerem	0c7d319fdc	Remove unused css files	2015-03-02 00:04:58 +01:00
Steffen van Bergerem	e188782a9a	Remove blueprint code	2015-03-02 00:04:57 +01:00
Steffen van Bergerem	c838389b67	Fix invitations and tests	2015-03-02 00:04:56 +01:00
Pablo Cuadrado	56a79828bc	using circled help icon	2015-03-01 12:04:55 +01:00
Pablo Cuadrado	3721861c94	border on the left of the stream and profile header	2015-03-01 12:04:55 +01:00
Pablo Cuadrado	b0a8ecf8be	margin 0 was messing up the left bar	2015-03-01 12:04:55 +01:00
Pablo Cuadrado	2fb594735e	main stream widths with fluid container	2015-03-01 12:04:55 +01:00
Pablo Cuadrado	c402c65f56	unprefixing opacity	2015-03-01 12:04:55 +01:00
Pablo Cuadrado	52fef10bea	lame BR removed	2015-03-01 12:04:54 +01:00
Pablo Cuadrado	75480c5454	using entypo on the right section, better alignment and styles	2015-03-01 12:04:54 +01:00
Pablo Cuadrado	ba9bb619e4	using container instead of container fluid for the stream, we can manage this ... better when migrating to Bootstrap 3	2015-03-01 12:04:54 +01:00
Pablo Cuadrado	84739a86d1	invite code box fix	2015-03-01 12:04:54 +01:00
Pablo Cuadrado	9cbc09316d	text shadow made the buttons look blurry	2015-03-01 12:04:53 +01:00
Pablo Cuadrado	b23c0f7ae4	ensuring that the oembed element has the same size of the thumb	2015-03-01 12:04:53 +01:00
Pablo Cuadrado	7f2ee4bf3d	dropping blueprint option on publisher	2015-03-01 12:04:53 +01:00
Pablo Cuadrado	24fdf8fb84	rightbar invitations ported to bootstrap	2015-03-01 12:04:53 +01:00
Pablo Cuadrado	b2e3866217	removing blueprint classes from new aspect modal	2015-03-01 12:04:53 +01:00
Pablo Cuadrado	122fde9093	colliding style removed	2015-03-01 12:04:52 +01:00
Pablo Cuadrado	cfff769152	comment button using bootstrap styles	2015-03-01 12:04:52 +01:00
Pablo Cuadrado	bb18803665	welcome to diaspora styles ported	2015-03-01 12:04:52 +01:00
Pablo Cuadrado	cb99ad9e68	left bar styles adjusted	2015-03-01 12:04:51 +01:00
Pablo Cuadrado	e48679affe	removing a missing mixing, using row instead of row-fluid	2015-03-01 12:04:51 +01:00
Pablo Cuadrado	c4fda4b563	main_stream ported, no further styling applied	2015-03-01 12:04:51 +01:00
flaburgan	741a24bc08	Add tooltip style on post report icon	2015-02-28 16:57:41 +01:00
Dennis Schubert	ab4e04e8c4	Don't specify file extensions in SCSS imports	2015-02-28 05:04:39 +01:00
Jonne Haß	c96834bdf2	Remove .css extension from SCSS files ... sass-rails 5.0 deprecated those	2015-02-28 03:37:46 +01:00
Jonne Haß	1b0cf2d11f	bump compass & sass	2015-02-28 02:36:14 +01:00
Jonne Haß	3a90386303	deliver needs to be called on the return value of the mailer call	2015-02-27 16:58:39 +01:00
Jonne Haß	f62ba0f73c	Don't split contact_ids when they already are an array	2015-02-27 16:58:39 +01:00
Jonne Haß	f49c8884f4	Use _url, not _path, in mailers	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ß	162303db37	Enable Rails 5 behavior for exceptions in after_commit callbacks	2015-02-27 16:58:39 +01:00
Jonne Haß	9ad2409264	Don't use AR internals (@attributes)	2015-02-27 16:58:38 +01:00
Jonne Haß	99ea156e1c	Refactor User.total_users into a scope	2015-02-27 16:30:51 +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ß	e46a77ba19	Merge pull request #5706 from aka001/help_section ... Update the help section #5698	2015-02-27 15:57:12 +01:00
Jonne Haß	e8440bb25f	Merge pull request #5683 from svbergerem/mobile-fix-style-more ... Mobile: fix style of 'more' button	2015-02-27 15:53:36 +01:00
Jonne Haß	205f82bfd0	Merge pull request #5648 from Zauberstuhl/jsxc_use_ajax_login ... Adjust jsxc initialization for ajax login	2015-02-27 15:52:30 +01:00
Jonne Haß	be1ab6c6a3	Merge branch 'collimarco-issue5350' into develop	2015-02-27 15:33:55 +01:00
Jonne Haß	073e99992e	Some fixes to participation controls ... * prevent default event in JS handlers to prevent jumping back to the top. * Use js-routes * Use sprite for icons * Reply with 200 instead of 204 when destroying a participation, to prevent errors in the browser console.	2015-02-27 15:31:30 +01:00
Akash Agrawall	e85cb7b373	Help_section_update_keyboard_shortcut	2015-02-27 16:36:11 +05:30
Augier	168adae009	Adding help section for chat	2015-02-26 18:06:39 +01:00
Lukas Matt	e484ebc85f	Using dot notation for accessing token	2015-02-25 00:11:01 +01:00
Lukas Matt	30685b2709	Adjust jsxc initialization for ajax login ... related to diaspora/jsxc#81	2015-02-25 00:09:23 +01:00
PIOTR KLOSINSKI	b8be76be3c	changed reshare function, so it adds the object to the stream ... tests for reshares Changelog.md update fixing a style issue removed unnecessary semicolon	2015-02-23 15:44:31 +01:00
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
Steffen van Bergerem	0434599bd0	Contacts page: 'Start a conversation' button should depend on number of contacts in aspect	2015-02-19 20:22:07 +01:00
Steffen van Bergerem	53714c4699	Fix notification for new conversations	2015-02-19 13:39:25 +01:00
Jonne Haß	a19b91083e	Merge pull request #5643 from aka001/5564_lock_account ... Lock account #5564	2015-02-19 03:43:38 +01:00
Akash Agrawall	3bb5e78893	Lock account #5564	2015-02-19 05:45:04 +05:30
flaburgan	2b19b4bfc9	Remove #sign-up-text, change placeholder text to lower-case, fix tests	2015-02-19 00:07:41 +01:00
Steffen van Bergerem	b3558d0db1	Fix captcha and box-shadow	2015-02-18 22:45:46 +01:00
flaburgan	1c231f3171	refactoring of the public pages design	2015-02-18 22:45:46 +01:00
flaburgan	44649e9167	Unify not connected pages	2015-02-18 22:45:46 +01:00
Steffen van Bergerem	06ab4d0514	Mobile: fix style of 'more' button	2015-02-18 20:41:01 +01:00
Steffen van Bergerem	7d485ce6a6	Add opacity transition for post controls	2015-02-18 18:16:10 +01:00
SansPseudoFix	0c49219ca7	Global prevent for overflow in mobile view	2015-02-17 13:00:39 +01:00
Steffen van Bergerem	eb7e2eac9d	Update jasmine-ajax	2015-02-17 04:03:42 +01:00
Steffen van Bergerem	d1dfd7c1cd	Style improvements for the year on the notifications page	2015-02-16 21:45:39 +01:00
Steffen van Bergerem	9c22ed6aef	Add year to notifications page	2015-02-16 18:02:50 +01:00
Steffen van Bergerem	4da6b075ad	Bootstrap stream: fix interaction buttons	2015-02-16 06:23:34 +01:00
Steffen van Bergerem	f1836580db	Bootstrap stream: add spinner and improve comment box	2015-02-16 04:56:35 +01:00
Jonne Haß	34ad598cff	Merge pull request #5594 from Faldrian/4055-add_contacts_mobile ... 4055 add contacts mobile	2015-02-15 23:12:18 +01:00
Faldrian	8f3c03edfa	Added dropdown to add/remove people from/to aspects in mobile view	2015-02-15 22:08:15 +01:00
Giniouxe	e2866a12ea	Issue #5662: Fix text on change button	2015-02-15 20:42:55 +01:00
Jonne Haß	9dbf6b82a8	Merge pull request #5655 from svbergerem/contacts-page-add-invitations ... Add invitation link to contacts page	2015-02-15 16:00:20 +01:00
Jonne Haß	f326b58d31	Merge pull request #5664 from svbergerem/remove-people-last_post ... Remove last_post from PeopleController	2015-02-15 15:58:02 +01:00
Steffen van Bergerem	9373d5bd20	Fix jasmine tests for new help routes	2015-02-14 19:38:00 +01:00
Augier	aa62266376	Added routing system to open a section in help	2015-02-14 18:05:40 +01:00
Steffen van Bergerem	f37a018b0e	Merge pull request #5521 from arlogn/profile-photos-as-thumbnails ... profile photos as thumbnails	2015-02-14 02:55:57 +01:00
arlogn	43a2a5c336	profile photos as thumbnails	2015-02-14 02:27:32 +01:00
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
Steffen van Bergerem	2193ff2b58	Remove last_post from PeopleController	2015-02-13 12:25:50 +01:00
Steffen van Bergerem	1733131c0c	Add invitation link to contacts page	2015-02-12 03:34:24 +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	17c7771a6b	Fix typo in AspectGlobalHelper	2015-02-10 16:43:14 +01:00
Jonne Haß	dece3cf6b0	Merge pull request #5417 from svbergerem/notifications-fix-timeago ... Fix timeago for notifications, add 'no notifications yet' message	2015-02-10 12:20:09 +01:00
Steffen van Bergerem	3312f97981	Fix timeago for notifications, add 'no notifications yet' message	2015-02-09 03:56:37 +01:00
Jonne Haß	ab2e4781f8	Merge pull request #5639 from aka001/5373_technical_limitation ... Technical limitations of how old one can be on D* #5373	2015-02-09 02:28:15 +01:00
Akash Agrawall	6b105274af	Technical limitation of how old one can be on D* 5373	2015-02-09 06:19:09 +05:30
Steffen van Bergerem	2ec093a54c	JSHint boss, evil, loopfunc and scripturl	2015-02-08 23:41:33 +01:00
Steffen van Bergerem	ab6732cac1	JSHint eqeqeq	2015-02-08 23:41:32 +01:00
Steffen van Bergerem	5fa6b8253e	JSHint unused and undefined variables	2015-02-08 23:41:32 +01:00
Steffen van Bergerem	a9a480da0a	JSHint semicolon errors	2015-02-08 23:41:31 +01:00
Steffen van Bergerem	6b0a5823e3	Add JSHint javascript linter	2015-02-08 23:41:31 +01:00
Faldrian	5d3145bf8f	added avatar error correction on core view rendering	2015-02-08 19:32:50 +01:00
Faldrian	32ca5cc16d	removed css-spill on reshare link in stream	2015-02-08 17:24:16 +01:00
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
Jonne Haß	3114b04a08	Merge pull request #5635 from svbergerem/remove-unused-files ... Remove unused files, fix syntax in jasmine tests	2015-02-07 23:43:48 +01:00
Jonne Haß	63363340f6	Merge pull request #5623 from AugierLe42e/fix-mobile-login-view ... [Mobile] Does not display the header on sing_in page	2015-02-07 21:30:03 +01:00
Steffen van Bergerem	c1d714d2c7	Remove unused files, fix syntax in jasmine tests	2015-02-07 21:17:51 +01:00
Steffen van Bergerem	7e5f5964e9	Remove photo export from settings	2015-02-07 14:59:18 +01:00
Steffen van Bergerem	8b33b9eb18	Merge pull request #5602 from Faldrian/more-shortcuts ... Add shortcuts for reshare, expand Post and open first link in a post Conflicts: config/locales/diaspora/en.yml	2015-02-07 14:41:56 +01:00
Steffen van Bergerem	5e98308b2c	Fix aspect dropdown on people search page inserted after initial page load	2015-02-07 11:22:26 +01:00
Jason Robinson	28ff7fb557	Merge pull request #5601 from Faldrian/5591-correct-moderation-placement-reshare ... Fixed moderation-button-position when viewing reshare	2015-02-05 22:25:28 +02:00
Augier	4be1e2b38e	Does not display the header on sing_in page	2015-02-04 23:45:13 +01:00
Sam Radhakrishnan	9fcef5b101	Fixed Isssue #5618. The profile update page shows the correct message.	2015-02-03 14:39:08 +05:30
Faldrian	db6464ed61	Fixed moderation-button-position when viewing reshare	2015-02-03 00:24:26 +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
Steffen van Bergerem	b4ff1f97e7	Merge pull request #5612 from Flaburgan/hide-signup-button-when-registration-are-disabled ... Hide sign up button when registration are disabled	2015-02-02 00:44:35 +01:00
flaburgan	b8aaad6318	Hide sign up button when registration are disabled	2015-02-01 14:01:44 +01:00
Jason Robinson	512de9cfd9	Merge pull request #5597 from gdpelican/feature/json-exporter-post-fields ... Add created_at to json posts for #5585	2015-02-01 13:18:48 +01: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
James Kiesel	43f48d0ae2	Add created_at to json posts for #5585	2015-01-28 10:21:16 +13:00
Augier	4ff5483025	Fix available services not correctly displayed	2015-01-26 20:45:03 +01:00
Flaburgan	69b881f34b	Fix monthly and halfyear active users count	2015-01-26 10:03:37 +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
Augier	f14ad5ce35	Fixes the header problem rendering statistics page	2015-01-25 13:24:19 +01:00
Faldrian	31c39a59d1	Added post moderation buttons in SPV	2015-01-25 05:11:59 +01:00
Jonne Haß	9eaa92068f	Merge pull request #5464 from SansPseudoFix/statistics_design ... [Feature] Statistics page	2015-01-24 23:57:40 +01:00
SansPseudoFix	dc44485230	Feature : Statistics design	2015-01-24 22:34:41 +01:00
SansPseudoFix	7e9525740b	fix #5568 - overflow json exporter	2015-01-21 17:54:59 +01:00
Jonne Haß	cd6475d572	Merge pull request #5562 from sjain1107/5560-Hide-community-spotlight ... 5560 Hide community spotlight setting if not enabled	2015-01-21 05:38:25 +01:00
Sakshi Jain	8b1f0453a1	5560 Hide community spotlight setting if not enabled	2015-01-20 10:31:31 +05:30
James Kiesel	7bbd9138de	Fix bad email formatting	2015-01-20 16:51:08 +13:00
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	9282a4ea8f	Refactor mobile javascript to get rid of console errors. ... Fixes also mobile bookmarklet services.	2015-01-17 15:50:06 +02:00
Jason Robinson	5c810a8a2e	Merge pull request #5489 from collimarco/solved5482 ... Solved #5482	2015-01-17 03:39:03 +02:00
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
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
Dumitru Ursu	36b66624e2	Invert gradient	2015-01-09 17:13:35 +02:00
Dumitru Ursu	80b4cb90ef	Use the standard syntax for gradient	2015-01-09 16:49:26 +02:00
Dumitru Ursu	3e1b944121	Remove prefixed CSS properties	2015-01-09 13:50:29 +02:00
Jonne Haß	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ß	d7a3559f4b	Merge pull request #5472 from svbergerem/fix-typo-profile-header ... Fix typo in profile_header_view	2015-01-06 14:37:34 +01:00
Jonne Haß	3f49bc52f4	Merge pull request #5468 from Flaburgan/add-followed-tags-to-mobile-menu ... Add followed tags to the mobile menu Conflicts: Changelog.md	2015-01-06 14:35:37 +01:00
Jonne Haß	e94e9add1a	Merge pull request #5452 from Flaburgan/allow-non-hosted-paypal-buttons ... Add currency setting to paypal donation and allow unhosted button setting Conflicts: Changelog.md	2015-01-06 14:32:57 +01:00
Steffen van Bergerem	9de6a26a22	Port contacts page to backbonejs	2015-01-04 17:13:18 +01:00
François Lamontagne	4c33a6adeb	Replace %{third_party_tools} by the appropriate hyperlink in tags FAQ (issue #5273)	2015-01-03 13:25:16 -05:00
Steffen van Bergerem	59e9597c77	Remove asyncSubHeader from app.pages.Profile	2015-01-03 15:20:33 +01:00
Marcelo Briones	fe6052865c	Remove limited content from email notifications	2014-12-28 22:15:47 -03:00
Flaburgan	b444cdf1ea	Add currency and allow unhosted button to paypal donation	2014-12-28 19:50:45 +01:00
Flaburgan	f9e9a0521d	Add followed tags to the mobile menu	2014-12-28 13:48:48 +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	8dea4b5fd9	Solve #5341	2014-12-24 11:52:12 +01:00
Jonne Haß	6c9f191696	Merge pull request #5491 from collimarco/solved5348 ... Solve #5348	2014-12-23 23:00:06 +01:00
Jason Robinson	30eaf82762	Merge pull request #5481 from svbergerem/remove-stream-template ... Remove unused stream template	2014-12-22 23:30:55 +02:00
Marco Colli	76cc5e2d5c	Add ActiveRecord::RecordNotFound catching. Add tests.	2014-12-22 12:36:09 +01:00
Marco Colli	d75071bac9	Solve #5348	2014-12-20 19:09:33 +01:00
Marco Colli	1ac2e728f4	Solved #5482	2014-12-20 11:05:12 +01:00
Dennis Schubert	7b0cff3250	Merge pull request #5488 from Faldrian/5240-fix_async_searchresults_blueprint ... Set refresh_search async searchresults load to use bootstrap Fix #5240	2014-12-20 04:55:25 +01:00
Dennis Schubert	91c14c19e3	Merge pull request #5487 from Faldrian/5313-adding_contacts_racecondition_fix ... Fixed growing number on events on hovercard dropdown container	2014-12-20 04:08:32 +01:00
Faldrian	43fd6e7ed6	Set refresh_search async searchresults load to use bootstrap	2014-12-20 03:58:20 +01:00
Faldrian	710d03b1c2	Fixed growing number on events on hovercard dropdown container	2014-12-20 02:44:48 +01:00
margori	27a1886834	Changes delete conversation button tooltip to 'hide' or 'delete'	2014-12-19 18:26:43 -03:00
Jonne Haß	3000d86d57	Merge pull request #5475 from svbergerem/tag-page-improve-wording ... Improve wording for tagged people on tag page	2014-12-17 16:46:09 +01:00
Steffen van Bergerem	7612f5e939	Remove unused stream template	2014-12-17 16:45:51 +01: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
Steffen van Bergerem	a5068259bb	Improve wording for tagged people on tag page	2014-12-15 18:08:53 +01:00
Steffen van Bergerem	e5895a1f1b	Fix order of poll answers	2014-12-13 18:22:30 +01: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
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ß	6836af89ad	Correctly implement OpenGraph tags ... Just defining og:site_name indicates that we support the OpenGraph protocol, but then we didn't set the required properties.	2014-12-08 02:25:09 +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
Steffen van Bergerem	7c775208b1	Merge pull request #5422 from SansPseudoFix/fix-code-overflow-spv-and-profile ... Fix code overflow spv and profile	2014-12-02 22:44:08 +01:00
SansPseudoFix	6d681f8306	Fix code overflow ... new file: app/assets/stylesheets/new_styles/_code.scss	2014-12-02 16:51:50 +01:00
Steffen van Bergerem	d742f23cd5	Content shouldn't exceed the profile sidebar	2014-12-02 02:03:15 +01:00
Steffen van Bergerem	4cc1b40443	Only remove photos from view when destroyed on server	2014-12-01 00:36:56 +01:00
Steffen van Bergerem	f6fbbbb5f6	Move tag prefill to Backbone, add tests	2014-11-30 17:14:05 +01:00
taro-k	b01026f9b8	pre-fill tag page form with the tag #4234	2014-11-30 14:15:45 +01:00
Steffen van Bergerem	b275b2edbc	Merge pull request #5435 from SansPseudoFix/5329-fix-mention-popup-hidden ... A temporary fix for mention modal #5329	2014-11-30 13:48:24 +01:00
Jonne Haß	2ab16d473c	Merge pull request #5410 from svbergerem/configurable-source-url ... Make source code url configurable Conflicts: config/diaspora.yml.example	2014-11-29 23:46:45 +01:00
SansPseudoFix	90b9f227d8	A temporary fix for mention modal #5329 ... A temporary fix for mention modal #5329 modified: app/assets/stylesheets/bootstrap-fix.css.scss modified: app/assets/stylesheets/bootstrap-fix.css.scss	2014-11-29 17:36:46 +01:00
Faldrian	29f55f42b6	truncate long opengraph description to 250 chars in mobile and stream view	2014-11-29 17:18:01 +01:00
Steffen van Bergerem	55f881da08	Make source code url configurable	2014-11-29 16:36:17 +01:00
Jonne Haß	544501a0e6	Merge pull request #5418 from svbergerem/publisher-counter-style-fix ... Fix character count placement for publisher	2014-11-29 16:11:45 +01:00
Laurent PERON	9661d00ec8	issue #5430 : message added	2014-11-28 10:31:47 +01:00
Steffen van Bergerem	389edbe3aa	Don't display undefined handle in search widget	2014-11-27 16:57:32 +01:00
Jonne Haß	49dfc27011	Merge pull request #5421 from Zauberstuhl/optimize_jsxc_login_process ... Optimize jsxc login process and bump jsxc version	2014-11-24 23:01:03 +01:00
Steffen van Bergerem	77b627dbe9	Merge pull request #5419 from SansPseudoFix/add-handle-search-terms ... Add handle search terms	2014-11-24 18:09:02 +01:00
Lukas Matt	ef29de8176	Configure form element and move xmpp config	2014-11-24 17:19:57 +01:00
Lukas Matt	0d4da2fba8	Login function deprecated ... related to diaspora/jsxc#50	2014-11-24 17:19:30 +01:00
Lukas Matt	44bc48ad5e	Remove debug output on default	2014-11-24 17:19:09 +01:00
SansPseudoFix	322ca4dac0	display handle for search bar ... fix margin and color hidden overflow for long handle and names modified: app/assets/javascripts/widgets/search.js modified: app/assets/stylesheets/autocomplete.css.scss add min width 300px modified: app/assets/javascripts/widgets/search.js modified: app/assets/stylesheets/autocomplete.css.scss	2014-11-24 13:17:57 +01:00
Steffen van Bergerem	8cb6e242bf	Fix character count placement for publisher	2014-11-23 18:36:05 +01:00
Jonne Haß	137e60ca51	Merge pull request #5400 from Faldrian/5003-fix-more-button-mobile ... Fix for "more" link on mobile view	2014-11-22 19:06:31 +01:00
Jonne Haß	6a034f172b	Merge pull request #5401 from Faldrian/4721-adjust-bootstrap-headerbar-like-blueprint ... fixed margins and fonts in headerbar. fixed bootstrap2 placeholder error	2014-11-22 19:00:55 +01:00
Jonne Haß	32c5508f3d	Merge pull request #5408 from Zauberstuhl/show_roster_minimized ... Display chat box minimized on default	2014-11-22 18:58:16 +01:00
Jonne Haß	9b49df80a5	Merge pull request #5409 from svbergerem/chat-extra-padding-for-roster ... Chat: add extra padding for the roster	2014-11-22 18:57:51 +01:00
Steffen van Bergerem	8f956383bd	Merge pull request #5407 from SansPseudoFix/5251-add-contact-dropdown-hidden ... Issue #5251: fix hidden overflow	2014-11-22 16:38:16 +01:00
SansPseudoFix	66b76024ed	Issue #5251: fix hidden overflow ... modified: app/assets/stylesheets/getting-started.css.scss modified: app/assets/stylesheets/getting-started.css.scss	2014-11-22 15:01:20 +01:00
Steffen van Bergerem	472d65cb61	Chat: add extra padding for the roster	2014-11-21 23:29:06 +01:00
Lukas Matt	5fee67e5e7	Display chat box minimized on default ... Currently it slides in if you login. with time it is annoying	2014-11-21 21:56:27 +01:00
Praveen Arimbrathodiyil	6378af5417	remove execution permissions from images and css	2014-11-20 23:38:36 +05:30
Faldrian	328a515dbe	fixed margins and fonts in headerbar. fixed bootstrap2 placeholder error	2014-11-16 18:19:32 +01:00
Faldrian	4dbf42d970	added different behaviour depending on existence of posts	2014-11-16 15:06:08 +01:00
Faldrian	21806a2c9b	mobile more-link only if there may be a next page; added message for end of stream	2014-11-16 01:43:55 +01:00
Lukas Matt	e40cf25177	Swap aspect chat privilege title	2014-11-13 14:38:23 +01:00
Lukas Matt	ea11133084	Include the chat front-end if chat is enabled ... * add jsxc helper file	2014-11-13 11:34:21 +01:00
Lukas Matt	735b10cc63	Chat privilege checkbox ... * add to contacts header for later modification * add to aspect creation box	2014-11-13 11:30:12 +01:00
Lukas Matt	24e1732256	Implement token authentication ... * create a new token on a new session * delete the current token on session exit	2014-11-13 11:27:56 +01:00
Lukas Matt	ae582e4543	Add toggle_chat_privilege to aspect controller	2014-11-13 11:24:07 +01:00
Lukas Matt	38a238eb36	Set chat-flag for every aspect manually ... On default none is permitted to chat with you. You have to set extra privilege for an aspect.	2014-11-13 11:21:21 +01:00
Lukas Matt	50a7541d14	Include jsxc deps and initialize the client on login	2014-11-13 11:17:19 +01:00
JesseWeinstein	fb51e9aa43	Only include the quote markdown if needed ... Intentionally do a converting-comparison against the empty string, to see if text is selected.	2014-11-10 23:41:34 -08:00
JesseWeinstein	ea33ef9e0b	Add Markdown to generated post ... Switch to using content parameter, which doesn't alter its value, unlike the other ones. Use a H2 header for the document.title, quote the selected text, and put the URL at the bottom, in a separate paragraph.	2014-11-10 23:24:23 -08:00
JesseWeinstein	9585a1877b	Split bookmarklet_url literal string into lines ... To improve the readabilit of diffs that modify it, per https://github.com/diaspora/diaspora/pull/5384#issuecomment-62443426	2014-11-10 23:16:31 -08:00
Jonne Haß	e68704890e	make sure to import perfect scrollbar plugin before our own mixins ... otherwise it overrides the border-radius mixin with an incompatible one	2014-11-09 20:31:24 +01:00
Jonne Haß	30de98cf3e	Merge pull request #5335 from svbergerem/paginate-contacts ... Paginate contacts	2014-11-09 19:04:07 +01:00
Jonne Haß	404a286588	Merge pull request #5355 from Chocobozzz/header-logo-hover ... Replace the black header logo with the white logo on hover	2014-11-09 18:55:59 +01:00
Jonne Haß	c7c57d40f5	Merge pull request #5380 from Faldrian/feature/3098-publisher-imageupload-layouterror-fix ... Feature/3098 publisher imageupload layouterror fix	2014-11-09 18:52:13 +01:00
Dennis Schubert	4c98445f1c	Fix presenters instead of modifying the getters	2014-11-09 07:47:40 -08: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	5bcd5087bf	Add Camo for remote images	2014-11-09 02:17:43 +01:00
Dennis Schubert	db2560d7fc	Add Camo for OpenGraph images	2014-11-09 01:36:16 +01:00
Dennis Schubert	89ad5b96ad	Add Camo for a profiles bio and location ... yes, we do have Markdown there. But please don't tell anyone.	2014-11-08 23:12:55 +01:00
Dennis Schubert	0a619749f2	Add Camo for profile images	2014-11-08 23:12:55 +01:00
Dennis Schubert	613f2d1142	Add Camo for comments	2014-11-08 23:12:55 +01:00
Dennis Schubert	92cd4e6b78	Use camo for Markdown images ... just a quick proof of concept	2014-11-08 05:14:18 +01:00
Faldrian	db13811c2c	added scrollbar to bookmark publisher, fixed mention layout bugs	2014-11-07 19:17:54 +01:00
Florian Staudacher	2c8bbd3343	Merge branch 'body-classes' of https://github.com/roymckenzie/diaspora into roymckenzie-body-classes	2014-11-07 16:39:33 +01:00
Faldrian	d928c69e36	Fix: displaying more than one row of image attachments broke publisher	2014-11-07 16:37:52 +01:00
Steffen van Bergerem	25e4e558c5	Ask for confirmation when leaving a submittable publisher	2014-11-02 01:49:33 +01:00
Chocobozzz	e411a344f4	Commit the new branding sprite	2014-10-21 17:14:25 +02:00
Paul Hill	ac4607d75c	LibreJS should work with most of the site	2014-10-21 02:48:18 +01:00
Chocobozzz	1aff0d8c2c	Add header logo when hoovered (white logo)	2014-10-18 22:24:05 +02:00
Jonne Haß	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ß	ef71c57190	Merge pull request #5342 from AugierLe42e/sass-to-scss ... Refactor application.css and bootstrap-headerfix.css	2014-10-14 19:42:31 +02:00
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
Augier	cdf4fc05df	Refactored the two last sass files in scss. #3796	2014-10-14 17:47:52 +02:00
Jonne Haß	4e6eacbeb1	Update _.template calls to undscore.js 1.7	2014-10-14 15:04:01 +02:00
Jonne Haß	1c0cf98958	Merge pull request #5237 from jaideng123/added_infinite_scrolling_to_notedropdown ... Notifications Dropdown infinite scrolling	2014-10-14 13:37:55 +02:00
Jonne Haß	e5b20106c6	Merge pull request #5279 from svbergerem/overflow-long-names-tag-page ... Hidden overflow for long names on tag pages Conflicts: Changelog.md	2014-10-14 13:30:22 +02:00
Jonne Haß	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