suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Zotero is a free, easy-to-use tool to help you collect, organize, cite, and share your research sources.
9,370 Commits 11 Branches 258 Tags 98 MiB
JavaScript 97.2%
CSS 2%
HTML 0.4%
XSLT 0.3%
f0770fa84d
Go to file
Dan Stillman f0770fa84d Fix various conflict resolution bugs 
Among other things, when choosing the local side for a conflict, the
remote version could still end up being saved.
2017-10-27 01:08:38 -04:00
chrome Fix various conflict resolution bugs 2017-10-27 01:08:38 -04:00
components Remove citeproc-prereqs, which isn't necessary anymore 2017-09-30 19:07:29 -04:00
defaults/preferences Update proxy authentication URLs 2017-07-28 20:41:10 -04:00
resource Update submodules 2017-10-25 23:56:12 -04:00
scripts Adjust ignore mask in build script to #*, not just #*.* 2017-10-05 17:22:11 -04:00
styles@05e21c623d Update submodules 2017-10-25 23:56:12 -04:00
test Fix various conflict resolution bugs 2017-10-27 01:08:38 -04:00
translators@5bf26f6a27 Update submodules 2017-10-25 23:56:12 -04:00
.babelrc Remove babel-plugin-transform-async-to-module-method 2017-10-05 17:18:43 -04:00
.gitattributes Fix enforcing of Unix newlines for SQL files 2016-02-26 18:37:44 -05:00
.gitignore Better build process (#1248) 2017-06-20 19:18:46 -04:00
.gitmodules Add Chai-as-Promised 2015-09-18 03:34:03 -05:00
.travis.yml Fix "Client failed to connect to the D-BUS daemon" in Travis output 2017-08-16 00:41:38 +02:00
chrome.manifest Firefox 55 compatibility: fix zotero-platform files 2017-09-30 03:33:50 -04:00
CONTRIBUTING.md Create CONTRIBUTING.md 2016-02-08 19:28:05 -05:00
COPYING Update copyright and trademark info. 2017-09-27 15:37:35 +02:00
install.rdf Update version 2017-10-17 20:53:43 -04:00
package-lock.json Update chai to 4.1.2 2017-10-27 01:08:38 -04:00
package.json Update chai to 4.1.2 2017-10-27 01:08:38 -04:00
README.md Merge branch '4.0' 2015-11-01 21:22:13 -05:00
update.rdf Update Fx minVersion to 45 2016-12-13 09:12:55 -05:00

README.md

Zotero

Build Status

Zotero is a free, easy-to-use tool to help you collect, organize, cite, and share your research sources.

Please post feature requests or bug reports to the Zotero Forums. If you're having trouble with Zotero, see Getting Help.

For more information on how to use this source code, see the Zotero wiki.