Code

Will you add day support ?#52

Code

Open

SebFourault wants to merge 92 commits intosbstjn:mastersbstjn/timesheet.js:masterfrom ntucakovic:masterntucakovic/timesheet-advanced.js:masterCopy head branch name to clipboard

+1,123-515

Commits

Commits on Jul 16, 2015

• Copy current timesheet to new timesheet-advanced. Switch logic between generating bubbles, and rendering. Next step is to create public function that will resize the bubbles on the resize of the pa…

  Show description for 44e5ee7
  

  Nikola Tucakovic

  committed
  44e5ee7

  Copy full SHA for 44e5ee7

Commits on Jul 17, 2015

• make default one work like on original plugin. (type is parallel)

  

  Nikola Tucakovic

  committed
  a4e571c

  Copy full SHA for a4e571c

• sass refactored

  

  Jelena

  committed
  97f261e

  Copy full SHA for 97f261e

• classes changed, added default bubble color

  

  Jelena

  committed
  cc752f2

  Copy full SHA for cc752f2

• serial render js

  

  Nikola Tucakovic

  committed
  6f5fdb7

  Copy full SHA for 6f5fdb7

• Merge branch 'develop' of https://github.com/ntucakovic/timesheet.js into develop

  Show description for 7819f78
  

  Nikola Tucakovic

  committed
  7819f78

  Copy full SHA for 7819f78

• default serial view

  

  Nikola Tucakovic

  committed
  b1f3e33

  Copy full SHA for b1f3e33

• Bubble constructor changed - 5 parameters required, some of them can be emty;

  Show description for 4fd1052
  

  Jelena

  committed
  4fd1052

  Copy full SHA for 4fd1052

• Merge branch 'develop' of https://github.com/ntucakovic/timesheet.js into develop

  Show description for b9f80b6
  

  Jelena

  committed
  b9f80b6

  Copy full SHA for b9f80b6

• link styled differently

  

  Jelena

  committed
  e4139cf

  Copy full SHA for e4139cf

• bug fixes serial view

  

  Nikola Tucakovic

  committed
  64ddc26

  Copy full SHA for 64ddc26

• Merge branch 'develop' into feature/serial_view

  Show description for 0ea3674
  

  Nikola Tucakovic

  committed
  0ea3674

  Copy full SHA for 0ea3674

• make serial view usable

  

  Nikola Tucakovic

  committed
  7e880ec

  Copy full SHA for 7e880ec

• position bubbles

  

  Nikola Tucakovic

  committed
  8838a8e

  Copy full SHA for 8838a8e

• Merge branch 'feature/serial_view' into develop

  

  Nikola Tucakovic

  committed
  ecd77d8

  Copy full SHA for ecd77d8

• More samples

  

  Nikola Tucakovic

  committed
  db784ba

  Copy full SHA for db784ba

• content changes

  

  Jelena

  committed
  1271455

  Copy full SHA for 1271455

• Merge branch 'develop' of https://github.com/ntucakovic/timesheet.js into develop

  Show description for 33d494d
  

  Jelena

  committed
  33d494d

  Copy full SHA for 33d494d

Commits on Jul 19, 2015

• only test page changed - displays parallel and serial examples

  

  Jelena

  committed
  f4ab40c

  Copy full SHA for f4ab40c

Commits on Jul 21, 2015

• Display current month line if applicable (only if last month on X axis is after current month)

  

  Nikola Tucakovic

  committed
  4e4ebdb

  Copy full SHA for 4e4ebdb

• Add timesheet type to wrapper

  

  Nikola Tucakovic

  committed
  653289b

  Copy full SHA for 653289b

• Fix specificity, no need to go so deep

  

  Nikola Tucakovic

  committed
  bb8f1a4

  Copy full SHA for bb8f1a4

• add ts-bubble-wrapper class to ul element on serial view

  

  Nikola Tucakovic

  committed
  2421c44

  Copy full SHA for 2421c44

• Improve sass specificity, use new class for ul wrapper

  

  Nikola Tucakovic

  committed
  a0078eb

  Copy full SHA for a0078eb

• change border radius on serial view

  

  Nikola Tucakovic

  committed
  7ada695

  Copy full SHA for 7ada695

• Merge branch 'feature/improve_sass_add_timesheet_type_to_container' into develop

  

  Nikola Tucakovic

  committed
  050a5d6

  Copy full SHA for 050a5d6

• removed try-catch

  

  Jelena

  committed
  e6ce25c

  Copy full SHA for e6ce25c

