Yaman Qalieh
|
7fc3a0b35c
|
meteor errors to fix #72
|
2016-08-31 23:21:53 -04:00 |
|
Yaman Qalieh
|
876272ada9
|
fix #73: placeholder values for createProfile
|
2016-08-31 23:05:26 -04:00 |
|
Kenneth Jao
|
c08ddac128
|
Added deleting work for admins/moderators, fixed #74
|
2016-08-31 22:54:44 -04:00 |
|
Yaman Qalieh
|
5f23c44857
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-31 20:33:34 -04:00 |
|
Yaman Qalieh
|
761fd43944
|
add request type and request info
|
2016-08-31 20:33:25 -04:00 |
|
yamanq
|
3abcb85e84
|
Update README.md
|
2016-08-31 18:42:21 -04:00 |
|
yamanq
|
b4ac665bd8
|
Update README.md
|
2016-08-31 18:35:20 -04:00 |
|
Yaman Qalieh
|
8542caec04
|
fix indenting etc
|
2016-08-31 07:05:23 -04:00 |
|
Kenneth Jao
|
1e830e8439
|
CSS reversion
|
2016-08-31 01:57:55 -04:00 |
|
Arav-Agarwal
|
cfef70b87f
|
Merge pull request #69 from ksjdragon/AravTest
Aravtest
|
2016-08-31 01:55:33 -04:00 |
|
Arav-Agarwal
|
3f4f07c28d
|
teihe
hiehieh
|
2016-08-31 01:53:18 -04:00 |
|
Arav-Agarwal
|
188d8033ac
|
My changes
Added commit and report number to work cards
|
2016-08-31 01:28:37 -04:00 |
|
Kenneth Jao
|
21435b5866
|
Added client side for generating preferences for new user
|
2016-08-30 23:29:27 -04:00 |
|
Yaman Qalieh
|
30c024a884
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-30 22:51:09 -04:00 |
|
Yaman Qalieh
|
b421e6a256
|
optimize until (including) trackUserInClass
|
2016-08-30 22:50:54 -04:00 |
|
Kenneth Jao
|
535ee70bbd
|
comments for profile, and small changes
|
2016-08-30 22:49:02 -04:00 |
|
Kenneth Jao
|
cd72662cb6
|
var renaming and commenting, main.js
|
2016-08-30 18:49:33 -04:00 |
|
Yaman Qalieh
|
2dc29d0f16
|
fix errors caused by not fixing merge
|
2016-08-30 06:42:04 -04:00 |
|
Kenneth Jao
|
044e63a889
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-29 23:32:25 -04:00 |
|
Kenneth Jao
|
8a0a18b454
|
Calendar adding issue, css hover still doesn't work; sidebar closes on mode change, fixed #64
|
2016-08-29 23:32:14 -04:00 |
|
Arav-Agarwal
|
ecb8ebae64
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# client/main/main.js
|
2016-08-29 23:18:22 -04:00 |
|
Yaman Qalieh
|
156fa11930
|
add scope to server variables
|
2016-08-29 21:13:35 -04:00 |
|
Yaman Qalieh
|
cb8c9025f4
|
serverData make global variable
|
2016-08-29 21:02:02 -04:00 |
|
Yaman Qalieh
|
9356b4b04c
|
add constants.js
|
2016-08-29 20:40:33 -04:00 |
|
Yaman Qalieh
|
ef2afa13e8
|
make themeColors global
|
2016-08-29 20:39:36 -04:00 |
|
Arav-Agarwal
|
3d09d2a8e1
|
Comments
Added some comments to the main js file. Just started, so i should be
done soon
|
2016-08-29 00:24:01 -04:00 |
|
Kenneth Jao
|
81ebc744d8
|
Fixed minor bugs
|
2016-08-28 23:25:43 -04:00 |
|
Kenneth Jao
|
79dd0c2c0e
|
fixed comment box height
|
2016-08-28 21:34:24 -04:00 |
|
Yaman Qalieh
|
02ea688420
|
fixed bad preference storage
|
2016-08-28 20:09:16 -04:00 |
|
Yaman Qalieh
|
d387699f67
|
fix time display for comments
|
2016-08-28 19:28:36 -04:00 |
|
Yaman Qalieh
|
1a9435a3de
|
cannot confirm and approve work at same time
|
2016-08-28 19:22:51 -04:00 |
|
Kenneth Jao
|
202df284a3
|
Display who's done, fixed #46
|
2016-08-28 18:55:10 -04:00 |
|
Kenneth Jao
|
5f186e55fc
|
Added toggling work
|
2016-08-28 18:41:35 -04:00 |
|
Kenneth Jao
|
f6449ffe0c
|
Fixed small display bug, removed unnecessary code
|
2016-08-28 14:45:35 -04:00 |
|
Kenneth Jao
|
073db86deb
|
Added preferences to profile
|
2016-08-28 14:36:26 -04:00 |
|
Kenneth Jao
|
a15e588c92
|
Fixed couldn't add work, and minor profile bug
|
2016-08-28 13:12:41 -04:00 |
|
Kenneth Jao
|
38eba83101
|
Adding and displaying comments
|
2016-08-27 21:38:42 -04:00 |
|
Kenneth Jao
|
6b2e56f067
|
comments are displayed, comment server bug
|
2016-08-27 19:29:51 -04:00 |
|
Kenneth Jao
|
5281bf4117
|
Made theme colors session variable, and changed card color
|
2016-08-27 19:01:14 -04:00 |
|
Kenneth Jao
|
0c84d9acb6
|
Made code getting from server function
|
2016-08-27 18:57:16 -04:00 |
|
Kenneth Jao
|
47119d4161
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-27 18:53:57 -04:00 |
|
Kenneth Jao
|
416eafcd4c
|
Lots of tiny bug fixes, such as display, naming, and functionality
|
2016-08-27 18:53:47 -04:00 |
|
Yaman Qalieh
|
af98278e64
|
use js filter on new server files
|
2016-08-27 09:47:59 -04:00 |
|
Yaman Qalieh
|
aed412af10
|
fix #58 with function getCode(classId)
|
2016-08-27 09:34:23 -04:00 |
|
Kenneth Jao
|
96e413f005
|
Work should be removed when 'done', fixed #47
|
2016-08-27 01:11:37 -04:00 |
|
Kenneth Jao
|
dddfe53c59
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-27 01:08:45 -04:00 |
|
Kenneth Jao
|
6e815de23f
|
Fixed default mode changing current mode
|
2016-08-27 01:08:33 -04:00 |
|
Kenneth Jao
|
db2c32956a
|
Added actual button, and bug fixes
|
2016-08-27 00:54:12 -04:00 |
|
Kenneth Jao
|
c52e477eee
|
Added time until hide homework
|
2016-08-26 23:50:46 -04:00 |
|
Yaman Qalieh
|
87494ca71f
|
fix indenting server
|
2016-08-26 21:32:17 -04:00 |
|