Francesca Sperati
|
28b13e5b28
|
Merge branch 'master' of https://github.com/ExtProjNomit/Nomit-Adminator
|
7 years ago |
Francesca Sperati
|
36864f4539
|
user card detail fix
|
7 years ago |
Mohammed Tantawy
|
fc9ebcb0c6
|
Merge pull request #58 from ExtProjNomit/profile-progress
Profile upload working
|
7 years ago |
Mohammed Tantawy
|
2c29316ce3
|
Profile upload working
Still need frontend check to ensure that all fields are required.
|
7 years ago |
francesca6431
|
2123a9ae18
|
Merge pull request #57 from ExtProjNomit/user-details-card
user card detail
|
7 years ago |
Francesca Sperati
|
c95189378e
|
user card detail
|
7 years ago |
Mohammed Tantawy
|
1abc237fa2
|
Merge pull request #56 from ExtProjNomit/profile-upload
profile upload start
|
7 years ago |
Mohammed Tantawy
|
9fa98f234f
|
profile upload start
|
7 years ago |
francesca6431
|
1c53d6f32e
|
Merge pull request #55 from ExtProjNomit/signup
profile minor fix
|
7 years ago |
Francesca Sperati
|
75930e9965
|
profile minor fix
|
7 years ago |
francesca6431
|
e5210d896d
|
Merge pull request #54 from ExtProjNomit/signup
signup page and minor fixes
|
7 years ago |
Francesca Sperati
|
d729d1a261
|
signup page and minor fixes
|
7 years ago |
Mohammed Tantawy
|
06685cfcba
|
Merge pull request #53 from ExtProjNomit/service-improved
service improved
|
7 years ago |
Mohammed Tantawy
|
1e74858f9c
|
service improved
|
7 years ago |
Mohammed Tantawy
|
f1f710d6e6
|
Merge pull request #52 from ExtProjNomit/improve-login
Improved modal to stay on after reload
|
7 years ago |
Mohammed Tantawy
|
088d7c0fa3
|
Improved modal to stay on after reload
Error messages now are specific
Placed a gif on loading
|
7 years ago |
Mohammed Tantawy
|
60266a3fda
|
Merge pull request #51 from ExtProjNomit/avatar-company-details
General fixes
|
7 years ago |
Mohammed Tantawy
|
a061e1ee71
|
General fixes
Added Avatar in Company details page
Refreshed the graphs in the dashboard page
Refresh Sidebar after loading
|
7 years ago |
Charlie Chiu
|
b2bfd0fec6
|
Merge pull request #49 from ExtProjNomit/signin-page
signin-page!!
|
7 years ago |
Mohammed Tantawy
|
4559e9edc8
|
Merge pull request #50 from ExtProjNomit/comp-avatar
company avatar
|
7 years ago |
Mohammed Tantawy
|
c43ff54d72
|
company avatar
|
7 years ago |
Charlie Chiu
|
4d6943e160
|
signin-page!!
|
7 years ago |
francesca6431
|
6260608236
|
Merge pull request #48 from ExtProjNomit/sidebar-buttons
minor fixes
|
7 years ago |
Francesca Sperati
|
dcc4ca1cb4
|
minor fixes
|
7 years ago |
francesca6431
|
4fdc1d2184
|
Merge pull request #47 from ExtProjNomit/sidebar-buttons
Sidebar buttons
|
7 years ago |
Francesca Sperati
|
e99d7a380e
|
topbarfix and siddebarbuttons
|
7 years ago |
Francesca Sperati
|
e0f1e43a2d
|
fixed buttons on top, sidebar
|
7 years ago |
Mohammed Tantawy
|
9158609d46
|
Modified topbar to get first char of user
|
7 years ago |
Mohammed Tantawy
|
a134e94f49
|
Merge pull request #44 from ExtProjNomit/company-details
Added route to company details
|
7 years ago |
Mohammed Tantawy
|
8b9f41e799
|
adkf
|
7 years ago |
francesca6431
|
d7d40d038d
|
Merge pull request #43 from ExtProjNomit/ciao
company-details html fixed
|
7 years ago |
Mohammed Tantawy
|
89b3cbab3d
|
Added route to company details
|
7 years ago |
Francesca Sperati
|
d9cd6e205b
|
company-details html fixed
|
7 years ago |
Mohammed Tantawy
|
d74f85397b
|
Merge pull request #42 from ExtProjNomit/user-details
Added user-details page
|
7 years ago |
Mohammed Tantawy
|
9d909c951f
|
Added user-details page
Added route to user-detail after click on the user page
|
7 years ago |
francesca6431
|
28d5b6e1d5
|
Merge pull request #41 from ExtProjNomit/ciao
buttons
|
7 years ago |
Francesca Sperati
|
5e7d2b4da7
|
buttons
|
7 years ago |
Mohammed Tantawy
|
60d1f19503
|
Merge pull request #40 from ExtProjNomit/masonry-fixes
Added fix for Masonry
|
7 years ago |
Mohammed Tantawy
|
e6bba5e030
|
Added fix for Masonry
now masonry should fix itself after the async call
|
7 years ago |
Francesca Sperati
|
f937bd7075
|
Merge branch 'master' into profile-fra
|
7 years ago |
Francesca Sperati
|
52fbd9ee2f
|
fixed profile and sidebar
|
7 years ago |
Davide Bragagnolo
|
d965aa7227
|
Merge branch 'master' into test-fix-env-server
|
7 years ago |
Davide Bragagnolo
|
5cbb83503a
|
fix webpack for angular and autodeploy
|
7 years ago |
francesca6431
|
790509e69a
|
Merge pull request #39 from ExtProjNomit/minor-ads-page
title changed on ads page
|
7 years ago |
Francesca Sperati
|
a38a569b42
|
title changed on ads page
|
7 years ago |
francesca6431
|
56d85e8545
|
Merge pull request #38 from ExtProjNomit/user-detail_company-detail
referee and user detailk pages
|
7 years ago |
Francesca Sperati
|
7265faa94a
|
referee and user detailk pages
|
7 years ago |
Davide Bragagnolo
|
fee9102e2a
|
test to fix heroku deplyment
|
7 years ago |
Mohammed Tantawy
|
0acabf6f15
|
Merge pull request #37 from ExtProjNomit/users-logo
user page logo
|
7 years ago |
Mohammed Tantawy
|
47fefe50fb
|
user page logo
|
7 years ago |