• Merge branch 'develop' of https://github.com/ntucakovic/timesheet.js into develop

  Show description for 263862b
  

  Jelena

  committed
  263862b

  Copy full SHA for 263862b

• Constructor options refactor

  

  Nikola Tucakovic

  committed
  fdce755

  Copy full SHA for fdce755

• use extra class parameter

  

  Nikola Tucakovic

  committed
  8933880

  Copy full SHA for 8933880

• Merge branch 'feature/constructor_fix' into develop

  Show description for fad7783
  

  Nikola Tucakovic

  committed
  fad7783

  Copy full SHA for fad7783

• Fix merge problems

  

  Nikola Tucakovic

  committed
  b08532a

  Copy full SHA for b08532a

• removed unused styles

  

  Jelena

  committed
  2026022

  Copy full SHA for 2026022

• added event listener on bubbles

  

  Jelena

  committed
  37bedf9

  Copy full SHA for 37bedf9

• override min/max logic

  

  Nikola Tucakovic

  committed
  8048166

  Copy full SHA for 8048166

• style

  

  Jelena

  committed
  785689b

  Copy full SHA for 785689b

• get attributes - initial

  

  Jelena

  committed
  428e9ae

  Copy full SHA for 428e9ae

• Alter offsets depending on min and max width of timesheet

  

  Nikola Tucakovic

  committed
  1be0247

  Copy full SHA for 1be0247

• Merge branch 'feature/min_max_date_fix' into develop

  

  Nikola Tucakovic

  committed
  f1c6fbe

  Copy full SHA for f1c6fbe

• tooltips

  

  Jelena

  committed
  dc67414

  Copy full SHA for dc67414

• Merge branch 'feature/tooltips' into develop

  Show description for 7193071
  

  Jelena

  committed
  7193071

  Copy full SHA for 7193071

• don't draw bubble if it doesn't fit within timesheet

  

  Nikola Tucakovic

  committed
  8384d5f

  Copy full SHA for 8384d5f

• fix timesheet max

  

  Nikola Tucakovic

  committed
  6cc9e4f

  Copy full SHA for 6cc9e4f

• x position improved

  

  Jelena

  committed
  9ac908b

  Copy full SHA for 9ac908b

• y position

  

  Jelena

  committed
  8767bdf

  Copy full SHA for 8767bdf

• cut off bubbles and increase height on parallel

  

  Nikola Tucakovic

  committed
  d57964e

  Copy full SHA for d57964e

• Merge branch 'feature/mix_max_fix' into develop

  

  Nikola Tucakovic

  committed
  1281703

  Copy full SHA for 1281703

• fix width (scrollbar appears) because of right border on section

  

  Nikola Tucakovic

  committed
  8e5876c

  Copy full SHA for 8e5876c

• styles improved

  

  Jelena

  committed
  e98bcfa

  Copy full SHA for e98bcfa

• changed examples

  

  Jelena

  committed
  69fca86

  Copy full SHA for 69fca86

• white mode

  

  Jelena

  committed
  f4d9468

  Copy full SHA for f4d9468

Commits on Jul 22, 2015

• X axis scroll mousewheel

  

  Nikola Tucakovic

  committed
  9b0a698

  Copy full SHA for 9b0a698

• Param to prevent binding scroll on X axis

  

  Nikola Tucakovic

  committed
  ed5a774

  Copy full SHA for ed5a774

• dark tooltips

  

  Jelena

  committed
  cf2d1fd

  Copy full SHA for cf2d1fd

• Merge branch 'feature/tooltip_position' into develop

  Show description for 8e294b7
  

  Jelena

  committed
  8e294b7

  Copy full SHA for 8e294b7

• Introduce light parameter to constructor and change classes' names

  

  Nikola Tucakovic

  committed
  a2a589e

  Copy full SHA for a2a589e

• bower.json update

  

  Nikola Tucakovic

  committed
  32c03ab

  Copy full SHA for 32c03ab

• api docs

  

  Jelena

  committed
  291c81a

  Copy full SHA for 291c81a

• Merge branch 'develop' of https://github.com/ntucakovic/timesheet.js into develop

  Show description for 7d29995
  

  Jelena

  committed
  7d29995

  Copy full SHA for 7d29995

• examples

  

  Jelena

  committed
  f5e226a

  Copy full SHA for f5e226a

• Remove timesheet.js and disable test for the time being

  

  Nikola Tucakovic

  committed
  018fe3a

  Copy full SHA for 018fe3a

