153 Commits

Author SHA1 Message Date
yamanq
a35182ae82 additional date checking 2016-08-15 13:58:46 -04:00
yamanq
70d20ea40b fixed leaveClass issue 2016-08-15 13:48:54 -04:00
yamanq
0200c0dc78 changed subscribers to list and fixed #13 2016-08-15 13:48:00 -04:00
yamanq
4326346af5 fixed login button 2016-08-14 15:42:39 -04:00
yamanq
9c87050333 fix joinclass issue 2016-08-14 15:02:18 -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
Yaman Qalieh
ddab8b86c2 Merge branch 'master' of https://github.com/ksjdragon/hourglass 2016-08-13 22:47:29 -04:00
Yaman Qalieh
c9fd63065f package additions 2016-08-13 22:47:07 -04:00
Kenneth Jao
68c6e0c32b Fixed profile images not displaying on new user 2016-08-13 20:52:47 -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
9957cba048 description optional 2016-08-13 17:36:35 -04:00
Yaman Qalieh
83214bec01 Merge branch 'master' of https://github.com/ksjdragon/hourglass 2016-08-13 17:33:40 -04:00
Yaman Qalieh
41a3c1bc16 description security and bug fixes 2016-08-13 17:33:12 -04:00
Kenneth Jao
5c99efc6e2 Merge branch 'master' of https://github.com/ksjdragon/hourglass 2016-08-13 17:26:15 -04:00
Kenneth Jao
8d066a9d64 Server functions and schema fixes 2016-08-13 17:26:07 -04:00
Yaman Qalieh
33c2b5e1c4 add date to comments 2016-08-13 16:18:04 -04:00
Kenneth Jao
72913d728a Added user in each comment 2016-08-13 16:12:25 -04:00
Kenneth Jao
37e0da4322 Added user for each comment 2016-08-13 16:10:01 -04:00
Yaman Qalieh
d5d2f842a3 web-beautify-js 2016-08-13 13:32:40 -04:00
Yaman Qalieh
6c2e98e6d0 add permissions and fix profile/publishing bugs 2016-08-13 09:02:04 -04:00
Kenneth Jao
0afd5c2ba1 Add homework framework 2016-08-12 23:10:27 -04:00
Kenneth Jao
f068fd23a6 Syntax error, and removed old test function 2016-08-12 22:43:56 -04:00
yamanq
eced94799b change markwork to togglework 2016-08-12 22:35:28 -04:00
yamanq
929f31ef97 bug fixes 2016-08-12 22:05:06 -04:00
yamanq
70eab47c44 change markDone to markWork 2016-08-12 22:00:16 -04:00
yamanq
5dc07fb7c3 work functions 2016-08-12 21:52:14 -04:00
yamanq
f2fa1fdc20 deleteWork secure and schema update 2016-08-12 21:00:32 -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
Yaman Qalieh
2c4b480e9d add publish to server 2016-08-12 20:11:26 -04:00
Kenneth Jao
000e992321 Display classes mode 2016-08-12 19:46:40 -04:00
Yaman Qalieh
3f984fca63 Merge branch 'master' of https://github.com/ksjdragon/hourglass 2016-08-12 19:11:07 -04:00
Yaman Qalieh
d3080dbb9a implemented alanning:roles 2016-08-12 19:10:54 -04:00
Kenneth Jao
bc81e5eb3e Moved images, made myClasses a global helper 2016-08-12 18:32:37 -04:00
yamanq
63652db9ac Merge branch 'master' of https://github.com/ksjdragon/hourglass 2016-08-12 18:27:41 -04:00
yamanq
6c48c7cd46 directory change 2016-08-12 18:27:30 -04:00
yamanq
568f6e245f profile fixes 2016-08-12 18:27:03 -04:00
Kenneth Jao
efca57c555 Added user classes display in sidebar 2016-08-12 18:18:08 -04:00
Kenneth Jao
090f9e1244 Display fix 2016-08-12 17:58:03 -04:00
Kenneth Jao
f6476182e0 Css display fix for profile 2016-08-12 17:51:16 -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