Francesca Sperati
40efa03db5
referee user-add
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
Mohammed Tantawy
ef58f60219
Merge pull request #23 from ExtProjNomit/sidebar-fixes
Sidebar fixes
7 years ago
Mohammed Tantawy
ddc54ed63c
Sidebar fixes
7 years ago
Mohammed Tantawy
3e04580b47
Merge pull request #22 from ExtProjNomit/topbar-fixes
topbar fixes
7 years ago
Mohammed Tantawy
2fef38ad66
topbar fixes
7 years ago
Mohammed Tantawy
5cada4d584
delete_footer
7 years ago
Charlie Chiu
2d868c044b
Merge pull request #21 from ExtProjNomit/users-history-reports-pages-updates
updated footer, history, users pages
7 years ago
Charlie Chiu
dda139e006
correcting conflicts
7 years ago
francesca6431
9f288e3628
Merge pull request #20 from ExtProjNomit/new-ad-form
ceration of new-ad-form page
7 years ago
francesca6431
eb338a69e8
Merge branch 'master' into new-ad-form
7 years ago
Charlie Chiu
7b40eb507a
updated footer, history, users pages
7 years ago
Francesca Sperati
a91a292021
ceration of new-ad-form page
7 years ago
Mohammed Tantawy
edac0dd369
Merge pull request #19 from ExtProjNomit/ng-profile
Profile and Signup
7 years ago
Mohammed Tantawy
34567dd854
Profile and Signup
Created route for signup and profile
Profile still needs to update info
Signup fully working, register new user in DB and login user
7 years ago
Mohammed Tantawy
1f58741d64
Merge pull request #18 from ExtProjNomit/ng-profile
Added Profile Route
7 years ago
Mohammed Tantawy
29c702c6b5
Added Profile Route
Profile displays forms depending on user
Topbar now filters users
After logout the it prompts the login modal
7 years ago
Mohammed Tantawy
b684ea07fb
Merge pull request #17 from ExtProjNomit/login-working
Login working
7 years ago
Mohammed Tantawy
98e6436b42
Fixed login
User data injected in controllers
Blurred Login modal
Modal now staying until login or signup
Now access to api restricted to users with access_token
7 years ago
Mohammed Tantawy
583e46e3a7
fixed conflicts
7 years ago
Mohammed Tantawy
66b898887b
Added Ads and Ads Details routing and services
Renamed files
7 years ago
Davide Bragagnolo
e11e5660c2
check if user is logged as shared service, broadcast for all controllers
7 years ago
Davide Bragagnolo
5ab3d70af0
Merge pull request #15 from ExtProjNomit/ng-routing
Started routing
7 years ago
Mohammed Tantawy
88da8d067a
Started routing
7 years ago
Mohammed Tantawy
e7f61a0a9d
Merge pull request #14 from ExtProjNomit/ng-logout
Added Logout
7 years ago
Mohammed Tantawy
c2c0d60c6e
Added Logout
Accessible from the button 'Logout' in the menu
7 years ago
Mohammed Tantawy
e6ee6be92b
Merge pull request #13 from ExtProjNomit/ng-start
Ng start
7 years ago
Mohammed Tantawy
4ea8989427
AngularJS start
Index structure as shell page
Added package ngRoute
Added custom directives for topbar, footer and sidebar
Dashboard routed as '/'
All modules loaded in main module 'app'
7 years ago
Mohammed Tantawy
8a79b5348e
fix sidebar
7 years ago