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 |
Mohammed Tantawy
|
f78b0e57a4
|
Merge pull request #36 from ExtProjNomit/added-routes
Added routes
|
7 years ago |
Mohammed Tantawy
|
d23b65b988
|
Added routes
Useres, Companies and Referees fetched from DB
Dispayed in proper pages
Added async and await on services
|
7 years ago |
francesca6431
|
55dcbeda1d
|
Merge pull request #35 from ExtProjNomit/user-add-2
referee user-add
|
7 years ago |
Francesca Sperati
|
40efa03db5
|
referee user-add
|
7 years ago |
Mohammed Tantawy
|
5f37b20133
|
Merge pull request #34 from ExtProjNomit/avatar-fixed
Applied avatar lib
|
7 years ago |
Mohammed Tantawy
|
e1d07cd42c
|
Applied avatar lib
|
7 years ago |
francesca6431
|
db1c617292
|
Merge pull request #33 from ExtProjNomit/user-add-1
regular user-add
|
7 years ago |
francesca6431
|
2da73d85de
|
Merge branch 'master' into user-add-1
|
7 years ago |
Francesca Sperati
|
f5194cd4b9
|
regular user-add
|
7 years ago |
Mohammed Tantawy
|
50389e4bec
|
Merge pull request #32 from ExtProjNomit/users-d
added user route and user details
|
7 years ago |
Mohammed Tantawy
|
ace1a0c73f
|
added user route and user details
|
7 years ago |
Davide
|
62323bbc23
|
hotfix for heroku, execute run dev instead of production server
|
7 years ago |
Mohammed Tantawy
|
be5743da2f
|
Merge pull request #31 from ExtProjNomit/topbar-refresh
progress to refresh
|
7 years ago |
Mohammed Tantawy
|
df4ee61610
|
progress to refresh
|
7 years ago |
francesca6431
|
4dacd4594d
|
Merge pull request #30 from ExtProjNomit/new-ad_new-user
new-ad new-user srchbar wysiwyg
|
7 years ago |
francesca6431
|
c589874774
|
Merge pull request #29 from ExtProjNomit/sidebar-updates
Sidebar updates & testing avatar initials
|
7 years ago |
Francesca Sperati
|
03cdf4fc84
|
new-ad new-user srchbar wysiwyg
|
7 years ago |
Charlie Chiu
|
59adb5a19e
|
-sidebar updates & testing avatar initials
|
7 years ago |
Mohammed Tantawy
|
8a221646ef
|
Merge pull request #28 from ExtProjNomit/minor-fix
minor fix
|
7 years ago |
Mohammed Tantawy
|
df1519d6a0
|
minor fix
|
7 years ago |
Mohammed Tantawy
|
d5518c117a
|
Merge pull request #27 from ExtProjNomit/layouts-updates
some layout updates
|
7 years ago |
Charlie Chiu
|
614b96b8bc
|
-users, companies, referees cards pages completed
-added sponsors logo in footer
-minor fixings (bkg,width) in sidebar, TBC
-uploaded 2 login page images
|
7 years ago |
Mohammed Tantawy
|
0ee1a917b1
|
Merge pull request #26 from ExtProjNomit/reports-updates
Completed reports page
|
7 years ago |
Charlie Chiu
|
1e50ad6749
|
completed reports page
|
7 years ago |
Mohammed Tantawy
|
b59028ed94
|
Merge pull request #25 from ExtProjNomit/history-route
added history route
|
7 years ago |
Mohammed Tantawy
|
e2ac4dbd41
|
added history route
|
7 years ago |
francesca6431
|
0ec5e84e50
|
Merge pull request #24 from ExtProjNomit/new-ad-form-2
profile page changes
|
7 years ago |
Francesca Sperati
|
8f2769aa6b
|
profile page changes
|
7 years ago |