-
444ecc5029
Fix merge
Kenneth Jao
2016-08-18 18:53:03 -04:00
-
80459a006b
Merge branch with master
Kenneth Jao
2016-08-18 18:48:32 -04:00
-
-
-
-
6cac521b59
Fixed adding work bug
Kenneth Jao
2016-08-18 18:47:03 -04:00
-
9162a34537
update all packages
Yaman Qalieh
2016-08-18 18:20:33 -04:00
-
1ae7fff308
update packages and fix #22
Yaman Qalieh
2016-08-18 18:11:45 -04:00
-
3716d8012a
fix indenting
Yaman Qalieh
2016-08-18 17:35:40 -04:00
-
f8b57bcfb9
more datepicker options
Yaman Qalieh
2016-08-18 17:33:13 -04:00
-
bd08f4e18a
fix reference date issue
Yaman Qalieh
2016-08-18 17:13:59 -04:00
-
9f610ee046
fix #43
Yaman Qalieh
2016-08-18 16:44:23 -04:00
-
8fe801020c
server formatting
Yaman Qalieh
2016-08-18 06:54:22 -04:00
-
-
15f1ba4085
Added small description text for creating a class, fixed #37
Kenneth Jao
2016-08-18 00:50:44 -04:00
-
38b4c33563
Added joining private classes, fixed issue #30
Kenneth Jao
2016-08-18 00:44:13 -04:00
-
6fc1ec14c9
Fixed the helper errors that appeared, fixed #3
Kenneth Jao
2016-08-17 23:39:51 -04:00
-
09e29aea96
Fixed change owner, and other display issues
Kenneth Jao
2016-08-17 22:33:01 -04:00
-
379f903507
Server bug fixes
Kenneth Jao
2016-08-17 22:32:33 -04:00
-
b9d22b9958
leaveclass bug
Yaman Qalieh
2016-08-17 19:24:46 -04:00
-
b460a2fec4
changeAdmin fixes
Yaman Qalieh
2016-08-17 19:18:02 -04:00
-
6231a743ea
upped security on joinPrivateClass
Yaman Qalieh
2016-08-17 18:52:38 -04:00
-
a5fc08ea04
Merge branch 'master' of https://github.com/ksjdragon/hourglass
Yaman Qalieh
2016-08-17 18:46:03 -04:00
-
-
f42050fe44
joinPrivateClass
Yaman Qalieh
2016-08-17 18:45:50 -04:00
-
0683c73f4c
Added created classes tab, and all functionality
Kenneth Jao
2016-08-16 20:46:38 -04:00
-
1ab2d57b79
fixed untrackUserInClass
Kenneth Jao
2016-08-16 18:22:02 -04:00
-
-
bd52504d25
push to concat
Yaman Qalieh
2016-08-16 18:14:07 -04:00
-
460ce03c0f
object setting bug
Yaman Qalieh
2016-08-16 17:53:27 -04:00
-
8ce0b46b65
trackuser bug
Yaman Qalieh
2016-08-16 17:19:21 -04:00
-
fbd0c0a515
fixed #35
Yaman Qalieh
2016-08-16 06:43:46 -04:00
-
93f8b3489e
routing for admin page
Yaman Qalieh
2016-08-16 06:15:15 -04:00
-
0d7ea51f0e
Merge branch 'master' of https://github.com/ksjdragon/hourglass
Yaman Qalieh
2016-08-15 22:32:08 -04:00
-
-
016c8d3d18
fix #33 and remove banned
Yaman Qalieh
2016-08-15 22:32:00 -04:00
-
b83ae6e6ff
remove banned client-side
Kenneth Jao
2016-08-15 22:28:49 -04:00
-
55ed7ace1e
Created classes tab, semi-styled and no functionality
Kenneth Jao
2016-08-15 22:15:07 -04:00
-
-
e871f6b7fc
Merge branch 'master' of https://github.com/ksjdragon/hourglass
Yaman Qalieh
2016-08-15 20:55:29 -04:00
-
-
a31b4f3673
publish and subscribe userinfo
Yaman Qalieh
2016-08-15 20:55:21 -04:00
-
583fbaa05a
Made work uneditable for non-authorized users
Kenneth Jao
2016-08-15 16:03:29 -04:00
-
-
36bdcf145f
Merge branch 'master' of https://github.com/ksjdragon/hourglass
yamanq
2016-08-15 14:00:55 -04:00
-
-
cfb25d8031
Merge branch 'master' of https://github.com/ksjdragon/hourglass
yamanq
2016-08-15 13:59:55 -04:00
-
-
ebf4d41ae7
Made createClass teacher optional
Kenneth Jao
2016-08-15 13:59:45 -04:00
-
-
a35182ae82
additional date checking
yamanq
2016-08-15 13:58:46 -04:00
-
70d20ea40b
fixed leaveClass issue
yamanq
2016-08-15 13:48:54 -04:00
-
a122d3b6aa
Merge branch 'master' of https://github.com/ksjdragon/hourglass
Kenneth Jao
2016-08-15 13:48:13 -04:00
-
-
0200c0dc78
changed subscribers to list and fixed #13
yamanq
2016-08-15 13:48:00 -04:00
-
ce56af885f
Reverted myClasses code
Kenneth Jao
2016-08-15 13:47:05 -04:00
-
58522390df
fixed 0 subscribers bug
Yaman Qalieh
2016-08-15 10:42:35 -04:00
-
-
6f29a1a02a
Made hour optional, fixed avatar display bug
Kenneth Jao
2016-08-14 21:48:42 -04:00
-
-
4326346af5
fixed login button
yamanq
2016-08-14 15:42:39 -04:00
-
9c87050333
fix joinclass issue
yamanq
2016-08-14 15:02:18 -04:00
-
153cf62888
temporarily comment out bug
Yaman Qalieh
2016-08-14 08:22:39 -04:00
-
015a329778
add datepicker options
Yaman Qalieh
2016-08-14 08:11:49 -04:00
-
dcfce8654f
Merge branch 'master' of https://github.com/ksjdragon/hourglass
Yaman Qalieh
2016-08-14 07:52:41 -04:00
-
-
655d5821e9
remove class if non-existant
Yaman Qalieh
2016-08-14 07:52:27 -04:00
-
353d9357d7
CSS display fix
Kenneth Jao
2016-08-13 23:49:53 -04:00
-
d79e157fe5
Added date picker, and changed work colors
Kenneth Jao
2016-08-13 23:46:32 -04:00
-
-
ddab8b86c2
Merge branch 'master' of https://github.com/ksjdragon/hourglass
Yaman Qalieh
2016-08-13 22:47:29 -04:00
-
-
c9fd63065f
package additions
Yaman Qalieh
2016-08-13 22:47:07 -04:00
-
68c6e0c32b
Fixed profile images not displaying on new user
Kenneth Jao
2016-08-13 20:52:47 -04:00
-
b1381234e2
Fixed bad function calling
Kenneth Jao
2016-08-13 20:24:56 -04:00
-
57aeb4d34b
Bug fixes
Kenneth Jao
2016-08-13 20:22:54 -04:00
-
00ded2965d
Fixed editWork, and displays work information on click
Kenneth Jao
2016-08-13 19:24:10 -04:00
-
6833e3a1cd
Adding work, display each work in correct class
Kenneth Jao
2016-08-13 18:58:54 -04:00
-
-
9957cba048
description optional
Yaman Qalieh
2016-08-13 17:36:35 -04:00
-
83214bec01
Merge branch 'master' of https://github.com/ksjdragon/hourglass
Yaman Qalieh
2016-08-13 17:33:40 -04:00
-
-
41a3c1bc16
description security and bug fixes
Yaman Qalieh
2016-08-13 17:33:12 -04:00
-
5c99efc6e2
Merge branch 'master' of https://github.com/ksjdragon/hourglass
Kenneth Jao
2016-08-13 17:26:15 -04:00
-
-
-
-
8d066a9d64
Server functions and schema fixes
Kenneth Jao
2016-08-13 17:26:07 -04:00
-
33c2b5e1c4
add date to comments
Yaman Qalieh
2016-08-13 16:18:04 -04:00
-
-
72913d728a
Added user in each comment
Kenneth Jao
2016-08-13 16:12:25 -04:00
-
-
37e0da4322
Added user for each comment
Kenneth Jao
2016-08-13 16:10:01 -04:00
-
d5d2f842a3
web-beautify-js
Yaman Qalieh
2016-08-13 13:32:40 -04:00
-
6c2e98e6d0
add permissions and fix profile/publishing bugs
Yaman Qalieh
2016-08-13 09:02:04 -04:00
-
-
0afd5c2ba1
Add homework framework
Kenneth Jao
2016-08-12 23:10:27 -04:00
-
f068fd23a6
Syntax error, and removed old test function
Kenneth Jao
2016-08-12 22:43:56 -04:00
-
eced94799b
change markwork to togglework
yamanq
2016-08-12 22:35:28 -04:00
-
929f31ef97
bug fixes
yamanq
2016-08-12 22:05:06 -04:00
-
70eab47c44
change markDone to markWork
yamanq
2016-08-12 22:00:16 -04:00
-
5dc07fb7c3
work functions
yamanq
2016-08-12 21:52:14 -04:00
-
f2fa1fdc20
deleteWork secure and schema update
yamanq
2016-08-12 21:00:32 -04:00
-
0e571e8942
Merge branch 'master' of https://github.com/ksjdragon/hourglass
Yaman Qalieh
2016-08-12 20:42:51 -04:00
-
-
cdd2cd99ab
publish and subscribe
Yaman Qalieh
2016-08-12 20:42:29 -04:00
-
2c4b480e9d
add publish to server
Yaman Qalieh
2016-08-12 20:11:26 -04:00
-
000e992321
Display classes mode
Kenneth Jao
2016-08-12 19:46:40 -04:00
-
-
3f984fca63
Merge branch 'master' of https://github.com/ksjdragon/hourglass
Yaman Qalieh
2016-08-12 19:11:07 -04:00
-
-
d3080dbb9a
implemented alanning:roles
Yaman Qalieh
2016-08-12 19:10:54 -04:00
-
bc81e5eb3e
Moved images, made myClasses a global helper
Kenneth Jao
2016-08-12 18:32:37 -04:00
-
-
63652db9ac
Merge branch 'master' of https://github.com/ksjdragon/hourglass
yamanq
2016-08-12 18:27:41 -04:00
-
-
6c48c7cd46
directory change
yamanq
2016-08-12 18:27:30 -04:00
-
568f6e245f
profile fixes
yamanq
2016-08-12 18:27:03 -04:00
-
efca57c555
Added user classes display in sidebar
Kenneth Jao
2016-08-12 18:18:08 -04:00
-
090f9e1244
Display fix
Kenneth Jao
2016-08-12 17:58:03 -04:00
-
-
f6476182e0
Css display fix for profile
Kenneth Jao
2016-08-12 17:51:16 -04:00
-
e0601fc6f5
fix bug
yamanq
2016-08-12 17:48:49 -04:00
-
60b1da6284
Merge branch 'master' of https://github.com/ksjdragon/hourglass
yamanq
2016-08-12 17:39:55 -04:00
-
-
c227386c3d
made it easier to change classes viewable on calendar
yamanq
2016-08-12 17:39:36 -04:00
-
4a8d06311a
moved autocomplete templates
Kenneth Jao
2016-08-12 17:38:22 -04:00
-
06ee977072
Merge branch 'master' of https://github.com/ksjdragon/hourglass
Kenneth Jao
2016-08-12 17:35:38 -04:00
-
-
-
-
92dc520924
Form clears only when check is clicked, fixed display issues
Kenneth Jao
2016-08-12 17:35:29 -04:00
-
cd8d53c887
only display user's classes
yamanq
2016-08-12 17:33:29 -04:00
-
08b1b1ef6d
change routing
Yaman Qalieh
2016-08-12 17:18:30 -04:00
-
8a34c1ab09
Merge branch 'master' of https://github.com/ksjdragon/hourglass
Yaman Qalieh
2016-08-12 17:14:32 -04:00
-
-
32324957ca
Merge branch 'master' of https://github.com/ksjdragon/hourglass
Kenneth Jao
2016-08-12 17:07:24 -04:00
-
-
-
-
bfaade2a3e
Made user classes display
Kenneth Jao
2016-08-12 17:07:12 -04:00