Kenneth Jao
|
444ecc5029
|
Fix merge
|
2016-08-18 18:53:03 -04:00 |
|
Kenneth Jao
|
80459a006b
|
Merge branch with master
|
2016-08-18 18:48:32 -04:00 |
|
Kenneth Jao
|
6cac521b59
|
Fixed adding work bug
|
2016-08-18 18:47:03 -04:00 |
|
Yaman Qalieh
|
9162a34537
|
update all packages
|
2016-08-18 18:20:33 -04:00 |
|
Yaman Qalieh
|
1ae7fff308
|
update packages and fix #22
|
2016-08-18 18:11:45 -04:00 |
|
Yaman Qalieh
|
3716d8012a
|
fix indenting
|
2016-08-18 17:35:40 -04:00 |
|
Yaman Qalieh
|
f8b57bcfb9
|
more datepicker options
|
2016-08-18 17:33:13 -04:00 |
|
Yaman Qalieh
|
bd08f4e18a
|
fix reference date issue
|
2016-08-18 17:13:59 -04:00 |
|
Yaman Qalieh
|
9f610ee046
|
fix #43
|
2016-08-18 16:44:23 -04:00 |
|
Yaman Qalieh
|
8fe801020c
|
server formatting
|
2016-08-18 06:54:22 -04:00 |
|
Kenneth Jao
|
15f1ba4085
|
Added small description text for creating a class, fixed #37
|
2016-08-18 00:50:44 -04:00 |
|
Kenneth Jao
|
38b4c33563
|
Added joining private classes, fixed issue #30
|
2016-08-18 00:44:13 -04:00 |
|
Kenneth Jao
|
6fc1ec14c9
|
Fixed the helper errors that appeared, fixed #3
|
2016-08-17 23:39:51 -04:00 |
|
Kenneth Jao
|
09e29aea96
|
Fixed change owner, and other display issues
|
2016-08-17 22:33:01 -04:00 |
|
Kenneth Jao
|
379f903507
|
Server bug fixes
|
2016-08-17 22:32:33 -04:00 |
|
Yaman Qalieh
|
b9d22b9958
|
leaveclass bug
|
2016-08-17 19:24:46 -04:00 |
|
Yaman Qalieh
|
b460a2fec4
|
changeAdmin fixes
|
2016-08-17 19:18:02 -04:00 |
|
Yaman Qalieh
|
6231a743ea
|
upped security on joinPrivateClass
|
2016-08-17 18:52:38 -04:00 |
|
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 |
|