Code

Merge develope#1

Code

Open

zeabdelkhalek wants to merge 143 commits intomasterScientificClubofESI/quill:masterfrom developeScientificClubofESI/quill:developeCopy head branch name to clipboard

+553,674-4,643

Commits

Commits on Dec 5, 2018

• Update schools.csv

  YasserDRIF

  authored
  40ddc90

  Copy full SHA for 40ddc90

• Update schools.csv

  YasserDRIF

  authored
  adf9e2f

  Copy full SHA for adf9e2f

Commits on Dec 6, 2018

• updated hackathon name

  

  [email protected]

  committed
  0f818cd

  Copy full SHA for 0f818cd

• test edit

  YasserDRIF

  committed
  d95b60f

  Copy full SHA for d95b60f

• Update .env

  YasserDRIF

  authored
  5327585

  Copy full SHA for 5327585

• Changing the questions... application/confirmation

  YasserDRIF

  committed
  dd748f3

  Copy full SHA for dd748f3

• Update .env

  YasserDRIF

  authored
  4191be6

  Copy full SHA for 4191be6

• Merge branch 'master' of https://github.com/YasserDRIF/quill

  YasserDRIF

  committed
  3c7bf86

  Copy full SHA for 3c7bf86

• Update .env

  YasserDRIF

  authored
  cc54ad9

  Copy full SHA for cc54ad9

• TEST

  YasserDRIF

  committed
  2b58499

  Copy full SHA for 2b58499

• Merge branch 'master' of https://github.com/YasserDRIF/quill

  YasserDRIF

  committed
  2816984

  Copy full SHA for 2816984

• hello

  YasserDRIF

  committed
  88b8a53

  Copy full SHA for 88b8a53

• test

  YasserDRIF

  committed
  3abc29a

  Copy full SHA for 3abc29a

• Changed the hackathon Year

  YasserDRIF

  committed
  0d43c11

  Copy full SHA for 0d43c11

• Added RemoveUser Function

  YasserDRIF

  committed
  2a686f3

  Copy full SHA for 2a686f3

Commits on Dec 7, 2018

• Added Remove user and edited questions

  YasserDRIF

  committed
  0b8749c

  Copy full SHA for 0b8749c

• added an updateAll function to Admins users edit page

  YasserDRIF

  committed
  0458cda

  Copy full SHA for 0458cda

• after Application submition, an email will be sent

  YasserDRIF

  committed
  25089a9

  Copy full SHA for 25089a9

• fixed ApplicationMail function

  YasserDRIF

  committed
  df91187

  Copy full SHA for df91187

• Auto send mails (Application/Confirmation/admmittance)

  YasserDRIF

  committed
  7090a3f

  Copy full SHA for 7090a3f

• Added number of hackathons to questions and stats

  YasserDRIF

  committed
  f652ddd

  Copy full SHA for f652ddd

• added SoftAccepted status and send Acceptance emails button

  YasserDRIF

  committed
  238da6c

  Copy full SHA for 238da6c

• added Soft Admitted to stats

  YasserDRIF

  committed
  8387b66

  Copy full SHA for 8387b66

• Changed default page size to 20

  YasserDRIF

  committed
  9ae0242

  Copy full SHA for 9ae0242

Commits on Dec 8, 2018

• Salah: QR Stillnot working

  YasserDRIF

  committed
  0f81742

  Copy full SHA for 0f81742

• Added HostSchool to Settings (Used in Stats)

  YasserDRIF

  committed
  aaddfb2

  Copy full SHA for aaddfb2

• Updated Readme

  YasserDRIF

  committed
  42db662

  Copy full SHA for 42db662

• SendQRMails Working ... removed old QRcode

  YasserDRIF

  committed
  3da3376

  Copy full SHA for 3da3376

• Send QRcode when admitted and show it in Dashboard

  YasserDRIF

  committed
  bcbb3be

  Copy full SHA for bcbb3be

• updated the emails css

  YasserDRIF

  committed
  f333646

  Copy full SHA for f333646

Commits on Dec 9, 2018

• Added 1Meal tracking feature in API .. work in progress

  YasserDRIF

  committed
  94d3f64

  Copy full SHA for 94d3f64

• Meal/workshop tracking ... Search filter seems to wrok

  YasserDRIF

  committed
  eeb359c

  Copy full SHA for eeb359c

• Fixed issue with user.live

  YasserDRIF

  committed
  1037820

  Copy full SHA for 1037820

• Filters now are working

  YasserDRIF

  committed
  0670d05

  Copy full SHA for 0670d05

Commits on Dec 10, 2018

• Added Mail tab to Admin View

  YasserDRIF

  committed
  9829da1

  Copy full SHA for 9829da1

• package

  YasserDRIF

  committed
  7c9d10c

  Copy full SHA for 7c9d10c

