Code

Implement labels (resolves #313)#392

Code

Merged

jace merged 147 commits intomasterhasgeek/funnel:masterfrom labelshasgeek/funnel:labelsCopy head branch name to clipboardApr 26, 2019

+2,442-440

Commits

Commits on Apr 8, 2019

• Revised labelset and label models

  jace

  committed
  516d262

• Fix docstrings, add columns

  jace

  committed
  49af3f6

• Fix foreignkey

  jace

  committed
  5dd3e91

• added migration for labels

  

  Bibhas

  committed
  169cb1d

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  

  Bibhas

  committed
  d5ffbed

• added tests for assigning labels

  

  Bibhas

  committed
  239fa9a

Commits on Apr 9, 2019

• added tests for radio labelsets

  

  Bibhas

  committed
  c1b655e

Commits on Apr 10, 2019

• added mock usermanager for auth testing

  

  Bibhas

  committed
  f06ebcd

• updated scope for user, team, profile and project fixture

  

  Bibhas

  committed
  cd4e894

• logging in without dummy usermanager

  

  Bibhas

  committed
  87b1f62

Commits on Apr 11, 2019

• Add manage label page(WIP) (#394)

  Show description for 7b40639
  vidya-ram

  authored
  7b40639

• added migration for moving old sections, session types and technical level to labelsets

  

  Bibhas

  committed
  909fa4e

• some comments

  

  Bibhas

  committed
  3e0c426

Commits on Apr 12, 2019

• added dynamic proposalform and handling of labels

  

  Bibhas

  committed
  8c74b4a

• added comments

  

  Bibhas

  committed
  ef7ee3a

• added removal of labels in non radio mode

  

  Bibhas

  committed
  e755ef3

• Add CTA button to proposal page

  vidya-ram

  committed
  3400a3e

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  vidya-ram

  committed
  9e51ff3

• Fix styling of proposal labels

  vidya-ram

  committed
  040509c

• removed the inner outer form classes, added get_proposal_form

  

  Bibhas

  committed
  e979dee

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  vidya-ram

  committed
  8f8e781

• added archived flag

  

  Bibhas

  committed
  9f9c8e9

Commits on Apr 13, 2019

• fixed labelview loader

  

  Bibhas

  committed
  b99b672

• added view for admins to set labels to a proposal

  

  Bibhas

  committed
  1ec283a

Commits on Apr 15, 2019

• fixed new form

  

  Bibhas

  committed
  97ab0c8

• comment

  

  Bibhas

  committed
  32e0db5

• fixed label loading in dynamic form

  

  Bibhas

  committed
  eee9e83

• Fix labels UI

  vidya-ram

  committed
  e74f8db

• Sync with master

  vidya-ram

  committed
  3551b8f

• Remove LabelSet

  Show description for e99e34b
  jace

  committed
  e99e34b

• Use self.is_parent

  jace

  committed
  b733c6b

• Required flag must be false if not a parent label

  jace

  committed
  c3f61e6

Commits on Apr 16, 2019

• Updated docstrings

  jace

  committed
  c838cf3

• Don't need use_alter for self-referential

  jace

  committed
  81f65a3

• Rename part_labels (column rename also needed)

  jace

  committed
  ba9670c

• added setter and expression for restricted and archived

  

  Bibhas

  committed
  9b5740e

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  

  Bibhas

  committed
  a3f118f

• modified migration for labels

  

  Bibhas

  committed
  12a2d17

• fixed expression for flags

  

  Bibhas

  committed
  10da32c

• replaced labelset views and form

  

  Bibhas

  committed
  d403b22

• removed labelset form

  

  Bibhas

  committed
  ea255bc

• added missing project FK in migration

  

  Bibhas

  committed
  a083c63

Commits on Apr 17, 2019

• Label form(WIP)

  vidya-ram

  committed
  a2cb4b1

• Remove unwanted fields from sublabel form and update the UI

  vidya-ram

  committed
  49d505a

• Remove description and bgcolor

  vidya-ram

  committed
  5d8bd1f

• added sublabel form

  

  Bibhas

  committed
  369c099

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  

  Bibhas

  committed
  0698e06

• added sublabelform

  

  Bibhas

  committed
  5cd4341

• Add emoji picker

  vidya-ram

  committed
  95b1028

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  vidya-ram

  committed
  29b2be9

Commits on Apr 18, 2019

• saving sublabels with emojis

  

  Bibhas

  committed
  cb24ad8

• removed length validator from emoji field

  

  Bibhas

  committed
  6d83dfd

• sending an empty sublabel form to template

  

  Bibhas

  committed
  580dce1

• modified how choices are formatted

  

  Bibhas

  committed
  d5e5ecc

Commits on Apr 19, 2019

• using labels_form template for label edit

  

  Bibhas

  committed
  ecb8b00

• sending sublabels to label edit form

  

  Bibhas

  committed
  2de3337

• Update the UI of manage label page

  vidya-ram

  committed
  ba2737d

• trying to use proxy for labelset

  

  Bibhas

  committed
  a8124b4

• saving labels

  

  Bibhas

  committed
  01d8390

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  

  Bibhas

  committed
  ece8fbf

Commits on Apr 22, 2019

• moved keys method to wrapper

  

  Bibhas

  committed
  9c442e2

• Rename label parent/children to main/options; fix archived expression

  jace

  committed
  7dd9829

• Uncommitted file in label main/options commit

  jace

  committed
  0563c56

• added migration for old labels

  Show description for 6350ae2
  

  Bibhas

  committed
  6350ae2

• Fixed proposal label form

  jace

  committed
  82c8236

• Validator message

  jace

  committed
  6800399

• Check for emoji on proposal page

  vidya-ram

  committed
  a6d1411

• Ignore archived label options

  jace

  committed
  f802f49

• old labels are not restricted

  

  Bibhas

  committed
  af8aee6

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  

  Bibhas

  committed
  d7d8f08

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  vidya-ram

  committed
  d28ec8c

• Remove unused ProposalFormData (from #109)

  Show description for 6b3391b
  jace

  committed
  6b3391b

• No CSRF in form fields

  jace

  committed
  1e8433d

• Check for emoji

  vidya-ram

  committed
  33e5b0b

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  vidya-ram

  committed
  647aae3

• only showing icon emoji if it's available

  

  Bibhas

  committed
  d424ee3

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  

  Bibhas

  committed
  ddefe22

• Friendlier messaging in label form; appropriate name

  jace

  committed
  bf1c304

• Rename label.is_main to has_options

  jace

  committed
  7859fb5

• Names should be in singular as per coding convention

  jace

  committed
  beadac5

• Remove label "icon" title in form (for now)

  jace

  committed
  02c9ae0

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  

  Bibhas

  committed
  976a2d3

• Add drag functionality to set sequence of sub labels

  vidya-ram

  committed
  15c31da

Commits on Apr 23, 2019

• Add support to reorder main labels

  vidya-ram

  committed
  43264cf

• added label form for admin panel and added id to labelform

  

  Bibhas

  committed
  d0f044c

• id field is option for labelform

  

  Bibhas

  committed
  4cbc4c6

• id is optional for options form

  

  Bibhas

  committed
  6949eba

• Layout of manage label page

  vidya-ram

  committed
  b59a8b5

• Add proposal_label_admin_form (WIP)

  vidya-ram

  committed
  2948838

• showing booleanfield for boolean labels

  

  Bibhas

  committed
  1191e75

• showing emoji in front of label title in widget

  

  Bibhas

  committed
  f506c37

• saving labels in admin panel

  

  Bibhas

  committed
  3012115

Commits on Apr 24, 2019

• redirecting to labels page if there is an error in proposals page label form

  

  Bibhas

  committed
  12e970f

• Add label widget

  vidya-ram

  committed
  8bdb16a

• Add functionality to add labels widget

  vidya-ram

  committed
  af72226

• fixed view for saving labels

  

  Bibhas

  committed
  e0a71e2

• Fix label widget for checkbox options

  vidya-ram

  committed
  df75fd3

• refactored tests and added more

  

  Bibhas

  committed
  779448b

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  

  Bibhas

  committed
  5e33781

• added test for label icon

  

  Bibhas

  committed
  baf9049

• added test for restricted setter

  

  Bibhas

  committed
  ca55200

• added simple integration test

  

  Bibhas

  committed
  e7b86b2

Commits on Apr 25, 2019

• added test for label create view

  

  Bibhas

  committed
  4441f64

• added test for adding labels with options

  

  Bibhas

  committed
  87fd255

• added id field to labels form

  

  Bibhas

  committed
  93718f8

• Style changes and moved widget JS code to JS bundle

  vidya-ram

  committed
  b408afc

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  vidya-ram

  committed
  2965703

• Merge branch 'master' of github.com:hasgeek/funnel into labels

  

  Bibhas

  committed
  ec9f418

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  

  Bibhas

  committed
  bd4d19f

• running npm build in travis

  

  Bibhas

  committed
  0a6cbe1

• Add seq and id field for all labels

  vidya-ram

  committed
  14651de

• Update the UI of manage label page

  vidya-ram

  committed
  ebb55d7

• Minor css updates of label page

  vidya-ram

  committed
  3a8f4eb

• calling reorder to fix ordering

  

  Bibhas

  committed
  fa4d228

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  

  Bibhas

  committed
  53fba72

• saving main label order from manage label page

  

  Bibhas

  committed
  ead9434

Commits on Apr 26, 2019

• added csrf protection to labels reorder form

  

  Bibhas

  committed
  d5c260d

• addded reordering of sublabels

  

  Bibhas

  committed
  bb068fe

• added viewsfor delete and archive

  

  Bibhas

  committed
  72bd94a

• added has_proposals to label model

  

  Bibhas

  committed
  fe8c478

• fix edit form

  

  Bibhas

  committed
  faf4823

• repalce hyphne in permission name

  

  Bibhas

  committed
  0191b36

• Add confirmation dialog for delete and archive

  vidya-ram

  committed
  b2f899a

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  

  Bibhas

  committed
  beb56d6

• fixed label delete view

  

  Bibhas

  committed
  e28132b

• using name instead of id

  

  Bibhas

  committed
  e3ab13c

• not reusing forms for label

  

  Bibhas

  committed
  38fde91

• moved label assignment from proposal model to label model

  

  Bibhas

  committed
  5dfaaf7

• Change delete and archive to ajax post

  vidya-ram

  committed
  5de04a7

• fixed migration

  

  Bibhas

  committed
  8f18f14

• linter fixes

  

  Bibhas

  committed
  0ffebb1

• Fix the label widget

  vidya-ram

  committed
  c37f4b7

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  

  Bibhas

  committed
  19a9b46

• deleting options before deleting main label

  

  Bibhas

  committed
  e8c8e78

• removed labelseqform

  

  Bibhas

  committed
  e88416e

• fixed syntax error

  

  Bibhas

  committed
  953bc35

• fixed proposal edit page label form

  

  Bibhas

  committed
  b4e7de1

• Add title_for_name

  jace

  committed
  98954c7

• fixed archived getter

  

  Bibhas

  committed
  344ac3b

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  

  Bibhas

  committed
  063d773

• Linter fixes

  jace

  committed
  e0482fc

• added test for label create, reorder and delete

  

  Bibhas

  committed
  e5fc767

• reordering after label delete

  

  Bibhas

  committed
  30bb4be

• Merge branch 'labels' of github.com:hasgeek/funnel into labels

  

  Bibhas

  committed
  08d497e

• added test for editing labels

  

  Bibhas

  committed
  4975b6f

• Session type hasn't been used for a while

  jace

  committed
  b71bc4e

• Rename sublabel to option

  jace

  committed
  8f9e45a