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.

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

2.0.0 #51

Merged
merged 29 commits into from
Oct 14, 2013
Merged

2.0.0 #51

merged 29 commits into from
Oct 14, 2013

Conversation

jmdobry
Copy link
Owner

@jmdobry jmdobry commented Sep 21, 2013

Conflicts:
	coverage/index.html
	coverage/src/angular-cache.js.html
	coverage/src/index.html
	docs/$AngularCacheFactoryProvider.html
	docs/AngularCache.html
	docs/AngularCacheFactory.html
	docs/angular-cache-2.0.0-SNAPSHOT.js.html
	docs/index.html
	docs/module-angular-cache.html
	package.json
Conflicts:
	src/angular-cache.js
@ghost ghost assigned jmdobry Sep 21, 2013
Conflicts:
	README.md
	bower.json
	coverage/index.html
	coverage/src/angular-cache.js.html
	coverage/src/index.html
	dist/angular-cache-1.2.0-SNAPSHOT.js
	dist/angular-cache-1.2.0-SNAPSHOT.min.js
	dist/angular-cache-1.2.0.js
	dist/angular-cache-1.2.0.min.js
	dist/angular-cache-2.0.0-SNAPSHOT.js
	dist/angular-cache-2.0.0-SNAPSHOT.min.js
	docs/$AngularCacheFactoryProvider.html
	docs/AngularCache.html
	docs/AngularCacheFactory.html
	docs/angular-cache-1.2.0-SNAPSHOT.js.html
	docs/angular-cache-1.2.0.js.html
	docs/angular-cache-2.0.0-SNAPSHOT.js.html
	docs/index.html
	docs/module-angular-cache.html
	package.json
Conflicts:
	docs/$AngularCacheFactoryProvider.html
	docs/AngularCache.html
	docs/AngularCacheFactory.html
	docs/angular-cache-2.0.0-SNAPSHOT.js.html
	docs/index.html
	docs/module-angular-cache.html
jmdobry and others added 20 commits September 21, 2013 11:39
…g lots of insiginificant changes to "docs/" and "coverage/". The "release" task will only be used on the "master" branch. The development branches will be free of having to deal with the "dist/", "docs/" and "coverage/" folders.
…nvoluted. Added increases validation for setting a cache's options. Improved the section in the README describing the configuration options. #46
Swapped `localStorageImpl` and `sessionStorageImpl` options for just `storageImpl` option.
jmdobry added a commit that referenced this pull request Oct 14, 2013
@jmdobry jmdobry merged commit 6dbe7bf into develop Oct 14, 2013
@jmdobry jmdobry deleted the 2.0.0 branch October 14, 2013 04:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant