108 commits

Author	SHA1	Message	Date
Yuki	cd904ae1bc	Fix FAQ	2015-05-26 04:56:58 +05:30
pixeldesu	961ebfd266	add routes and empty index for discover	2015-05-13 20:56:51 +02:00
Yuki	3d2b884b74	Revert to 'rspec fixes' -- 'Inbox user answers a question' is a mysterious failure	2015-05-11 16:09:12 +05:30
Yuki	b543c35665	i wonder if this is the issue	2015-05-11 16:02:50 +05:30
Yuki	d81c11c0e6	what's the internal server error	2015-05-11 15:50:01 +05:30
Yuki	fa1ef1de21	this probably is it, if it's not then it's your problem, i didn't cause this	2015-05-11 15:34:08 +05:30
Yuki	56b64d70bd	rspec fixes	2015-05-11 14:40:42 +05:30
Georg G	4c6b009d23	use Sidekiq for processing	2015-05-10 02:57:27 +02:00
Yuki	20ebb6dbad	rake command to migrate to AWS	2015-05-09 19:48:34 +05:30
Yuki	0a34cc07b3	Paperclip fog support, needs AWS/Rack testing before deployment! (Retrospring/bugs#48)	2015-05-08 23:48:18 +05:30
Georg G.	9b39491d88	Merge pull request #18 from skiprope/temp-bans ... Support for ban reasons and ban times.	2015-05-05 16:54:23 +02:00
Yuki	2204227273	Feature-comment-smiles complete (fix Retrospring/bugs#42)	2015-05-04 07:09:47 +05:30
Yuki	9688b7ee48	Merge stable	2015-04-28 10:22:54 +05:30
Yuki	ee29e1f28f	Reporting and Deleting logic	2015-04-26 07:06:25 +05:30
Yuki	be04d3528c	Support for ban reasons and ban times. Fixes Retrospring/bugs#26 and Retrospring/bugs#25	2015-04-23 06:26:29 +05:30
Georg G	ef4fd30cd9	closes Retrospring/bugs#17	2015-04-22 00:33:55 +02:00
Yuki	ecffd07344	Support for post subscriptions	2015-04-21 06:42:11 +05:30
Georg G	5ce34de74f	added Rack initializer	2015-04-19 01:24:50 +02:00
Yuki	e2bfc26c75	Markdown preview through AJAX (/ajax/preview)	2015-04-19 03:47:13 +05:30
Georg G	77c8026e2f	renamed config.serve_static_assets to config.serve_static_files	2015-04-18 21:56:05 +02:00
nilsding	c357036047	removed deployment-related stuff	2015-04-02 01:30:24 +02:00
nilsding	47cbbed719	made admin listing changeable in justask.yml	2015-04-02 01:28:42 +02:00
Andreas N	c50531c988	Merge remote-tracking branch 'remotes/origin/texts' into develop	2015-02-16 18:59:59 +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
nilsding	0a69ee04a7	changed exception rendering option for test environment [ci skip]	2015-01-26 16:14:20 +01:00
nilsding	097041c8d2	update questiongenerator	2015-01-18 01:12:53 +01:00
nilsding	2c502aeaa4	added Group and GroupMember to RailsAdmin	2015-01-17 19:30:24 +01:00
nilsding	927ec9678f	deleting groups works now! finally!!!	2015-01-17 18:57:23 +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	2c19ae8aea	finally get rid of that '@' in the URL	2015-01-17 16:29:11 +01:00
Andreas N	74e74dedef	added terms of service	2015-01-16 23:16:28 +01:00
Andreas N	75ae141759	added privacy policy	2015-01-16 22:36:39 +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	65e514c55d	added sharing to Tumblr	2015-01-13 00:12:48 +01:00
nilsding	9de917fb23	closes GitHub issue #57	2015-01-12 13:00:00 +01:00
nilsding	f93624fa2c	added groups route thing	2015-01-12 06:57:43 +01:00
nilsding	6fcbee55c4	added forbidden user names (including case insensitivity!)	2015-01-09 14:12:52 +01:00
Andreas N	4161002da0	added faq page	2015-01-07 21:30:52 +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	7be7de11cd	moved answering code from inbox_controller.rb to answer_controller.rb	2015-01-03 18:40:39 +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
nilsding	57c1650e04	added mailers to development environment	2015-01-01 18:08:09 +01:00
nilsding	a70b7c5fdb	alright....	2015-01-01 17:57:44 +01:00
nilsding	88616f0280	added another mailer thing	2015-01-01 17:56:52 +01:00
nilsding	d3b9b4640d	added Mailer queue	2015-01-01 17:34:14 +01:00
nilsding	db83a29911	added devise-async and configured Devise for email	2015-01-01 17:31:58 +01:00