Code

Zain/navbar finaltouches#16

Code

Open

zainalqalawi wants to merge 135 commits intomeet-projects:mastermeet-projects/Y3S18-seed-app:masterfrom zainalqalawi:Zain/navbar_finaltoucheszainalqalawi/Roots:Zain/navbar_finaltouchesCopy head branch name to clipboard

+1,875-97

Commits

Commits on Jul 24, 2018

• created login and register forms

  georgead01

  committed
  d2b9617

  Copy full SHA for d2b9617

• first version of Journeys DB

  aboud20-meet

  committed
  19c7ae9

  Copy full SHA for 19c7ae9

• Update README.md

  sama18-meet

  authored
  dc97b5c

  Copy full SHA for dc97b5c

• Merge branch 'master' of https://github.com/zain18-meet/Roots

  aboud20-meet

  committed
  cfe3549

  Copy full SHA for cfe3549

• edited views.py to include journey routing

  aboud20-meet

  committed
  1569cb1

  Copy full SHA for 1569cb1

• edited views.py to include journey routing

  aboud20-meet

  committed
  469f707

  Copy full SHA for 469f707

• fix register

  georgead01

  committed
  43a2ce8

  Copy full SHA for 43a2ce8

• fixed register

  georgead01

  committed
  f095301

  Copy full SHA for f095301

• fixed register

  georgead01

  committed
  cd8cc21

  Copy full SHA for cd8cc21

• fixed a few typos

  aboud20-meet

  committed
  2c4b6d0

  Copy full SHA for 2c4b6d0

• Merge branch 'master' of https://github.com/zain18-meet/Roots

  aboud20-meet

  committed
  d3a13bb

  Copy full SHA for d3a13bb

• database models USER

  aboud20-meet

  committed
  4c68d54

  Copy full SHA for 4c68d54

Commits on Jul 25, 2018

• created HTML files for Profile/Browse

  aboud20-meet

  committed
  aeb1e6b

  Copy full SHA for aeb1e6b

• started register py

  georgead01

  committed
  719afc8

  Copy full SHA for 719afc8

• started register

  georgead01

  committed
  1ef7088

  Copy full SHA for 1ef7088

• created and in progress of apply.html

  aboud20-meet

  committed
  ca4f9d5

  Copy full SHA for ca4f9d5

• Merge branch 'master' of https://github.com/zain18-meet/Roots

  aboud20-meet

  committed
  49a700c

  Copy full SHA for 49a700c

• connected form to DB

  aboud20-meet

  committed
  9b80263

  Copy full SHA for 9b80263

• created HTML files for Journey

  aboud20-meet

  committed
  b981310

  Copy full SHA for b981310

• Merge branch 'master' of https://github.com/zain18-meet/Roots

  aboud20-meet

  committed
  3b26dec

  Copy full SHA for 3b26dec

• finished register backend not tested

  zainalqalawi

  committed
  a96b887

  Copy full SHA for a96b887

• register backend finished not tested

  zainalqalawi

  committed
  80a8626

  Copy full SHA for 80a8626

• register backend finished not tested

  zainalqalawi

  committed
  36cb884

  Copy full SHA for 36cb884

• vjhgv

  aboud20-meet

  committed
  f072b2d

  Copy full SHA for f072b2d

• everything I have up until now

  aboud20-meet

  committed
  65217d8

  Copy full SHA for 65217d8

• sign up and in works

  aboud20-meet

  committed
  bb3cab4

  Copy full SHA for bb3cab4

• Merge pull request #1 from zain18-meet/register-and-login

  Show description for ee004d8
  zainalqalawi

  authored
  ee004d8

  Copy full SHA for ee004d8

• corrected login and register

  aboud20-meet

  committed
  61cd2b9

  Copy full SHA for 61cd2b9

• finished front and back end for display journey

  aboud20-meet

  committed
  7b95912

  Copy full SHA for 7b95912

• Did everything that has to do with the Journey table with Ade

  aboud20-meet

  committed
  76dcb3c

  Copy full SHA for 76dcb3c

• Merge branch 'master' of https://github.com/zain18-meet/Roots

  aboud20-meet

  committed
  83cb546

  Copy full SHA for 83cb546

• finished front and back end for display journey

  aboud20-meet

  committed
  301aa8f

  Copy full SHA for 301aa8f

• solved merge conflict

  aboud20-meet

  committed
  3586310

  Copy full SHA for 3586310

