Skip to content

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

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
Open
averynortonsmith wants to merge 57 commits into
base: master
Choose a base branch
from
Open

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

averynortonsmith wants to merge 57 commits into from

Conversation

@averynortonsmith
Copy link

@averynortonsmith averynortonsmith commented Jul 19, 2016

No description provided.

zepheiryan added 30 commits July 19, 2016 17:18
@zepheiryan
removing svn script
f455c46
@zepheiryan
adding tools from svn externals
d121a5a
@zepheiryan
adding externals libraries
ac33f19
@zepheiryan
Merge branch 'master' into requirejs
5e6e5d4
@zepheiryan
adding ignore file
84eaf23
@zepheiryan
modifying configuration to work with SimileAjax given it's located fo…
1858aef 
…r local development, change baseUrl and SimileAjax location to canonical URLs for production
@zepheiryan
fix path to use simile-ajax package, fix bugs
8eb0ea0
@zepheiryan
remove unnecessary namespace
5c1b8ac
@zepheiryan
call Timeline.load() from itself, no need to wait for anything else -…
ec4a3d8 
… RequireJS here means it will be ready to run when it's been defined
@zepheiryan
provide local and canonical configs for others including Timeline as …
98628c5 
…a RequireJS package
@zepheiryan
convert front page example to RequireJS form
57e8f4d
@zepheiryan
removing documentation, remove from build process
578230b
@zepheiryan
adjusting documentation, removing excess
88013bf
@zepheiryan
fix usage of String to SimileAajx.StringUtils
d830b6c
@zepheiryan
up version
bb026b6
@zepheiryan
updating example to use RequireJS form
da7b397
@zepheiryan
remove circular dependency, make GeochronoUnit available as Geochrono…
a49a06d 
….Unit
@zepheiryan
main.js not needed
093f1c3
@zepheiryan
adapting based on actual use
f695321
@zepheiryan
move block to init method, failing on undefined/nulls otherwise
8c2d220
@zepheiryan
change back to shorter simile-ajax inclusion based on configs
e7a3608
@zepheiryan
adapt everything to requirejs mode
ab37b54
@zepheiryan
check if layers are null before changing attributes
b7d641b
@zepheiryan
typo, missing semi
6d64700
@zepheiryan
fixing broken freebase links to point to google api for freebase
e4db5f7
@zepheiryan
adapt to use bundles
fb0c9c5
@zepheiryan
adding optimizer and configurations along with supporting libraries a…
89a81e4 
…nd build jobs, plus necessary changes to code for optimizer to run
@zepheiryan
not useful
f583ebc
@zepheiryan
removing jquery, not used in timeline at all
79126ed
@zepheiryan
removing jquery
002305a
zepheiryan added 27 commits July 19, 2016 17:19
@zepheiryan
documentation
f673bc2
@zepheiryan
adapted back to using old style - require.js, but still able to use t…
17e78d7 
…he way it was originally designed
@zepheiryan
not tracking timeline-api.js, a generated file now
b166e9d
@zepheiryan
one jquery function call, actually - will leave it in under the idea …
b115529 
…that moving entirely to jquery is a better path to take
@zepheiryan
removing jsmin, modifying build to track new bundling
9c9e7fb
@zepheiryan
untested configs for require bundles and for development purposes
e706a01
@zepheiryan
provide code block example
e911071
@zepheiryan
read in conf from RequireJS
f58edeb
@zepheiryan
adding new example to cover requirejs development on timeline
0ecb2d8
@zepheiryan
only load css if simile ajax hasn't figured out where it is yet
98bec2f
@zepheiryan
add config block
aeb6be6
@zepheiryan
further expand on license; change general copyright note
148920a
@zepheiryan
this would work if the timeline-api URL in use actually existed; try …
a176bc6 
…it against something else at this juncture
@zepheiryan
adapt examples to require bundle form
fd093cd
@zepheiryan
copy debug into place
e7dfce0
@zepheiryan
call setPrefix instead of internal method, call load if not loaded, m…
fd33d11 
…ake sure urlPrefix terminates in slash
@zepheiryan
make this example work as well
1185319
@zepheiryan
add link to aaronsw example
6d7fd7c
@zepheiryan
don't bundle jquery in require-aware optimizing; include url cache bu…
5de4795 
…sting arg for dev; tune use of ajax param a bit
@zepheiryan
moved timeline to timeline-core and base to timeline-base
5dd967a
@zepheiryan
bundle i18n into timeline require bundle, only leave out jquery
97fb9ea
@zepheiryan
ignore debug bundle
670354b
@zepheiryan
remove explicit list of locales, use ant to generate
1593d3a
@zepheiryan
moving constants over to timeline-base, removing domReady, using jQue…
3bf5248 
…ry document ready since its semantics are better understood (executed in order received)
@zepheiryan
for full bundle, execute loads on document ready immediately; probabl…
737bc21 
…y network timing dependent, but possibly allows continued legacy usage to work as expected
@zepheiryan
use document.ready for require-aware examples instead of document.bod…
09760c7 
…y.onload, which fires too soon for library loading to complete
@zepheiryan
use document.ready for require-aware examples instead of document.bod…
42af580 
…y.onload, which fires too soon for library loading to complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@averynortonsmith @zepheiryan