Adminator-admin-dashboard

Commit Graph

Author	SHA1	Message	Date
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
Mohammed Tantawy	ee3feaf2ef	Migrating to AngularJS	7 years ago
francesca6431	969f116463	Merge pull request #12 from ExtProjNomit/style-integration Style integration by Charlie	7 years ago
francesca6431	c6b285d806	Merge branch 'master' into style-integration	7 years ago
Charlie Chiu	f9ab0a92fe	- integrated stylesheets, index, ads, ads_1, profile, sidebar	7 years ago
Mohammed Tantawy	49b30442a5	Merge pull request #11 from ExtProjNomit/small-ref delete useless module	7 years ago
Mohammed Tantawy	7928547128	delete useless module	7 years ago
Mohammed Tantawy	17807cc329	Merge pull request #9 from ExtProjNomit/different-accounts-=-different-menus menus and profile page updated with role views	7 years ago
Mohammed Tantawy	f65bc5f919	Merge branch 'master' into different-accounts-=-different-menus	7 years ago
Mohammed Tantawy	c183fb4d39	Merge pull request #10 from ExtProjNomit/login_angjs AngularJS login	7 years ago
Mohammed Tantawy	15033823f2	AngularJS login MVC Structure implemented in login Controller needs refactoring to remove all logs Refactoring in styling to fit screen	7 years ago
Charlie Chiu	355ef20760	ad-details-2	7 years ago
Francesca Sperati	7c1530e252	menus and profile page updated with role views	7 years ago
Charlie Chiu	f9626c7218	Merge branch 'master' into ads_2	7 years ago
Charlie Chiu	3bc67f4969	ads page by charlie	7 years ago
francesca6431	de965a8b0a	Merge pull request #8 from ExtProjNomit/comp-ads_1-referee Comp ads 1 referee	7 years ago
Francesca Sperati	40c67733c5	companies, ads_1, referee pages	7 years ago
Francesca Sperati	27526c5587	companies, ads_1, referee pages	7 years ago
Mohammed Tantawy	225cb637c2	Merge pull request #7 from ExtProjNomit/ui-page_users Ui page users	7 years ago
Mohammed Tantawy	0b52ffe6a7	Merge pull request #6 from ExtProjNomit/master implementation of users.html page	7 years ago
Francesca Sperati	1fe9cfa277	implementation of page users.html	7 years ago
Davide Bragagnolo	0adceb1fad	Merge pull request #5 from ExtProjNomit/ui-parts-and-page_ads ads page completed + fixed conflict with forms.html	7 years ago
Francesca Sperati	2d397cac95	fixed conflict with forms.html	7 years ago
Francesca Sperati	4b820f17e8	ads page completed	7 years ago
francesca6431	7a3319aa0e	Merge pull request #4 from ExtProjNomit/ui-parts-and-page_ads split the top and side bars into files (html _loadert), start ads.htm…	7 years ago
Francesca Sperati	7ae73f1683	fix the logos code	7 years ago

1 2 3

139 Commits (3e04580b47abd711c16aa617eebe466c12c8a7c7) All Branches Search

139 Commits (3e04580b47abd711c16aa617eebe466c12c8a7c7)

All Branches