Commit Graph

971 Commits

Author SHA1 Message Date
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 f8a20099fa forgot to add the schema file, argh 2015-01-12 22:44:35 +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 38e5550241 strip blank spaces 2015-01-12 13:08:10 +01:00
nilsding 9de917fb23 closes GitHub issue #57 2015-01-12 13:00:00 +01:00
nilsding 011150ba17 added a lock icon 2015-01-12 07:08:06 +01:00
nilsding f93624fa2c added groups route thing 2015-01-12 06:57:43 +01:00
nilsding d1a6c512c4 finally corrected that model thing. 2015-01-12 06:41:44 +01:00
nilsding 5e26d72d91 finally commited the stuff I wrote 4 hours ago 2015-01-10 23:29:04 +01:00
nilsding bc826f07fe moved Piwik code to its own file 2015-01-10 18:53:25 +01:00
Andreas N 1a41ea3193 it would be nice if you'd actually include this icon 2015-01-10 13:58:51 +01:00
Andreas N 01ac598c20 android sure has weird preferences 2015-01-10 13:58:19 +01:00
Andreas N 460f5c377d more tries to fix 2015-01-10 13:56:39 +01:00
Andreas N 7937bff707 let's see if we can fix this 2015-01-10 13:50:08 +01:00
Andreas N 1a9df6da6c added new favicons 2015-01-10 13:43:02 +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 77259d8cef Merge remote-tracking branch 'origin/master' 2015-01-09 21:54:18 +01:00
Andreas N 273624f679 updated answerbox design 2015-01-09 21:52:09 +01:00
Andreas N 3e88abe36d updated answerbox design 2015-01-09 21:44:41 +01:00
nilsding 6fcbee55c4 added forbidden user names (including case insensitivity!) 2015-01-09 14:12:52 +01:00
nilsding 081a9ee4a8 vittu 2015-01-08 22:54:10 +01:00
nilsding 03ac252dca fixed fuckup 2015-01-08 22:53:29 +01:00
Andreas N 7882ccbc03 how about design update 2015-01-08 22:50:59 +01:00
nilsding d97763eda0 Revert "Le Funny Emoji Meme Face x--DD"
This reverts commit 5118ba9761.
2015-01-08 22:34:50 +01:00
nilsding 5118ba9761 Le Funny Emoji Meme Face x--DD 2015-01-08 22:28:56 +01:00
nilsding c2811e65ce fixed indentation 2015-01-08 18:23:03 +01:00
nilsding 181a6b72b0 pagination for notifications 2015-01-08 18:22:27 +01:00
nilsding 6b28c35d4a the pointy face should work again???? 2015-01-08 18:10:20 +01:00
nilsding ce7f896e0c added Group model 2015-01-08 13:16:13 +01:00
Andreas N 52791b737b added link to FAQ page 2015-01-07 22:06:21 +01:00
Andreas N 4a8eee158d fixed faq page 2015-01-07 21:57:46 +01:00
Andreas N 546bc67bba fixed faq page 2015-01-07 21:52:56 +01:00
Andreas N 6ca96aaa71 fixed faq page 2015-01-07 21:50:44 +01:00
Andreas N 0d4a271299 Merge branch 'master' of git.rrerr.net:justask/justask 2015-01-07 21:37:22 +01:00
Andreas N 4161002da0 added faq page 2015-01-07 21:30:52 +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 d8f964bda2 added en language to layout (for screenreaders) 2015-01-07 16:02:02 +01:00
nilsding ddfba921c9 removed %p tag 2015-01-07 13:59:04 +01:00
nilsding a8d533cef7 markdown for comments and in the bio 2015-01-07 07:02:07 +01:00
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