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

Merged in Zepheira timeline (fixed duplicate commit issue) #4

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

Merged in Zepheira timeline (fixed duplicate commit issue) #4

wants to merge 57 commits into from

Commits on Jul 19, 2016

  1. removing svn script

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    f455c46 View commit details
    Browse the repository at this point in the history

  2. adding tools from svn externals

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    d121a5a View commit details
    Browse the repository at this point in the history

  3. adding externals libraries

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    ac33f19 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into requirejs

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    5e6e5d4 View commit details
    Browse the repository at this point in the history

  5. adding ignore file

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    84eaf23 View commit details
    Browse the repository at this point in the history

  6. modifying configuration to work with SimileAjax given it's located fo… 

    …r local development, change baseUrl and SimileAjax location to canonical URLs for production
    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    1858aef View commit details
    Browse the repository at this point in the history

  7. fix path to use simile-ajax package, fix bugs

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    8eb0ea0 View commit details
    Browse the repository at this point in the history

  8. remove unnecessary namespace

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    5c1b8ac View commit details
    Browse the repository at this point in the history

  9. call Timeline.load() from itself, no need to wait for anything else -… 

    … RequireJS here means it will be ready to run when it's been defined
    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    ec4a3d8 View commit details
    Browse the repository at this point in the history

  10. provide local and canonical configs for others including Timeline as … 

    …a RequireJS package
    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    98628c5 View commit details
    Browse the repository at this point in the history

  11. convert front page example to RequireJS form

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    57e8f4d View commit details
    Browse the repository at this point in the history

  12. removing documentation, remove from build process

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    578230b View commit details
    Browse the repository at this point in the history

  13. adjusting documentation, removing excess

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    88013bf View commit details
    Browse the repository at this point in the history

  14. fix usage of String to SimileAajx.StringUtils

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    d830b6c View commit details
    Browse the repository at this point in the history

  15. up version

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    bb026b6 View commit details
    Browse the repository at this point in the history

  16. updating example to use RequireJS form

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    da7b397 View commit details
    Browse the repository at this point in the history

  17. remove circular dependency, make GeochronoUnit available as Geochrono… 

    ….Unit
    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    a49a06d View commit details
    Browse the repository at this point in the history

  18. main.js not needed

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    093f1c3 View commit details
    Browse the repository at this point in the history

  19. adapting based on actual use

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    f695321 View commit details
    Browse the repository at this point in the history

  20. move block to init method, failing on undefined/nulls otherwise

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    8c2d220 View commit details
    Browse the repository at this point in the history

  21. change back to shorter simile-ajax inclusion based on configs

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    e7a3608 View commit details
    Browse the repository at this point in the history

  22. adapt everything to requirejs mode

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    ab37b54 View commit details
    Browse the repository at this point in the history

  23. check if layers are null before changing attributes

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    b7d641b View commit details
    Browse the repository at this point in the history

  24. typo, missing semi

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    6d64700 View commit details
    Browse the repository at this point in the history

  25. fixing broken freebase links to point to google api for freebase

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    e4db5f7 View commit details
    Browse the repository at this point in the history

  26. adapt to use bundles

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    fb0c9c5 View commit details
    Browse the repository at this point in the history

  27. adding optimizer and configurations along with supporting libraries a… 

    …nd build jobs, plus necessary changes to code for optimizer to run
    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    89a81e4 View commit details
    Browse the repository at this point in the history

  28. not useful

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    f583ebc View commit details
    Browse the repository at this point in the history

  29. removing jquery, not used in timeline at all

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    79126ed View commit details
    Browse the repository at this point in the history

  30. removing jquery

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    002305a View commit details
    Browse the repository at this point in the history

  31. documentation

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    f673bc2 View commit details
    Browse the repository at this point in the history

  32. adapted back to using old style - require.js, but still able to use t… 

    …he way it was originally designed
    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    17e78d7 View commit details
    Browse the repository at this point in the history

  33. not tracking timeline-api.js, a generated file now

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    b166e9d View commit details
    Browse the repository at this point in the history

  34. one jquery function call, actually - will leave it in under the idea … 

    …that moving entirely to jquery is a better path to take
    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    b115529 View commit details
    Browse the repository at this point in the history

  35. removing jsmin, modifying build to track new bundling

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    9c9e7fb View commit details
    Browse the repository at this point in the history

  36. untested configs for require bundles and for development purposes

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    e706a01 View commit details
    Browse the repository at this point in the history

  37. provide code block example

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    e911071 View commit details
    Browse the repository at this point in the history

  38. read in conf from RequireJS

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    f58edeb View commit details
    Browse the repository at this point in the history

  39. adding new example to cover requirejs development on timeline

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    0ecb2d8 View commit details
    Browse the repository at this point in the history

  40. only load css if simile ajax hasn't figured out where it is yet

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    98bec2f View commit details
    Browse the repository at this point in the history

  41. add config block

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    aeb6be6 View commit details
    Browse the repository at this point in the history

  42. further expand on license; change general copyright note

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    148920a View commit details
    Browse the repository at this point in the history

  43. this would work if the timeline-api URL in use actually existed; try … 

    …it against something else at this juncture
    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    a176bc6 View commit details
    Browse the repository at this point in the history

  44. adapt examples to require bundle form

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    fd093cd View commit details
    Browse the repository at this point in the history

  45. copy debug into place

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    e7dfce0 View commit details
    Browse the repository at this point in the history

  46. call setPrefix instead of internal method, call load if not loaded, m… 

    …ake sure urlPrefix terminates in slash
    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    fd33d11 View commit details
    Browse the repository at this point in the history

  47. make this example work as well

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    1185319 View commit details
    Browse the repository at this point in the history

  48. add link to aaronsw example

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    6d7fd7c View commit details
    Browse the repository at this point in the history

  49. don't bundle jquery in require-aware optimizing; include url cache bu… 

    …sting arg for dev; tune use of ajax param a bit
    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    5de4795 View commit details
    Browse the repository at this point in the history

  50. moved timeline to timeline-core and base to timeline-base

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    5dd967a View commit details
    Browse the repository at this point in the history

  51. bundle i18n into timeline require bundle, only leave out jquery

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    97fb9ea View commit details
    Browse the repository at this point in the history

  52. ignore debug bundle

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    670354b View commit details
    Browse the repository at this point in the history

  53. remove explicit list of locales, use ant to generate

    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    1593d3a View commit details
    Browse the repository at this point in the history

  54. moving constants over to timeline-base, removing domReady, using jQue… 

    …ry document ready since its semantics are better understood (executed in order received)
    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    3bf5248 View commit details
    Browse the repository at this point in the history

  55. for full bundle, execute loads on document ready immediately; probabl… 

    …y network timing dependent, but possibly allows continued legacy usage to work as expected
    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    737bc21 View commit details
    Browse the repository at this point in the history

  56. use document.ready for require-aware examples instead of document.bod… 

    …y.onload, which fires too soon for library loading to complete
    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    09760c7 View commit details
    Browse the repository at this point in the history

  57. use document.ready for require-aware examples instead of document.bod… 

    …y.onload, which fires too soon for library loading to complete
    @zepheiryan
    zepheiryan authored and Avery Nortonsmith committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    42af580 View commit details
    Browse the repository at this point in the history