Kenneth Jao
|
3a9b505abe
|
Finished admin page - buttons, permissions, create admin, user editing, delete correctly, styling
|
2016-11-03 02:05:43 -04:00 |
|
Kenneth Jao
|
88beb191c9
|
Slight reorganization
|
2016-11-01 23:07:09 -04:00 |
|
Kenneth Jao
|
725c779620
|
Fixed user collection display, and other admin display issues
|
2016-10-24 09:54:35 -04:00 |
|
Kenneth Jao
|
c7ffbc947c
|
Merge
|
2016-10-23 22:12:09 -04:00 |
|
Kenneth Jao
|
81962e24ef
|
New UI, display fixes, and small bugs
|
2016-10-23 22:11:27 -04:00 |
|
Kenneth Jao
|
650e13881b
|
Added admin buttons for status, and user info
|
2016-10-23 22:10:02 -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
|
17c98f163b
|
Many display fixes
|
2016-10-20 21:54:38 -04:00 |
|
Kenneth Jao
|
57cacea42a
|
Minor bug fixes
|
2016-10-19 01:24:14 -04:00 |
|
Kenneth Jao
|
85f9b4798e
|
minor fixes
|
2016-10-18 16:27:42 -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
|
3f931f617a
|
New inputs for creating work, restriction and comments still needed
|
2016-10-14 01:49:08 -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
|
44f5f12266
|
Package editing
|
2016-10-10 22:26: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 |
|
Kenneth Jao
|
d5ef3f4881
|
Compressed images and change calendar text color
|
2016-10-01 17:26:39 -04:00 |
|
Yaman Qalieh
|
9e8219b463
|
fix bugs in profile architecture
|
2016-09-29 23:51:49 -04:00 |
|
Kenneth Jao
|
c9ad662b36
|
renamed theme colors
|
2016-09-27 12:04:40 -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
|
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
|
daa985097b
|
do not allow main page until school is filled
|
2016-09-25 11:59:36 -04:00 |
|
Kenneth Jao
|
b480fa6558
|
Added NotFound for undefined user, and moved redirection to router
|
2016-09-10 14:06:22 -04:00 |
|
Yaman Qalieh
|
775a9aa502
|
admin page original
|
2016-09-08 17:18:15 -04:00 |
|
Yaman Qalieh
|
a329b4b08e
|
tabbing
|
2016-09-08 17:11:35 -04:00 |
|
Kenneth Jao
|
afb3486268
|
CSS fixes
|
2016-09-07 20:04:51 -04:00 |
|
Kenneth Jao
|
2a08efacba
|
Fixed header CSS on main
|
2016-09-07 18:13:13 -04:00 |
|
Kenneth Jao
|
bf91825c0a
|
Added user dropdown
|
2016-09-07 15:33:13 -04:00 |
|
Kenneth Jao
|
1d66a88ef1
|
Fixed admin page not waiting
|
2016-09-06 00:27:30 -04:00 |
|
Yaman Qalieh
|
604db80371
|
Merge branch 'master' of https://github.com/ksjdragon/hourglass
|
2016-09-05 13:44:30 -04:00 |
|
Yaman Qalieh
|
374a570a35
|
profile pages now work
|
2016-09-05 13:44:18 -04:00 |
|
Kenneth Jao
|
c2d06c9036
|
Fix merge conflict
|
2016-09-05 00:16:26 -04:00 |
|
Kenneth Jao
|
b47a6e7f65
|
CSS optimization, changed client profile handling
|
2016-09-05 00:08:59 -04:00 |
|
Yaman Qalieh
|
3a9fd1ed0d
|
filter on router
|
2016-09-04 20:20:40 -04:00 |
|
Kenneth Jao
|
9ec4fc6bfb
|
Added admin page layout, small null checking changes
|
2016-09-04 01:09:05 -04:00 |
|
Kenneth Jao
|
7abb353961
|
Removed school checking, as client is changed to display nothing if undefined
|
2016-09-01 00:30:05 -04:00 |
|
Yaman Qalieh
|
e23398999a
|
fix #76
|
2016-09-01 00:13:17 -04:00 |
|
Kenneth Jao
|
2b96ce9d4f
|
Removed defaults client side
|
2016-08-31 23:08:12 -04:00 |
|
Kenneth Jao
|
21435b5866
|
Added client side for generating preferences for new user
|
2016-08-30 23:29:27 -04:00 |
|
Yaman Qalieh
|
cb8c9025f4
|
serverData make global variable
|
2016-08-29 21:02:02 -04:00 |
|
Yaman Qalieh
|
9356b4b04c
|
add constants.js
|
2016-08-29 20:40:33 -04:00 |
|
Kenneth Jao
|
cf09cf33bd
|
router syntax error
|
2016-08-25 23:09:12 -04:00 |
|
yamanq
|
9c63a46409
|
update router for admin page
|
2016-08-25 22:02:23 -04:00 |
|
Yaman Qalieh
|
860bed577d
|
added requests collection for admin requests
|
2016-08-20 22:38:01 -04:00 |
|