Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• aa16f61cea Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-09-10 16:11:41 -04:00
• 4d4fb0d69c css fix Kenneth Jao 2016-09-10 14:17:51 -04:00
• c82ceb9afa Added creator to work card Kenneth Jao 2016-09-10 14:13:00 -04:00
• cb17d7e2ea Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-09-10 14:06:31 -04:00
• b480fa6558 Added NotFound for undefined user, and moved redirection to router Kenneth Jao 2016-09-10 14:06:22 -04:00
• 725a72f21a Added creator for work Kenneth Jao 2016-09-10 13:39:46 -04:00
• 006f9db206 reorderClasses Yaman Qalieh 2016-09-10 12:12:15 -04:00
• 2908c46452 More CSS fixes Kenneth Jao 2016-09-10 03:07:55 -04:00
• 473fe2e22d removed console log Kenneth Jao 2016-09-10 02:30:56 -04:00
• 9bb703b886 Optimized filter highlighting Kenneth Jao 2016-09-10 02:26:11 -04:00
• 392a40bd20 Fixed calendar class filter highlighting Kenneth Jao 2016-09-10 01:55:41 -04:00
• e68fb2552f Request box css fixes Kenneth Jao 2016-09-10 00:44:06 -04:00
• a9ef959369 Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-09-10 00:39:41 -04:00
• 6b693d4b8d CSS fixes for profile, and main Kenneth Jao 2016-09-10 00:39:28 -04:00
• df29c7dda3 fix #85 Yaman Qalieh 2016-09-09 22:25:02 -04:00
• 7d90cd6871 Fixed request css and js Kenneth Jao 2016-09-09 08:20:51 -04:00
• 1fb3d8f4d1 CSS fixes Kenneth Jao 2016-09-09 02:27:37 -04:00
• 93e1eff12f Fixed login button clicking, minor css Kenneth Jao 2016-09-09 02:17:32 -04:00
• 8299918ea7 Header css fixes for main Kenneth Jao 2016-09-09 02:06:00 -04:00
• 83e0ae74b4 Small bug fixes Kenneth Jao 2016-09-09 01:41:07 -04:00
• ef0d586eff CSS fixes for login Kenneth Jao 2016-09-09 00:45:58 -04:00
• aabd11f017 CSS fixes Kenneth Jao 2016-09-08 23:55:15 -04:00
• 4143d2cf05 CSS fixes, and update packages Kenneth Jao 2016-09-08 21:32:10 -04:00
• c37244fce8 Fixed not adding to superadmin list Kenneth Jao 2016-09-08 21:01:52 -04:00
• 775a9aa502 admin page original Yaman Qalieh 2016-09-08 17:18:15 -04:00
• a329b4b08e tabbing Yaman Qalieh 2016-09-08 17:11:35 -04:00
• ed8038261f Added request sending Kenneth Jao 2016-09-08 16:51:22 -04:00
• 7dde278cbd remove console logging Yaman Qalieh 2016-09-07 21:33:59 -04:00
• f68bc3ad54 minor fixes Yaman Qalieh 2016-09-07 21:26:26 -04:00
• afb3486268 CSS fixes Kenneth Jao 2016-09-07 20:04:51 -04:00
• 2a08efacba Fixed header CSS on main Kenneth Jao 2016-09-07 18:13:13 -04:00
• 00950f36e6 Fixed editProfile deleting name Kenneth Jao 2016-09-07 18:11:36 -04:00
• bf91825c0a Added user dropdown Kenneth Jao 2016-09-07 15:33:13 -04:00
• 230245813c Put click in html Kenneth Jao 2016-09-07 11:52:28 -04:00
• 607bae992d login CSS for all resolutions, optimized Kenneth Jao 2016-09-07 11:51:30 -04:00
• 2b5744dbd4 Optimized owned classes, and fixed bugs relating to it Kenneth Jao 2016-09-07 02:05:31 -04:00
• 9de73d9338 Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-09-07 01:53:27 -04:00
• 5bcb54dba7 Aligned classes CSS Kenneth Jao 2016-09-07 01:53:15 -04:00
• dac17c2d84 Chrome browser CSS compatiblity Kenneth Jao 2016-09-07 01:52:54 -04:00
• 94c86e6a2a Fixed get code in server and client Kenneth Jao 2016-09-07 01:12:30 -04:00
• 96f7962acf admin classes css fix Kenneth Jao 2016-09-07 00:36:33 -04:00
• 1211259fb4 Fix overlay css and form clearing in profile Kenneth Jao 2016-09-07 00:08:47 -04:00
• a4b380695f Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-09-06 20:56:40 -04:00
• a5caad8e46 shorten editProfile Yaman Qalieh 2016-09-06 20:56:31 -04:00
• 1b54686ec3 CSS for private class box Kenneth Jao 2016-09-06 20:02:56 -04:00
• 5484edfd8b Fixed join class CSS in profile Kenneth Jao 2016-09-06 19:52:37 -04:00
• 160d50af1f CSS fixes for profile Kenneth Jao 2016-09-06 19:28:36 -04:00
• 7735b6cfdb Added default avatar and banner to createProfile, and small bug Kenneth Jao 2016-09-06 18:57:55 -04:00
• 4d684a7271 CSS fixes for class display Kenneth Jao 2016-09-06 17:46:32 -04:00
• 67c203ab7e Added css and some js for admin value editing Kenneth Jao 2016-09-06 17:29:23 -04:00
• 22f51f7537 CSS fixes Kenneth Jao 2016-09-06 08:50:39 -04:00
• e4ad100a49 More admin page functionality Kenneth Jao 2016-09-06 01:36:03 -04:00
• f5ee6f7aff Added classesfor admin Kenneth Jao 2016-09-06 00:27:43 -04:00
• 1d66a88ef1 Fixed admin page not waiting Kenneth Jao 2016-09-06 00:27:30 -04:00
• 09e6afd10b CSS fix Kenneth Jao 2016-09-05 19:19:01 -04:00
• 689a4cbb6d CSS layering fix Kenneth Jao 2016-09-05 19:15:20 -04:00
• bee59d458c Added links to user profile for banned/moderators Kenneth Jao 2016-09-05 17:19:04 -04:00
• 6a7f69f65c Added user icons and links to profile Kenneth Jao 2016-09-05 16:41:22 -04:00
• ea8e083d7c Minor restrict bug Kenneth Jao 2016-09-05 15:49:42 -04:00
• baace551fe Redid CSS for editWork div Kenneth Jao 2016-09-05 15:45:21 -04:00
• cd73f4533e Css fixes Kenneth Jao 2016-09-05 15:08:59 -04:00
• bfc5f64848 Fixed favicon directory Kenneth Jao 2016-09-05 15:06:00 -04:00
• 8de7baec99 Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-09-05 14:56:47 -04:00
• d6a8c94941 Fixed rinput restriction Kenneth Jao 2016-09-05 14:51:40 -04:00
• 604db80371 Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-09-05 13:44:30 -04:00
• 374a570a35 profile pages now work Yaman Qalieh 2016-09-05 13:44:18 -04:00
• ab4cbb371a Added prep code for admin Kenneth Jao 2016-09-05 02:35:31 -04:00
• c2d06c9036 Fix merge conflict Kenneth Jao 2016-09-05 00:16:26 -04:00
• b47a6e7f65 CSS optimization, changed client profile handling Kenneth Jao 2016-09-05 00:08:59 -04:00
• 3a9fd1ed0d filter on router Yaman Qalieh 2016-09-04 20:20:40 -04:00
• a213cfde23 filter on server/main Yaman Qalieh 2016-09-04 20:16:13 -04:00
• 8eaaff37f4 web-beautify filter Yaman Qalieh 2016-09-04 20:13:31 -04:00
• b98f229c0b fix emacs warnings Yaman Qalieh 2016-09-04 20:10:58 -04:00
• 8fd8a9412a fix buggy characters left Yaman Qalieh 2016-09-04 19:13:44 -04:00
• 8cbe8e253a Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-09-04 19:00:43 -04:00
• d3c5c6c46e CSS fix Kenneth Jao 2016-09-04 19:00:30 -04:00
• 2932def0d4 do not allow other users to view classes Yaman Qalieh 2016-09-04 15:48:28 -04:00
• abdd95477c publish userfields needed for profile pages Yaman Qalieh 2016-09-04 15:47:45 -04:00
• dc1e0c8df8 CSS addition Kenneth Jao 2016-09-04 01:13:33 -04:00
• 9ec4fc6bfb Added admin page layout, small null checking changes Kenneth Jao 2016-09-04 01:09:05 -04:00
• 69b441ec25 bug fix Yaman Qalieh 2016-09-03 21:54:39 -04:00
• ae1c9ea1d1 Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-09-03 21:36:46 -04:00
• 007ea30d42 publish personal work Yaman Qalieh 2016-09-03 21:36:33 -04:00
• b94003fcaf personal edit and delete work Yaman Qalieh 2016-09-03 21:34:06 -04:00
• 09dd53fb6f edit createWork to allow personal work to be created Yaman Qalieh 2016-09-03 21:12:17 -04:00
• cbb8f22f50 Minor bugs, fixed #75 Kenneth Jao 2016-09-03 02:02:09 -04:00
• 9df47a896a Syntax error Kenneth Jao 2016-09-02 12:23:05 -04:00
• 64fa523e3d small optimization Yaman Qalieh 2016-09-02 11:24:54 -04:00
• f95b53db08 Renaming and small optmization Kenneth Jao 2016-09-02 01:00:52 -04:00
• bded6702cf disable all filters, and renaming Kenneth Jao 2016-09-02 00:53:12 -04:00
• 7eebae2b9f Fixed comments Kenneth Jao 2016-09-02 00:34:40 -04:00
• fabe20ddfe Fixed calendar bugs Kenneth Jao 2016-09-02 00:15:29 -04:00
• bd4f6017c8 relaxes security on editProfile in order to fix #80 Yaman Qalieh 2016-09-01 07:15:17 -04:00
• acb0b23d38 Merge pull request #79 from Arav-Agarwal/master ksjdragon 2016-09-01 00:51:26 -04:00
• f79e840ae2 Display fixes Kenneth Jao 2016-09-01 00:38:06 -04:00
• 7a3c536a27 Merge pull request #1 from ksjdragon/master Arav-Agarwal 2016-09-01 00:32:36 -04:00
• ed6a594705 CSS Reversion Kenneth Jao 2016-09-01 00:30:49 -04:00
• 7abb353961 Removed school checking, as client is changed to display nothing if undefined Kenneth Jao 2016-09-01 00:30:05 -04:00
• 3282d861ff Display fixes Kenneth Jao 2016-09-01 00:28:10 -04:00
• a0d277001e Fixed issue #77 Kenneth Jao 2016-09-01 00:23:22 -04:00