Commit Graph

862 Commits

Author SHA1 Message Date
nilsding b26ec1dd0b fixed question generator not working if privacy_allow_anonymous_questions is false (GitHub issue #71) 2015-01-27 17:51:39 +01:00
Andreas N 8ff92dca15 Merge remote-tracking branch 'origin/master' 2015-01-26 18:41:37 +01:00
Andreas N 32956319d4 changed question-text line height 2015-01-26 18:41:16 +01:00
nilsding 68c4b6435e Merge branch 'notification-dropdown' 2015-01-26 18:10:20 +01:00
nilsding 4e49258463 removed annoying margin, ready to merge [ci skip] 2015-01-26 18:08:03 +01:00
nilsding f7e71d3d67 how about this selector? 2015-01-26 18:04:17 +01:00
nilsding 9dfb6c1603 Merge remote-tracking branch 'origin/notification-dropdown' into notification-dropdown 2015-01-26 17:56:07 +01:00
nilsding 2b1c109332 fucking 2015-01-26 17:55:58 +01:00
Andreas N 174ea6b774 changed display of notification badge 2015-01-26 17:55:18 +01:00
nilsding 13bdbaa430 centred the "New notifications will appear here" text and also fixed class for notifications entry on navbar 2015-01-26 17:53:23 +01:00
nilsding c8b02bbf50 actually add some code here 2015-01-26 17:50:45 +01:00
Andreas N 45e08651af fixed some more stuff 2015-01-26 17:33:40 +01:00
Andreas N 2a0d80b755 basic stuff fixed 2015-01-26 17:21:40 +01:00
Andreas N da9c15d43c basic stuff added 2015-01-26 17:16:32 +01:00
nilsding 0a69ee04a7 changed exception rendering option for test environment [ci skip] 2015-01-26 16:14:20 +01:00
Andreas N e9c7c5120b hotfix 2015-01-26 15:57:07 +01:00
Andreas N 370169c35a update and fix mobile design 2015-01-26 15:51:18 +01:00
Andreas N 1a3c491e45 remove fa-spin from blogger badge 2015-01-25 20:50:42 +01:00
Andreas N 40eb19d387 updated colours thingy 2015-01-25 20:48:14 +01:00
nilsding 87d08f92e8 forgot to add migration and everything 2015-01-25 20:30:53 +01:00
nilsding 0d639fd6ec added blogger badge 2015-01-25 20:30:09 +01:00
nilsding 6d68da5ae1 added Rcov formatter for simplecov 2015-01-25 19:56:39 +01:00
nilsding 626cedca0e attempt #2 2015-01-25 19:42:13 +01:00
nilsding ef4b0e78f8 attempt to prevent phantomjs timeouts 2015-01-25 19:33:41 +01:00
nilsding 83e23accfe update TODO 2015-01-25 19:21:44 +01:00
nilsding 53244234a5 update questiongenerator 2015-01-25 19:16:32 +01:00
nilsding bae7307778 no longer require factory_girl_rails 2015-01-25 19:06:22 +01:00
Andreas N fa2220dd00 added Filippus to admins 2015-01-19 17:39:19 +01:00
nilsding 05334e3bd0 added some specs 2015-01-18 14:15:21 +01:00
nilsding 097041c8d2 update questiongenerator 2015-01-18 01:12:53 +01:00
Andreas N c60e345d7b removed kyr from admins 2015-01-17 21:35:52 +01:00
nilsding 44b4e8721a alright 2015-01-17 19:53:34 +01:00
nilsding 4a8005b195 closes issue #64 2015-01-17 19:49:11 +01:00
nilsding 2c502aeaa4 added Group and GroupMember to RailsAdmin 2015-01-17 19:30:24 +01:00
Andreas N 1f73b3e3fa Merge remote-tracking branch 'origin/groups' into groups 2015-01-17 19:15:15 +01:00
Andreas N 26605dd66f more fixes for member listing for groups 2015-01-17 19:15:06 +01:00
nilsding 2ffd514bf1 forgot the @ 2015-01-17 19:14:18 +01:00
Andreas N f714e8d0e2 fix member listing for groups 2015-01-17 19:13:31 +01:00
Andreas N 0b2c1b86c8 added member listing for groups 2015-01-17 19:13:09 +01:00
nilsding 1c26af4c8c @group now holds the current group 2015-01-17 19:07:31 +01:00
nilsding 927ec9678f deleting groups works now! finally!!! 2015-01-17 18:57:23 +01:00
Andreas N 745f600f60 added delete button 2015-01-17 18:42:56 +01:00
Andreas N 2ddb39e530 added top padding 2015-01-17 18:36:46 +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
nilsding 0bf59a0bb0 fixed that damn tab link border thing 2015-01-17 16:26:46 +01:00
nilsding 5fd5af9f47 Merge branch 'master' into groups 2015-01-17 15:51:52 +01:00
Andreas N fa3020e36d i honestly don't know whats wrong here 2015-01-17 12:45:02 +01:00
Andreas N c36c3e6472 fixed faq 2015-01-17 12:41:59 +01:00