1170 Commits

Author	SHA1	Message	Date
nilsding	13bdbaa430	centred the "New notifications will appear here" text and also fixed class for notifications entry on navbar	2015-01-26 17:53:23 +01:00
nilsding	c8b02bbf50	actually add some code here	2015-01-26 17:50:45 +01:00
Andreas N	2a0d80b755	basic stuff fixed	2015-01-26 17:21:40 +01:00
Andreas N	da9c15d43c	basic stuff added	2015-01-26 17:16:32 +01:00
Andreas N	e9c7c5120b	hotfix	2015-01-26 15:57:07 +01:00
Andreas N	370169c35a	update and fix mobile design	2015-01-26 15:51:18 +01:00
Andreas N	1a3c491e45	remove fa-spin from blogger badge	2015-01-25 20:50:42 +01:00
nilsding	0d639fd6ec	added blogger badge	2015-01-25 20:30:09 +01:00
Andreas N	fa2220dd00	added Filippus to admins	2015-01-19 17:39:19 +01:00
Andreas N	5b67ac7f0a	added template css file	2015-01-18 00:23:55 +01:00
Andreas N	3edfbb42a1	add design stuff for header display	2015-01-18 00:16:06 +01:00
Andreas N	c60e345d7b	removed kyr from admins	2015-01-17 21:35:52 +01:00
Andreas N	26605dd66f	more fixes for member listing for groups	2015-01-17 19:15:06 +01:00
Andreas N	f714e8d0e2	fix member listing for groups	2015-01-17 19:13:31 +01:00
Andreas N	0b2c1b86c8	added member listing for groups	2015-01-17 19:13:09 +01:00
nilsding	927ec9678f	deleting groups works now! finally!!!	2015-01-17 18:57:23 +01:00
Andreas N	745f600f60	added delete button	2015-01-17 18:42:56 +01:00
nilsding	a0d0731a6b	creating groups works now.	2015-01-17 18:24:36 +01:00
nilsding	dd6af3f651	adding and removing users to/from groups works now	2015-01-17 17:50:25 +01:00
nilsding	5fd5af9f47	Merge branch 'master' into groups	2015-01-17 15:51:52 +01:00
Andreas N	fa3020e36d	i honestly don't know whats wrong here	2015-01-17 12:45:02 +01:00
Andreas N	c36c3e6472	fixed faq	2015-01-17 12:41:59 +01:00
Andreas N	599a88c34a	updated faq	2015-01-17 12:39:31 +01:00
Andreas N	991ad1f838	added agree statement to sign in page	2015-01-17 12:34:51 +01:00
Andreas N	6871733249	update terms of service	2015-01-17 09:21:49 +01:00
Andreas N	d5b14f0654	update effective date	2015-01-17 09:13:56 +01:00
Andreas N	74e74dedef	added terms of service	2015-01-16 23:16:28 +01:00
Andreas N	28e72b3adc	added panel-body	2015-01-16 22:45:00 +01:00
Andreas N	d593e0edd4	added privacy policy	2015-01-16 22:43:56 +01:00
Andreas N	75ae141759	added privacy policy	2015-01-16 22:36:39 +01:00
Andreas N	597c54aa93	remove empty header	2015-01-15 16:18:35 +01:00
Andreas N	e90d9777b2	update about page with cool header	2015-01-15 16:04:59 +01:00
Andreas N	0e052ee1be	added tab navigation	2015-01-14 20:14:58 +01:00
Andreas N	b99fe56038	update design to be condensed	2015-01-14 19:57:11 +01:00
Andreas N	0ad2bc9ca2	fix indentation	2015-01-14 19:37:51 +01:00
Andreas N	c557192b61	wrapping list-group in panel, just for design stuff	2015-01-14 16:29:53 +01:00
Andreas N	1497f97395	attempt to center input	2015-01-14 15:44:27 +01:00
Andreas N	050d94e8d7	update group membership modal	2015-01-14 15:35:53 +01:00
Andreas N	42534982d6	move icons	2015-01-14 14:20:04 +01:00
Andreas N	03eb5ad738	Merge remote-tracking branch 'origin/master'	2015-01-14 14:17:33 +01:00
Andreas N	3fe879768f	updated sharing section	2015-01-14 14:17:24 +01:00
nilsding	642be7996d	added Fontawesome icon	2015-01-14 07:32:43 +01:00
nilsding	c99fe89235	added group memberships modal	2015-01-14 07:07:40 +01:00
nilsding	d7350838ba	Merge branch 'master' into groups	2015-01-13 23:13:38 +01:00
Andreas N	f350f2806a	change theme-color	2015-01-13 22:57:50 +01:00
Andreas N	3316ccb7bc	fix indentation	2015-01-13 19:06:26 +01:00
Andreas N	e0871a661b	fix sharing settings	2015-01-13 19:04:27 +01:00
Andreas N	1ed216df25	update sharing settings	2015-01-13 18:59:58 +01:00
nilsding	a05d763b75	selecting the group from the ask followers modal works now.	2015-01-13 15:45:32 +01:00
nilsding	9b0b2df18e	added %select to the ask followers modal	2015-01-13 14:50:28 +01:00
nilsding	a8ed21942e	added group_timelines	2015-01-13 13:23:12 +01:00
nilsding	eaa4096af5	Merge branch 'master' into groups ... Conflicts: db/schema.rb	2015-01-13 07:05:11 +01:00
nilsding	1bb369aa7d	implemented basic functionality of YE OLDE BANHAMMER!	2015-01-12 22:44:13 +01:00
nilsding	011150ba17	added a lock icon	2015-01-12 07:08:06 +01:00
nilsding	f93624fa2c	added groups route thing	2015-01-12 06:57:43 +01:00
nilsding	bc826f07fe	moved Piwik code to its own file	2015-01-10 18:53:25 +01:00
Andreas N	01ac598c20	android sure has weird preferences	2015-01-10 13:58:19 +01:00
Andreas N	460f5c377d	more tries to fix	2015-01-10 13:56:39 +01:00
Andreas N	7937bff707	let's see if we can fix this	2015-01-10 13:50:08 +01:00
Andreas N	1a9df6da6c	added new favicons	2015-01-10 13:43:02 +01:00
Andreas N	77259d8cef	Merge remote-tracking branch 'origin/master'	2015-01-09 21:54:18 +01:00
Andreas N	273624f679	updated answerbox design	2015-01-09 21:52:09 +01:00
Andreas N	3e88abe36d	updated answerbox design	2015-01-09 21:44:41 +01:00
nilsding	081a9ee4a8	vittu	2015-01-08 22:54:10 +01:00
nilsding	03ac252dca	fixed fuckup	2015-01-08 22:53:29 +01:00
Andreas N	7882ccbc03	how about design update	2015-01-08 22:50:59 +01:00
nilsding	d97763eda0	Revert "Le Funny Emoji Meme Face x--DD" ... This reverts commit 5118ba9761.	2015-01-08 22:34:50 +01:00
nilsding	5118ba9761	Le Funny Emoji Meme Face x--DD	2015-01-08 22:28:56 +01:00
nilsding	c2811e65ce	fixed indentation	2015-01-08 18:23:03 +01:00
nilsding	181a6b72b0	pagination for notifications	2015-01-08 18:22:27 +01:00
Andreas N	52791b737b	added link to FAQ page	2015-01-07 22:06:21 +01:00
Andreas N	4a8eee158d	fixed faq page	2015-01-07 21:57:46 +01:00
Andreas N	546bc67bba	fixed faq page	2015-01-07 21:52:56 +01:00
Andreas N	6ca96aaa71	fixed faq page	2015-01-07 21:50:44 +01:00
Andreas N	0d4a271299	Merge branch 'master' of git.rrerr.net:justask/justask	2015-01-07 21:37:22 +01:00
Andreas N	4161002da0	added faq page	2015-01-07 21:30:52 +01:00
ix	66734193b0	pressing ctrl/meta + m toggles the question box	2015-01-07 19:58:43 +01:00
ix	d8f964bda2	added en language to layout (for screenreaders)	2015-01-07 16:02:02 +01:00
nilsding	ddfba921c9	removed %p tag	2015-01-07 13:59:04 +01:00
nilsding	a8d533cef7	markdown for comments and in the bio	2015-01-07 07:02:07 +01:00
nilsding	0916628c43	added link to bug tracker	2015-01-07 00:36:09 +01:00
Andreas N	1b4eb15152	tooltips for smiles	2015-01-06 17:33:02 +01:00
Andreas N	0d784aee47	finish implementing new badge design	2015-01-06 15:32:14 +01:00
Andreas N	11cd8b59f8	fix broken labels	2015-01-05 00:50:27 +01:00
Andreas N	fcf7d430eb	updated about page even more	2015-01-05 00:32:58 +01:00
Andreas N	e1563da2f3	updated about page	2015-01-05 00:10:35 +01:00
Andreas N	124d588b39	added kyr to team display	2015-01-05 00:02:13 +01:00
nilsding	59b431513b	made privacy_allow_stranger_answers work	2015-01-03 22:37:10 +01:00
nilsding	09b6a6bc10	made that stuff work	2015-01-03 22:27:14 +01:00
nilsding	bc94a729a6	users now can enable/disable some privacy settings	2015-01-03 21:58:56 +01:00
nilsding	fd4e66bb75	Merge branch 'master' into privacy	2015-01-03 20:28:20 +01:00
nilsding	81becddbd5	added pagination to answers	2015-01-03 19:24:51 +01:00
nilsding	f53ca1b449	the new answer is now shown	2015-01-03 19:14:26 +01:00
nilsding	9dc98a3e4e	users may not not answer their own question	2015-01-03 19:08:09 +01:00
nilsding	72140be316	moved answer thing to the bottom	2015-01-03 19:02:06 +01:00
Andreas N	e22dd08f75	Merge remote-tracking branch 'origin/master'	2015-01-03 18:57:39 +01:00
Andreas N	a259c19ef0	how about some updated design for this	2015-01-03 18:57:30 +01:00
nilsding	88b71d8f31	added render of the answerbox to the response	2015-01-03 18:56:06 +01:00
nilsding	f4d63ae4e3	users now can answer other people's questions	2015-01-03 18:41:10 +01:00
nilsding	7be7de11cd	moved answering code from inbox_controller.rb to answer_controller.rb	2015-01-03 18:40:39 +01:00
nilsding	c4c6cb62d8	removed redundant line	2015-01-03 18:13:18 +01:00
Andreas N	82924cfbec	fix profile size indifference	2015-01-03 15:23:43 +01:00
Andreas N	a09cb9431f	revert 'fixed button layout on mobile devices'	2015-01-03 04:29:43 +01:00
Andreas N	0881f4a999	fixed button layout on mobile devices	2015-01-03 04:25:25 +01:00
Andreas N	efee32a024	Merge remote-tracking branch 'origin/master'	2015-01-03 04:22:22 +01:00
Andreas N	d06802fd41	fixed button layout on mobile devices	2015-01-03 04:22:10 +01:00
nilsding	ddae3c6278	crapkit sucks	2015-01-03 04:01:42 +01:00
nilsding	85c32346b0	Merge branch 'master' of 10.2.0.1:justask/justask	2015-01-03 03:56:22 +01:00
Andreas N	639fa43a5a	fix indentation	2015-01-03 03:56:14 +01:00
Andreas N	1c7b064dbd	removed this shit	2015-01-03 03:54:30 +01:00
nilsding	9869a46fef	Revert "attempt fix for #39" ... This reverts commit 16f319a0a6.	2015-01-03 03:50:54 +01:00
Andreas N	34a5b56555	added follow button to dim view	2015-01-03 03:43:32 +01:00
Andreas N	16f319a0a6	attempt fix for #39	2015-01-03 03:12:01 +01:00
Andreas N	c74f4086eb	even more design updates	2015-01-03 02:13:53 +01:00
Andreas N	dfb879899a	even more design updates	2015-01-03 02:08:09 +01:00
Andreas N	e25b05297f	even more design updatess	2015-01-03 02:00:54 +01:00
Andreas N	75fb90c9e5	add cool new profile panel design	2015-01-03 01:49:56 +01:00
Andreas N	00250ddcab	fix this shit, take 2	2015-01-03 00:33:10 +01:00
Andreas N	e6eff218b5	fix this shit	2015-01-03 00:32:07 +01:00
Andreas N	aa6c892eb3	added supporter display	2015-01-03 00:24:06 +01:00
nilsding	74ece9d971	added privacy setting routes ... this took me longer than it should have taken	2015-01-02 21:34:56 +01:00
Andreas N	dd21ce344b	fixed button, or attempt fix	2015-01-02 17:40:34 +01:00
Andreas N	65445954c8	moved button on different sizes to navbar or right side	2015-01-02 17:27:44 +01:00
Andreas N	97086a8a9a	add privacy tab	2015-01-02 01:09:04 +01:00
Andreas N	57f469e429	you can report yourself anymore in comments	2015-01-02 00:41:26 +01:00
Andreas N	ed9c7e945d	you can report yourself anymore	2015-01-02 00:38:59 +01:00
Andreas N	dc558902f4	Merge remote-tracking branch 'origin/master'	2015-01-01 19:10:41 +01:00
Andreas N	d5b538461e	added moderator display to about page	2015-01-01 19:10:31 +01:00
nilsding	f6e405c2e9	url: HTTPS!	2015-01-01 18:55:17 +01:00
nilsding	5c0fd6838f	hmm?	2015-01-01 18:45:15 +01:00
nilsding	4a49b7fc27	ffffff	2015-01-01 18:19:02 +01:00
nilsding	b76a78bdfb	also this	2015-01-01 18:17:40 +01:00
nilsding	77b92b0b23	changed a few Devise views	2015-01-01 17:50:25 +01:00
nilsding	ed6e91c33f	changed about avatar	2015-01-01 17:21:39 +01:00
Andreas N	ba0e39e99b	Merge remote-tracking branch 'origin/master'	2015-01-01 17:09:30 +01:00
Andreas N	96704c06da	updated bugtracker link in about page	2015-01-01 17:09:15 +01:00
nilsding	daa8eefff6	temp fix	2014-12-29 22:01:54 +01:00
nilsding	fa16612ba8	made the new cropper work	2014-12-29 16:29:46 +01:00
nilsding	f7cb3478be	:medium everywhere	2014-12-29 14:57:16 +01:00
nilsding	b61a631f15	added hidden fields	2014-12-29 14:50:25 +01:00
nilsding	bba9fb8354	removed gravatar warning	2014-12-29 13:56:23 +01:00
nilsding	5071e3ffe8	added JCrop to view	2014-12-29 13:52:19 +01:00
nilsding	678e03deed	uploading profile pictures works now	2014-12-29 11:21:43 +01:00
Andreas N	70ac565e6b	added following information thingy	2014-12-29 02:32:44 +01:00
nilsding	65e90e1c64	reporting users works as well.	2014-12-29 01:47:04 +01:00
nilsding	27558f83c4	made tabs work	2014-12-29 01:25:48 +01:00
nilsding	34a2f3cd6b	deleting comments works now	2014-12-29 01:05:30 +01:00
nilsding	a0c0d68e43	posting moderation comments works now	2014-12-29 00:50:14 +01:00
nilsding	b7b5ee960e	deleting reports works now	2014-12-29 00:21:06 +01:00
nilsding	486d5d18f2	this fucker finally works how I want it to	2014-12-28 23:57:07 +01:00
nilsding	7a0b3f4af7	added votes for reports	2014-12-28 23:26:16 +01:00
nilsding	3f3591c6e7	removed hardcoded occurrences of "justask"	2014-12-28 22:39:10 +01:00
nilsding	7d55141a1a	added deleted column to reports	2014-12-28 21:34:36 +01:00
nilsding	b3f165b12b	reporting and deleting comments works now	2014-12-28 21:14:01 +01:00
Andreas N	f158acff3f	added delete button to moderationbox	2014-12-28 20:13:45 +01:00
nilsding	7bfa5132dd	added link to the reported object	2014-12-28 20:05:30 +01:00
nilsding	ce280fffa1	reporting things via ajax works now	2014-12-28 19:55:50 +01:00
nilsding	3f24542410	added git info for development rails env	2014-12-28 19:45:49 +01:00
nilsding	90fe42e643	Merge remote-tracking branch 'origin/master' into moderation ... Conflicts: app/models/user.rb	2014-12-28 19:29:01 +01:00
nilsding	5829d4f1ef	removed unnecessary p tag	2014-12-28 19:11:36 +01:00
nilsding	0e4d744478	added Markdown to answers	2014-12-28 19:06:49 +01:00
Andreas N	05002b8d10	added floating ask your followers button	2014-12-27 19:18:55 +01:00
nilsding	35e956e692	dropdown is now left	2014-12-27 18:14:31 +01:00
Andreas N	33694d3820	hiding block-button for now	2014-12-27 18:12:50 +01:00
Andreas N	d0000f0754	block-sized action button	2014-12-27 18:10:04 +01:00
Andreas N	8a6d661216	added actions for user profile	2014-12-27 18:07:25 +01:00
Andreas N	2e048d9472	add text for no comments	2014-12-27 16:38:07 +01:00
nilsding	cd289a32c4	removed report comment thing	2014-12-27 16:18:02 +01:00
nilsding	e75284dba0	added some view logic	2014-12-27 16:14:57 +01:00
Andreas N	84806a8001	copy-pasted comment section for moderation	2014-12-27 16:09:04 +01:00
Andreas N	56441a4967	more fix.	2014-12-27 16:03:09 +01:00
nilsding	642d88da07	,	2014-12-27 15:56:34 +01:00
nilsding	1a131d8c47	Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation	2014-12-27 15:50:59 +01:00
Andreas N	edeff57293	Fixxed!	2014-12-27 15:50:36 +01:00
nilsding	5c5edbab13	Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation	2014-12-27 15:40:07 +01:00
Andreas N	be44301874	I hope this finally fixes it ;_;	2014-12-27 15:39:45 +01:00
nilsding	27aa704511	Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation	2014-12-27 15:38:16 +01:00
Andreas N	018a377c24	finally	2014-12-27 15:38:06 +01:00
nilsding	f1298a416f	Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation	2014-12-27 15:31:44 +01:00
Andreas N	9522bfa8f0	I should probably put that in the right file	2014-12-27 15:31:34 +01:00
nilsding	8a23ce0cf3	Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation	2014-12-27 15:28:10 +01:00
nilsding	4e81467163	hhhh	2014-12-27 15:28:01 +01:00
Andreas N	2e2c2dac58	trying to fix dropdowns	2014-12-27 15:27:39 +01:00
Andreas N	1700bfb0f5	update comment design again	2014-12-27 15:22:30 +01:00
Andreas N	f8d8c13fb9	update comment design	2014-12-27 15:15:35 +01:00
Andreas N	c7c10b43b9	Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation	2014-12-27 15:13:05 +01:00
Andreas N	395d1691f8	update comment design	2014-12-27 15:12:57 +01:00
nilsding	260d5cddd7	updated delete button	2014-12-27 14:59:48 +01:00
nilsding	1a43ae0054	UND NACH RECHTS, RECHTS, RECHTS, IMMER NACH RRRECHTS	2014-12-27 02:34:01 +01:00
Andreas N	2c8cd5bc3e	fix broken dropdown	2014-12-27 02:29:57 +01:00
Andreas N	bdd3cd5afc	Added button for report/delete actions	2014-12-27 02:26:51 +01:00
Andreas N	92af469aa4	Merge branch 'master' into moderation	2014-12-27 02:12:32 +01:00
nilsding	64d50ad9b4	fox'd	2014-12-27 01:55:09 +01:00
nilsding	a37cd95f46	Merge branch 'master' into notifications-tooltips	2014-12-27 01:46:34 +01:00
nilsding	9fe8be1db8	Merge branch 'master' of git.rrerr.net:justask/justask ... Conflicts: app/views/shared/_answerbox.html.haml	2014-12-27 00:40:02 +01:00
nilsding	c817f32b18	j	2014-12-27 00:39:03 +01:00
Andreas N	20c173442d	remove that button	2014-12-27 00:37:42 +01:00
Andreas N	4961a44d59	add collapsed view for single answerbox	2014-12-27 00:33:45 +01:00
nilsding	d31bfa6d8b	added a few placeholders	2014-12-27 00:19:55 +01:00
pixeldesu	32ace00f84	forgot the extra profile pages	2014-12-26 15:32:53 +01:00
nilsding	cb003ce36d	added link to moderation panel in navbar	2014-12-26 14:09:07 +01:00
pixeldesu	40dc6a140d	fix margin if content is empty	2014-12-26 13:48:20 +01:00
pixeldesu	e900b794d3	increased sidebar size on profile	2014-12-26 13:45:29 +01:00
nilsding	9e918fa3dc	added moderator to users	2014-12-26 13:34:01 +01:00
pixeldesu	f403a0a2f8	added tabs, moderation box view and comment display	2014-12-25 23:47:11 +01:00
pixeldesu	32623ec2f2	added basic mod page	2014-12-25 23:14:45 +01:00
pixeldesu	2107ec6270	init moderation controller	2014-12-25 23:00:33 +01:00
nilsding	b927b3bc87	orrrr	2014-12-25 15:16:57 +01:00
nilsding	4e2cfd5188	???	2014-12-25 15:16:10 +01:00
nilsding	de1ef57a8a	dose that work	2014-12-25 15:13:52 +01:00
Andreas N	9440eafbe8	Merge branch 'master' of git.rrerr.net:justask/justask	2014-12-25 14:27:24 +01:00
Andreas N	4f777968e5	readded links to questions on user profile	2014-12-25 14:26:35 +01:00
Andreas N	a09c01cc44	fixed text display for anon questionbox	2014-12-25 14:22:49 +01:00
nilsding	22838ebfda	Meymeys	2014-12-21 23:10:26 +01:00
Andreas N	7429aca044	remove br	2014-12-21 23:09:16 +01:00
nilsding	98e9fe098f	Meymeys	2014-12-21 23:07:56 +01:00
Andreas N	40b0097149	more fix	2014-12-21 23:07:01 +01:00
Andreas N	6201b7043b	how to stupid fix	2014-12-21 23:05:53 +01:00
nilsding	b01e1791d4	Merge remote-tracking branch 'origin/inbox'	2014-12-21 23:04:43 +01:00
Andreas N	23af34494e	add share on Twitter button	2014-12-21 23:01:21 +01:00
nilsding	2169a86615	added a count	2014-12-21 15:36:57 +01:00
nilsding	dc0b105b46	added .panel-title	2014-12-21 14:28:33 +01:00
nilsding	7a18790241	added disable attribute if there are no questions in the inbox	2014-12-21 14:11:35 +01:00
nilsding	1ba34c59d0	added "delete all questions" button thing	2014-12-21 13:41:57 +01:00
Andreas N	55f1680c18	hide delete inbox for now	2014-12-20 16:15:59 +01:00
Andreas N	000fa09a5e	restructure inbox design	2014-12-20 14:37:14 +01:00
Andreas N	ba9b6d1e12	add link to question/answer in question display	2014-12-20 02:14:27 +01:00
Andreas N	5aa6248cb1	icon bar animation shows up when you have new notifications	2014-12-20 01:37:05 +01:00
Andreas N	368949a031	fix design stuff	2014-12-20 00:03:07 +01:00
Andreas N	5d19a975f3	indentation is my best friend	2014-12-19 23:38:09 +01:00
Andreas N	b074abad4d	fuck panel-body	2014-12-19 23:35:54 +01:00
Andreas N	7543da2701	move profile things into something different	2014-12-19 23:33:42 +01:00
Andreas N	bdff6f4110	the journey of fixes has finally an end	2014-12-19 23:05:45 +01:00
Andreas N	a764632538	more fixes and updates	2014-12-19 23:03:03 +01:00
Andreas N	c1f0388da4	I reached the end of the file, fixing this I finally did it	2014-12-19 22:58:06 +01:00
Andreas N	20796654f5	more fix	2014-12-19 22:57:08 +01:00
Andreas N	f7e35a3977	fix stuff	2014-12-19 22:56:16 +01:00
Andreas N	e9985ed0aa	how about new template	2014-12-19 22:52:12 +01:00
Andreas N	75bca2430b	added links to pages	2014-12-19 22:37:04 +01:00
Andreas N	46c9ccc0ac	question page added	2014-12-19 22:34:24 +01:00
Andreas N	e483714f44	fix headings	2014-12-19 22:11:49 +01:00
Andreas N	0f1e0ef3f9	fixed missing profile-header	2014-12-19 21:49:48 +01:00
pixeldesu	ae27f06df6	added tooltips to notification links	2014-12-16 16:54:33 +01:00
pixeldesu	c3905791b6	move answer link to 'answered by username' section	2014-12-16 16:14:42 +01:00
nilsding	a30e6509b5	fixed things	2014-12-15 07:47:56 +01:00
nilsding	5da0778131	fixed link	2014-12-14 15:58:39 +01:00
nilsding	1c01ced3c8	fixed link	2014-12-14 15:49:44 +01:00
nilsding	da537971d1	added item	2014-12-14 15:48:19 +01:00
pixeldesu	cf78d4758a	rounded images	2014-12-14 15:44:17 +01:00
pixeldesu	3bcd67d1a4	rounded image was missing	2014-12-14 15:42:54 +01:00
pixeldesu	91711b24fe	add a bit of margin to smiles section	2014-12-14 15:41:08 +01:00
nilsding	3eec44f422	Merge remote-tracking branches 'remotes/origin/master' and 'remotes/origin/users-smiled' into notifications	2014-12-14 15:29:32 +01:00
nilsding	b0a2072f96	made notification tabs work	2014-12-14 15:24:59 +01:00
pixeldesu	d963191bd0	added smile display to answerbox	2014-12-14 15:22:37 +01:00
nilsding	c9d57e235f	added route for notifications	2014-12-14 15:17:52 +01:00
nilsding	dec91d474d	added notification_count	2014-12-14 15:15:15 +01:00
nilsding	43474a6c92	"commented on your answer"	2014-12-14 15:10:23 +01:00
nilsding	154c360e15	"smiled your answer"	2014-12-14 15:06:10 +01:00
nilsding	c9b5947e6b	"followed you"	2014-12-14 14:58:29 +01:00
nilsding	2549d94f31	made a few things prettier	2014-12-14 14:41:44 +01:00
nilsding	ab9347f053	notifications work now!	2014-12-14 14:34:51 +01:00
pixeldesu	156d92e946	fixed typo...or wrong word	2014-12-14 13:52:18 +01:00
pixeldesu	1997d36b2f	how about I look into how to change the dropdown first	2014-12-13 19:48:31 +01:00
nilsding	1870acdd3a	fluid	2014-12-13 18:24:50 +01:00
nilsding	e1d250cadd	change wording	2014-12-13 18:20:25 +01:00
pixeldesu	103103764b	how about this thing	2014-12-13 18:04:52 +01:00
nilsding	de69e84e5a	Haml::SyntaxError	2014-12-13 18:03:27 +01:00
pixeldesu	3173d70aac	added new frontpage design	2014-12-13 17:52:58 +01:00
nilsding	935acb7335	added layouts/messages to setting views	2014-12-13 16:03:18 +01:00
nilsding	a2dae7c5d4	checked state is best state	2014-12-13 15:49:19 +01:00
nilsding	82277847b9	Merge branch 'omniauth'	2014-12-13 15:40:50 +01:00
nilsding	013d1d44b7	the checkbox should now share to services	2014-12-13 15:17:50 +01:00
pixeldesu	461d48556b	Merge branch 'master' of git.rrerr.net:justask/justask	2014-12-13 00:55:07 +01:00
pixeldesu	aa1686121a	add profile header display	2014-12-13 00:55:00 +01:00
pixeldesu	6e154bc462	added checkbox for Twitter sharing	2014-12-13 00:01:54 +01:00
nilsding	3cd5739ce9	added link to Sidekiq::Web	2014-12-12 23:58:35 +01:00
nilsding	9168d908dd	aw yeah	2014-12-12 22:37:52 +01:00
nilsding	c91fbe43b1	added Services view.	2014-12-12 21:54:17 +01:00
nilsding	f24433d84e	added Services controller	2014-12-12 21:43:09 +01:00
pixeldesu	c4bdc8fd3e	design updates	2014-12-12 19:01:34 +01:00
nilsding	54ec828e5b	display_all	2014-12-12 18:54:17 +01:00
nilsding	4d944e1684	Karim abused this too much	2014-12-12 18:49:34 +01:00
pixeldesu	a0f883f062	hide left sidebar links on smallest screen size	2014-12-12 17:48:19 +01:00
pixeldesu	61f9224302	how many navs do we need inside a navbar	2014-12-12 17:44:04 +01:00
pixeldesu	7c9df66ae7	moved public timeline	2014-12-12 17:43:32 +01:00
pixeldesu	38c08970c8	Merge branch 'master' of git.rrerr.net:justask/justask	2014-12-12 16:50:23 +01:00
pixeldesu	ba7df144d4	fix top margin	2014-12-12 16:49:15 +01:00
nilsding	ebd0719599	foxed about page	2014-12-12 16:45:39 +01:00
pixeldesu	3f8fb96975	update about page things	2014-12-12 16:31:50 +01:00
nilsding	f4ee900ae6	slkegjlkd	2014-12-11 18:00:24 +01:00
nilsding	40399c8dc1	pixel broked it	2014-12-11 17:56:52 +01:00
pixeldesu	1d320fd847	added navbar toggle animation	2014-12-11 15:49:01 +01:00
nilsding	27867a9284	added navbar entry for public timeline	2014-12-11 06:51:26 +01:00
nilsding	f679bdd659	added some panel	2014-12-11 06:44:25 +01:00
nilsding	2251a21872	added public timeline	2014-12-11 06:39:35 +01:00
pixeldesu	0e52a9aef8	attempt to fix overlapping comment count	2014-12-10 21:16:18 +01:00
nilsding	93540e0969	added placeholder. ... thank you #based quad	2014-12-10 20:38:54 +01:00
nilsding	c8154c1fc2	added Piwik tracking	2014-12-10 19:54:27 +01:00
nilsding	217683de6c	update about page (muh shekels)	2014-12-10 19:50:49 +01:00
pixeldesu	9e03ca64e9	added gravatar info to settings page	2014-12-10 19:38:09 +01:00
pixeldesu	31f520ed4b	fix more stuff	2014-12-10 19:14:24 +01:00
pixeldesu	2a9db637a0	how about no centered text	2014-12-10 19:11:06 +01:00
pixeldesu	aa32861f7f	new display to generate more questions	2014-12-10 19:09:44 +01:00
nilsding	06112b0cce	added link to Kontrollzentrum in the navbar for admins	2014-12-10 18:23:25 +01:00
nilsding	a4edb4147d	generating questions is great	2014-12-09 23:37:44 +01:00
nilsding	9d9713e655	this does not belong here	2014-12-09 23:22:56 +01:00
nilsding	daab6ce4f5	THIS IS SPARTA	2014-12-09 23:21:41 +01:00
pixeldesu	ef9579594c	added notification test page	2014-12-09 23:07:04 +01:00
pixeldesu	f277b249c2	added notification controller	2014-12-09 22:35:11 +01:00
pixeldesu	bee2404fe3	fix equal sign	2014-12-09 22:23:51 +01:00
pixeldesu	a9a10dd04d	remove pluralize stuff	2014-12-09 22:07:45 +01:00
pixeldesu	98b63b45c6	splitting scss, pluralizing entries, etc	2014-12-09 15:32:29 +01:00
nilsding	c18ac74700	renamed following to friends	2014-12-08 19:51:34 +01:00
nilsding	e63e52f585	the count is now incremented/decremented correctly on the view followers/friends pages	2014-12-08 19:48:12 +01:00
nilsding	f381baa702	ZHE FIXXX	2014-12-08 17:18:26 +01:00
nilsding	0f2dc34e55	why not zoidberg?	2014-12-08 17:14:02 +01:00
nilsding	b4408ffbd2	!!! (aka. made follower/following links clickable)	2014-12-08 17:11:54 +01:00
nilsding	742bba0b12	?	2014-12-08 17:10:09 +01:00
nilsding	30c8654a27	added follower/following pages	2014-12-08 17:03:06 +01:00
nilsding	2caf81d08e	ayyyy vodka	2014-12-08 16:01:27 +01:00
nilsding	293837984e	added pagination to User#show	2014-12-08 15:23:04 +01:00
nilsding	cc87061fe2	Links. (Und rechts)	2014-12-08 15:17:26 +01:00
nilsding	bd16bd794d	alright this should do.	2014-12-08 14:22:11 +01:00
nilsding	6c0e6d1a51	hmm...	2014-12-08 14:18:16 +01:00
nilsding	c279026ce0	added pagination! (at least on the timeline)	2014-12-08 14:14:13 +01:00
nilsding	da97b7dcf4	show the ask followers modal only for signed in users	2014-12-08 13:10:25 +01:00
pixeldesu	51498d3825	fixed navbar display	2014-12-07 21:06:57 +01:00
nilsding	afe9b8f743	bugFuchs	2014-12-07 20:57:10 +01:00
nilsding	7de522a82f	added question#show thing and more...	2014-12-07 20:51:44 +01:00
nilsding	a9f5ddab65	added thing	2014-12-07 20:18:53 +01:00
nilsding	58d0efc219	implemented "ask your followers"	2014-12-07 20:13:45 +01:00
nilsding	81b131779b	current password now moved to its own modal, it's more visible then.	2014-12-07 16:04:05 +01:00
nilsding	3632dbde9f	fixed path	2014-12-07 15:53:19 +01:00
pixeldesu	01c5577cdd	changed display for comments	2014-12-07 15:36:08 +01:00
nilsding	bc4e6d4ed2	added some counters to sdgjlk	2014-12-07 15:11:09 +01:00
nilsding	9f4d9214bd	added some counters to user profiles	2014-12-07 15:10:05 +01:00
nilsding	8ab5458b1b	posting comments is now possible.	2014-12-07 15:05:44 +01:00
nilsding	50151453d8	added ajax/comment_controller	2014-12-07 14:31:20 +01:00
nilsding	a34972379f	unregistered users will see the smile_count if at least someone smiled the answer	2014-12-07 12:46:25 +01:00
nilsding	382277adf0	iOS web app things	2014-12-06 17:08:10 +01:00
nilsding	a2e1e2557b	smile count is now in the button itself if the user is signed in	2014-12-05 20:21:15 +01:00
nilsding	c276b6aacf	added comment text input box thing	2014-12-05 20:17:44 +01:00
nilsding	668b032a25	the comment button now actually does something!	2014-12-05 19:50:21 +01:00
nilsding	641fa1ddc3	added show answer thing	2014-12-05 07:02:23 +01:00
pixeldesu	ac17c09cf7	more changes	2014-12-01 21:33:51 +01:00
pixeldesu	3c4a240b8a	updated profile display	2014-12-01 21:11:32 +01:00
nilsding	8b682bd52f	added website, bio and location fields to user	2014-12-01 20:47:10 +01:00
pixeldesu	be438f670f	Merge branch 'master' of git.rrerr.net:nilsding/justask	2014-11-30 23:08:21 +01:00
pixeldesu	ed307504b0	cool profile changes	2014-11-30 23:08:11 +01:00
nilsding	c159e3b5bc	INDENTATIONS	2014-11-30 21:15:51 +01:00
nilsding	631aed196b	new partial...	2014-11-30 21:14:55 +01:00
nilsding	bc77ad0032	Gebrechungsschaden	2014-11-30 21:12:17 +01:00
nilsding	28df95c089	hnn	2014-11-30 21:08:00 +01:00
pixeldesu	449cc68958	more fixes to timestamp display	2014-11-30 21:05:16 +01:00
pixeldesu	484c8d9b65	alternate display	2014-11-30 21:02:17 +01:00
pixeldesu	ba625247ae	remove timestamp from question asked	2014-11-30 20:59:21 +01:00
pixeldesu	94f1ac4568	panel show me your body	2014-11-30 20:58:10 +01:00
pixeldesu	76da9065e2	information for inbox	2014-11-30 20:55:22 +01:00
pixeldesu	433b0cc3a0	more fixes about fixes	2014-11-30 20:51:44 +01:00
pixeldesu	5687feeb0a	more fixes	2014-11-30 20:47:28 +01:00
pixeldesu	e20037a89a	timestamp	2014-11-30 20:45:21 +01:00
nilsding	f1d93646a2	better check 'em thrice	2014-11-30 20:37:52 +01:00
nilsding	dccb7f9116	better check 'em twice	2014-11-30 20:37:10 +01:00
nilsding	f6906d0dde	check your timestamp privileges	2014-11-30 20:36:26 +01:00
nilsding	97c197f112	smiles!!!	2014-11-30 20:31:22 +01:00
pixeldesu	3a42ceafaf	finally	2014-11-30 19:30:06 +01:00
pixeldesu	10b1e31a2f	what is a dash?	2014-11-30 19:27:28 +01:00
pixeldesu	3c6479f303	pluralize	2014-11-30 19:25:53 +01:00
pixeldesu	6808b15062	fix bug	2014-11-30 19:18:30 +01:00
pixeldesu	48f30f50ac	add inbox message to index widget	2014-11-30 19:13:19 +01:00
nilsding	5f8533ec9d	Merge remote-tracking branch 'origin/master'	2014-11-30 18:24:11 +01:00
nilsding	52ec2cffba	colours	2014-11-30 18:23:57 +01:00
pixeldesu	1979f528a9	revert remove newline	2014-11-30 18:17:39 +01:00
pixeldesu	7a795dc290	remove newline	2014-11-30 18:16:27 +01:00
pixeldesu	616589f678	updated inbox question display	2014-11-30 18:15:00 +01:00
nilsding	b1eb0f72d0	a	2014-11-30 18:10:53 +01:00
nilsding	ae4952db28	deleting questions from the inbox is now possible	2014-11-30 18:05:51 +01:00
pixeldesu	05591f51ef	default	2014-11-30 17:58:11 +01:00
pixeldesu	7230098075	fix meta tag fuckup	2014-11-30 17:53:38 +01:00
pixeldesu	5b0c180b1d	add webapp meta tags for apple devices	2014-11-30 17:51:00 +01:00
pixeldesu	7364de190f	more fixes	2014-11-30 17:40:31 +01:00
pixeldesu	63276a57ef	fixes	2014-11-30 17:36:26 +01:00
pixeldesu	f5231ec304	hiding smiled-text on mobile devices	2014-11-30 17:35:03 +01:00
pixeldesu	5829046402	added smile to timeline page	2014-11-30 17:31:42 +01:00
pixeldesu	a6af5e7609	added spans	2014-11-30 17:28:28 +01:00
pixeldesu	33d42b6a76	dash o	2014-11-30 17:24:24 +01:00
pixeldesu	7933e9073b	Merge branch 'master' of git.rrerr.net:nilsding/justask	2014-11-30 17:22:42 +01:00
pixeldesu	ecdaf7d45f	added buttons that don't do a thing yet	2014-11-30 17:22:34 +01:00
nilsding	d3c2b43a73	added statistics to about page	2014-11-30 16:53:04 +01:00
nilsding	4220091eae	added a few iOS® meta tags	2014-11-30 16:41:18 +01:00
pixeldesu	09ecb0e189	update meta theme	2014-11-30 16:26:10 +01:00
pixeldesu	af1d3cbb27	Merge branch 'master' of git.rrerr.net:nilsding/justask	2014-11-30 16:19:27 +01:00
pixeldesu	249c4cd587	oh boy profile updates	2014-11-30 16:19:20 +01:00
nilsding	155b60f8b2	"answered by xyz" should not be shown on the user page	2014-11-30 16:09:39 +01:00
pixeldesu	dbdb3c81ab	removed newline	2014-11-30 16:07:56 +01:00
nilsding	03bce30714	fixed indentation	2014-11-30 16:06:42 +01:00
pixeldesu	c0c6ac182b	added username of user who answered the question	2014-11-30 16:04:37 +01:00
nilsding	01aff9b673	added jbuilder templates	2014-11-30 15:47:12 +01:00
Georg G	be8a9fdc10	Merge branch 'follow-users' into 'master' ... Follow users See merge request !1	2014-11-30 15:40:18 +01:00
nilsding	e8974415c9	timeline now actually shows entries	2014-11-30 15:39:13 +01:00
nilsding	81c4f14a62	added user/actions partial	2014-11-30 15:28:58 +01:00
nilsding	d4c1ce83de	added ids to counts	2014-11-30 15:28:38 +01:00
pixeldesu	3496cd7f0a	hide images if anonymous and links to profiles	2014-11-30 14:43:27 +01:00
pixeldesu	2b81ad86db	added gravatar support	2014-11-30 14:31:38 +01:00
pixeldesu	409cb8aa66	added team display to about page	2014-11-30 14:21:11 +01:00
pixeldesu	bf4a90b8b5	pull?	2014-11-30 14:01:36 +01:00
pixeldesu	e8d7874bef	lets try to fix this stuff here	2014-11-30 13:52:44 +01:00
pixeldesu	b5b977ab5c	what the fuck is badge-danger?	2014-11-30 02:06:15 +01:00
pixeldesu	6a722af2f7	more changes to answerbox	2014-11-30 00:23:11 +01:00
pixeldesu	ed1d43be01	more changes	2014-11-30 00:10:23 +01:00
pixeldesu	b3e26a6fd2	admin status changes	2014-11-30 00:06:47 +01:00
pixeldesu	36ac06ec6e	more style fixes on profiles	2014-11-29 23:40:57 +01:00
pixeldesu	cdf6b9ba06	Merge branch 'master' of git.rrerr.net:nilsding/justask	2014-11-29 23:29:42 +01:00
pixeldesu	057ebe08af	more changes to answerbox	2014-11-29 23:29:34 +01:00
nilsding	5d88368c00	Kauf dir was denn das macht Spaß kauf einfach Irgendwas™	2014-11-29 23:26:55 +01:00
pixeldesu	fa313dc2c1	equals	2014-11-29 23:21:31 +01:00
pixeldesu	6c04d1d24d	answerbox update things	2014-11-29 23:18:52 +01:00
pixeldesu	bc254bc60d	changed profile display a bit	2014-11-29 22:56:38 +01:00
nilsding	685b0efe83	added motivation header	2014-11-29 22:34:11 +01:00
nilsding	178a01d2f1	added admin badge	2014-11-28 22:41:29 +01:00
nilsding	70aec0b86e	back to bootswatch.	2014-11-28 20:23:17 +01:00
nilsding	dc83151e65	fixed delete button not showing up	2014-11-28 19:23:54 +01:00
nilsding	4476e54ca5	added answerbox	2014-11-27 11:50:29 +01:00
nilsding	8dff4462cf	added (ajax) answer controller	2014-11-26 17:05:46 +01:00
nilsding	b0b19dd3e2	added shared links to devise views	2014-11-25 13:58:20 +01:00
nilsding	e0c63e3099	changed about texts a bit	2014-11-24 18:11:44 +01:00
nilsding	6c5cd4f116	added footer thing to show page	2014-11-24 17:52:58 +01:00
nilsding	4701b8a37e	added links to the bottom of some pages	2014-11-17 13:19:59 +01:00
nilsding	493bfe881c	added links to the bottom of some pages	2014-11-17 13:19:08 +01:00
nilsding	5fa2611297	about pages?? why (k)not	2014-11-17 13:02:11 +01:00
pixeldesu	6cb23c818e	ROW ROW FIGHT THE POWER	2014-11-13 20:02:41 +01:00
pixeldesu	9a3e6bb51b	ALL YOUR META TAGS ARE BELONG TO US	2014-11-13 19:37:11 +01:00
pixeldesu	f98e534c12	ALL YOUR FORM-CONTROL ARE BELONG TO US	2014-11-13 19:20:18 +01:00
nilsding	8ae0fc6c22	the display name is now shown on the profile if it's set	2014-11-13 12:52:08 +01:00
nilsding	1b48fb0343	added question/answer counts to profile	2014-11-12 23:25:43 +01:00
nilsding	b1a1c83163	answers are now shown on the user page	2014-11-12 20:40:24 +01:00
nilsding	b821476ba6	modified inbox a bit	2014-11-11 20:24:49 +01:00
nilsding	fb48c6d995	finally, setting the display_name works.	2014-11-11 20:20:00 +01:00
nilsding	550824e287	modified settings pages a bit	2014-11-11 20:01:24 +01:00
nilsding	025aaf2ba7	NIX	2014-11-11 19:53:35 +01:00
nilsding	a7c9181fc5	fixed fuckups (again)	2014-11-11 18:09:28 +01:00
nilsding	ba7bd2239b	answering works now.	2014-11-11 18:02:59 +01:00
nilsding	1702c2fca4	added inbox ajax thing	2014-11-11 16:19:20 +01:00
nilsding	a7f37fb31c	added Inbox controller	2014-11-11 07:10:41 +01:00
nilsding	c19f44f527	added site_name to the promotion box, removed "Front" navbar entry for non-registered users	2014-11-11 06:41:04 +01:00
nilsding	4d35d96d1c	badges in the navbar!	2014-11-10 23:46:51 +01:00
nilsding	ba71902c27	asking questions is now possible! …kinda.	2014-11-10 21:56:30 +01:00
nilsding	f7f71e9cc9	modified show_user_profile routes, added ajax route	2014-11-10 13:04:10 +01:00
nilsding	8d46fe7843	added ajax controller	2014-11-10 13:03:42 +01:00
nilsding	2cc1062af7	allahu snackbar	2014-11-08 20:41:08 +01:00
nilsding	d236fd38ec	Erbsenzähler raus.	2014-11-08 20:41:00 +01:00
nilsding	f515bf7bea	—€ this.	2014-11-04 15:56:00 +01:00
nilsding	03c71e30e5	changed debug mode string	2014-11-03 13:05:03 +01:00
nilsding	237c170ddc	navbar and page title now show the site_name defined in APP_CONFIGwq	2014-11-03 13:03:24 +01:00
nilsding	8d36050840	settings pages	2014-11-02 20:52:19 +01:00
nilsding	1db15a6dc7	renamed .user-page to .j2-page	2014-11-02 20:29:01 +01:00
nilsding	8124c317de	something with devise	2014-11-02 20:28:42 +01:00
nilsding	f3e5ce3e2b	added jumbotron for not signed in users	2014-11-02 18:16:56 +01:00
nilsding	fc8e6eb5f3	routes,	2014-11-02 17:58:37 +01:00
nilsding	c211b29395	new users controller	2014-11-02 17:57:37 +01:00
nilsding	cc4bf8d277	added question widget (haml2html'ified old code™)	2014-11-02 17:55:47 +01:00
nilsding	dd802036b1	on second thought...	2014-11-02 13:47:35 +01:00
nilsding	ae66877cde	changed a few things	2014-10-28 06:36:38 +01:00
nilsding	f4da926a42	changed email_field to text_field where we don't need an email address	2014-08-01 18:01:34 +02:00
nilsding	ef6da69011	removed a line	2014-08-01 17:41:15 +02:00
nilsding	4916bfe0d3	bootstrap'ified all devise views	2014-08-01 17:40:48 +02:00
nilsding	7641726677	added authentication and everything	2014-08-01 15:27:08 +02:00
nilsding	310e7e80b4	added basic bootstrap navbar and layout and everything	2014-08-01 11:55:50 +02:00
nilsding	601b27d3b3	added static pages	2014-08-01 11:47:25 +02:00
nilsding	386066c55b	first commit	2014-08-01 11:23:47 +02:00