• removed some junk and some links

  YasserDRIF

  committed
  cbdaf1d

  Copy full SHA for cbdaf1d

• Sending emails according to template and filter (Fixed)

  YasserDRIF

  committed
  40624c3

  Copy full SHA for 40624c3

• Updated the login page image + primary color

  YasserDRIF

  committed
  071e0f2

  Copy full SHA for 071e0f2

Commits on Dec 13, 2018

• Added "Challenges" Collection to track later the CTF challenges

  YasserDRIF

  committed
  c3d105d

  Copy full SHA for c3d105d

Commits on Dec 14, 2018

• CTF challenges added _User/admin features

  YasserDRIF

  committed
  5caee05

  Copy full SHA for 5caee05

• Added Check-In, Fixed send acceptance mail, started adding volunteer

  YasserDRIF

  committed
  c3f4f80

  Copy full SHA for c3f4f80

Commits on Dec 15, 2018

• Added the ability to create Volunteer

  YasserDRIF

  committed
  66d5415

  Copy full SHA for 66d5415

• fixed access rights probleme in Users API (to use it in CTF challenges)

  YasserDRIF

  committed
  0492d21

  Copy full SHA for 0492d21

Commits on Dec 16, 2018

• removed console logs used in debuging

  YasserDRIF

  committed
  baef852

  Copy full SHA for baef852

• Realtime check for if CTF answer is right ,removed CheckOut from UI

  YasserDRIF

  committed
  8e91aea

  Copy full SHA for 8e91aea

Commits on Dec 18, 2018

• Added show challenge to UI

  YasserDRIF

  committed
  fe9b3a5

  Copy full SHA for fe9b3a5

Commits on Dec 19, 2018

• Added a new Teams interface _ Add new team function _ get all API

  YasserDRIF

  committed
  5e077fe

  Copy full SHA for 5e077fe

Commits on Dec 23, 2018

• Rewrote the teams view in a new way + good design

  YasserDRIF

  committed
  3421c65

  Copy full SHA for 3421c65

Commits on Dec 25, 2018

• Adding hackathons teams to DB feature (used for marketing) - ADMIN

  YasserDRIF

  committed
  2fa2864

  Copy full SHA for 2fa2864

• Trageted ads based on Past hackathons

  YasserDRIF

  committed
  ca2f60e

  Copy full SHA for ca2f60e

Commits on Dec 27, 2018

• Added reject to Admin.Users

  YasserDRIF

  committed
  038c735

  Copy full SHA for 038c735

• Fixed schools naming + emails

  YasserDRIF

  committed
  c9b48a0

  Copy full SHA for c9b48a0

• Added provinces to application

  YasserDRIF

  committed
  d5488a7

  Copy full SHA for d5488a7

• Added Export Users, Improved Meals/workshops tracking

  YasserDRIF

  committed
  3de277e

  Copy full SHA for 3de277e

• Added Teams Stats... more stats later

  YasserDRIF

  committed
  5e02db5

  Copy full SHA for 5e02db5

• removed some code Junk

  YasserDRIF

  committed
  8577eaa

  Copy full SHA for 8577eaa

Commits on Dec 28, 2018

• Added Some random views ... Need them Urgent

  YasserDRIF

  committed
  0e8710f

  Copy full SHA for 0e8710f

Commits on Jan 3, 2019

• Added a home screen and moved the Login to it

  YasserDRIF

  committed
  1dbc8b6

  Copy full SHA for 1dbc8b6

• Trying to lazyload Controllers

  YasserDRIF

  committed
  2a3bd10

  Copy full SHA for 2a3bd10

• removed some junk files

  YasserDRIF

  committed
  e9e742a

  Copy full SHA for e9e742a

Commits on Jan 4, 2019

• Merge branch 'develope' of https://github.com/YasserDRIF/quill into develope

  YasserDRIF

  committed
  fffbea3

  Copy full SHA for fffbea3

• removed Lazy loading (Not working)

  YasserDRIF

  committed
  8d0472d

  Copy full SHA for 8d0472d

Commits on Jan 10, 2019

• removed some unused packages

  YasserDRIF

  committed
  01d136b

  Copy full SHA for 01d136b

• Removed some unnecessary requires

  YasserDRIF

  committed
  a15442f

  Copy full SHA for a15442f

• reduced images files sizes

  YasserDRIF

  committed
  9f24c4a

  Copy full SHA for 9f24c4a

Commits on Jan 18, 2019

• Fixed title not refering to the global app name constant

  YasserDRIF

  committed
  6329961

  Copy full SHA for 6329961

Commits on Jan 20, 2019

• added event start Date

  YasserDRIF

  committed
  698b93f

  Copy full SHA for 698b93f

• removed some old unused code

  YasserDRIF

  committed
  3b85fd0

  Copy full SHA for 3b85fd0