• resolved conflict

  aboud20-meet

  committed
  0a6756f

  Copy full SHA for 0a6756f

• Merge pull request #2 from zain18-meet/journey_func

  Show description for 99d00b3
  zainalqalawi

  authored
  99d00b3

  Copy full SHA for 99d00b3

Commits on Jul 26, 2018

• worked on Browse and routing for it

  aboud20-meet

  committed
  6ba1bb4

  Copy full SHA for 6ba1bb4

• Adds info submitted in the apply form to both User table and JOurney table

  aboud20-meet

  committed
  83e3241

  Copy full SHA for 83e3241

• Adds info submitted in the apply form to both User table and JOurney table

  aboud20-meet

  committed
  043ec9e

  Copy full SHA for 043ec9e

• profile page works

  georgead01

  committed
  0003818

  Copy full SHA for 0003818

• Merge branch 'master' into browse_func_data

  guy18-meet

  authored
  3cfd402

  Copy full SHA for 3cfd402

• Merge pull request #3 from zain18-meet/browse_func_data

  Show description for 433c0a9
  guy18-meet

  authored
  433c0a9

  Copy full SHA for 433c0a9

• Merge branch 'master' into profile

  guy18-meet

  authored
  75e62b9

  Copy full SHA for 75e62b9

• Merge pull request #4 from zain18-meet/profile

  Show description for 1408d37
  guy18-meet

  authored
  1408d37

  Copy full SHA for 1408d37

• small fixes

  georgead01

  committed
  01c6e89

  Copy full SHA for 01c6e89

• register design

  aboud20-meet

  committed
  1c80838

  Copy full SHA for 1c80838

• Merge branch 'master' of github.com:zain18-meet/Roots into Register_login_design

  aboud20-meet

  committed
  482a529

  Copy full SHA for 482a529

• MVP

  aboud20-meet

  committed
  66be71f

  Copy full SHA for 66be71f

• Merge branch 'master' into MVP

  sama18-meet

  authored
  0e9071b

  Copy full SHA for 0e9071b

• Merge pull request #5 from zain18-meet/MVP

  Show description for d868916
  sama18-meet

  authored
  d868916

  Copy full SHA for d868916

• design

  aboud20-meet

  committed
  23e0054

  Copy full SHA for 23e0054

• Merge branch 'master' into Register_login_design

  zainalqalawi

  authored
  bfc98f1

  Copy full SHA for bfc98f1

• Merge pull request #6 from zain18-meet/Register_login_design

  Show description for 3a8121f
  zainalqalawi

  authored
  3a8121f

  Copy full SHA for 3a8121f

• setting up heroku

  aboud20-meet

  committed
  3966e5b

  Copy full SHA for 3966e5b

• FINAL MVP

  aboud20-meet

  committed
  4638216

  Copy full SHA for 4638216

• Merge branch 'master' of https://github.com/zain18-meet/Roots

  aboud20-meet

  committed
  d809923

  Copy full SHA for d809923

Commits on Jul 29, 2018

• Fixed all bugs and errors. This is the official MVP (without the CSS).

  aboud20-meet

  committed
  da73c42

  Copy full SHA for da73c42

• css and nav bar

  aboud20-meet

  committed
  c875cb8

  Copy full SHA for c875cb8

• merge conflict

  aboud20-meet

  committed
  cf6d212

  Copy full SHA for cf6d212

• add

  aboud20-meet

  committed
  1b027e3

  Copy full SHA for 1b027e3

Commits on Jul 30, 2018

• small changes in nav bar. committing for Ade

  aboud20-meet

  committed
  f7f87be

  Copy full SHA for f7f87be

• small changes in nav bar. committing for Ade

  aboud20-meet

  committed
  140f596

  Copy full SHA for 140f596

• fixed major bugs and completed partial MVP

  zainalqalawi

  committed
  0b6ad7a

  Copy full SHA for 0b6ad7a

• Merge pull request #7 from zain18-meet/browse_func_data

  Show description for 036f517
  zainalqalawi

  authored
  036f517

  Copy full SHA for 036f517

• fixed more in navbar

  aboud20-meet

  committed
  6e626a6

  Copy full SHA for 6e626a6

• MVP + Navbar

  aboud20-meet

  committed
  dbec378

  Copy full SHA for dbec378

• Merge branch 'master' into Sama-Navbar

  sama18-meet

  authored
  82edfe3

  Copy full SHA for 82edfe3

