kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 9ee9d36835 Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-09-01 00:13:28 -04:00
  • e23398999a fix #76 Yaman Qalieh 2016-09-01 00:13:17 -04:00
  • cc9f755334 Merge pull request #78 from Arav-Agarwal/master ksjdragon 2016-09-01 00:09:16 -04:00
  • 726be1e084 css reversion Arav-Agarwal 2016-09-01 00:07:56 -04:00
  • 094093e078 Added login button to profile page Arav-Agarwal 2016-09-01 00:05:45 -04:00
  • 80126c4631 check for profile existence Yaman Qalieh 2016-08-31 23:49:54 -04:00
  • 6f499ad2f9 Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-08-31 23:39:35 -04:00
  • 5f97910f0f Null checking Kenneth Jao 2016-08-31 23:38:47 -04:00
  • da9c2913fc explicit if statements Yaman Qalieh 2016-08-31 23:38:45 -04:00
  • 566a477787 syntax error Yaman Qalieh 2016-08-31 23:33:36 -04:00
  • e47cfaf7e1 router bug Yaman Qalieh 2016-08-31 23:32:35 -04:00
  • 2e80cdf2fb Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-08-31 23:22:08 -04:00
  • 7fc3a0b35c meteor errors to fix #72 Yaman Qalieh 2016-08-31 23:21:53 -04:00
  • a031ee92f4 syntax error Kenneth Jao 2016-08-31 23:09:21 -04:00
  • 2b96ce9d4f Removed defaults client side Kenneth Jao 2016-08-31 23:08:12 -04:00
  • 876272ada9 fix #73: placeholder values for createProfile Yaman Qalieh 2016-08-31 23:05:26 -04:00
  • c08ddac128 Added deleting work for admins/moderators, fixed #74 Kenneth Jao 2016-08-31 22:54:44 -04:00
  • 5f23c44857 Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-08-31 20:33:34 -04:00
  • 761fd43944 add request type and request info Yaman Qalieh 2016-08-31 20:33:25 -04:00
  • 3abcb85e84 Update README.md yamanq 2016-08-31 18:42:21 -04:00
  • b4ac665bd8 Update README.md yamanq 2016-08-31 18:35:20 -04:00
  • 8542caec04 fix indenting etc Yaman Qalieh 2016-08-31 07:05:23 -04:00
  • 1e830e8439 CSS reversion Kenneth Jao 2016-08-31 01:57:55 -04:00
  • cfef70b87f Merge pull request #69 from ksjdragon/AravTest Arav-Agarwal 2016-08-31 01:55:33 -04:00
  • 3f4f07c28d teihe Arav-Agarwal 2016-08-31 01:53:18 -04:00
  • 188d8033ac My changes Arav-Agarwal 2016-08-31 01:28:37 -04:00
  • 21435b5866 Added client side for generating preferences for new user Kenneth Jao 2016-08-30 23:29:27 -04:00
  • 30c024a884 Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-08-30 22:51:09 -04:00
  • b421e6a256 optimize until (including) trackUserInClass Yaman Qalieh 2016-08-30 22:50:54 -04:00
  • 535ee70bbd comments for profile, and small changes Kenneth Jao 2016-08-30 22:49:02 -04:00
  • cd72662cb6 var renaming and commenting, main.js Kenneth Jao 2016-08-30 18:49:33 -04:00
  • 2dc29d0f16 fix errors caused by not fixing merge Yaman Qalieh 2016-08-30 06:42:04 -04:00
  • 044e63a889 Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-08-29 23:32:25 -04:00
  • 8a0a18b454 Calendar adding issue, css hover still doesn't work; sidebar closes on mode change, fixed #64 Kenneth Jao 2016-08-29 23:32:14 -04:00
  • ecb8ebae64 Merge remote-tracking branch 'origin/master' Arav-Agarwal 2016-08-29 23:18:22 -04:00
  • 156fa11930 add scope to server variables Yaman Qalieh 2016-08-29 21:13:35 -04:00
  • cb8c9025f4 serverData make global variable Yaman Qalieh 2016-08-29 21:02:02 -04:00
  • 9356b4b04c add constants.js Yaman Qalieh 2016-08-29 20:40:33 -04:00
  • ef2afa13e8 make themeColors global Yaman Qalieh 2016-08-29 20:39:36 -04:00
  • 3d09d2a8e1 Comments Arav-Agarwal 2016-08-29 00:24:01 -04:00
  • 81ebc744d8 Fixed minor bugs Kenneth Jao 2016-08-28 23:25:43 -04:00
  • 79dd0c2c0e fixed comment box height Kenneth Jao 2016-08-28 21:34:24 -04:00
  • 02ea688420 fixed bad preference storage Yaman Qalieh 2016-08-28 20:09:16 -04:00
  • d387699f67 fix time display for comments Yaman Qalieh 2016-08-28 19:28:36 -04:00
  • 1a9435a3de cannot confirm and approve work at same time Yaman Qalieh 2016-08-28 19:22:51 -04:00
  • 202df284a3 Display who's done, fixed #46 Kenneth Jao 2016-08-28 18:55:10 -04:00
  • 5f186e55fc Added toggling work Kenneth Jao 2016-08-28 18:41:35 -04:00
  • f6449ffe0c Fixed small display bug, removed unnecessary code Kenneth Jao 2016-08-28 14:45:35 -04:00
  • 073db86deb Added preferences to profile Kenneth Jao 2016-08-28 14:36:26 -04:00
  • a15e588c92 Fixed couldn't add work, and minor profile bug Kenneth Jao 2016-08-28 13:12:41 -04:00
  • 38eba83101 Adding and displaying comments Kenneth Jao 2016-08-27 21:38:42 -04:00
  • 6b2e56f067 comments are displayed, comment server bug Kenneth Jao 2016-08-27 19:29:51 -04:00
  • 5281bf4117 Made theme colors session variable, and changed card color Kenneth Jao 2016-08-27 19:01:14 -04:00
  • 0c84d9acb6 Made code getting from server function Kenneth Jao 2016-08-27 18:57:16 -04:00
  • 47119d4161 Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-08-27 18:53:57 -04:00
  • 416eafcd4c Lots of tiny bug fixes, such as display, naming, and functionality Kenneth Jao 2016-08-27 18:53:47 -04:00
  • af98278e64 use js filter on new server files Yaman Qalieh 2016-08-27 09:47:59 -04:00
  • aed412af10 fix #58 with function getCode(classId) Yaman Qalieh 2016-08-27 09:34:23 -04:00
  • 96e413f005 Work should be removed when 'done', fixed #47 Kenneth Jao 2016-08-27 01:11:37 -04:00
  • dddfe53c59 Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-08-27 01:08:45 -04:00
  • 6e815de23f Fixed default mode changing current mode Kenneth Jao 2016-08-27 01:08:33 -04:00
  • db2c32956a Added actual button, and bug fixes Kenneth Jao 2016-08-27 00:54:12 -04:00
  • c52e477eee Added time until hide homework Kenneth Jao 2016-08-26 23:50:46 -04:00
  • 87494ca71f fix indenting server Yaman Qalieh 2016-08-26 21:32:17 -04:00
  • 043d9b93a1 Added click to display classes from sidebar, fixed #53 Kenneth Jao 2016-08-26 01:02:28 -04:00
  • 0f7017ce5b Display and small bug fix Kenneth Jao 2016-08-25 23:34:14 -04:00
  • e8799aeb27 Added sidebar clases on-hover 'highlight' work Kenneth Jao 2016-08-25 23:31:34 -04:00
  • 2c1d8cddd8 Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-08-25 23:09:51 -04:00
  • cf09cf33bd router syntax error Kenneth Jao 2016-08-25 23:09:12 -04:00
  • aced6645a1 Profile Arav-Agarwal 2016-08-25 22:56:10 -04:00
  • f0fa84c47a Comments Arav-Agarwal 2016-08-25 22:35:44 -04:00
  • 9c63a46409 update router for admin page yamanq 2016-08-25 22:02:23 -04:00
  • e2a38adee2 update school directory yamanq 2016-08-25 21:57:22 -04:00
  • 3bae4df7c0 create profile yamanq 2016-08-24 21:15:16 -04:00
  • 2b2a61dfe9 should fix #54 Yaman Qalieh 2016-08-24 21:09:34 -04:00
  • 1533f24cda Fixed leave class, #51 Kenneth Jao 2016-08-23 22:09:07 -04:00
  • 7b1219716e commenting on server yamanq 2016-08-23 21:35:10 -04:00
  • 53b69348d1 Implement default mode, css fixes Kenneth Jao 2016-08-23 00:11:57 -04:00
  • f09532438e Added preferences, and dark theme Kenneth Jao 2016-08-22 23:44:48 -04:00
  • db85d38145 createcomments Yaman Qalieh 2016-08-22 16:52:04 -04:00
  • e68ffb9dba add leave class button Kenneth Jao 2016-08-21 22:50:23 -04:00
  • a797de4c0e Update main.js yamanq 2016-08-21 22:48:15 -04:00
  • d26ebd2d27 Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-08-21 10:02:20 -04:00
  • 7aed50f2a3 added error system Yaman Qalieh 2016-08-21 10:02:07 -04:00
  • e5012e3c04 Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-08-20 23:37:17 -04:00
  • 7680fc1bac Fixed clicking and css issues Kenneth Jao 2016-08-20 23:37:04 -04:00
  • 550f96aa86 Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-08-20 22:38:13 -04:00
  • 860bed577d added requests collection for admin requests Yaman Qalieh 2016-08-20 22:38:01 -04:00
  • 3fd993db98 removed subscribing in profile.js Kenneth Jao 2016-08-20 22:26:55 -04:00
  • 0de9853dc4 Fixed datepicker appearing 4 months later, fixed #45 Kenneth Jao 2016-08-20 21:29:11 -04:00
  • 1f1a9fa0a3 fix 2 small bugs Yaman Qalieh 2016-08-20 20:56:05 -04:00
  • 1bdd65c4bf Added adding work from calendar, fixed #38 Kenneth Jao 2016-08-20 15:58:31 -04:00
  • 12e9017959 Fixed last commit Kenneth Jao 2016-08-19 22:04:32 -04:00
  • 45576e7619 Prevented moving dates for unauthorized users Kenneth Jao 2016-08-19 21:59:41 -04:00
  • 93bd64c4b4 Update calendar on change Kenneth Jao 2016-08-18 23:59:38 -04:00
  • bca216cf65 Fixed calendar display, and added date moving on calendar Kenneth Jao 2016-08-18 20:27:18 -04:00
  • a0357f23bb Fixed small bugs Kenneth Jao 2016-08-18 19:32:39 -04:00
  • 24e44e1607 check if code exists Yaman Qalieh 2016-08-18 19:08:58 -04:00
  • 5c3025363f Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-08-18 19:05:50 -04:00
  • de01667272 gencode fix Yaman Qalieh 2016-08-18 19:05:39 -04:00