Yaman Qalieh
|
a5fc08ea04
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-17 18:46:03 -04:00 |
|
Yaman Qalieh
|
f42050fe44
|
joinPrivateClass
|
2016-08-17 18:45:50 -04:00 |
|
Kenneth Jao
|
0683c73f4c
|
Added created classes tab, and all functionality
|
2016-08-16 20:46:38 -04:00 |
|
Kenneth Jao
|
1ab2d57b79
|
fixed untrackUserInClass
|
2016-08-16 18:22:02 -04:00 |
|
Yaman Qalieh
|
bd52504d25
|
push to concat
|
2016-08-16 18:14:07 -04:00 |
|
Yaman Qalieh
|
460ce03c0f
|
object setting bug
|
2016-08-16 17:53:27 -04:00 |
|
Yaman Qalieh
|
8ce0b46b65
|
trackuser bug
|
2016-08-16 17:19:21 -04:00 |
|
Yaman Qalieh
|
fbd0c0a515
|
fixed #35
|
2016-08-16 06:43:46 -04:00 |
|
Yaman Qalieh
|
93f8b3489e
|
routing for admin page
|
2016-08-16 06:15:15 -04:00 |
|
Yaman Qalieh
|
0d7ea51f0e
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-15 22:32:08 -04:00 |
|
Yaman Qalieh
|
016c8d3d18
|
fix #33 and remove banned
|
2016-08-15 22:32:00 -04:00 |
|
Kenneth Jao
|
b83ae6e6ff
|
remove banned client-side
|
2016-08-15 22:28:49 -04:00 |
|
Kenneth Jao
|
55ed7ace1e
|
Created classes tab, semi-styled and no functionality
|
2016-08-15 22:15:07 -04:00 |
|
Yaman Qalieh
|
e871f6b7fc
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-15 20:55:29 -04:00 |
|
Yaman Qalieh
|
a31b4f3673
|
publish and subscribe userinfo
|
2016-08-15 20:55:21 -04:00 |
|
Kenneth Jao
|
583fbaa05a
|
Made work uneditable for non-authorized users
|
2016-08-15 16:03:29 -04:00 |
|
yamanq
|
36bdcf145f
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-15 14:00:55 -04:00 |
|
yamanq
|
cfb25d8031
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-15 13:59:55 -04:00 |
|
Kenneth Jao
|
ebf4d41ae7
|
Made createClass teacher optional
|
2016-08-15 13:59:45 -04:00 |
|
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 |
|
Kenneth Jao
|
a122d3b6aa
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-15 13:48:13 -04:00 |
|
yamanq
|
0200c0dc78
|
changed subscribers to list and fixed #13
|
2016-08-15 13:48:00 -04:00 |
|
Kenneth Jao
|
ce56af885f
|
Reverted myClasses code
|
2016-08-15 13:47:05 -04:00 |
|
Yaman Qalieh
|
58522390df
|
fixed 0 subscribers bug
|
2016-08-15 10:42:35 -04:00 |
|
Kenneth Jao
|
6f29a1a02a
|
Made hour optional, fixed avatar display bug
|
2016-08-14 21:48:42 -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 |
|