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 |
|
Kenneth Jao
|
06ee977072
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-12 17:35:38 -04:00 |
|
Kenneth Jao
|
92dc520924
|
Form clears only when check is clicked, fixed display issues
|
2016-08-12 17:35:29 -04:00 |
|
yamanq
|
cd8d53c887
|
only display user's classes
|
2016-08-12 17:33:29 -04:00 |
|
Yaman Qalieh
|
08b1b1ef6d
|
change routing
|
2016-08-12 17:18:30 -04:00 |
|
Yaman Qalieh
|
8a34c1ab09
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-12 17:14:32 -04:00 |
|
Kenneth Jao
|
32324957ca
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-12 17:07:24 -04:00 |
|
Kenneth Jao
|
bfaade2a3e
|
Made user classes display
|
2016-08-12 17:07:12 -04:00 |
|
Yaman Qalieh
|
8731695160
|
removed unnecesary code
|
2016-08-12 16:34:46 -04:00 |
|
yamanq
|
0984ce7347
|
display only public classes on search
|
2016-08-12 16:12:03 -04:00 |
|
Kenneth Jao
|
3b3f0d9e8c
|
Fixed create class form sending
|
2016-08-12 15:55:35 -04:00 |
|
Yaman Qalieh
|
a02d939875
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-12 15:50:21 -04:00 |
|
Yaman Qalieh
|
92c3229538
|
joinClass fix
|
2016-08-12 15:50:07 -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 |
|
Yaman Qalieh
|
513e19046c
|
formatted code
|
2016-08-12 12:13:26 -04:00 |
|
Yaman Qalieh
|
4f67ff8194
|
optimization fixes on server
|
2016-08-12 12:10:21 -04:00 |
|
yamanq
|
7032b30aa1
|
merge conflict
|
2016-08-12 00:57:04 -04:00 |
|
yamanq
|
c4492d6ff2
|
change name of field in editProfile
|
2016-08-11 23:57:33 -04:00 |
|
Kenneth Jao
|
a15b70adc5
|
Display fixesfor cross-browsers compatibility
|
2016-08-11 22:14:13 -04:00 |
|
yamanq
|
69d063452a
|
update editProfile
|
2016-08-11 21:53:08 -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
|
bc3aa5ce81
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-10 21:57:04 -04:00 |
|
Kenneth Jao
|
308c346124
|
Added joining classes, and viewing classes
|
2016-08-10 21:56:12 -04:00 |
|
yamanq
|
15143172ad
|
add name to work
|
2016-08-10 18:26:23 -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
|
5c8cca4009
|
deleteWork no security
|
2016-08-10 17:43:31 -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 |
|
yamanq
|
9062fa0aed
|
typo
|
2016-08-10 15:58:25 -04:00 |
|
yamanq
|
c281f00905
|
classes join
|
2016-08-10 15:57:10 -04:00 |
|
Kenneth Jao
|
6f6fc5bddf
|
Fixed profile display bugs
|
2016-08-10 15:28:21 -04:00 |
|
yamanq
|
5b575922b3
|
classes on profile page
|
2016-08-10 15:19:53 -04:00 |
|
Kenneth Jao
|
f1d7e180f0
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-10 14:43:09 -04:00 |
|
Kenneth Jao
|
1d1fe5319f
|
Added editing class tabs
|
2016-08-10 14:42:31 -04:00 |
|
yamanq
|
157bcf33e9
|
add fullcalendar
|
2016-08-10 14:34:56 -04:00 |
|
yamanq
|
efe80f8b45
|
createClass optimization
|
2016-08-10 14:14:55 -04:00 |
|
yamanq
|
2fffc374b6
|
deleteSchool, deleteClass
|
2016-08-10 14:05:45 -04:00 |
|
yamanq
|
e2f4afbd1b
|
add fullcalendar:fullcalendar
|
2016-08-10 13:54:34 -04:00 |
|
yamanq
|
c3cc549785
|
added full calendar
|
2016-08-10 13:49:27 -04:00 |
|
yamanq
|
dfdaadf68e
|
createClass bug
|
2016-08-10 13:48:46 -04:00 |
|
yamanq
|
5e2db196d7
|
add alanning:roles
|
2016-08-10 08:05:38 -04:00 |
|