Commits on Jan 25, 2019

• Added MinifyJS to gulp

  YasserDRIF

  committed
  7c6ac29

  Copy full SHA for 7c6ac29

Commits on Jan 26, 2019

• Added List of workshops/meals in API (Non configurable in UI yer)

  YasserDRIF

  committed
  cdce3cd

  Copy full SHA for cdce3cd

• Added attachment to admittance email _ improved the application View

  YasserDRIF

  committed
  f2d24c5

  Copy full SHA for f2d24c5

Commits on Jan 27, 2019

• Added clubs in UserSource __ charts appear in stats

  YasserDRIF

  committed
  fde1090

  Copy full SHA for fde1090

Commits on Feb 3, 2019

• Uglify is Working, fixed host school bug

  YasserDRIF

  committed
  d5724fe

  Copy full SHA for d5724fe

Commits on Jan 1, 2020

• Update routes.js

  zeabdelkhalek

  authored
  3715366

  Copy full SHA for 3715366

• Delete yarn.lock

  zeabdelkhalek

  authored
  4778b88

  Copy full SHA for 4778b88

Commits on Feb 26, 2020

• Update package.json

  AdelNamani

  authored
  e2bb924

  Copy full SHA for e2bb924

• Update package.json

  AdelNamani

  authored
  3717bc1

  Copy full SHA for 3717bc1

• Update package.json

  zeabdelkhalek

  authored
  2b76829

  Copy full SHA for 2b76829

Commits on Mar 9, 2020

• fix db

  zeabdelkhalek

  committed
  9013c08

  Copy full SHA for 9013c08

• add build & plugins folder

  zeabdelkhalek

  committed
  6c88213

  Copy full SHA for 6c88213

• fix admin ctrl

  zeabdelkhalek

  committed
  503b8c4

  Copy full SHA for 503b8c4

• fix swal

  zeabdelkhalek

  committed
  4e0fa99

  Copy full SHA for 4e0fa99

• fix db url

  zeabdelkhalek

  committed
  6326904

  Copy full SHA for 6326904

• Update .env

  zeabdelkhalek

  authored
  1a92027

  Copy full SHA for 1a92027

Commits on Mar 10, 2020

• fix qr code

  zeabdelkhalek

  committed
  e00f317

  Copy full SHA for e00f317

• Update logo to Hackit

  YasserDRIF

  authored
  6c691a5

  Copy full SHA for 6c691a5

• Updated Color to Mauve

  YasserDRIF

  authored
  bf7bd69

  Copy full SHA for bf7bd69

• Edit event name

  YasserDRIF

  authored
  aae6631

  Copy full SHA for aae6631

• Removed home screen temporarily

  YasserDRIF

  authored
  fdca746

  Copy full SHA for fdca746

• fix build colors

  zeabdelkhalek

  committed
  e057ce3

  Copy full SHA for e057ce3

• Added requireLogout to /login route

  YasserDRIF

  authored
  a42803b

  Copy full SHA for a42803b

• added isTeamMember function

  YasserDRIF

  authored
  9977436

  Copy full SHA for 9977436

• Update app.js

  YasserDRIF

  authored
  f2e2b36

  Copy full SHA for f2e2b36

• added CV link

  AymenRaouf

  committed
  be8e6e8

  Copy full SHA for be8e6e8

Commits on Mar 11, 2020

• Update team.html

  YasserDRIF

  authored
  9a6e7e9

  Copy full SHA for 9a6e7e9

• Fixed isJoined problem in Teams page

  YasserDRIF

  authored
  7b9e9ed

  Copy full SHA for 7b9e9ed

• fixed issue in teams (Build)

  YasserDRIF

  committed
  6fb0431

  Copy full SHA for 6fb0431

• Show Teams when submitted and Hide Challenges

  YasserDRIF

  committed
  581a218

  Copy full SHA for 581a218

• Added ability to make team private

  YasserDRIF

  committed
  68eca58

  Copy full SHA for 68eca58

• Added Skill select when joining team

  YasserDRIF

  committed
  95908bb

  Copy full SHA for 95908bb

• updated Make team private TEXT

  YasserDRIF

  committed
  742a8cc

  Copy full SHA for 742a8cc

• Add national card id field in confirmation

  AdelNamani

  committed
  42ccbb5

  Copy full SHA for 42ccbb5

• Merge branch 'develope' of https://github.com/ScientificClubofESI/quill into develope

  AdelNamani

  committed
  7935e19

  Copy full SHA for 7935e19

Commits on Mar 12, 2020

• add form validations

  zeabdelkhalek

  committed
  df9bab1

  Copy full SHA for df9bab1

• fix create users script

  zeabdelkhalek

  committed
  6a6be1e

  Copy full SHA for 6a6be1e

