262 Commits

Author SHA1 Message Date
Kenneth Jao
cd73f4533e Css fixes 2016-09-05 15:08:59 -04:00
Kenneth Jao
bfc5f64848 Fixed favicon directory 2016-09-05 15:06:00 -04:00
Kenneth Jao
d6a8c94941 Fixed rinput restriction 2016-09-05 14:51:40 -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
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
d3c5c6c46e CSS fix 2016-09-04 19:00:30 -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
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
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
Kenneth Jao
f79e840ae2 Display fixes 2016-09-01 00:38:06 -04:00
Kenneth Jao
ed6a594705 CSS Reversion 2016-09-01 00:30:49 -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
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
Kenneth Jao
5f97910f0f Null checking 2016-08-31 23:38:47 -04:00
Kenneth Jao
a031ee92f4 syntax error 2016-08-31 23:09:21 -04:00
Kenneth Jao
2b96ce9d4f Removed defaults client side 2016-08-31 23:08:12 -04:00
Kenneth Jao
c08ddac128 Added deleting work for admins/moderators, fixed #74 2016-08-31 22:54:44 -04:00
Kenneth Jao
1e830e8439 CSS reversion 2016-08-31 01:57:55 -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
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
cb8c9025f4 serverData make global variable 2016-08-29 21:02:02 -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
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