• rename scale and data

  

  Nikola Tucakovic

  committed
  2df0a22

  Copy full SHA for 2df0a22

• prefix variables

  

  Nikola Tucakovic

  committed
  ef2027b

  Copy full SHA for ef2027b

• prefix variables

  

  Nikola Tucakovic

  committed
  ac66be0

  Copy full SHA for ac66be0

• Merge branch 'feature/rename_classes' into develop

  

  Nikola Tucakovic

  committed
  ff3d31c

  Copy full SHA for ff3d31c

• hide tooltips

  

  Jelena

  committed
  683dcff

  Copy full SHA for 683dcff

• Merge branch 'develop' of https://github.com/ntucakovic/timesheet.js into develop

  Show description for 5274d6b
  

  Jelena

  committed
  5274d6b

  Copy full SHA for 5274d6b

• removed old tests because they don't make sense anymore

  

  Jelena

  committed
  408eeb0

  Copy full SHA for 408eeb0

• click on tooltip does not close it

  

  Jelena

  committed
  f043e26

  Copy full SHA for f043e26

Commits on Jul 23, 2015

• Check if bubble fits on serial view. Typo ts-vertical-line to tsa-vertical-line

  

  Nikola Tucakovic

  committed
  e8787f9

  Copy full SHA for e8787f9

• Fix margin on bubble-wrap ul element

  

  Nikola Tucakovic

  committed
  307dbad

  Copy full SHA for 307dbad

• Serial hover bug fix

  

  Nikola Tucakovic

  committed
  742873c

  Copy full SHA for 742873c

Commits on Jul 24, 2015

• quick fix event binding

  

  Nikola Tucakovic

  committed
  e5e837e

  Copy full SHA for e5e837e

• Add and remove active bubble classes on tooltips

  

  Nikola Tucakovic

  committed
  9b723cc

  Copy full SHA for 9b723cc

• Merge branch 'feature/tooltip_active' into develop

  

  Nikola Tucakovic

  committed
  20a79c0

  Copy full SHA for 20a79c0

• Margin month feature

  

  Nikola Tucakovic

  committed
  943e32f

  Copy full SHA for 943e32f

• Added triangles to the tooltips; added tsa-tooltip--top and tsa-tooltip--botom classes to indicate whether tooltip is above or below the bubble; added classes to indicate if bubble is linked

  

  Byteout

  committed
  229d9bc

  Copy full SHA for 229d9bc

• merge

  

  Byteout

  committed
  5377634

  Copy full SHA for 5377634

• Switch data to json for bubbles

  

  Nikola Tucakovic

  committed
  2184c6f

  Copy full SHA for 2184c6f

• Merge branch 'develop' of https://github.com/ntucakovic/timesheet.js into develop

  Show description for 15703e6
  

  Nikola Tucakovic

  committed
  15703e6

  Copy full SHA for 15703e6

• data attributes in bubble

  

  Nikola Tucakovic

  committed
  181420e

  Copy full SHA for 181420e

Commits on Jul 27, 2015

• fix empty link render

  

  Nikola Tucakovic

  committed
  d60eaba

  Copy full SHA for d60eaba

Commits on Jul 28, 2015

• Fix firefox's close tooltip

  

  Nikola Tucakovic

  committed
  d123215

  Copy full SHA for d123215

Commits on Mar 22, 2016

• changes in readme.md

  

  Jelena

  committed
  fb3bf7e

  Copy full SHA for fb3bf7e

• package json

  

  Jelena

  committed
  b7822b2

  Copy full SHA for b7822b2

• theme added in readme

  

  Jelena

  committed
  28ee616

  Copy full SHA for 28ee616

• Fix landing page

  

  Nikola Tucakovic

  committed
  a44f90e

  Copy full SHA for a44f90e

• Add images to readme

  

  Nikola Tucakovic

  committed
  3457e02

  Copy full SHA for 3457e02

• Add rows for readme

  

  Nikola Tucakovic

  committed
  5d26ec7

  Copy full SHA for 5d26ec7

• Fix code in haml file

  

  Nikola Tucakovic

  committed
  5800303

  Copy full SHA for 5800303

• Add version to bower component

  

  Nikola Tucakovic

  committed
  534c3eb

  Copy full SHA for 534c3eb

• Clean up repo

  

  Nikola Tucakovic

  committed
  ea3ee1a

  Copy full SHA for ea3ee1a