47 Commits

Author SHA1 Message Date
Yaman Qalieh
a31b4f3673 publish and subscribe userinfo 2016-08-15 20:55:21 -04:00
Kenneth Jao
ce56af885f Reverted myClasses code 2016-08-15 13:47:05 -04:00
yamanq
4326346af5 fixed login button 2016-08-14 15:42:39 -04:00
Yaman Qalieh
153cf62888 temporarily comment out bug 2016-08-14 08:22:39 -04:00
Yaman Qalieh
015a329778 add datepicker options 2016-08-14 08:11:49 -04:00
Yaman Qalieh
dcfce8654f Merge branch 'master' of https://github.com/ksjdragon/hourglass 2016-08-14 07:52:41 -04:00
Yaman Qalieh
655d5821e9 remove class if non-existant 2016-08-14 07:52:27 -04:00
Kenneth Jao
353d9357d7 CSS display fix 2016-08-13 23:49:53 -04:00
Kenneth Jao
d79e157fe5 Added date picker, and changed work colors 2016-08-13 23:46:32 -04:00
Kenneth Jao
b1381234e2 Fixed bad function calling 2016-08-13 20:24:56 -04:00
Kenneth Jao
57aeb4d34b Bug fixes 2016-08-13 20:22:54 -04:00
Kenneth Jao
00ded2965d Fixed editWork, and displays work information on click 2016-08-13 19:24:10 -04:00
Kenneth Jao
6833e3a1cd Adding work, display each work in correct class 2016-08-13 18:58:54 -04:00
Yaman Qalieh
41a3c1bc16 description security and bug fixes 2016-08-13 17:33:12 -04:00
Kenneth Jao
0afd5c2ba1 Add homework framework 2016-08-12 23:10:27 -04:00
Yaman Qalieh
0e571e8942 Merge branch 'master' of https://github.com/ksjdragon/hourglass 2016-08-12 20:42:51 -04:00
Yaman Qalieh
cdd2cd99ab publish and subscribe 2016-08-12 20:42:29 -04:00
Kenneth Jao
000e992321 Display classes mode 2016-08-12 19:46:40 -04:00
Kenneth Jao
bc81e5eb3e Moved images, made myClasses a global helper 2016-08-12 18:32:37 -04:00
Kenneth Jao
efca57c555 Added user classes display in sidebar 2016-08-12 18:18:08 -04:00
yamanq
e0601fc6f5 fix bug 2016-08-12 17:48:49 -04:00
yamanq
60b1da6284 Merge branch 'master' of https://github.com/ksjdragon/hourglass 2016-08-12 17:39:55 -04:00
yamanq
c227386c3d made it easier to change classes viewable on calendar 2016-08-12 17:39:36 -04:00
Kenneth Jao
4a8d06311a moved autocomplete templates 2016-08-12 17:38:22 -04:00
yamanq
cd8d53c887 only display user's classes 2016-08-12 17:33:29 -04:00
Kenneth Jao
b31451682a Reformatted css, and added 'Main Menu' button from /profile 2016-08-12 12:50:37 -04:00
Yaman Qalieh
09104bbbeb formatting 2016-08-12 12:28:55 -04:00
Kenneth Jao
f8f36f2616 Profile page functions correctly, display mostly complete, minor fixes 2016-08-11 18:28:29 -04:00
Kenneth Jao
e3444a8fc6 Code cleanup, and display formatting/css 2016-08-11 03:10:32 -04:00
Kenneth Jao
670e212543 Added save settings button 2016-08-11 01:53:24 -04:00
Kenneth Jao
73c53370a4 Added character restrictions, Usage: add attribute "restrict=[\'max\']" in the DOM 2016-08-10 22:48:38 -04:00
Kenneth Jao
308c346124 Added joining classes, and viewing classes 2016-08-10 21:56:12 -04:00
Kenneth Jao
e9fc5b28b0 Fixed calendar not displaying events 2016-08-10 18:13:08 -04:00
yamanq
946f8e3257 bug 2016-08-10 18:02:38 -04:00
yamanq
1ca406c9d7 calendar fixes 2016-08-10 17:51:42 -04:00
yamanq
22704145c6 createWork() and calendar work 2016-08-10 17:42:07 -04:00
Kenneth Jao
1d948d0c39 Added calendar display 2016-08-10 16:31:54 -04:00
Kenneth Jao
12b933d8f1 Profile page layout, and working form buttons, no submission 2016-08-10 00:25:19 -04:00
Kenneth Jao
318dc60e3f CSS fix 2016-08-09 18:54:36 -04:00
Kenneth Jao
b4bea3499c Aligned school display 2016-08-09 18:17:46 -04:00
yamanq
ccde0fcc11 add school name after Hourglass on main page 2016-08-09 18:13:41 -04:00
yamanq
3c5b6f51a5 Merge branch 'master' of https://github.com/ksjdragon/hourglass 2016-08-09 17:46:37 -04:00
yamanq
176aecaa8a added teacher autocomplete 2016-08-09 17:46:22 -04:00
Kenneth Jao
a8ceff4e2d Fixed css 2016-08-09 17:21:14 -04:00
Kenneth Jao
bed620cef2 More page display fixes 2016-08-09 17:07:11 -04:00
Kenneth Jao
76e0701f71 Minor display fixes, and removed useless code 2016-08-09 14:49:43 -04:00
Kenneth Jao
3e7d6fec7c Folder organization 2016-08-09 01:33:14 -04:00