445 Commits

Author	SHA1	Message	Date
Georg G	d5fcec4d7d	hide that "Load more" button if you delete all questions	2015-02-12 22:15:01 +01:00
Andreas N	2a854c1cda	update paddings	2015-02-12 18:14:23 +01:00
Andreas N	f58ec9f2a6	another try to fix	2015-02-12 17:50:13 +01:00
Andreas N	c033f1f4b2	media queries for min and max size	2015-02-12 17:48:19 +01:00
Andreas N	0f8940435d	impoooortant	2015-02-12 17:46:19 +01:00
Andreas N	910c1a81d6	I heard you like importants in media queries so I put an important in your media query	2015-02-12 17:44:07 +01:00
Andreas N	06d2af92ce	another way to fix this	2015-02-12 17:25:46 +01:00
Andreas N	42dd275b2f	more optimizations to mobile display	2015-02-12 17:22:40 +01:00
Andreas N	f46ebe5a30	doing the worst things to css since its existence	2015-02-12 17:11:21 +01:00
Andreas N	8a83db4291	can we remove the important here?	2015-02-12 17:02:14 +01:00
Andreas N	b9874ff423	more centered alignment for single usernames	2015-02-12 17:01:50 +01:00
Andreas N	4e7c0ec819	trying to fix this³	2015-02-12 16:59:54 +01:00
Andreas N	136b4dbba5	trying to fix this²	2015-02-12 16:57:51 +01:00
Andreas N	8e9a893c79	trying to fix this	2015-02-12 16:54:48 +01:00
Andreas N	ed3490c40c	whoops	2015-02-12 16:52:08 +01:00
Andreas N	89ea02e7af	the navbar is kinda broken	2015-02-12 16:51:04 +01:00
Andreas N	1ef032e69e	some more changes	2015-02-12 16:48:14 +01:00
Andreas N	0dfbac0bda	update profile dropdown, first draft	2015-02-12 16:37:07 +01:00
Andreas N	cb13903493	update moderator display	2015-02-12 15:57:05 +01:00
Andreas N	cde8d8a30f	remove padding on specific rows on mobile devices	2015-02-05 15:17:15 +01:00
Georg G	06cc52ffc5	made these checkboxes work	2015-02-03 17:48:30 +01:00
Georg G	96f4a9433f	moderation javascripts now only get loaded if the current_user is a moderator or above	2015-02-03 17:31:04 +01:00
Andreas N	bca0344792	remove margin from navbar	2015-01-30 22:53:44 +01:00
Andreas N	5369f34bab	Merge remote-tracking branch 'remotes/origin/inbox-options'	2015-01-30 20:27:11 +01:00
Andreas N	5ce2368310	Merge branch 'inbox-options'	2015-01-30 20:22:48 +01:00
nilsding	a7fbc5b366	fixed inbox entries and toggle button	2015-01-28 06:49:17 +01:00
Andreas N	9c2b0951bf	add coffescript to expand options	2015-01-27 18:25:20 +01:00
nilsding	ca7789750a	made NProgress loading bar brighter (GitHub issue #73)	2015-01-27 17:53:05 +01:00
Andreas N	8ff92dca15	Merge remote-tracking branch 'origin/master'	2015-01-26 18:41:37 +01:00
Andreas N	32956319d4	changed question-text line height	2015-01-26 18:41:16 +01:00
nilsding	4e49258463	removed annoying margin, ready to merge [ci skip]	2015-01-26 18:08:03 +01:00
nilsding	f7e71d3d67	how about this selector?	2015-01-26 18:04:17 +01:00
Andreas N	174ea6b774	changed display of notification badge	2015-01-26 17:55:18 +01:00
Andreas N	45e08651af	fixed some more stuff	2015-01-26 17:33:40 +01:00
Andreas N	da9c15d43c	basic stuff added	2015-01-26 17:16:32 +01:00
Andreas N	370169c35a	update and fix mobile design	2015-01-26 15:51:18 +01:00
Andreas N	40eb19d387	updated colours thingy	2015-01-25 20:48:14 +01:00
nilsding	0d639fd6ec	added blogger badge	2015-01-25 20:30:09 +01:00
nilsding	05334e3bd0	added some specs	2015-01-18 14:15:21 +01:00
Andreas N	3edfbb42a1	add design stuff for header display	2015-01-18 00:16:06 +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
Andreas N	2ddb39e530	added top padding	2015-01-17 18:36:46 +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	0bf59a0bb0	fixed that damn tab link border thing	2015-01-17 16:26:46 +01:00
nilsding	5fd5af9f47	Merge branch 'master' into groups	2015-01-17 15:51:52 +01:00
nilsding	53cb527c7f	put that damn tooltip in the callback function.	2015-01-15 17:47:54 +01:00
Andreas N	b99fe56038	update design to be condensed	2015-01-14 19:57:11 +01:00
Andreas N	053a2d695c	I think this is causing some problems with the design	2015-01-14 19:30:48 +01:00
Andreas N	1497f97395	attempt to center input	2015-01-14 15:44:27 +01:00
nilsding	d7350838ba	Merge branch 'master' into groups	2015-01-13 23:13:38 +01:00
nilsding	5f3feaa4e6	MAXIMUM SASS™	2015-01-13 22:55:45 +01:00
Andreas N	1b0b505ec9	another try	2015-01-13 22:37:02 +01:00
Andreas N	1c40721688	hopefully	2015-01-13 22:34:48 +01:00
Andreas N	9e1de238da	please	2015-01-13 22:32:23 +01:00
Andreas N	20f01094b5	stupid overrides	2015-01-13 22:15:18 +01:00
Andreas N	bb7cb3ded0	change the primary color to purple	2015-01-13 22:10:45 +01:00
Andreas N	e834a1ae29	change the primary color to purple	2015-01-13 22:03:43 +01:00
nilsding	3d34f916c9	Merge branch 'master' into navbar-color ... Conflicts: app/assets/stylesheets/application.css.scss	2015-01-13 21:56:00 +01:00
nilsding	0ee58e0d20	it doesn't make much sense changing the variables after loading bootstrap	2015-01-13 21:54:56 +01:00
Andreas N	40a5689a4b	cool new navbar colours	2015-01-13 21:53:47 +01:00
Andreas N	c1e6945bff	cool new navbar colours	2015-01-13 21:27:39 +01:00
nilsding	14eb6b035b	Revert "got rid of nprogress" ... This reverts commit 3574993746.	2015-01-13 19:49:43 +01:00
nilsding	a05d763b75	selecting the group from the ask followers modal works now.	2015-01-13 15:45:32 +01:00
nilsding	1bb369aa7d	implemented basic functionality of YE OLDE BANHAMMER!	2015-01-12 22:44:13 +01:00
nilsding	3574993746	got rid of nprogress	2015-01-12 15:53:14 +01:00
nilsding	bc826f07fe	moved Piwik code to its own file	2015-01-10 18:53:25 +01:00
Andreas N	bbfba492ae	change the line height for answers	2015-01-09 22:03:58 +01:00
Andreas N	e2564f4d37	pretty much the worst issue I ever caused	2015-01-09 21:59:26 +01:00
Andreas N	16cb29852f	fix shit	2015-01-09 21:57:30 +01:00
Andreas N	3e88abe36d	updated answerbox design	2015-01-09 21:44:41 +01:00
ix	054ece5aed	its not a button ok	2015-01-07 19:59:42 +01:00
ix	66734193b0	pressing ctrl/meta + m toggles the question box	2015-01-07 19:58:43 +01:00
ix	26c21e6a27	fixed being unable to use cmd+enter on macs	2015-01-07 00:52:19 +01:00
ix	f76603a071	manual merge??	2015-01-06 18:59:52 +01:00
ix	221025fef7	fixed tooltip loading on loading more questions/answers	2015-01-06 18:56:43 +01:00
Andreas N	4b114b0cab	fixed badge size	2015-01-06 15:35:16 +01:00
Andreas N	0d784aee47	finish implementing new badge design	2015-01-06 15:32:14 +01:00
Andreas N	17afe26171	added new profile badge display	2015-01-06 15:26:24 +01:00
Andreas N	11cd8b59f8	fix broken labels	2015-01-05 00:50:27 +01:00
nilsding	cdfe5564d6	made C-RET work again	2015-01-03 22:36:51 +01:00
nilsding	f1c0bc5a4c	Merge branch 'sweetalert'	2015-01-03 19:54:42 +01:00
Andreas N	30189ae6b8	fixed overlay z-index	2015-01-03 19:53:22 +01:00
nilsding	7d9a0b720d	even more fixes	2015-01-03 19:49:47 +01:00
nilsding	0485be8eb9	report user also now has sweetalert	2015-01-03 19:45:14 +01:00
nilsding	d183a79493	fixed sweetalert for use with Turbolinks, changed wording	2015-01-03 19:43:51 +01:00
nilsding	f53ca1b449	the new answer is now shown	2015-01-03 19:14:26 +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
Andreas N	f5a469bafa	fix alert text for destroying answers	2015-01-03 18:40:56 +01:00
nilsding	7be7de11cd	moved answering code from inbox_controller.rb to answer_controller.rb	2015-01-03 18:40:39 +01:00
Andreas N	9d3b8cced4	replaced alerts with sweetAlert	2015-01-03 17:36:55 +01:00
Andreas N	ac9738d058	added sweetalert scripts	2015-01-03 16:54:10 +01:00
Andreas N	c6e7170e7b	added sweetalert styles	2015-01-03 16:51:57 +01:00
Andreas N	ca222f86c8	fix profile-text margin	2015-01-03 04:32:26 +01:00
Andreas N	c871f63f8a	brighter gray	2015-01-03 04:01:25 +01:00
Andreas N	1c7b064dbd	removed this shit	2015-01-03 03:54:30 +01:00
Andreas N	6bf1c6bb01	changed background color	2015-01-03 03:52:50 +01:00
Andreas N	15605682b2	fix	2015-01-03 03:47:48 +01:00
Andreas N	34a5b56555	added follow button to dim view	2015-01-03 03:43:32 +01:00
Andreas N	c71061c5a3	even more design updates	2015-01-03 02:14:49 +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	6ab87a5431	add cool new profile panel design	2015-01-03 01:58:27 +01:00
Andreas N	75fb90c9e5	add cool new profile panel design	2015-01-03 01:49:56 +01:00
Andreas N	aa6c892eb3	added supporter display	2015-01-03 00:24:06 +01:00
Andreas N	26f21f8e97	fixed #37	2015-01-02 00:28:19 +01:00
Andreas N	806d83fc0c	updated css	2015-01-01 19:45:34 +01:00
Andreas N	d5b538461e	added moderator display to about page	2015-01-01 19:10:31 +01:00
nilsding	7d504778b0	"Delete all" button is now disabled properly and the ibCount is now incremented by 1 (closes GitHub issues #34 and #27)	2014-12-30 16:20:47 +01:00
nilsding	8998b84027	updateVars is now called when the image finished loading	2014-12-29 17:22:43 +01:00
nilsding	338fa5bdb2	divide by scale	2014-12-29 16:39:27 +01:00
nilsding	fa16612ba8	made the new cropper work	2014-12-29 16:29:46 +01:00
nilsding	26363c4742	added jquery.guillotine	2014-12-29 15:47:10 +01:00
nilsding	4adc6eec09	ugh	2014-12-29 14:49:57 +01:00
nilsding	5071e3ffe8	added JCrop to view	2014-12-29 13:52:19 +01:00
nilsding	f6ceafb710	added jquery.Jcrop	2014-12-29 09:39:47 +01:00
nilsding	65e90e1c64	reporting users works as well.	2014-12-29 01:47:04 +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	b3f165b12b	reporting and deleting comments works now	2014-12-28 21:14:01 +01:00
nilsding	27afd18d25	fixed follow button	2014-12-28 20:22:37 +01:00
nilsding	6864faee03	reporting answers works now	2014-12-28 19:56:37 +01:00
nilsding	9fe827b537	removed .button calls for destroy	2014-12-28 19:56:13 +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
Andreas N	4bb65be9e5	css changes	2014-12-27 19:26:35 +01:00
Andreas N	6b3552526c	css changes	2014-12-27 19:24:46 +01:00
Andreas N	f236e7b709	css changes	2014-12-27 19:22:27 +01:00
Andreas N	05002b8d10	added floating ask your followers button	2014-12-27 19:18:55 +01:00
Andreas N	56441a4967	more fix.	2014-12-27 16:03:09 +01:00
Andreas N	3c2467092b	fixing other stuff I broke with this fix.	2014-12-27 15:59:09 +01:00
Andreas N	be30f9c7e5	PLEASE WORK	2014-12-27 15:56:01 +01:00
Andreas N	7a9949c85c	PLEASE	2014-12-27 15:54:26 +01:00
Andreas N	edeff57293	Fixxed!	2014-12-27 15:50:36 +01:00
nilsding	260d5cddd7	updated delete button	2014-12-27 14:59:48 +01:00
Andreas N	a5c8405b9a	attempt to fix this shit	2014-12-27 03:01:52 +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
pixeldesu	40dc6a140d	fix margin if content is empty	2014-12-26 13:48:20 +01:00
nilsding	9e918fa3dc	added moderator to users	2014-12-26 13:34:01 +01:00
nilsding	2aea87d305	Meymeys	2014-12-21 22:41:14 +01:00
nilsding	b45b273f50	I TAKE A LOOK AT MY ENORMOUS MEMES	2014-12-21 22:29:52 +01:00
nilsding	e8f4c2662a	goddamnit Karim	2014-12-21 16:40:10 +01:00
nilsding	2169a86615	added a count	2014-12-21 15:36:57 +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	000fa09a5e	restructure inbox design	2014-12-20 14:37:14 +01:00
Andreas N	00f1c6ac1a	attempt fix	2014-12-20 02:04:35 +01:00
Andreas N	cc3dcdddd5	more view fixes	2014-12-19 23:41:15 +01:00
Andreas N	7543da2701	move profile things into something different	2014-12-19 23:33:42 +01:00
Andreas N	e9985ed0aa	how about new template	2014-12-19 22:52:12 +01:00
Andreas N	e483714f44	fix headings	2014-12-19 22:11:49 +01:00
nilsding	fc5dc30751	asdf	2014-12-16 17:32:23 +01:00
nilsding	a30e6509b5	fixed things	2014-12-15 07:47:56 +01:00
pixeldesu	91711b24fe	add a bit of margin to smiles section	2014-12-14 15:41:08 +01:00
pixeldesu	1156548ef6	fix button opacity	2014-12-13 18:12:24 +01:00
pixeldesu	6706203ac1	more fixes	2014-12-13 18:10:57 +01:00
pixeldesu	3173d70aac	added new frontpage design	2014-12-13 17:52:58 +01:00
nilsding	82277847b9	Merge branch 'omniauth'	2014-12-13 15:40:50 +01:00
nilsding	d25d45cbd4	fixed deletion button	2014-12-13 15:40:31 +01:00
nilsding	013d1d44b7	the checkbox should now share to services	2014-12-13 15:17:50 +01:00
pixeldesu	aa1686121a	add profile header display	2014-12-13 00:55:00 +01:00
nilsding	8743a21371	closes Github issue #11	2014-12-12 19:05:35 +01:00
pixeldesu	ba7df144d4	fix top margin	2014-12-12 16:49:15 +01:00
pixeldesu	1d320fd847	added navbar toggle animation	2014-12-11 15:49:01 +01:00
pixeldesu	0e52a9aef8	attempt to fix overlapping comment count	2014-12-10 21:16:18 +01:00
nilsding	883bedcbf1	C-<RET> for asking questions	2014-12-10 20:54:12 +01:00
nilsding	aa28eb18fc	added margin to the load more button.	2014-12-10 20:37:47 +01:00
nilsding	a4edb4147d	generating questions is great	2014-12-09 23:37:44 +01:00
pixeldesu	766d0e2a2b	fix notification icon	2014-12-09 23:15:14 +01:00
pixeldesu	ef9579594c	added notification test page	2014-12-09 23:07:04 +01:00
pixeldesu	98b63b45c6	splitting scss, pluralizing entries, etc	2014-12-09 15:32:29 +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	2d8305095b	make sure the user really wants to delete something…	2014-12-08 15:45:15 +01:00
nilsding	c486c293ef	restructured javascript files	2014-12-08 15:42:34 +01:00
nilsding	c279026ce0	added pagination! (at least on the timeline)	2014-12-08 14:14:13 +01:00
nilsding	69e55f001e	bugFuchs	2014-12-08 12:50:02 +01:00
nilsding	58d0efc219	implemented "ask your followers"	2014-12-07 20:13:45 +01:00
nilsding	c26b081cc0	you can now answer a question by hitting ctrl+return	2014-12-07 18:33:26 +01:00
pixeldesu	01c5577cdd	changed display for comments	2014-12-07 15:36:08 +01:00
nilsding	8ab5458b1b	posting comments is now possible.	2014-12-07 15:05:44 +01:00
nilsding	a8b8dd31e0	Merge branch 'master' of git.rrerr.net:nilsding/justask	2014-12-07 11:04:45 +01:00
nilsding	382277adf0	iOS web app things	2014-12-06 17:08:10 +01:00
nilsding	9f1174f56b	fixed smile button	2014-12-05 21:55:01 +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	ea0bf31ba1	security	2014-12-01 20:06:26 +01:00
pixeldesu	4a52e791eb	Exo	2014-12-01 20:03:00 +01:00
pixeldesu	0bb58fefb3	word wrapping	2014-11-30 23:18:46 +01:00
pixeldesu	562fa112e7	css is a bitch	2014-11-30 23:12:18 +01:00
pixeldesu	8ee8fabf0d	css changes	2014-11-30 23:09:33 +01:00
pixeldesu	a82ecad4ed	change text color	2014-11-30 21:09:01 +01:00
pixeldesu	449cc68958	more fixes to timestamp display	2014-11-30 21:05:16 +01:00
nilsding	97c197f112	smiles!!!	2014-11-30 20:31:22 +01:00
pixeldesu	2dffcbec98	how about fixing colors	2014-11-30 18:27:48 +01:00
nilsding	ae4952db28	deleting questions from the inbox is now possible	2014-11-30 18:05:51 +01:00
pixeldesu	c0c6ac182b	added username of user who answered the question	2014-11-30 16:04:37 +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	814a509f60	added JS for following/unfollowing	2014-11-30 15:34:23 +01:00
pixeldesu	1907583565	fix muted link displayability, only limit to answerboxes	2014-11-30 14:09:45 +01:00
pixeldesu	98ed4dfe85	fix image dimensions	2014-11-30 14:08:51 +01:00
pixeldesu	bf4a90b8b5	pull?	2014-11-30 14:01:36 +01:00
pixeldesu	adce8fa27a	maybe this fixes it	2014-11-30 13:57:15 +01:00
pixeldesu	b5b977ab5c	what the fuck is badge-danger?	2014-11-30 02:06:15 +01:00
pixeldesu	78812f58f9	even more changes	2014-11-30 00:31:23 +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	36ac06ec6e	more style fixes on profiles	2014-11-29 23:40:57 +01:00
pixeldesu	057ebe08af	more changes to answerbox	2014-11-29 23:29:34 +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	5608148550	changed nprogress colour	2014-11-28 21:41:32 +01:00
nilsding	5b013314ed	added rails-assets-growl for notifications	2014-11-28 21:35:44 +01:00
nilsding	965d7b701e	fixed font size	2014-11-28 21:17:50 +01:00
nilsding	70aec0b86e	back to bootswatch.	2014-11-28 20:23:17 +01:00
nilsding	3994bdeb02	JS	2014-11-27 11:50:41 +01:00
nilsding	976cdef4d7	changed nprogress colour	2014-11-26 13:34:23 +01:00
nilsding	4701b8a37e	added links to the bottom of some pages	2014-11-17 13:19:59 +01:00
nilsding	82c2463509	fixed javascript €rr0r	2014-11-11 19:52:52 +01:00
nilsding	1e2214f5ad	added jquery.turborails	2014-11-11 18:16:09 +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	9fad73341e	we want to make POST requests here…	2014-11-10 18:25:46 +01:00
nilsding	b65c60ea76	we are now making AJAX requests	2014-11-10 18:19:04 +01:00
nilsding	2cc1062af7	allahu snackbar	2014-11-08 20:41:08 +01:00
pixeldesu	3991f05501	design stuff	2014-11-08 19:29:41 +01:00
nilsding	f15cdf5d7f	made vertical scrollbar always visible	2014-11-03 12:59:55 +01:00
nilsding	1db15a6dc7	renamed .user-page to .j2-page	2014-11-02 20:29:01 +01:00
nilsding	1554b4b9f5	added FontAwesome and NProgress	2014-11-02 19:02:53 +01:00
nilsding	8973772896	h	2014-11-02 17:58:47 +01:00
nilsding	c211b29395	new users controller	2014-11-02 17:57:37 +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	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	386066c55b	first commit	2014-08-01 11:23:47 +02:00