• fixed more bugs

  aboud20-meet

  committed
  390ba30

  Copy full SHA for 390ba30

Commits on Jul 31, 2018

• add is user var

  sama18-meet

  committed
  46349a0

  Copy full SHA for 46349a0

• Merge pull request #8 from zain18-meet/Sama-Navbar

  Show description for 7903c44
  sama18-meet

  authored
  7903c44

  Copy full SHA for 7903c44

• Reviews & Ratings

  sama18-meet

  committed
  49a0d80

  Copy full SHA for 49a0d80

Commits on Aug 1, 2018

• Added Notifications system and span to navbar

  sama18-meet

  committed
  e820065

  Copy full SHA for e820065

• refactor part of the views and templates

  sama18-meet

  committed
  4100cc1

  Copy full SHA for 4100cc1

Commits on Aug 2, 2018

• MVP + REVIEWS + NOTIFICATIONS + WISHLIST + QUESTIONS

  sama18-meet

  committed
  c5ea20a

  Copy full SHA for c5ea20a

Commits on Aug 3, 2018

• Merge pull request #9 from zain18-meet/Sky

  Show description for 414848d
  sama18-meet

  authored
  414848d

  Copy full SHA for 414848d

Commits on Aug 5, 2018

• lets do this

  sama18-meet

  committed
  399d540

  Copy full SHA for 399d540

• i love u matt and i fixed this #baggute

  sama18-meet

  committed
  b9dd96b

  Copy full SHA for b9dd96b

• remove new browse function

  sama18-meet

  committed
  05d3928

  Copy full SHA for 05d3928

• remove user spacename

  sama18-meet

  committed
  a162bd7

  Copy full SHA for a162bd7

• Merge pull request #10 from zain18-meet/adi/routing-fix

  Show description for 33b3e8d
  sama18-meet

  authored
  33b3e8d

  Copy full SHA for 33b3e8d

• add register form to browse page

  zainalqalawi

  committed
  328b75c

  Copy full SHA for 328b75c

• cols are working browse

  sama18-meet

  committed
  5421437

  Copy full SHA for 5421437

• add example modal

  zainalqalawi

  committed
  d59c134

  Copy full SHA for d59c134

• modal basic

  zainalqalawi

  committed
  0b71b19

  Copy full SHA for 0b71b19

• apply css

  aboud20-meet

  committed
  4ff84aa

  Copy full SHA for 4ff84aa

Commits on Aug 6, 2018

• working modals and routing

  zainalqalawi

  committed
  29f6d35

  Copy full SHA for 29f6d35

• structured journey page

  georgead01

  committed
  91a1005

  Copy full SHA for 91a1005

• css for storyteller page

  aboud20-meet

  committed
  e1c4d06

  Copy full SHA for e1c4d06

• profile css progress

  aboud20-meet

  committed
  1e39937

  Copy full SHA for 1e39937

• profile layout fixed ratings

  georgead01

  committed
  6d9fe9e

  Copy full SHA for 6d9fe9e

• Merge pull request #11 from zain18-meet/journey

  Show description for dc4e397
  guy18-meet

  authored
  dc4e397

  Copy full SHA for dc4e397

• aplly css

  aboud20-meet

  committed
  0e6b19b

  Copy full SHA for 0e6b19b

• Merge branch 'master' of https://github.com/zain18-meet/Roots into Malak/profile_css

  aboud20-meet

  committed
  f9fc906

  Copy full SHA for f9fc906

• deleted villa shit

  zainalqalawi

  committed
  cdb4089

  Copy full SHA for cdb4089

• merge

  zainalqalawi

  committed
  ecf945a

  Copy full SHA for ecf945a

• Merge pull request #12 from zain18-meet/Avigail/css_applypage

  Show description for fb817f8
  zainalqalawi

  authored
  fb817f8

  Copy full SHA for fb817f8

• nothing

  aboud20-meet

  committed
  1881dd8

  Copy full SHA for 1881dd8

• merge

  aboud20-meet

  committed
  168850f

  Copy full SHA for 168850f

• navbar and login/reg

  zainalqalawi

  committed
  3121a68

  Copy full SHA for 3121a68

• merge

  zainalqalawi

  committed
  67c6063

  Copy full SHA for 67c6063

• working

  zainalqalawi

  committed
  a8b6bfc

  Copy full SHA for a8b6bfc

