Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• e225f08a6a Merge Kenneth Jao 2016-10-10 23:06:57 -04:00
• 44f5f12266 Package editing Kenneth Jao 2016-10-10 22:26:24 -04:00
• 2aa7fda78b create superadmin on profile creation Yaman Qalieh 2016-10-10 22:22:47 -04:00
• ca5db6c42c remove direct bootstrap dependency Yaman Qalieh 2016-10-10 22:14:26 -04:00
• 3bc2cd1d3d Revert "replace houston with yogiben" Kenneth Jao 2016-10-10 00:52:00 -04:00
• dc69f67f85 Merge commit Kenneth Jao 2016-10-09 23:00:40 -04:00
• 4c813b6667 Basic new input system Kenneth Jao 2016-10-09 22:57:04 -04:00
• 069a9faa9f replace houston with yogiben Yaman Qalieh 2016-10-09 22:55:57 -04:00
• 14719eeb99 Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-10-09 12:37:07 -04:00
• 8c025136d8 fix #107 Yaman Qalieh 2016-10-09 12:36:40 -04:00
• 5f24473999 Update README.md yamanq 2016-10-05 22:47:50 -04:00
• be716d982a web beautify filter Yaman Qalieh 2016-10-03 23:13:05 -04:00
• 196976cc9f Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-10-02 23:54:38 -04:00
• cc709406c8 semicolon Yaman Qalieh 2016-10-02 23:54:22 -04:00
• b5a4351bc2 Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-10-01 17:27:02 -04:00
• d5ef3f4881 Compressed images and change calendar text color Kenneth Jao 2016-10-01 17:26:39 -04:00
• 204a2691b7 implement sAlert Yaman Qalieh 2016-10-01 16:18:48 -04:00
• 18c784fab3 run code filter Yaman Qalieh 2016-10-01 16:09:58 -04:00
• 2797423008 Alert on main page button click Kenneth Jao 2016-10-01 15:56:51 -04:00
• 00221db2c8 prepare version name for update Yaman Qalieh 2016-10-01 00:20:29 -04:00
• 6801983777 fix final profile bugs; should be ready for 0.1.2 Yaman Qalieh 2016-09-29 23:57:32 -04:00
• 9e8219b463 fix bugs in profile architecture Yaman Qalieh 2016-09-29 23:51:49 -04:00
• 6acb02aa7d upgrade theme structure Yaman Qalieh 2016-09-29 23:39:34 -04:00
• a6756158a3 prepare for version 0.1.2 Yaman Qalieh 2016-09-29 22:25:10 -04:00
• 9f16a5cc85 fix small typing error Yaman Qalieh 2016-09-28 23:09:45 -04:00
• 36705152e0 Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-09-27 19:12:26 -04:00
• e4eba216e4 successful select2 test Yaman Qalieh 2016-09-27 19:12:06 -04:00
• c9ad662b36 renamed theme colors Kenneth Jao 2016-09-27 12:04:40 -04:00
• 94f775b0d6 Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-09-27 11:47:51 -04:00
• 73d14137cd Fix merge Kenneth Jao 2016-09-27 00:26:29 -04:00
• d3676ec3ab Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-09-27 00:24:43 -04:00
• bba1cd1c75 Added themes in constants, and background images, minor fixes Kenneth Jao 2016-09-27 00:22:26 -04:00
• bacb13ae7c fix profile editing bugs Yaman Qalieh 2016-09-26 19:31:29 -04:00
• 2a0aeaa849 fix bug of avatar pic not showing on non-admin Yaman Qalieh 2016-09-26 19:05:06 -04:00
• f6b6fd5389 fix user profiles not loading when logged out Yaman Qalieh 2016-09-26 18:58:15 -04:00
• 2f078dc8bf remove semantic, add select2 Yaman Qalieh 2016-09-26 18:55:18 -04:00
• fcd7e184dd Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-09-26 11:59:18 -04:00
• 589ce7b23b groundwork Yaman Qalieh 2016-09-25 12:04:09 -04:00
• b41b485c02 fix version Yaman Qalieh 2016-09-25 12:00:23 -04:00
• daa985097b do not allow main page until school is filled Yaman Qalieh 2016-09-25 11:59:36 -04:00
• 75a82e2202 Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-09-25 11:58:37 -04:00
• c7d7391bdb background addition for visibility Yaman Qalieh 2016-09-24 20:41:39 -04:00
• ea64ed9c51 Modified login CSS, added version number Kenneth Jao 2016-09-24 19:48:50 -04:00
• 88e90f4f33 Fixed new profile not loading new values Kenneth Jao 2016-09-24 19:10:49 -04:00
• 2835310f0d Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-09-24 19:04:16 -04:00
• 38727ecd31 css fix Kenneth Jao 2016-09-24 19:04:11 -04:00
• 44c8c0cbd1 fix css of export button Yaman Qalieh 2016-09-24 16:39:29 -04:00
• 354279182a add basic export button Yaman Qalieh 2016-09-23 20:55:15 -04:00
• a4c146a725 cleanup Yaman Qalieh 2016-09-23 19:54:01 -04:00
• d266c58b14 csv to download Yaman Qalieh 2016-09-23 19:53:00 -04:00
• 5a9c7ec36d json to csv Yaman Qalieh 2016-09-23 19:37:53 -04:00
• e7078c622a add class name to JSON Yaman Qalieh 2016-09-22 21:21:36 -04:00
• 1a31a25b36 site info => JSON Yaman Qalieh 2016-09-22 21:17:34 -04:00
• 20c0ca7a9f add click event for eventual export Yaman Qalieh 2016-09-22 00:36:08 -04:00
• e1002b5a0d groundwork Yaman Qalieh 2016-09-20 21:10:22 -04:00
• 6f1c7203ff Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-09-20 09:47:18 -04:00
• e90f0de75e CSS fix Kenneth Jao 2016-09-20 09:47:14 -04:00
• c5567fe206 web-beautify Yaman Qalieh 2016-09-19 23:13:00 -04:00
• e6f7ea7c39 remove Avatars/ and add 75 class icons Yaman Qalieh 2016-09-18 23:02:36 -04:00
• d8e4fe55ad fix #98 Yaman Qalieh 2016-09-18 22:13:33 -04:00
• ae94ebd997 remove avatar field on server Yaman Qalieh 2016-09-17 21:39:59 -04:00
• 66286d1b9a syntax error Yaman Qalieh 2016-09-17 21:39:51 -04:00
• 185c67d950 change prof pic on profile Yaman Qalieh 2016-09-17 21:35:51 -04:00
• a6426ac146 change prof on main Yaman Qalieh 2016-09-17 21:35:12 -04:00
• 8d2af9122d finish dragula Yaman Qalieh 2016-09-16 18:08:56 -04:00
• c4d2d730f1 reorder classes save Yaman Qalieh 2016-09-16 17:25:15 -04:00
• f6cf5fdaf7 Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-09-16 16:48:42 -04:00
• 26ddd5a538 move dragula Yaman Qalieh 2016-09-16 16:48:39 -04:00
• 46a3b7395a added hiding 'bad' (low ratio) work Kenneth Jao 2016-09-16 09:10:56 -04:00
• e627c449f1 Removed extra field Kenneth Jao 2016-09-16 08:45:20 -04:00
• 60dfa22485 Sorts work by date Kenneth Jao 2016-09-16 08:43:07 -04:00
• 415a621f6c Added coloring for reports/confirmations Kenneth Jao 2016-09-15 13:37:13 -04:00
• a2f796ad60 Added hover for type filters Kenneth Jao 2016-09-15 10:25:10 -04:00
• 463a4bd3c4 added rotation when dragging Kenneth Jao 2016-09-15 10:08:59 -04:00
• b11850fb6c Fixed CSS when dragging Kenneth Jao 2016-09-15 09:40:45 -04:00
• 8e0256c845 Final touches for filter classes Kenneth Jao 2016-09-15 09:19:54 -04:00
• 6b74524b9c Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-09-15 08:30:29 -04:00
• e6da917ca0 add filters for work types Kenneth Jao 2016-09-15 08:30:24 -04:00
• 61fc9d6cbe add dragula client side, just need to read event now Yaman Qalieh 2016-09-15 06:35:39 -04:00
• 010fac7e2b cleaning up Yaman Qalieh 2016-09-14 06:37:32 -04:00
• 1d6321a553 add dragula Yaman Qalieh 2016-09-13 20:42:28 -04:00
• d8d20229c6 Optimized and fixed currentWork for reactive updating, editWork CSS scale/zoom fixes Kenneth Jao 2016-09-13 01:37:47 -04:00
• a5d0d17947 CSS size and zoom fixes Kenneth Jao 2016-09-12 11:12:06 -04:00
• 7842b995dc workcard formatting Kenneth Jao 2016-09-12 09:18:58 -04:00
• 8127553578 make superadmins superadmins Yaman Qalieh 2016-09-12 06:38:57 -04:00
• d2531fd29a Merge pull request #96 from Arav-Agarwal/master ksjdragon 2016-09-12 00:18:56 -04:00
• 9ca0b14183 Fixed work-card formatting Arav-Agarwal 2016-09-12 00:17:31 -04:00
• a9d787ca83 Profile css modifications Kenneth Jao 2016-09-11 23:43:20 -04:00
• 12e07cb08e Fixed card overflow Kenneth Jao 2016-09-11 23:33:38 -04:00
• 2eab366a0a Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-09-11 23:23:12 -04:00
• b9a4cbc6bd Large CSS update for main Kenneth Jao 2016-09-11 23:22:50 -04:00
• d942f0647f Merge branch 'master' of https://github.com/ksjdragon/hourglass Yaman Qalieh 2016-09-11 18:59:14 -04:00
• 2513737e20 fix filter bug for personal Yaman Qalieh 2016-09-11 18:58:57 -04:00
• 925b1276b2 Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-09-11 18:54:16 -04:00
• d09e0d918e Changed max-height for classHolder Kenneth Jao 2016-09-11 18:54:08 -04:00
• fae5b62a33 fix calendar bug for personal Yaman Qalieh 2016-09-11 18:51:09 -04:00
• 3dd703f103 personal work added Yaman Qalieh 2016-09-11 18:47:50 -04:00
• 8d46da7f28 Fixed profile saving default values to profile Kenneth Jao 2016-09-11 18:10:00 -04:00
• fba2b847b1 Merge branch 'master' of https://github.com/ksjdragon/hourglass Kenneth Jao 2016-09-10 19:15:18 -04:00
• e5b27791a9 Scrolling CSS fix, and minor css fix Kenneth Jao 2016-09-10 19:08:32 -04:00