Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Will you add day support ? #52

Open
wants to merge 92 commits into
base: master
Choose a base branch
from
Open

Will you add day support ? #52

wants to merge 92 commits into from

Commits on Jul 16, 2015

  1. Copy current timesheet to new timesheet-advanced. Switch logic betwee… 

    …n generating bubbles, and rendering. Next step is to create public function that will resize the bubbles on the resize of the parent container.
    Nikola Tucakovic committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    44e5ee7 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2015

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

    Nikola Tucakovic committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    a4e571c View commit details
    Browse the repository at this point in the history

  2. sass refactored

    Jelena committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    97f261e View commit details
    Browse the repository at this point in the history

  3. classes changed, added default bubble color

    Jelena committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    cc752f2 View commit details
    Browse the repository at this point in the history

  4. serial render js

    Nikola Tucakovic committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    6f5fdb7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' of https://github.com/ntucakovic/timesheet.js … 

    …into develop

Conflicts:
	dist/timesheet-advanced.min.js
	source/javascripts/main.js
    Nikola Tucakovic committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    7819f78 View commit details
    Browse the repository at this point in the history

  6. default serial view

    Nikola Tucakovic committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    b1f3e33 View commit details
    Browse the repository at this point in the history

  7. Bubble constructor changed - 5 parameters required, some of them can … 

    …be emty;

Added parameter "link";
    Jelena committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    4fd1052 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' of https://github.com/ntucakovic/timesheet.js … 

    …into develop

Conflicts:
	dist/timesheet-advanced.min.js
	source/javascripts/timesheet-advanced.js
    Jelena committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    b9f80b6 View commit details
    Browse the repository at this point in the history

  9. link styled differently

    Jelena committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    e4139cf View commit details
    Browse the repository at this point in the history

  10. bug fixes serial view

    Nikola Tucakovic committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    64ddc26 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'develop' into feature/serial_view 

    Conflicts:
	dist/timesheet-advanced.min.js
	dist/timesheet.min.css
	dist/timesheet.min.css.map
	source/javascripts/main.js
    Nikola Tucakovic committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    0ea3674 View commit details
    Browse the repository at this point in the history

  12. make serial view usable

    Nikola Tucakovic committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    7e880ec View commit details
    Browse the repository at this point in the history

  13. position bubbles

    Nikola Tucakovic committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    8838a8e View commit details
    Browse the repository at this point in the history

  14. Merge branch 'feature/serial_view' into develop

    Nikola Tucakovic committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    ecd77d8 View commit details
    Browse the repository at this point in the history

  15. More samples

    Nikola Tucakovic committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    db784ba View commit details
    Browse the repository at this point in the history

  16. content changes

    Jelena committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    1271455 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'develop' of https://github.com/ntucakovic/timesheet.js … 

    …into develop

Conflicts:
	dist/timesheet.min.css.map
    Jelena committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    33d494d View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2015

  1. only test page changed - displays parallel and serial examples

    Jelena committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    f4ab40c View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2015

  1. Display current month line if applicable (only if last month on X axi… 

    …s is after current month)
    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    4e4ebdb View commit details
    Browse the repository at this point in the history

  2. Add timesheet type to wrapper

    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    653289b View commit details
    Browse the repository at this point in the history

  3. Fix specificity, no need to go so deep

    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    bb8f1a4 View commit details
    Browse the repository at this point in the history

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

    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    2421c44 View commit details
    Browse the repository at this point in the history

  5. Improve sass specificity, use new class for ul wrapper

    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    a0078eb View commit details
    Browse the repository at this point in the history

  6. change border radius on serial view

    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    7ada695 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/improve_sass_add_timesheet_type_to_container' i… 

    …nto develop
    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    050a5d6 View commit details
    Browse the repository at this point in the history

  8. removed try-catch

    Jelena committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    e6ce25c View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' of https://github.com/ntucakovic/timesheet.js … 

    …into develop

