72 Commits

Author SHA1 Message Date
Kenneth Jao
3f6fd93eed Finished mobile login page 2017-04-08 16:45:53 -04:00
Kenneth Jao
1347bf5ef5 Minor css fixes 2017-04-08 14:20:08 -04:00
Kenneth Jao
0c18d7f5a5 Fixed mobile bugs, changed version display 2017-04-08 14:15:28 -04:00
Kenneth Jao
b31624e632 Redesigned 404 page 2017-04-08 00:23:52 -04:00
Kenneth Jao
e59229bbea Finished mobile main, and mobile login 2017-04-08 00:09:54 -04:00
Kenneth Jao
485be935f3 More mobile development 2017-02-26 19:27:50 -05:00
Kenneth Jao
77f8772be8 mobile page start 2017-02-22 23:09:31 -05:00
Kenneth Jao
4757bcd5cf CSS fixes, adding slimScroll 2017-02-03 03:43:21 -05:00
Kenneth Jao
cf082c40d9 Finished profile page, fixed minor bugs, css fixes 2017-01-25 23:19:23 -05:00
Kenneth Jao
49bafc87ed More sign-in page, CSS/text fixes, calendar refectching fix 2017-01-19 01:11:17 -05:00
Yaman Qalieh
242336de54 Merge branch 'master' of github.com:ksjdragon/hourglass 2017-01-17 10:33:21 -05:00
Yaman Qalieh
2fc96ef4f9 router problems 2017-01-16 17:56:36 -05:00
Kenneth Jao
5026ead717 Merge + CSS 2017-01-16 00:14:55 -05:00
Kenneth Jao
a137dff49f signup page 2017-01-15 23:59:10 -05:00
Yaman Qalieh
793a7ce03f routing + grade + schoolyear of prof page 2017-01-15 22:00:02 -05:00
Kenneth Jao
a551c37d1a Completed main page 2016-11-08 20:19:22 -05:00
Yaman Qalieh
00abcf7ce6 add basework of new profile page 2016-11-07 17:26:02 -05:00
Kenneth Jao
6d2d49f78b Slight theme changes, new backgrounds, more menus 2016-11-07 02:51:06 -05:00
Kenneth Jao
313f79044b Manage class menu start layout 2016-11-03 23:12:57 -04:00
Kenneth Jao
3a9b505abe Finished admin page - buttons, permissions, create admin, user editing, delete correctly, styling 2016-11-03 02:05:43 -04:00
Kenneth Jao
88beb191c9 Slight reorganization 2016-11-01 23:07:09 -04:00
Kenneth Jao
725c779620 Fixed user collection display, and other admin display issues 2016-10-24 09:54:35 -04:00
Kenneth Jao
c7ffbc947c Merge 2016-10-23 22:12:09 -04:00
Kenneth Jao
81962e24ef New UI, display fixes, and small bugs 2016-10-23 22:11:27 -04:00
Kenneth Jao
650e13881b Added admin buttons for status, and user info 2016-10-23 22:10:02 -04:00
Kenneth Jao
1d51d384d5 More admin functions 2016-10-21 20:35:56 -04:00
Kenneth Jao
e4705c472d minor fixes, started admin editing 2016-10-21 03:03:11 -04:00
Kenneth Jao
17c98f163b Many display fixes 2016-10-20 21:54:38 -04:00
Kenneth Jao
57cacea42a Minor bug fixes 2016-10-19 01:24:14 -04:00
Kenneth Jao
85f9b4798e minor fixes 2016-10-18 16:27:42 -04:00
Kenneth Jao
4e5e7bb14a Naming changes, css fixes, small bugs 2016-10-18 14:14:59 -04:00
Kenneth Jao
98e5575e3d Finished new inputs for profile page 2016-10-16 19:55:19 -04:00
Kenneth Jao
3f931f617a New inputs for creating work, restriction and comments still needed 2016-10-14 01:49:08 -04:00
Kenneth Jao
b225da48a3 Added yogiben:admin and adjusted css to not apply to admin page 2016-10-11 00:12:24 -04:00
Kenneth Jao
44f5f12266 Package editing 2016-10-10 22:26:24 -04:00
Kenneth Jao
3bc2cd1d3d Revert "replace houston with yogiben"
This reverts commit 39a97d101e853ccc144b0e8ceed2b4cbc4061674.

Conflicts:
	lib/constants.js
2016-10-10 00:52:00 -04:00
Kenneth Jao
dc69f67f85 Merge commit 2016-10-09 23:00:40 -04:00
Kenneth Jao
4c813b6667 Basic new input system 2016-10-09 22:57:04 -04:00
Yaman Qalieh
069a9faa9f replace houston with yogiben 2016-10-09 22:55:57 -04:00
Kenneth Jao
d5ef3f4881 Compressed images and change calendar text color 2016-10-01 17:26:39 -04:00
Yaman Qalieh
9e8219b463 fix bugs in profile architecture 2016-09-29 23:51:49 -04:00
Kenneth Jao
c9ad662b36 renamed theme colors 2016-09-27 12:04:40 -04:00
Kenneth Jao
d3676ec3ab Merge branch 'master' of https://github.com/ksjdragon/hourglass
Conflicts:
	client/profile/profile.js
2016-09-27 00:24:43 -04:00
Kenneth Jao
bba1cd1c75 Added themes in constants, and background images, minor fixes 2016-09-27 00:22:26 -04:00
Yaman Qalieh
2a0aeaa849 fix bug of avatar pic not showing on non-admin 2016-09-26 19:05:06 -04:00
Yaman Qalieh
f6b6fd5389 fix user profiles not loading when logged out 2016-09-26 18:58:15 -04:00
Yaman Qalieh
daa985097b do not allow main page until school is filled 2016-09-25 11:59:36 -04:00
Kenneth Jao
b480fa6558 Added NotFound for undefined user, and moved redirection to router 2016-09-10 14:06:22 -04:00
Yaman Qalieh
775a9aa502 admin page original 2016-09-08 17:18:15 -04:00
Yaman Qalieh
a329b4b08e tabbing 2016-09-08 17:11:35 -04:00