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
|
94f775b0d6
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-09-27 11:47:51 -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
|
2a0aeaa849
|
fix bug of avatar pic not showing on non-admin
|
2016-09-26 19:05:06 -04:00 |
|
Yaman Qalieh
|
f6b6fd5389
|
fix user profiles not loading when logged out
|
2016-09-26 18:58:15 -04:00 |
|
Yaman Qalieh
|
2f078dc8bf
|
remove semantic, add select2
|
2016-09-26 18:55:18 -04:00 |
|
Kenneth Jao
|
fcd7e184dd
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-09-26 11:59:18 -04:00 |
|
Yaman Qalieh
|
589ce7b23b
|
groundwork
|
2016-09-25 12:04:09 -04:00 |
|
Yaman Qalieh
|
b41b485c02
|
fix version
|
2016-09-25 12:00:23 -04:00 |
|
Yaman Qalieh
|
daa985097b
|
do not allow main page until school is filled
|
2016-09-25 11:59:36 -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
|
e1002b5a0d
|
groundwork
|
2016-09-20 21:10:22 -04:00 |
|
Kenneth Jao
|
6f1c7203ff
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-09-20 09:47:18 -04:00 |
|
Kenneth Jao
|
e90f0de75e
|
CSS fix
|
2016-09-20 09:47:14 -04:00 |
|
Yaman Qalieh
|
c5567fe206
|
web-beautify
|
2016-09-19 23:13:00 -04:00 |
|
Yaman Qalieh
|
e6f7ea7c39
|
remove Avatars/ and add 75 class icons
|
2016-09-18 23:02:36 -04:00 |
|
Yaman Qalieh
|
d8e4fe55ad
|
fix #98
|
2016-09-18 22:13:33 -04:00 |
|
Yaman Qalieh
|
ae94ebd997
|
remove avatar field on server
|
2016-09-17 21:39:59 -04:00 |
|
Yaman Qalieh
|
66286d1b9a
|
syntax error
|
2016-09-17 21:39:51 -04:00 |
|
Yaman Qalieh
|
185c67d950
|
change prof pic on profile
|
2016-09-17 21:35:51 -04:00 |
|
Yaman Qalieh
|
a6426ac146
|
change prof on main
|
2016-09-17 21:35:12 -04:00 |
|
Yaman Qalieh
|
8d2af9122d
|
finish dragula
|
2016-09-16 18:08:56 -04:00 |
|
Yaman Qalieh
|
c4d2d730f1
|
reorder classes save
|
2016-09-16 17:25:15 -04:00 |
|
Yaman Qalieh
|
f6cf5fdaf7
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-09-16 16:48:42 -04:00 |
|
Yaman Qalieh
|
26ddd5a538
|
move dragula
|
2016-09-16 16:48:39 -04:00 |
|
Kenneth Jao
|
46a3b7395a
|
added hiding 'bad' (low ratio) work
|
2016-09-16 09:10:56 -04:00 |
|
Kenneth Jao
|
e627c449f1
|
Removed extra field
|
2016-09-16 08:45:20 -04:00 |
|
Kenneth Jao
|
60dfa22485
|
Sorts work by date
|
2016-09-16 08:43:07 -04:00 |
|
Kenneth Jao
|
415a621f6c
|
Added coloring for reports/confirmations
|
2016-09-15 13:37:13 -04:00 |
|