Conflicts:
	dist/timesheet-advanced.min.js
    Jelena committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    263862b View commit details
    Browse the repository at this point in the history

  10. Constructor options refactor

    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    fdce755 View commit details
    Browse the repository at this point in the history

  11. use extra class parameter

    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    8933880 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'feature/constructor_fix' into develop 

    Conflicts:
	dist/timesheet-advanced.min.js
	source/javascripts/main.js
	source/javascripts/timesheet-advanced.js
    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    fad7783 View commit details
    Browse the repository at this point in the history

  13. Fix merge problems

    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    b08532a View commit details
    Browse the repository at this point in the history

  14. removed unused styles

    Jelena committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    2026022 View commit details
    Browse the repository at this point in the history

  15. added event listener on bubbles

    Jelena committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    37bedf9 View commit details
    Browse the repository at this point in the history

  16. override min/max logic

    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    8048166 View commit details
    Browse the repository at this point in the history

  17. style

    Jelena committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    785689b View commit details
    Browse the repository at this point in the history

  18. get attributes - initial

    Jelena committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    428e9ae View commit details
    Browse the repository at this point in the history

  19. Alter offsets depending on min and max width of timesheet

    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    1be0247 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'feature/min_max_date_fix' into develop

    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    f1c6fbe View commit details
    Browse the repository at this point in the history

  21. tooltips

    Jelena committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    dc67414 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'feature/tooltips' into develop 

    Conflicts:
	dist/timesheet-advanced.min.js
	dist/timesheet.min.css
	dist/timesheet.min.css.map
	source/javascripts/timesheet-advanced.js
    Jelena committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    7193071 View commit details
    Browse the repository at this point in the history

  23. don't draw bubble if it doesn't fit within timesheet

    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    8384d5f View commit details
    Browse the repository at this point in the history

  24. fix timesheet max

    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    6cc9e4f View commit details
    Browse the repository at this point in the history

  25. x position improved

    Jelena committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    9ac908b View commit details
    Browse the repository at this point in the history

  26. y position

    Jelena committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    8767bdf View commit details
    Browse the repository at this point in the history

  27. cut off bubbles and increase height on parallel

    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    d57964e View commit details
    Browse the repository at this point in the history

  28. Merge branch 'feature/mix_max_fix' into develop

    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    1281703 View commit details
    Browse the repository at this point in the history

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

    Nikola Tucakovic committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    8e5876c View commit details
    Browse the repository at this point in the history

  30. styles improved

    Jelena committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    e98bcfa View commit details
    Browse the repository at this point in the history

  31. changed examples

    Jelena committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    69fca86 View commit details
    Browse the repository at this point in the history

  32. white mode

    Jelena committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    f4d9468 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2015

  1. X axis scroll mousewheel

    Nikola Tucakovic committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    9b0a698 View commit details
    Browse the repository at this point in the history

  2. Param to prevent binding scroll on X axis

    Nikola Tucakovic committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    ed5a774 View commit details
    Browse the repository at this point in the history

  3. dark tooltips

    Jelena committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    cf2d1fd View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/tooltip_position' into develop 

    Conflicts:
	dist/timesheet-advanced.min.js
	dist/timesheet.min.css
	dist/timesheet.min.css.map
	source/javascripts/timesheet-advanced.js
    Jelena committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    8e294b7 View commit details
    Browse the repository at this point in the history

  5. Introduce light parameter to constructor and change classes' names

    Nikola Tucakovic committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    a2a589e View commit details
    Browse the repository at this point in the history

  6. bower.json update

    Nikola Tucakovic committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    32c03ab View commit details
    Browse the repository at this point in the history

  7. api docs

    Jelena committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    291c81a View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' of https://github.com/ntucakovic/timesheet.js … 

    …into develop

Conflicts:
	dist/timesheet-advanced.min.js
    Jelena committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    7d29995 View commit details
    Browse the repository at this point in the history

  9. examples

    Jelena committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    f5e226a View commit details
    Browse the repository at this point in the history

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

    Nikola Tucakovic committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    018fe3a View commit details
    Browse the repository at this point in the history

  11. rename scale and data

    Nikola Tucakovic committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    2df0a22 View commit details
    Browse the repository at this point in the history

  12. prefix variables

    Nikola Tucakovic committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    ef2027b View commit details
    Browse the repository at this point in the history

  13. prefix variables

    Nikola Tucakovic committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    ac66be0 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'feature/rename_classes' into develop

    Nikola Tucakovic committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    ff3d31c View commit details
    Browse the repository at this point in the history

  15. hide tooltips

    Jelena committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    683dcff View commit details
    Browse the repository at this point in the history

  16. Merge branch 'develop' of https://github.com/ntucakovic/timesheet.js … 

    …into develop

