Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• aefcaaf21e Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-11-07 02:51:16 -05:00
• 6d2d49f78b Slight theme changes, new backgrounds, more menus Kenneth Jao 2016-11-07 02:51:06 -05:00
• 21a207ab7b Update README.md yamanq 2016-11-06 00:31:34 -04:00
• 4239fd6289 Downgraded momentjs to fix load error Kenneth Jao 2016-11-05 17:29:43 -04:00
• 20b7b5c456 Merge branch 'master' of github.com:ksjdragon/hourglass Yaman Qalieh 2016-11-05 10:35:06 -04:00
• 84b0705d39 update meteor and packages Yaman Qalieh 2016-11-05 10:34:21 -04:00
• 2c0ca43068 remove subtle pattern for solid bg Yaman Qalieh 2016-11-05 10:29:39 -04:00
• a7f7b7798d Decorations Kenneth Jao 2016-11-04 01:15:08 -04:00
• 313f79044b Manage class menu start layout Kenneth Jao 2016-11-03 23:12:57 -04:00
• 31e8ded42e Added partial menu items Kenneth Jao 2016-11-03 17:36:07 -04:00
• 3a9b505abe Finished admin page - buttons, permissions, create admin, user editing, delete correctly, styling Kenneth Jao 2016-11-03 02:05:43 -04:00
• 4a9c117814 Merge branch 'master' of github.com:ksjdragon/hourglass Yaman Qalieh 2016-11-02 23:03:31 -04:00
• 3c3bcbffd6 fix bug in securityCheck Yaman Qalieh 2016-11-02 23:03:24 -04:00
• 043a453b2d Minor changes, small fixes Kenneth Jao 2016-11-02 19:18:36 -04:00
• 88beb191c9 Slight reorganization Kenneth Jao 2016-11-01 23:07:09 -04:00
• 3efa1a15e2 Added calendar creating work for new UI Kenneth Jao 2016-11-01 22:34:11 -04:00
• d9d2ffb1ae Fixed login CSS Kenneth Jao 2016-11-01 00:32:42 -04:00
• 1d59526052 Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-11-01 00:13:13 -04:00
• ebc1339282 Fixed tab functionality and click to retract; moved requests to sidebar Kenneth Jao 2016-11-01 00:13:00 -04:00
• 124789983a increase unapproved class number to 8 Yaman Qalieh 2016-10-30 22:34:11 -04:00
• 6b33252462 faculty graduation year Yaman Qalieh 2016-10-29 00:00:16 -04:00
• 3ced7b37a2 success message Yaman Qalieh 2016-10-28 23:59:02 -04:00
• 4a6b765086 implement errors onto client Yaman Qalieh 2016-10-28 23:47:26 -04:00
• fcdbca066c fix various bugs Yaman Qalieh 2016-10-28 23:23:07 -04:00
• 106f72f1e9 finish security rehaul Yaman Qalieh 2016-10-28 22:24:09 -04:00
• fcc89a7b60 add sikka firewall Yaman Qalieh 2016-10-27 18:29:07 -04:00
• 5569b574bf createWork optimizations Yaman Qalieh 2016-10-26 22:02:29 -04:00
• fc57be9d93 fixed bugs in securityCheck and test implemented into createWork Yaman Qalieh 2016-10-26 21:52:47 -04:00
• 2029b49a12 improve error function Yaman Qalieh 2016-10-25 22:06:46 -04:00
• 692c13f812 start error system Yaman Qalieh 2016-10-25 21:05:56 -04:00
• 725c779620 Fixed user collection display, and other admin display issues Kenneth Jao 2016-10-24 09:54:35 -04:00
• 3810cf8b2b sidebar text formatting Kenneth Jao 2016-10-24 08:40:56 -04:00
• a08db12369 Made filter parts openable, added slim scroll Kenneth Jao 2016-10-23 22:38:14 -04:00
• c7ffbc947c Merge Kenneth Jao 2016-10-23 22:12:09 -04:00
• 81962e24ef New UI, display fixes, and small bugs Kenneth Jao 2016-10-23 22:11:27 -04:00
• 650e13881b Added admin buttons for status, and user info Kenneth Jao 2016-10-23 22:10:02 -04:00
• 7f0d29ae16 optimizations Yaman Qalieh 2016-10-23 21:47:14 -04:00
• 92b23f6d78 toggle approveClass Yaman Qalieh 2016-10-23 21:45:02 -04:00
• a06ed677fe approveClass Yaman Qalieh 2016-10-23 21:42:18 -04:00
• df7dd3cc64 Merge branch 'master' of github.com:ksjdragon/hourglass Yaman Qalieh 2016-10-23 17:51:08 -04:00
• 14b16680af remove Papa Yaman Qalieh 2016-10-23 17:50:59 -04:00
• fab410e8fd change export format to ics Yaman Qalieh 2016-10-23 17:50:05 -04:00
• a00591cc55 Update README.md yamanq 2016-10-23 16:35:57 -04:00
• b15a7875ac Update README.md yamanq 2016-10-23 16:35:23 -04:00
• 0eda7b94b7 Finish Profile and add User yamanq 2016-10-23 16:34:47 -04:00
• 9bf40c2c0d improve duplicate function Yaman Qalieh 2016-10-23 16:23:16 -04:00
• 013b0ee851 Merge branch 'master' of github.com:ksjdragon/hourglass Yaman Qalieh 2016-10-23 16:19:16 -04:00
• 2bfe58b3f1 prevent overlapping classes Yaman Qalieh 2016-10-23 16:19:08 -04:00
• 2dc62abe6f Update README.md yamanq 2016-10-23 16:02:46 -04:00
• d2dbdb0cd3 run filter on profile.js Yaman Qalieh 2016-10-23 15:49:43 -04:00
• 5cf986e7e1 update meteor to 1.4.1.3 Yaman Qalieh 2016-10-23 15:46:32 -04:00
• 234df9df94 Update README.md ksjdragon 2016-10-22 18:43:08 -04:00
• 7047697164 Update README.md ksjdragon 2016-10-22 18:42:49 -04:00
• 05f5f1275f Fixed last commit Kenneth Jao 2016-10-22 18:39:23 -04:00
• 254183bec5 Added ordering by subscribers when searching Kenneth Jao 2016-10-22 18:08:51 -04:00
• 54e97eadc9 fixed decimal members Kenneth Jao 2016-10-22 17:43:03 -04:00
• a5d3193f0e full autocomplete search Kenneth Jao 2016-10-22 17:40:42 -04:00
• d7dcf0be86 Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-10-22 17:23:24 -04:00
• 18c172c088 classes autocomplete Yaman Qalieh 2016-10-22 17:23:18 -04:00
• 5baf08543f Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-10-22 17:17:47 -04:00
• fae6597284 search all fields Yaman Qalieh 2016-10-22 17:10:44 -04:00
• b8fb7faea0 Added bootstrap js for modals Kenneth Jao 2016-10-22 17:04:29 -04:00
• aa4efb54c2 dragula reorder Yaman Qalieh 2016-10-22 16:55:22 -04:00
• 100889af4c Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-10-22 16:29:50 -04:00
• c002372967 joining bug Yaman Qalieh 2016-10-22 16:29:21 -04:00
• 622f6363f3 Max height of classes ksjdragon 2016-10-22 16:15:07 -04:00
• 0090f64d8e Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-10-22 16:11:19 -04:00
• 59ffa9a756 fix admin code bug Yaman Qalieh 2016-10-22 16:10:52 -04:00
• ced3331006 Removed non-highlighting on admin page ksjdragon 2016-10-22 16:05:33 -04:00
• 1d51d384d5 More admin functions Kenneth Jao 2016-10-21 20:35:56 -04:00
• e4705c472d minor fixes, started admin editing Kenneth Jao 2016-10-21 03:03:11 -04:00
• 4bc535847c ExportDiv css Kenneth Jao 2016-10-20 22:21:22 -04:00
• c56865b407 better dynamic resizing Kenneth Jao 2016-10-20 22:09:28 -04:00
• d9f001e459 description margin Kenneth Jao 2016-10-20 21:58:42 -04:00
• fb073243d9 Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-10-20 21:54:55 -04:00
• 17c98f163b Many display fixes Kenneth Jao 2016-10-20 21:54:38 -04:00
• 9c1936ee0a check box fix Yaman Qalieh 2016-10-19 21:20:49 -04:00
• 174f70769a Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-10-19 21:12:08 -04:00
• 76e0a4d55b change thumbs down to warning Yaman Qalieh 2016-10-19 21:12:04 -04:00
• 0a368eb17e removed unnecessary code Kenneth Jao 2016-10-19 01:26:24 -04:00
• 57cacea42a Minor bug fixes Kenneth Jao 2016-10-19 01:24:14 -04:00
• bf025fd1a7 New work bug fix Kenneth Jao 2016-10-19 00:26:35 -04:00
• d08d38acdd default date for new work Kenneth Jao 2016-10-19 00:15:30 -04:00
• 86eecc47ee removed console.log Kenneth Jao 2016-10-18 23:54:24 -04:00
• 871ba2777e change default theme name in serveR Kenneth Jao 2016-10-18 23:53:20 -04:00
• 1942b15113 css fix Kenneth Jao 2016-10-18 16:34:45 -04:00
• 274e6f961e Removed theme transitioning Kenneth Jao 2016-10-18 16:30:35 -04:00
• 85f9b4798e minor fixes Kenneth Jao 2016-10-18 16:27:42 -04:00
• 81dc4a1b75 Css change Kenneth Jao 2016-10-18 14:22:44 -04:00
• 9b4d68d8a6 css changes Kenneth Jao 2016-10-18 14:18:05 -04:00
• 4e5e7bb14a Naming changes, css fixes, small bugs Kenneth Jao 2016-10-18 14:14:59 -04:00
• 98e5575e3d Finished new inputs for profile page Kenneth Jao 2016-10-16 19:55:19 -04:00
• 87a36f8250 Finished main page with new inputs Kenneth Jao 2016-10-16 02:15:47 -04:00
• 3f931f617a New inputs for creating work, restriction and comments still needed Kenneth Jao 2016-10-14 01:49:08 -04:00
• fcdfa3e63e CSS fixes, centering for all screen sizes Kenneth Jao 2016-10-13 14:10:39 -04:00
• a7154c17dc Readded packages Kenneth Jao 2016-10-12 01:50:47 -04:00
• 0bcec1bfd6 Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-10-12 01:47:32 -04:00
• 640b59636d Cleaned up new input management Kenneth Jao 2016-10-12 01:45:36 -04:00
• b428045f9d add graduation year on server Yaman Qalieh 2016-10-11 06:40:01 -04:00
• b225da48a3 Added yogiben:admin and adjusted css to not apply to admin page Kenneth Jao 2016-10-11 00:12:24 -04:00