Kenneth Jao
|
d6a8c94941
|
Fixed rinput restriction
|
2016-09-05 14:51:40 -04:00 |
|
Yaman Qalieh
|
604db80371
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-09-05 13:44:30 -04:00 |
|
Yaman Qalieh
|
374a570a35
|
profile pages now work
|
2016-09-05 13:44:18 -04:00 |
|
Kenneth Jao
|
ab4cbb371a
|
Added prep code for admin
|
2016-09-05 02:35:31 -04:00 |
|
Kenneth Jao
|
c2d06c9036
|
Fix merge conflict
|
2016-09-05 00:16:26 -04:00 |
|
Kenneth Jao
|
b47a6e7f65
|
CSS optimization, changed client profile handling
|
2016-09-05 00:08:59 -04:00 |
|
Yaman Qalieh
|
3a9fd1ed0d
|
filter on router
|
2016-09-04 20:20:40 -04:00 |
|
Yaman Qalieh
|
a213cfde23
|
filter on server/main
|
2016-09-04 20:16:13 -04:00 |
|
Yaman Qalieh
|
8eaaff37f4
|
web-beautify filter
|
2016-09-04 20:13:31 -04:00 |
|
Yaman Qalieh
|
b98f229c0b
|
fix emacs warnings
|
2016-09-04 20:10:58 -04:00 |
|
Yaman Qalieh
|
8fd8a9412a
|
fix buggy characters left
|
2016-09-04 19:13:44 -04:00 |
|
Kenneth Jao
|
8cbe8e253a
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-09-04 19:00:43 -04:00 |
|
Kenneth Jao
|
d3c5c6c46e
|
CSS fix
|
2016-09-04 19:00:30 -04:00 |
|
Yaman Qalieh
|
2932def0d4
|
do not allow other users to view classes
|
2016-09-04 15:48:28 -04:00 |
|
Yaman Qalieh
|
abdd95477c
|
publish userfields needed for profile pages
|
2016-09-04 15:47:45 -04:00 |
|
Kenneth Jao
|
dc1e0c8df8
|
CSS addition
|
2016-09-04 01:13:33 -04:00 |
|
Kenneth Jao
|
9ec4fc6bfb
|
Added admin page layout, small null checking changes
|
2016-09-04 01:09:05 -04:00 |
|
Yaman Qalieh
|
69b441ec25
|
bug fix
|
2016-09-03 21:54:39 -04:00 |
|
Yaman Qalieh
|
ae1c9ea1d1
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-09-03 21:36:46 -04:00 |
|
Yaman Qalieh
|
007ea30d42
|
publish personal work
|
2016-09-03 21:36:33 -04:00 |
|
Yaman Qalieh
|
b94003fcaf
|
personal edit and delete work
|
2016-09-03 21:34:06 -04:00 |
|
Yaman Qalieh
|
09dd53fb6f
|
edit createWork to allow personal work to be created
|
2016-09-03 21:12:17 -04:00 |
|
Kenneth Jao
|
cbb8f22f50
|
Minor bugs, fixed #75
|
2016-09-03 02:02:09 -04:00 |
|
Kenneth Jao
|
9df47a896a
|
Syntax error
|
2016-09-02 12:23:05 -04:00 |
|
Yaman Qalieh
|
64fa523e3d
|
small optimization
|
2016-09-02 11:24:54 -04:00 |
|
Kenneth Jao
|
f95b53db08
|
Renaming and small optmization
|
2016-09-02 01:00:52 -04:00 |
|
Kenneth Jao
|
bded6702cf
|
disable all filters, and renaming
|
2016-09-02 00:53:12 -04:00 |
|
Kenneth Jao
|
7eebae2b9f
|
Fixed comments
|
2016-09-02 00:34:40 -04:00 |
|
Kenneth Jao
|
fabe20ddfe
|
Fixed calendar bugs
|
2016-09-02 00:15:29 -04:00 |
|
Yaman Qalieh
|
bd4f6017c8
|
relaxes security on editProfile in order to fix #80
|
2016-09-01 07:15:17 -04:00 |
|
ksjdragon
|
acb0b23d38
|
Merge pull request #79 from Arav-Agarwal/master
|
2016-09-01 00:51:26 -04:00 |
|
Kenneth Jao
|
f79e840ae2
|
Display fixes
|
2016-09-01 00:38:06 -04:00 |
|
Arav-Agarwal
|
7a3c536a27
|
Merge pull request #1 from ksjdragon/master
Testing this new branch setup
|
2016-09-01 00:32:36 -04:00 |
|
Kenneth Jao
|
ed6a594705
|
CSS Reversion
|
2016-09-01 00:30:49 -04:00 |
|
Kenneth Jao
|
7abb353961
|
Removed school checking, as client is changed to display nothing if undefined
|
2016-09-01 00:30:05 -04:00 |
|
Kenneth Jao
|
3282d861ff
|
Display fixes
|
2016-09-01 00:28:10 -04:00 |
|
Kenneth Jao
|
a0d277001e
|
Fixed issue #77
|
2016-09-01 00:23:22 -04:00 |
|
Yaman Qalieh
|
9ee9d36835
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-09-01 00:13:28 -04:00 |
|
Yaman Qalieh
|
e23398999a
|
fix #76
|
2016-09-01 00:13:17 -04:00 |
|
ksjdragon
|
cc9f755334
|
Merge pull request #78 from Arav-Agarwal/master
Added login button to profile page
|
2016-09-01 00:09:16 -04:00 |
|
Arav-Agarwal
|
726be1e084
|
css reversion
|
2016-09-01 00:07:56 -04:00 |
|
Arav-Agarwal
|
094093e078
|
Added login button to profile page
|
2016-09-01 00:05:45 -04:00 |
|
Yaman Qalieh
|
80126c4631
|
check for profile existence
|
2016-08-31 23:49:54 -04:00 |
|
Yaman Qalieh
|
6f499ad2f9
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-31 23:39:35 -04:00 |
|
Kenneth Jao
|
5f97910f0f
|
Null checking
|
2016-08-31 23:38:47 -04:00 |
|
Yaman Qalieh
|
da9c2913fc
|
explicit if statements
|
2016-08-31 23:38:45 -04:00 |
|
Yaman Qalieh
|
566a477787
|
syntax error
|
2016-08-31 23:33:36 -04:00 |
|
Yaman Qalieh
|
e47cfaf7e1
|
router bug
|
2016-08-31 23:32:35 -04:00 |
|
Yaman Qalieh
|
2e80cdf2fb
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-08-31 23:22:08 -04:00 |
|
Yaman Qalieh
|
7fc3a0b35c
|
meteor errors to fix #72
|
2016-08-31 23:21:53 -04:00 |
|