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 |
|
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
|
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 |
|