Commit Graph

793 Commits

Author SHA1 Message Date
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
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
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
Andreas N 3750bfa4c6 updated README 2015-01-06 15:21:32 +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
Andreas N d487dd5906 updated TODO 2015-01-04 23:17:37 +01:00
Andreas N a26b9e0a49 Merge remote-tracking branch 'origin/master' 2015-01-04 23:09:42 +01:00
Andreas N 8ff2be24f2 fixed rake task wording 2015-01-04 23:09:30 +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 b3348dbfff added a few privacy options to users 2015-01-03 21:43:19 +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