Yaman Qalieh
|
100889af4c
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-10-22 16:29:50 -04:00 |
|
Yaman Qalieh
|
c002372967
|
joining bug
|
2016-10-22 16:29:21 -04:00 |
|
ksjdragon
|
622f6363f3
|
Max height of classes
|
2016-10-22 16:15:07 -04:00 |
|
Yaman Qalieh
|
0090f64d8e
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-10-22 16:11:19 -04:00 |
|
Yaman Qalieh
|
59ffa9a756
|
fix admin code bug
|
2016-10-22 16:10:52 -04:00 |
|
ksjdragon
|
ced3331006
|
Removed non-highlighting on admin page
|
2016-10-22 16:05:33 -04:00 |
|
Kenneth Jao
|
1d51d384d5
|
More admin functions
|
2016-10-21 20:35:56 -04:00 |
|
Kenneth Jao
|
e4705c472d
|
minor fixes, started admin editing
|
2016-10-21 03:03:11 -04:00 |
|
Kenneth Jao
|
4bc535847c
|
ExportDiv css
|
2016-10-20 22:21:22 -04:00 |
|
Kenneth Jao
|
c56865b407
|
better dynamic resizing
|
2016-10-20 22:09:28 -04:00 |
|
Kenneth Jao
|
d9f001e459
|
description margin
|
2016-10-20 21:58:42 -04:00 |
|
Kenneth Jao
|
fb073243d9
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-10-20 21:54:55 -04:00 |
|
Kenneth Jao
|
17c98f163b
|
Many display fixes
|
2016-10-20 21:54:38 -04:00 |
|
Yaman Qalieh
|
9c1936ee0a
|
check box fix
|
2016-10-19 21:20:49 -04:00 |
|
Yaman Qalieh
|
174f70769a
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-10-19 21:12:08 -04:00 |
|
Yaman Qalieh
|
76e0a4d55b
|
change thumbs down to warning
|
2016-10-19 21:12:04 -04:00 |
|
Kenneth Jao
|
0a368eb17e
|
removed unnecessary code
|
2016-10-19 01:26:24 -04:00 |
|
Kenneth Jao
|
57cacea42a
|
Minor bug fixes
|
2016-10-19 01:24:14 -04:00 |
|
Kenneth Jao
|
bf025fd1a7
|
New work bug fix
|
2016-10-19 00:26:35 -04:00 |
|
Kenneth Jao
|
d08d38acdd
|
default date for new work
|
2016-10-19 00:15:30 -04:00 |
|
Kenneth Jao
|
86eecc47ee
|
removed console.log
|
2016-10-18 23:54:24 -04:00 |
|
Kenneth Jao
|
871ba2777e
|
change default theme name in serveR
|
2016-10-18 23:53:20 -04:00 |
|
Kenneth Jao
|
1942b15113
|
css fix
|
2016-10-18 16:34:45 -04:00 |
|
Kenneth Jao
|
274e6f961e
|
Removed theme transitioning
|
2016-10-18 16:30:35 -04:00 |
|
Kenneth Jao
|
85f9b4798e
|
minor fixes
|
2016-10-18 16:27:42 -04:00 |
|
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
|
a7154c17dc
|
Readded packages
|
2016-10-12 01:50:47 -04:00 |
|
Kenneth Jao
|
0bcec1bfd6
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-10-12 01:47:32 -04:00 |
|
Kenneth Jao
|
640b59636d
|
Cleaned up new input management
|
2016-10-12 01:45:36 -04:00 |
|
Yaman Qalieh
|
b428045f9d
|
add graduation year on server
|
2016-10-11 06:40:01 -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
|
e225f08a6a
|
Merge
|
2016-10-10 23:06:57 -04:00 |
|
Kenneth Jao
|
44f5f12266
|
Package editing
|
2016-10-10 22:26:24 -04:00 |
|
Yaman Qalieh
|
2aa7fda78b
|
create superadmin on profile creation
|
2016-10-10 22:22:47 -04:00 |
|
Yaman Qalieh
|
ca5db6c42c
|
remove direct bootstrap dependency
|
2016-10-10 22:14:26 -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
|
14719eeb99
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-10-09 12:37:07 -04:00 |
|
Yaman Qalieh
|
8c025136d8
|
fix #107
|
2016-10-09 12:36:40 -04:00 |
|
yamanq
|
5f24473999
|
Update README.md
|
2016-10-05 22:47:50 -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 |
|