297 Commits

Author SHA1 Message Date
Kenneth Jao
81dc4a1b75 Css change 2016-10-18 14:22:44 -04:00
Kenneth Jao
9b4d68d8a6 css changes 2016-10-18 14:18:05 -04:00
Kenneth Jao
4e5e7bb14a Naming changes, css fixes, small bugs 2016-10-18 14:14:59 -04:00
Kenneth Jao
98e5575e3d Finished new inputs for profile page 2016-10-16 19:55:19 -04:00
Kenneth Jao
87a36f8250 Finished main page with new inputs 2016-10-16 02:15:47 -04:00
Kenneth Jao
3f931f617a New inputs for creating work, restriction and comments still needed 2016-10-14 01:49:08 -04:00
Kenneth Jao
fcdfa3e63e CSS fixes, centering for all screen sizes 2016-10-13 14:10:39 -04:00
Kenneth Jao
640b59636d Cleaned up new input management 2016-10-12 01:45:36 -04:00
Kenneth Jao
b225da48a3 Added yogiben:admin and adjusted css to not apply to admin page 2016-10-11 00:12:24 -04:00
Kenneth Jao
3bc2cd1d3d Revert "replace houston with yogiben"
This reverts commit 39a97d101e853ccc144b0e8ceed2b4cbc4061674.

Conflicts:
	lib/constants.js
2016-10-10 00:52:00 -04:00
Kenneth Jao
dc69f67f85 Merge commit 2016-10-09 23:00:40 -04:00
Kenneth Jao
4c813b6667 Basic new input system 2016-10-09 22:57:04 -04:00
Yaman Qalieh
069a9faa9f replace houston with yogiben 2016-10-09 22:55:57 -04:00
Yaman Qalieh
be716d982a web beautify filter 2016-10-03 23:13:05 -04:00
Yaman Qalieh
196976cc9f Merge branch 'master' of https://github.com/ksjdragon/hourglass 2016-10-02 23:54:38 -04:00
Yaman Qalieh
cc709406c8 semicolon 2016-10-02 23:54:22 -04:00
Kenneth Jao
b5a4351bc2 Merge branch 'master' of https://github.com/ksjdragon/hourglass 2016-10-01 17:27:02 -04:00
Kenneth Jao
d5ef3f4881 Compressed images and change calendar text color 2016-10-01 17:26:39 -04:00
Yaman Qalieh
204a2691b7 implement sAlert 2016-10-01 16:18:48 -04:00
Yaman Qalieh
18c784fab3 run code filter 2016-10-01 16:09:58 -04:00
Kenneth Jao
2797423008 Alert on main page button click 2016-10-01 15:56:51 -04:00
Yaman Qalieh
00221db2c8 prepare version name for update 2016-10-01 00:20:29 -04:00
Yaman Qalieh
6801983777 fix final profile bugs; should be ready for 0.1.2 2016-09-29 23:57:32 -04:00
Yaman Qalieh
9e8219b463 fix bugs in profile architecture 2016-09-29 23:51:49 -04:00
Yaman Qalieh
6acb02aa7d upgrade theme structure 2016-09-29 23:39:34 -04:00
Yaman Qalieh
a6756158a3 prepare for version 0.1.2 2016-09-29 22:25:10 -04:00
Yaman Qalieh
9f16a5cc85 fix small typing error 2016-09-28 23:09:45 -04:00
Yaman Qalieh
36705152e0 Merge branch 'master' of https://github.com/ksjdragon/hourglass 2016-09-27 19:12:26 -04:00
Yaman Qalieh
e4eba216e4 successful select2 test 2016-09-27 19:12:06 -04:00
Kenneth Jao
c9ad662b36 renamed theme colors 2016-09-27 12:04:40 -04:00
Kenneth Jao
73d14137cd Fix merge 2016-09-27 00:26:29 -04:00
Kenneth Jao
d3676ec3ab Merge branch 'master' of https://github.com/ksjdragon/hourglass
Conflicts:
	client/profile/profile.js
2016-09-27 00:24:43 -04:00
Kenneth Jao
bba1cd1c75 Added themes in constants, and background images, minor fixes 2016-09-27 00:22:26 -04:00
Yaman Qalieh
bacb13ae7c fix profile editing bugs 2016-09-26 19:31:29 -04:00
Yaman Qalieh
b41b485c02 fix version 2016-09-25 12:00:23 -04:00
Yaman Qalieh
75a82e2202 Merge branch 'master' of https://github.com/ksjdragon/hourglass 2016-09-25 11:58:37 -04:00
Yaman Qalieh
c7d7391bdb background addition for visibility 2016-09-24 20:41:39 -04:00
Kenneth Jao
ea64ed9c51 Modified login CSS, added version number 2016-09-24 19:48:50 -04:00
Kenneth Jao
88e90f4f33 Fixed new profile not loading new values 2016-09-24 19:10:49 -04:00
Kenneth Jao
2835310f0d Merge branch 'master' of https://github.com/ksjdragon/hourglass 2016-09-24 19:04:16 -04:00
Kenneth Jao
38727ecd31 css fix 2016-09-24 19:04:11 -04:00
Yaman Qalieh
44c8c0cbd1 fix css of export button 2016-09-24 16:39:29 -04:00
Yaman Qalieh
354279182a add basic export button 2016-09-23 20:55:15 -04:00
Yaman Qalieh
a4c146a725 cleanup 2016-09-23 19:54:01 -04:00
Yaman Qalieh
d266c58b14 csv to download 2016-09-23 19:53:00 -04:00
Yaman Qalieh
5a9c7ec36d json to csv 2016-09-23 19:37:53 -04:00
Yaman Qalieh
e7078c622a add class name to JSON 2016-09-22 21:21:36 -04:00
Yaman Qalieh
1a31a25b36 site info => JSON 2016-09-22 21:17:34 -04:00
Yaman Qalieh
20c0ca7a9f add click event for eventual export 2016-09-22 00:36:08 -04:00
Yaman Qalieh
d8e4fe55ad fix #98 2016-09-18 22:13:33 -04:00