697 commits

Author	SHA1	Message	Date
ix	90cff830a2	Merge branch 'master' of git.rrerr.net:justask/justask	2015-01-07 00:52:41 +01:00
ix	26c21e6a27	fixed being unable to use cmd+enter on macs	2015-01-07 00:52:19 +01:00
nilsding	0916628c43	added link to bug tracker	2015-01-07 00:36:09 +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	1b4eb15152	tooltips for smiles	2015-01-06 17:33:02 +01:00
Andreas N	4b114b0cab	fixed badge size	2015-01-06 15:35:16 +01:00
Andreas N	7b37676be2	Merge remote-tracking branch 'origin/master'	2015-01-06 15:32:25 +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
nilsding	3567ba6190	numbers	2015-01-05 10:16:00 +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	9e0abc342a	redirect to login page	2015-01-03 22:48:59 +01:00
nilsding	59b431513b	made privacy_allow_stranger_answers work	2015-01-03 22:37:10 +01:00
nilsding	cdfe5564d6	made C-RET work again	2015-01-03 22:36:51 +01:00
nilsding	997430f909	opting-out of the public timeline works now	2015-01-03 22:30:40 +01:00
nilsding	09b6a6bc10	made that stuff work	2015-01-03 22:27:14 +01:00
nilsding	175e113af1	an error is now raised if the user does not want to receive anonymous questions	2015-01-03 22:06:23 +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	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	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	aec3e1c800	if a question was answered, all occurrences of it in the inbox are now gone	2015-01-03 19:02:56 +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	e37907f948	removed unnecessary puts	2015-01-03 18:42:24 +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	496ff61a65	added User#answered?	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
nilsding	c4c6cb62d8	removed redundant line	2015-01-03 18:13:18 +01:00
nilsding	8aee9bd69e	added User#answer, moved some code from inbox.rb to answer.rb	2015-01-03 18:09:56 +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	82924cfbec	fix profile size indifference	2015-01-03 15:23:43 +01:00
Andreas N	ca222f86c8	fix profile-text margin	2015-01-03 04:32:26 +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	98af66be63	Merge remote-tracking branch 'origin/master'	2015-01-03 04:01:52 +01:00
nilsding	ddae3c6278	crapkit sucks	2015-01-03 04:01:42 +01:00
Andreas N	c871f63f8a	brighter gray	2015-01-03 04:01:25 +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
Andreas N	6bf1c6bb01	changed background color	2015-01-03 03:52:50 +01:00
nilsding	9869a46fef	Revert "attempt fix for #39" ... This reverts commit 16f319a0a6.	2015-01-03 03:50:54 +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	16f319a0a6	attempt fix for #39	2015-01-03 03:12:01 +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	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	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	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	e9ab8deb85	:async	2015-01-01 18:17:34 +01:00
nilsding	149868c097	this should do.	2015-01-01 18:08:16 +01:00
nilsding	5df705cdaa	argh	2015-01-01 17:59:24 +01:00
nilsding	dee2ba253e	fix this shit	2015-01-01 17:54:16 +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	1d3848424d	changed regex for matching user mentions	2014-12-31 16:02:34 +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	daa8eefff6	temp fix	2014-12-29 22:01:54 +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	f7cb3478be	:medium everywhere	2014-12-29 14:57:16 +01:00
nilsding	e7a0d77fd4	changed flash thing	2014-12-29 14:54:32 +01:00
nilsding	3e033cc102	permit more params!	2014-12-29 14:52:06 +01:00
nilsding	7aa954e212	added cropper processor	2014-12-29 14:51:52 +01:00
nilsding	b61a631f15	added hidden fields	2014-12-29 14:50:25 +01:00
nilsding	4adc6eec09	ugh	2014-12-29 14:49:57 +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	7074a1edf7	mark gravatar-url as deprecated	2014-12-29 12:56:41 +01:00
nilsding	b378a03afa	added delayed_paperclip	2014-12-29 11:58:01 +01:00
nilsding	678e03deed	uploading profile pictures works now	2014-12-29 11:21:43 +01:00
nilsding	501f039e7f	gravatar_url returns the users' profile_picture	2014-12-29 10:18:38 +01:00
nilsding	cf3933271a	added profile_picture to users	2014-12-29 10:18:12 +01:00
nilsding	f6ceafb710	added jquery.Jcrop	2014-12-29 09:39:47 +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	49c371302c	unique smiles only!	2014-12-28 22:15:25 +01:00
nilsding	40f54fd19a	more before_destroy and after_create	2014-12-28 21:58:35 +01:00
nilsding	bb3e431393	added associations for this	2014-12-28 21:47:51 +01:00
nilsding	2c29dd9a18	even more after_create and before_destroy	2014-12-28 21:46:57 +01:00
nilsding	7d157cde8f	dependent: :destroy	2014-12-28 21:42:21 +01:00
nilsding	9c9c4fdc5d	after_create and before_destroy	2014-12-28 21:40:33 +01:00
nilsding	fec91eeb5b	before_destroy	2014-12-28 21:34:42 +01:00
nilsding	7d55141a1a	added deleted column to reports	2014-12-28 21:34:36 +01:00
nilsding	b6c0b1864a	moved some code	2014-12-28 21:20:07 +01:00
nilsding	6d81b4a24b	FUCK this!!!!!	2014-12-28 21:14:10 +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
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	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	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	774cf8df99	h	2014-12-28 19:32:08 +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
nilsding	d79394640e	fixed GitHub issue #25	2014-12-28 00:34:56 +01:00
nilsding	3046a5e4b3	fixed tweet not tweeting	2014-12-27 21:03:18 +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