Commit Graph

  • 1c53d6f Merge pull request #55 from ExtProjNomit/signup by francesca6431 2019-02-11 18:53:25 +1100
  • 75930e9 profile minor fix by Francesca Sperati 2019-02-11 18:52:11 +1100
  • e5210d8 Merge pull request #54 from ExtProjNomit/signup by francesca6431 2019-02-11 18:24:32 +1100
  • d729d1a signup page and minor fixes by Francesca Sperati 2019-02-11 18:23:29 +1100
  • 06685cf Merge pull request #53 from ExtProjNomit/service-improved by Mohammed Tantawy 2019-02-11 11:53:49 +1100
  • 1e74858 service improved by Mohammed Tantawy 2019-02-11 11:52:45 +1100
  • f1f710d Merge pull request #52 from ExtProjNomit/improve-login by Mohammed Tantawy 2019-02-11 11:38:28 +1100
  • 088d7c0 Improved modal to stay on after reload Error messages now are specific Placed a gif on loading by Mohammed Tantawy 2019-02-11 11:22:03 +1100
  • 60266a3 Merge pull request #51 from ExtProjNomit/avatar-company-details by Mohammed Tantawy 2019-02-10 12:20:29 +1100
  • a061e1e General fixes Added Avatar in Company details page Refreshed the graphs in the dashboard page Refresh Sidebar after loading by Mohammed Tantawy 2019-02-10 12:15:57 +1100
  • b2bfd0f Merge pull request #49 from ExtProjNomit/signin-page by Charlie Chiu 2019-02-10 01:27:40 +1100
  • 4559e9e Merge pull request #50 from ExtProjNomit/comp-avatar by Mohammed Tantawy 2019-02-10 01:27:30 +1100
  • c43ff54 company avatar by Mohammed Tantawy 2019-02-10 01:26:24 +1100
  • 4d6943e signin-page!! by Charlie Chiu 2019-02-10 01:26:05 +1100
  • 6260608 Merge pull request #48 from ExtProjNomit/sidebar-buttons by francesca6431 2019-02-10 01:25:56 +1100
  • dcc4ca1 minor fixes by Francesca Sperati 2019-02-10 01:24:15 +1100
  • 4fdc1d2 Merge pull request #47 from ExtProjNomit/sidebar-buttons by francesca6431 2019-02-10 00:38:29 +1100
  • e99d7a3 topbarfix and siddebarbuttons by Francesca Sperati 2019-02-10 00:35:50 +1100
  • e0f1e43 fixed buttons on top, sidebar by Francesca Sperati 2019-02-10 00:29:30 +1100
  • 9158609 Modified topbar to get first char of user by Mohammed Tantawy 2019-02-10 00:28:54 +1100
  • a134e94 Merge pull request #44 from ExtProjNomit/company-details by Mohammed Tantawy 2019-02-09 20:51:08 +1100
  • 8b9f41e adkf by Mohammed Tantawy 2019-02-09 20:49:58 +1100
  • d7d40d0 Merge pull request #43 from ExtProjNomit/ciao by francesca6431 2019-02-09 20:45:24 +1100
  • 89b3cba Added route to company details by Mohammed Tantawy 2019-02-09 20:45:05 +1100
  • d9cd6e2 company-details html fixed by Francesca Sperati 2019-02-09 20:40:32 +1100
  • d74f853 Merge pull request #42 from ExtProjNomit/user-details by Mohammed Tantawy 2019-02-09 20:14:25 +1100
  • 9d909c9 Added user-details page Added route to user-detail after click on the user page by Mohammed Tantawy 2019-02-09 20:11:48 +1100
  • 28d5b6e Merge pull request #41 from ExtProjNomit/ciao by francesca6431 2019-02-09 20:05:38 +1100
  • 5e7d2b4 buttons by Francesca Sperati 2019-02-09 20:04:25 +1100
  • 60d1f19 Merge pull request #40 from ExtProjNomit/masonry-fixes by Mohammed Tantawy 2019-02-09 19:23:47 +1100
  • e6bba5e Added fix for Masonry now masonry should fix itself after the async call by Mohammed Tantawy 2019-02-09 19:21:13 +1100
  • f937bd7 Merge branch 'master' into profile-fra by Francesca Sperati 2019-02-09 18:59:37 +1100
  • 52fbd9e fixed profile and sidebar by Francesca Sperati 2019-02-09 18:57:17 +1100
  • d965aa7 Merge branch 'master' into test-fix-env-server by Davide Bragagnolo 2019-02-09 18:35:42 +1100
  • 5cbb835 fix webpack for angular and autodeploy by Davide Bragagnolo 2019-02-09 18:35:13 +1100
  • 790509e Merge pull request #39 from ExtProjNomit/minor-ads-page by francesca6431 2019-02-09 16:48:46 +1100
  • a38a569 title changed on ads page by Francesca Sperati 2019-02-09 16:47:10 +1100
  • 56d85e8 Merge pull request #38 from ExtProjNomit/user-detail_company-detail by francesca6431 2019-02-09 16:14:31 +1100
  • 7265faa referee and user detailk pages by Francesca Sperati 2019-02-09 16:13:26 +1100
  • fee9102 test to fix heroku deplyment by Davide Bragagnolo 2019-02-09 14:08:29 +1100
  • 0acabf6 Merge pull request #37 from ExtProjNomit/users-logo by Mohammed Tantawy 2019-02-09 14:02:26 +1100
  • 47fefe5 user page logo by Mohammed Tantawy 2019-02-09 14:00:04 +1100
  • f78b0e5 Merge pull request #36 from ExtProjNomit/added-routes by Mohammed Tantawy 2019-02-08 21:55:21 +1100
  • d23b65b Added routes Useres, Companies and Referees fetched from DB Dispayed in proper pages Added async and await on services by Mohammed Tantawy 2019-02-08 21:47:30 +1100
  • 55dcbed Merge pull request #35 from ExtProjNomit/user-add-2 by francesca6431 2019-02-08 19:49:56 +1100
  • 40efa03 referee user-add by Francesca Sperati 2019-02-08 19:47:54 +1100
  • 5f37b20 Merge pull request #34 from ExtProjNomit/avatar-fixed by Mohammed Tantawy 2019-02-08 18:42:22 +1100
  • e1d07cd Applied avatar lib by Mohammed Tantawy 2019-02-08 18:41:24 +1100
  • db1c617 Merge pull request #33 from ExtProjNomit/user-add-1 by francesca6431 2019-02-08 17:52:16 +1100
  • 2da73d8 Merge branch 'master' into user-add-1 by francesca6431 2019-02-08 17:52:07 +1100
  • f5194cd regular user-add by Francesca Sperati 2019-02-08 17:49:00 +1100
  • 50389e4 Merge pull request #32 from ExtProjNomit/users-d by Mohammed Tantawy 2019-02-08 17:47:52 +1100
  • ace1a0c added user route and user details by Mohammed Tantawy 2019-02-08 17:47:05 +1100
  • 62323bb hotfix for heroku, execute run dev instead of production server by Davide 2019-02-08 17:02:57 +1100
  • be5743d Merge pull request #31 from ExtProjNomit/topbar-refresh by Mohammed Tantawy 2019-02-08 16:54:28 +1100
  • df4ee61 progress to refresh by Mohammed Tantawy 2019-02-08 16:52:25 +1100
  • 4dacd45 Merge pull request #30 from ExtProjNomit/new-ad_new-user by francesca6431 2019-02-08 14:19:20 +1100
  • c589874 Merge pull request #29 from ExtProjNomit/sidebar-updates by francesca6431 2019-02-08 14:14:54 +1100
  • 03cdf4f new-ad new-user srchbar wysiwyg by Francesca Sperati 2019-02-08 14:12:07 +1100
  • 59adb5a -sidebar updates & testing avatar initials by Charlie Chiu 2019-02-08 13:14:25 +1100
  • 8a22164 Merge pull request #28 from ExtProjNomit/minor-fix by Mohammed Tantawy 2019-02-08 11:42:17 +1100
  • df1519d minor fix by Mohammed Tantawy 2019-02-08 11:40:27 +1100
  • d5518c1 Merge pull request #27 from ExtProjNomit/layouts-updates by Mohammed Tantawy 2019-02-08 11:28:36 +1100
  • 614b96b -users, companies, referees cards pages completed -added sponsors logo in footer -minor fixings (bkg,width) in sidebar, TBC -uploaded 2 login page images by Charlie Chiu 2019-02-08 04:59:18 +1100
  • 0ee1a91 Merge pull request #26 from ExtProjNomit/reports-updates by Mohammed Tantawy 2019-02-05 19:34:41 +1100
  • 1e50ad6 completed reports page by Charlie Chiu 2019-02-05 19:26:00 +1100
  • b59028e Merge pull request #25 from ExtProjNomit/history-route by Mohammed Tantawy 2019-02-05 19:01:53 +1100
  • e2ac4db added history route by Mohammed Tantawy 2019-02-05 19:00:57 +1100
  • 0ec5e84 Merge pull request #24 from ExtProjNomit/new-ad-form-2 by francesca6431 2019-02-05 18:38:15 +1100
  • 8f2769a profile page changes by Francesca Sperati 2019-02-05 18:36:10 +1100
  • ef58f60 Merge pull request #23 from ExtProjNomit/sidebar-fixes by Mohammed Tantawy 2019-02-05 18:22:41 +1100
  • ddc54ed Sidebar fixes by Mohammed Tantawy 2019-02-05 18:21:59 +1100
  • 3e04580 Merge pull request #22 from ExtProjNomit/topbar-fixes by Mohammed Tantawy 2019-02-05 18:06:14 +1100
  • 2fef38a topbar fixes by Mohammed Tantawy 2019-02-05 18:03:35 +1100
  • 5cada4d delete_footer by Mohammed Tantawy 2019-02-05 17:11:46 +1100
  • 2d868c0 Merge pull request #21 from ExtProjNomit/users-history-reports-pages-updates by Charlie Chiu 2019-02-05 16:50:15 +1100
  • dda139e correcting conflicts by Charlie Chiu 2019-02-05 16:49:54 +1100
  • 9f288e3 Merge pull request #20 from ExtProjNomit/new-ad-form by francesca6431 2019-02-05 16:38:03 +1100
  • eb338a6 Merge branch 'master' into new-ad-form by francesca6431 2019-02-05 16:37:34 +1100
  • 7b40eb5 updated footer, history, users pages by Charlie Chiu 2019-02-05 16:30:26 +1100
  • a91a292 ceration of new-ad-form page by Francesca Sperati 2019-02-05 16:27:37 +1100
  • edac0dd Merge pull request #19 from ExtProjNomit/ng-profile by Mohammed Tantawy 2019-02-04 17:49:34 +1100
  • 34567dd 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 by Mohammed Tantawy 2019-02-04 17:46:52 +1100
  • 1f58741 Merge pull request #18 from ExtProjNomit/ng-profile by Mohammed Tantawy 2019-02-03 20:06:21 +1100
  • 29c702c Added Profile Route Profile displays forms depending on user Topbar now filters users After logout the it prompts the login modal by Mohammed Tantawy 2019-02-03 20:02:05 +1100
  • b684ea0 Merge pull request #17 from ExtProjNomit/login-working by Mohammed Tantawy 2019-02-02 21:20:19 +1100
  • 98e6436 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 by Mohammed Tantawy 2019-02-02 21:16:32 +1100
  • 583e46e fixed conflicts by Mohammed Tantawy 2019-02-02 20:27:10 +1100
  • 66b8988 Added Ads and Ads Details routing and services Renamed files by Mohammed Tantawy 2019-02-02 20:18:51 +1100
  • e11e566 check if user is logged as shared service, broadcast for all controllers by Davide Bragagnolo 2019-02-02 20:16:27 +1100
  • 5ab3d70 Merge pull request #15 from ExtProjNomit/ng-routing by Davide Bragagnolo 2019-02-02 16:49:40 +1100
  • 88da8d0 Started routing by Mohammed Tantawy 2019-02-02 16:03:37 +1100
  • e7f61a0 Merge pull request #14 from ExtProjNomit/ng-logout by Mohammed Tantawy 2019-02-02 14:47:17 +1100
  • c2c0d60 Added Logout Accessible from the button 'Logout' in the menu by Mohammed Tantawy 2019-02-02 14:28:41 +1100
  • e6ee6be Merge pull request #13 from ExtProjNomit/ng-start by Mohammed Tantawy 2019-02-02 12:12:08 +1100
  • 4ea8989 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' by Mohammed Tantawy 2019-02-02 12:07:27 +1100
  • 8a79b53 fix sidebar by Mohammed Tantawy 2019-02-01 12:42:59 +1100
  • ee3feaf Migrating to AngularJS by Mohammed Tantawy 2019-02-01 12:35:00 +1100
  • 969f116 Merge pull request #12 from ExtProjNomit/style-integration by francesca6431 2019-02-01 12:31:49 +1100
  • c6b285d Merge branch 'master' into style-integration by francesca6431 2019-02-01 12:31:18 +1100