Commit Graph

1095 Commits

Author SHA1 Message Date
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
pixeldesu 1d320fd847 added navbar toggle animation 2014-12-11 15:49:01 +01:00
pixeldesu 7e2ed21908 update Gemfile 2014-12-11 14:23:57 +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 883bedcbf1 C-<RET> for asking questions 2014-12-10 20:54:12 +01:00
nilsding 93540e0969 added placeholder.
thank you #based quad
2014-12-10 20:38:54 +01:00
nilsding aa28eb18fc added margin to the load more button. 2014-12-10 20:37:47 +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
nilsding 392857684c update TODO 2014-12-10 19:41:32 +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 3a65f77394 humans.txt 2014-12-10 19:01:56 +01:00
nilsding 06112b0cce added link to Kontrollzentrum in the navbar for admins 2014-12-10 18:23:25 +01:00
nilsding 0eb5e8104b added RailsAdmin 2014-12-10 17:01:59 +01:00
nilsding a4edb4147d generating questions is great 2014-12-09 23:37:44 +01:00
nilsding 912ccea445 Merge remote-tracking branch 'origin/master' 2014-12-09 23:23:28 +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 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 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