Commit graph

976 commits

Author SHA1 Message Date
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
Andreas N
ac6c7a5c79 Merge remote-tracking branch 'origin/master' 2015-01-17 12:39:41 +01:00
Andreas N
599a88c34a updated faq 2015-01-17 12:39:31 +01:00
Andreas N
991ad1f838 added agree statement to sign in page 2015-01-17 12:34:51 +01:00
Andreas N
6871733249 update terms of service 2015-01-17 09:21:49 +01:00
Andreas N
d5b14f0654 update effective date 2015-01-17 09:13:56 +01:00
Andreas N
ec62fea665 updated screen name validator 2015-01-16 23:31:02 +01:00
Andreas N
74e74dedef added terms of service 2015-01-16 23:16:28 +01:00
Andreas N
28e72b3adc added panel-body 2015-01-16 22:45:00 +01:00
Andreas N
d593e0edd4 added privacy policy 2015-01-16 22:43:56 +01:00
Andreas N
75ae141759 added privacy policy 2015-01-16 22:36:39 +01:00
nilsding
53cb527c7f put that damn tooltip in the callback function. 2015-01-15 17:47:54 +01:00
Andreas N
597c54aa93 remove empty header 2015-01-15 16:18:35 +01:00
Andreas N
e90d9777b2 update about page with cool header 2015-01-15 16:04:59 +01:00
Andreas N
0e052ee1be added tab navigation 2015-01-14 20:14:58 +01:00
Andreas N
b99fe56038 update design to be condensed 2015-01-14 19:57:11 +01:00
Andreas N
0ad2bc9ca2 fix indentation 2015-01-14 19:37:51 +01:00
Andreas N
053a2d695c I think this is causing some problems with the design 2015-01-14 19:30:48 +01:00
nilsding
3ba2b785d4 added maximum length for group name 2015-01-14 17:48:21 +01:00
nilsding
e5b753681c Merge branch 'master' into groups 2015-01-14 17:38:47 +01:00
Andreas N
c557192b61 wrapping list-group in panel, just for design stuff 2015-01-14 16:29:53 +01:00
Andreas N
1497f97395 attempt to center input 2015-01-14 15:44:27 +01:00
Andreas N
050d94e8d7 update group membership modal 2015-01-14 15:35:53 +01:00
Andreas N
42534982d6 move icons 2015-01-14 14:20:04 +01:00
Andreas N
03eb5ad738 Merge remote-tracking branch 'origin/master' 2015-01-14 14:17:33 +01:00
Andreas N
3fe879768f updated sharing section 2015-01-14 14:17:24 +01:00
nilsding
0c97ae60d4 finally got rid of that .each 2015-01-14 07:50:27 +01:00
nilsding
642be7996d added Fontawesome icon 2015-01-14 07:32:43 +01:00
nilsding
c99fe89235 added group memberships modal 2015-01-14 07:07:40 +01:00
nilsding
f907c4b5a8 returning 404 if group was not found 2015-01-13 23:21:16 +01:00
nilsding
d7350838ba Merge branch 'master' into groups 2015-01-13 23:13:38 +01:00
Andreas N
f350f2806a change theme-color 2015-01-13 22:57:50 +01:00
nilsding
5f3feaa4e6 MAXIMUM SASS™ 2015-01-13 22:55:45 +01:00
Andreas N
1b0b505ec9 another try 2015-01-13 22:37:02 +01:00
Andreas N
1c40721688 hopefully 2015-01-13 22:34:48 +01:00
Andreas N
9e1de238da please 2015-01-13 22:32:23 +01:00
Andreas N
20f01094b5 stupid overrides 2015-01-13 22:15:18 +01:00
Andreas N
bb7cb3ded0 change the primary color to purple 2015-01-13 22:10:45 +01:00
Andreas N
e834a1ae29 change the primary color to purple 2015-01-13 22:03:43 +01:00
nilsding
3d34f916c9 Merge branch 'master' into navbar-color
Conflicts:
	app/assets/stylesheets/application.css.scss
2015-01-13 21:56:00 +01:00
nilsding
0ee58e0d20 it doesn't make much sense changing the variables after loading bootstrap 2015-01-13 21:54:56 +01:00
Andreas N
40a5689a4b cool new navbar colours 2015-01-13 21:53:47 +01:00
Andreas N
c1e6945bff cool new navbar colours 2015-01-13 21:27:39 +01:00
nilsding
14eb6b035b Revert "got rid of nprogress"
This reverts commit 3574993746.
2015-01-13 19:49:43 +01:00
Andreas N
3316ccb7bc fix indentation 2015-01-13 19:06:26 +01:00