Conflicts:
	dist/timesheet-advanced.min.js
    Jelena committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    5274d6b View commit details
    Browse the repository at this point in the history

  17. removed old tests because they don't make sense anymore

    Jelena committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    408eeb0 View commit details
    Browse the repository at this point in the history

  18. click on tooltip does not close it

    Jelena committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    f043e26 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2015

  1. Check if bubble fits on serial view. Typo ts-vertical-line to tsa-ver… 

    …tical-line
    Nikola Tucakovic committed Jul 23, 2015
    Configuration menu
    Copy the full SHA
    e8787f9 View commit details
    Browse the repository at this point in the history

  2. Fix margin on bubble-wrap ul element

    Nikola Tucakovic committed Jul 23, 2015
    Configuration menu
    Copy the full SHA
    307dbad View commit details
    Browse the repository at this point in the history

  3. Serial hover bug fix

    Nikola Tucakovic committed Jul 23, 2015
    Configuration menu
    Copy the full SHA
    742873c View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2015

  1. quick fix event binding

    Nikola Tucakovic committed Jul 24, 2015
    Configuration menu
    Copy the full SHA
    e5e837e View commit details
    Browse the repository at this point in the history

  2. Add and remove active bubble classes on tooltips

    Nikola Tucakovic committed Jul 24, 2015
    Configuration menu
    Copy the full SHA
    9b723cc View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/tooltip_active' into develop

    Nikola Tucakovic committed Jul 24, 2015
    Configuration menu
    Copy the full SHA
    20a79c0 View commit details
    Browse the repository at this point in the history

  4. Margin month feature

    Nikola Tucakovic committed Jul 24, 2015
    Configuration menu
    Copy the full SHA
    943e32f View commit details
    Browse the repository at this point in the history

  5. Added triangles to the tooltips; added tsa-tooltip--top and tsa-toolt… 

    …ip--botom classes to indicate whether tooltip is above or below the bubble; added classes to indicate if bubble is linked
    Byteout committed Jul 24, 2015
    Configuration menu
    Copy the full SHA
    229d9bc View commit details
    Browse the repository at this point in the history

  6. merge

    Byteout committed Jul 24, 2015
    Configuration menu
    Copy the full SHA
    5377634 View commit details
    Browse the repository at this point in the history

  7. Switch data to json for bubbles

    Nikola Tucakovic committed Jul 24, 2015
    Configuration menu
    Copy the full SHA
    2184c6f View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' of https://github.com/ntucakovic/timesheet.js … 

    …into develop

Conflicts:
	dist/timesheet-advanced.min.js
    Nikola Tucakovic committed Jul 24, 2015
    Configuration menu
    Copy the full SHA
    15703e6 View commit details
    Browse the repository at this point in the history

  9. data attributes in bubble

    Nikola Tucakovic committed Jul 24, 2015
    Configuration menu
    Copy the full SHA
    181420e View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2015

  1. fix empty link render

    Nikola Tucakovic committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    d60eaba View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2015

  1. Fix firefox's close tooltip

    Nikola Tucakovic committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    d123215 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2016

  1. changes in readme.md

    Jelena committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    fb3bf7e View commit details
    Browse the repository at this point in the history

  2. package json

    Jelena committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    b7822b2 View commit details
    Browse the repository at this point in the history

  3. theme added in readme

    Jelena committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    28ee616 View commit details
    Browse the repository at this point in the history

  4. Fix landing page

    Nikola Tucakovic committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    a44f90e View commit details
    Browse the repository at this point in the history

  5. Add images to readme

    Nikola Tucakovic committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    3457e02 View commit details
    Browse the repository at this point in the history

  6. Add rows for readme

    Nikola Tucakovic committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    5d26ec7 View commit details
    Browse the repository at this point in the history

  7. Fix code in haml file

    Nikola Tucakovic committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    5800303 View commit details
    Browse the repository at this point in the history

  8. Add version to bower component

    Nikola Tucakovic committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    534c3eb View commit details
    Browse the repository at this point in the history

  9. Clean up repo

    Nikola Tucakovic committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    ea3ee1a View commit details
    Browse the repository at this point in the history