372 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	d25d45cbd4	fixed deletion button	2014-12-13 15:40:31 +01:00
nilsding	633e133713	sharing now works for real.	2014-12-13 15:38:16 +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	b25c419e52	aw yeah	2014-12-12 23:53:23 +01:00
nilsding	76c614ea66	alright	2014-12-12 23:45:49 +01:00
nilsding	5aab94207a	answer is now returned in Inbox#answer	2014-12-12 23:14:32 +01:00
nilsding	e2cabbe934	added foreman	2014-12-12 22:59:35 +01:00
nilsding	7e5ce0c048	added sidekiq.yml	2014-12-12 22:59:25 +01:00
nilsding	9c59e802c1	boost connection pool	2014-12-12 22:50:54 +01:00
nilsding	9168d908dd	aw yeah	2014-12-12 22:37:52 +01:00
nilsding	23fc3009fe	bugFuchs	2014-12-12 22:35:23 +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
nilsding	12180bf1f2	added OmniAuth initializer	2014-12-12 21:42:50 +01:00
nilsding	6d23ed5dcd	added service model	2014-12-12 21:42:34 +01:00
nilsding	704d40cadd	added OmniAuth gems	2014-12-12 19:59:53 +01:00
nilsding	8743a21371	closes Github issue #11	2014-12-12 19:05:35 +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	130cbb27ce	Set a validation on :display_name	2014-12-12 18:52:56 +01:00
nilsding	4d944e1684	Karim abused this too much	2014-12-12 18:49:34 +01:00
nilsding	319d75fdf5	added sidekiq/web	2014-12-12 18:35:14 +01:00
nilsding	d9d23edc6d	alright, let's don't.	2014-12-12 18:04:34 +01:00
nilsding	6078555c20	LET'S MAKE THIS HAPPEN	2014-12-12 18:00:34 +01:00
nilsding	b79d4f30ac	oy vey	2014-12-12 17:54:13 +01:00
nilsding	e50bd47741	Merge remote-tracking branch 'origin/master' ... Conflicts: app/views/public/index.html.haml app/views/static/index.html.haml	2014-12-12 17:50:38 +01:00
nilsding	72ed9c3b3d	let there be XS (although XL is better ;-)	2014-12-12 17:48:45 +01:00
pixeldesu	a0f883f062	hide left sidebar links on smallest screen size	2014-12-12 17:48:19 +01:00
pixeldesu	fb3e85ed51	Merge branch 'master' of git.rrerr.net:justask/justask	2014-12-12 17:44:11 +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
nilsding	c5f2e8e449	added Sidekiq initializer	2014-12-12 17:35:16 +01:00
nilsding	21282961b3	Merge branch 'master' of git.rrerr.net:justask/justask	2014-12-12 17:24:38 +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	bfeb7b3edb	updated configuration example	2014-12-12 13:45:02 +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
nilsding	1369661d97	we live edgy with the questiongenerator.	2014-12-11 17:38:44 +01:00
pixeldesu	3b6faaee8d	updated TODO	2014-12-11 16:17:03 +01:00
pixeldesu	54f492d8d6	updated TODO	2014-12-11 15:49:30 +01:00