• st_profile layout

  aboud20-meet

  committed
  84ba0c5

  Copy full SHA for 84ba0c5

• revert css

  aboud20-meet

  committed
  63b581a

  Copy full SHA for 63b581a

• fixed the style.css page

  aboud20-meet

  committed
  d4f37bf

  Copy full SHA for d4f37bf

• pull

  zainalqalawi

  committed
  efb0fa6

  Copy full SHA for efb0fa6

• Merge pull request #13 from zain18-meet/avigail/fix-style

  Show description for 0875a98
  guy18-meet

  authored
  0875a98

  Copy full SHA for 0875a98

• merge

  zainalqalawi

  committed
  397cd96

  Copy full SHA for 397cd96

• navbar

  zainalqalawi

  committed
  8b09e58

  Copy full SHA for 8b09e58

• redirect to browse

  georgead01

  committed
  f7e15c5

  Copy full SHA for f7e15c5

• navbar

  zainalqalawi

  committed
  30c73c3

  Copy full SHA for 30c73c3

• Merge pull request #14 from zain18-meet/zain/modals-inputstyles

  Show description for 4ae0ff3
  guy18-meet

  authored
  4ae0ff3

  Copy full SHA for 4ae0ff3

• browse css and design

  sama18-meet

  committed
  041cb44

  Copy full SHA for 041cb44

• merge

  sama18-meet

  committed
  e285bf7

  Copy full SHA for e285bf7

• browse edits

  sama18-meet

  committed
  f1e6b2a

  Copy full SHA for f1e6b2a

• browse updated cards & view details button is done

  sama18-meet

  committed
  1db2592

  Copy full SHA for 1db2592

• new stuff with backend

  sama18-meet

  committed
  903571e

  Copy full SHA for 903571e

• finished layout for browse without the fonts

  sama18-meet

  committed
  af3fde0

  Copy full SHA for af3fde0

• Merge pull request #15 from zain18-meet/adi/browse-layout

  Show description for b0a1123
  zainalqalawi

  authored
  b0a1123

  Copy full SHA for b0a1123

• idkkkkkk

  sama18-meet

  committed
  799ea55

  Copy full SHA for 799ea55

• changed the font for the journeys container and add a picture for the profile

  sama18-meet

  committed
  2fcd5ba

  Copy full SHA for 2fcd5ba

• nothing

  sama18-meet

  committed
  4e2a8f9

  Copy full SHA for 4e2a8f9

• merged malak branch with the master

  sama18-meet

  committed
  a6c82cf

  Copy full SHA for a6c82cf

Commits on Aug 7, 2018

• add journey and profile

  sama18-meet

  committed
  a382bea

  Copy full SHA for a382bea

• fixed jpurney page

  georgead01

  committed
  de2a358

  Copy full SHA for de2a358

• Merge pull request #17 from zain18-meet/guy/fixing-view-journey

  Show description for 3b4f51c
  malak18-meet

  authored
  3b4f51c

  Copy full SHA for 3b4f51c

• Merge branch 'master' of https://github.com/zain18-meet/Roots

  sama18-meet

  committed
  daa2aeb

  Copy full SHA for daa2aeb

• small css change

  sama18-meet

  committed
  a6a7739

  Copy full SHA for a6a7739

• profile, apply, addjourney

  aboud20-meet

  committed
  85ef4b0

  Copy full SHA for 85ef4b0

• Merge branch 'master' into Malak/profile_css

  zainalqalawi

  authored
  ee63850

  Copy full SHA for ee63850

• Merge pull request #18 from zain18-meet/Malak/profile_css

  Show description for f4f00a0
  zainalqalawi

  authored
  f4f00a0

  Copy full SHA for f4f00a0

• small edits

  aboud20-meet

  committed
  f1532dd

  Copy full SHA for f1532dd

• added the head of the show journey and fixed containers

  aboud20-meet

  committed
  5f4395d

  Copy full SHA for 5f4395d

• something not so important

  aboud20-meet

  committed
  a8a291f

  Copy full SHA for a8a291f

• css

  aboud20-meet

  committed
  856a231

  Copy full SHA for 856a231

• final touches

  aboud20-meet

  committed
  7f928dd

  Copy full SHA for 7f928dd

Commits on Aug 8, 2018

• css

  aboud20-meet

  committed
  fa0bf4c

  Copy full SHA for fa0bf4c