• Merge branch 'develope' of https://github.com/ScientificClubofESI/quill into develope

  zeabdelkhalek

  committed
  80dbd5f

  Copy full SHA for 80dbd5f

• Added ability to join using team code

  YasserDRIF

  committed
  427a04d

  Copy full SHA for 427a04d

• Merge branch 'develope' of https://github.com/ScientificClubofESI/quill into develope

  YasserDRIF

  committed
  d9bba66

  Copy full SHA for d9bba66

• Build

  YasserDRIF

  committed
  cad5434

  Copy full SHA for cad5434

• add ability to see hacker details when request join team

  zeabdelkhalek

  committed
  a724380

  Copy full SHA for a724380

• Merge branch 'develope' of https://github.com/ScientificClubofESI/quill into develope

  zeabdelkhalek

  committed
  e77360f

  Copy full SHA for e77360f

• Added teams review in Admin

  YasserDRIF

  committed
  80e61d0

  Copy full SHA for 80e61d0

• Added Best filters ever

  YasserDRIF

  committed
  d0e62e1

  Copy full SHA for d0e62e1

• some fixes

  YasserDRIF

  committed
  b6a2081

  Copy full SHA for b6a2081

• when joining team show error if team not found

  YasserDRIF

  committed
  dbe13b6

  Copy full SHA for dbe13b6

• Forse https test

  YasserDRIF

  committed
  29e786e

  Copy full SHA for 29e786e

• remove https force

  YasserDRIF

  committed
  d5ecae4

  Copy full SHA for d5ecae4

• express-sslify test

  YasserDRIF

  committed
  09a2f8b

  Copy full SHA for 09a2f8b

• express-sslify test 2

  YasserDRIF

  committed
  9e61ffd

  Copy full SHA for 9e61ffd

• ssl-express-www TEST

  YasserDRIF

  committed
  3aef3b7

  Copy full SHA for 3aef3b7

• ssl-express-www TEST 2

  YasserDRIF

  committed
  50415b4

  Copy full SHA for 50415b4

• strong-ssl-redirect TEST

  YasserDRIF

  committed
  4b8703e

  Copy full SHA for 4b8703e

• strong-ssl-redirect TEST 2

  YasserDRIF

  committed
  9933548

  Copy full SHA for 9933548

• heroku-ssl-redirect TEST

  YasserDRIF

  committed
  85ff535

  Copy full SHA for 85ff535

Commits on Mar 13, 2020

• prodcution to dev

  YasserDRIF

  committed
  5a45b12

  Copy full SHA for 5a45b12

• Drive first integration (not working)

  YasserDRIF

  committed
  282ef6d

  Copy full SHA for 282ef6d

Commits on Mar 14, 2020

• Added team field in User obejct

  YasserDRIF

  committed
  e3f5e6c

  Copy full SHA for e3f5e6c

• Added Update Stats button / Changed time language

  YasserDRIF

  committed
  5c66502

  Copy full SHA for 5c66502

Commits on Mar 15, 2020

• User can't create two teams

  YasserDRIF

  committed
  a500d16

  Copy full SHA for a500d16

• Removing team doesn't send email to teamAdmin

  YasserDRIF

  committed
  f30a926

  Copy full SHA for f30a926

• Admin can't delete last admin

  YasserDRIF

  committed
  a96dc36

  Copy full SHA for a96dc36

• Added Event End date + helpers for date selection

  YasserDRIF

  committed
  adcbf34

  Copy full SHA for adcbf34

• Added update users confirmBy+fixed checkIN filter

  YasserDRIF

  committed
  ea95b19

  Copy full SHA for ea95b19

• Fixed : go to page 0 when serach or filter applied

  YasserDRIF

  committed
  7130d61

  Copy full SHA for 7130d61

Commits on Mar 16, 2020

• add cv upload file + view social media buttons

  zeabdelkhalek

  committed
  7a643ce

  Copy full SHA for 7a643ce

• fix add volunteer

  zeabdelkhalek

  committed
  ddf0ffd

  Copy full SHA for ddf0ffd

• add dropzone

  zeabdelkhalek

  committed
  fd016bd

  Copy full SHA for fd016bd

• accept teams wothout verification

  YasserDRIF

  committed
  7b0272d

  Copy full SHA for 7b0272d

• Merge branch 'develope' of ScientificClubofESI

  YasserDRIF

  committed
  1edb6d7

  Copy full SHA for 1edb6d7

• add Remove Button to Dropzone

  YasserDRIF

  committed
  70705fb

  Copy full SHA for 70705fb

Commits on Mar 18, 2020

• #46me3n Added accept/Reject team to backednd

  YasserDRIF

  committed
  e68d38a

  Copy full SHA for e68d38a

Commits on Mar 19, 2020

• #48gwrm remove old upload

  YasserDRIF

  committed
  ea1612a

  Copy full SHA for ea1612a