mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
zotero/chrome/skin/default/zotero
History
Dan Stillman 0aecaad761 Update conflict resolution for API syncing 
This will appear much less frequently, since non-conflicting field changes on
both sides can be resolved automatically, but genuine field conflicts still
require manual conflict resolution.

The merge pane is no longer editable, since the itembox code to do that is
async and can't run in a modal window, but it's not really necessary,
particularly with conflicts happening less frequently.

TODO:

- Remote item deletions
- File conflicts
- Maybe handle some edge cases where the conflicted items fail to save
2015-08-06 04:14:49 -04:00
..
bindings Merge branch '4.0' 2015-07-18 07:09:53 -04:00
licenses Add wizard for My Publications 2015-04-26 19:41:45 -04:00
mac Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
report Merged r3581-3616 from 1.0 branch, plus some report tweaks 2008-10-25 08:01:43 +00:00
timeline Update zotero:// extensions (report, timeline, etc.) for async DB, and more 2014-09-09 00:36:29 -04:00
win Copy mainwindow-dropdown-arrow.png to skin directory for availability in Standalone 2011-06-07 06:00:36 +00:00
about.css About pane updates 2011-12-14 17:52:10 -05:00
annotate-add-selected.png Merged revisions 3080-3081,3084,3087-3088,3090,3092,3099-3103,3113-3114,3132,3134-3143,3145,3148-3151,3154-3159,3165,3174,3194,3234-3235,3239-3240,3244,3246-3254,3258-3262,3268,3270,3274,3279,3286-3288,3294-3295 from 1.0 branch via svnmerge 2008-09-01 01:54:00 +00:00
annotate-add.png Merged revisions 3080-3081,3084,3087-3088,3090,3092,3099-3103,3113-3114,3132,3134-3143,3145,3148-3151,3154-3159,3165,3174,3194,3234-3235,3239-3240,3244,3246-3254,3258-3262,3268,3270,3274,3279,3286-3288,3294-3295 from 1.0 branch via svnmerge 2008-09-01 01:54:00 +00:00
annotate-collapse.png Merged revisions 3080-3081,3084,3087-3088,3090,3092,3099-3103,3113-3114,3132,3134-3143,3145,3148-3151,3154-3159,3165,3174,3194,3234-3235,3239-3240,3244,3246-3254,3258-3262,3268,3270,3274,3279,3286-3288,3294-3295 from 1.0 branch via svnmerge 2008-09-01 01:54:00 +00:00
annotate-highlight-selected.png Merged revisions 3080-3081,3084,3087-3088,3090,3092,3099-3103,3113-3114,3132,3134-3143,3145,3148-3151,3154-3159,3165,3174,3194,3234-3235,3239-3240,3244,3246-3254,3258-3262,3268,3270,3274,3279,3286-3288,3294-3295 from 1.0 branch via svnmerge 2008-09-01 01:54:00 +00:00
annotate-highlight.png Merged revisions 3080-3081,3084,3087-3088,3090,3092,3099-3103,3113-3114,3132,3134-3143,3145,3148-3151,3154-3159,3165,3174,3194,3234-3235,3239-3240,3244,3246-3254,3258-3262,3268,3270,3274,3279,3286-3288,3294-3295 from 1.0 branch via svnmerge 2008-09-01 01:54:00 +00:00
annotate-unhighlight-selected.png Merged revisions 3080-3081,3084,3087-3088,3090,3092,3099-3103,3113-3114,3132,3134-3143,3145,3148-3151,3154-3159,3165,3174,3194,3234-3235,3239-3240,3244,3246-3254,3258-3262,3268,3270,3274,3279,3286-3288,3294-3295 from 1.0 branch via svnmerge 2008-09-01 01:54:00 +00:00
annotate-unhighlight.png Merged revisions 3080-3081,3084,3087-3088,3090,3092,3099-3103,3113-3114,3132,3134-3143,3145,3148-3151,3154-3159,3165,3174,3194,3234-3235,3239-3240,3244,3246-3254,3258-3262,3268,3270,3274,3279,3286-3288,3294-3295 from 1.0 branch via svnmerge 2008-09-01 01:54:00 +00:00
annotation-close.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
annotation-grippy.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
annotation-hidden.gif Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
annotation-hide.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
annotation-move-selected.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
annotation-move.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
annotation.css Merged revisions 3080-3081,3084,3087-3088,3090,3092,3099-3103,3113-3114,3132,3134-3143,3145,3148-3151,3154-3159,3165,3174,3194,3234-3235,3239-3240,3244,3246-3254,3258-3262,3268,3270,3274,3279,3286-3288,3294-3295 from 1.0 branch via svnmerge 2008-09-01 01:54:00 +00:00
annotation.html Merged revisions 3080-3081,3084,3087-3088,3090,3092,3099-3103,3113-3114,3132,3134-3143,3145,3148-3151,3154-3159,3165,3174,3194,3234-3235,3239-3240,3244,3246-3254,3258-3262,3268,3270,3274,3279,3286-3288,3294-3295 from 1.0 branch via svnmerge 2008-09-01 01:54:00 +00:00
arrow-curve-090-left.png Add icons to context menus 2013-04-13 01:53:02 -05:00
arrow-down.gif Adding as new file 2008-12-29 21:03:52 +00:00
arrow-join-090.png Add icons to context menus 2013-04-13 01:53:02 -05:00
arrow-split-090.png Add icons to context menus 2013-04-13 01:53:02 -05:00
arrow_refresh.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
arrow_refresh@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
arrow_rotate_animated.png Adds animated sync icon -- not yet perfect 2008-06-30 15:14:35 +00:00
arrow_rotate_static.png Adds animated sync icon -- not yet perfect 2008-06-30 15:14:35 +00:00
attach-small.png On-demand download support 2011-11-26 03:45:55 -05:00
attach.png - Changed toolbar note button to context-sensitive menu for adding standalone and child notes 2009-09-14 04:18:58 +00:00
attach@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
bell_error.png - Use a different sync error icon for version cut-offs 2010-02-04 04:45:29 +00:00
bibliography.css - Fix Doc Prefs window in OpenOffice to reflect correct app 2009-08-08 11:32:16 +00:00
bookmark-pencil.png Add icons to context menus 2013-04-13 01:53:02 -05:00
bullet_blue.png On-demand download support 2011-11-26 03:45:55 -05:00
bullet_blue_empty.png On-demand download support 2011-11-26 03:45:55 -05:00
bullet_yellow.png On-demand download support 2011-11-26 03:45:55 -05:00
chevron-left_808080_32.png Guidance panel for new save icon 2015-06-25 22:51:05 -04:00
chevron-right_808080_32.png Guidance panel for new save icon 2015-06-25 22:51:05 -04:00
citation-add-gray.png Not done yet 2006-10-02 23:46:36 +00:00
citation-add.png Not done yet 2006-10-02 23:46:36 +00:00
citation-delete-gray.png Not done yet 2006-10-02 23:46:36 +00:00
citation-delete.png Not done yet 2006-10-02 23:46:36 +00:00
citation-down-gray.png - add Frank's citation re-ordering patch, with a few changes 2010-06-06 00:01:11 +00:00
citation-down.png - add Frank's citation re-ordering patch, with a few changes 2010-06-06 00:01:11 +00:00
citation-up-gray.png - add Frank's citation re-ordering patch, with a few changes 2010-06-06 00:01:11 +00:00
citation-up.png - add Frank's citation re-ordering patch, with a few changes 2010-06-06 00:01:11 +00:00
cog.png Not done yet 2006-10-02 23:46:36 +00:00
cog@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
control_stop_blue.png Missing icon from previous commit 2008-11-29 14:14:53 +00:00
control_stop_blue@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
cross-script.png Add icons to context menus 2013-04-13 01:53:02 -05:00
cross.png - better interface for PDF recognizer 2008-09-03 06:20:19 +00:00
document-search-result.png Add icons to context menus 2013-04-13 01:53:02 -05:00
drive_network.png Adds WebDAV file sync 2008-08-31 23:36:01 +00:00
edit-list-order.png Add icons to context menus 2013-04-13 01:53:02 -05:00
error.png Rename error/warning icons 2015-05-19 22:42:43 -04:00
error@2x.png Rename error/warning icons 2015-05-19 22:42:43 -04:00
errorReport.css Error report improvements 2014-05-26 20:07:41 -04:00
group_add.png 2.0b3 megacommit 2009-05-14 18:23:40 +00:00
integration.css Fix box scrolling 2013-05-23 23:27:29 -04:00
itemPane.css Make "Restore to Library" button look somewhat less awful 2012-01-16 23:04:36 -05:00
lifebuoy.png Add icons to context menus 2013-04-13 01:53:02 -05:00
locate-external-viewer.png - locate menu tweaks (needs more testing) 2011-02-11 08:07:20 +00:00
locate-external-viewer@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
locate-internal-viewer.png - locate menu tweaks (needs more testing) 2011-02-11 08:07:20 +00:00
locate-library-lookup.png - locate menu tweaks (needs more testing) 2011-02-11 08:07:20 +00:00
locate-show-file.png - locate menu tweaks (needs more testing) 2011-02-11 08:07:20 +00:00
locate-view-online.png - locate menu tweaks (needs more testing) 2011-02-11 08:07:20 +00:00
locate-view-online@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
longTagFixer.css Long tag fixer tool -- runs automatically if server returns a long tag error, giving the option to split, edit, or delete the offending tag 2009-05-29 11:49:55 +00:00
merge.css Update conflict resolution for API syncing 2015-08-06 04:14:49 -04:00
minus-active.png shrink +/- buttons by 2px 2011-02-14 07:40:04 +00:00
minus.png shrink +/- buttons by 2px 2011-02-14 07:40:04 +00:00
overlay.css Merge branch '4.0' 2015-06-27 16:59:58 -04:00
page-white-add@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
page_white_add.png Add icons to context menus 2013-04-13 01:53:02 -05:00
pie.png File sync overhaul 2012-12-11 15:16:40 -05:00
plus-active.png shrink +/- buttons by 2px 2011-02-14 07:40:04 +00:00
plus.png shrink +/- buttons by 2px 2011-02-14 07:40:04 +00:00
preferences.css Move shortcut keys prefpane to tab of Advanced 2015-03-09 12:08:31 +01:00
prefs-advanced.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
prefs-export.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
prefs-general.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
prefs-keys.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
prefs-proxies.png closes #743, Support non-EZproxy proxies 2008-07-28 11:11:12 +00:00
prefs-search.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
prefs-styles.png fixes #1030, CSL broken on trunk due to XML namespace change 2008-06-20 06:40:05 +00:00
prefs-sync.png Initial Zotero 1.5 Megacommit 2008-05-04 08:32:48 +00:00
progress_arcs.png Server-side translation and attachment upload, part 1 2012-04-09 00:46:50 -04:00
publicationsDialog.css Add wizard for My Publications 2015-04-26 19:41:45 -04:00
puzzle-arrow.png Add icons to context menus 2013-04-13 01:53:02 -05:00
report_user.png Support for NSF Reviewer item type (for NSF use only -- not installed by default) 2010-01-15 21:55:25 +00:00
rtfscan-accept.png Adds RTF scan feature. this could probably use some more testing. Acceptable citations are in the form 2009-05-01 11:46:07 +00:00
rtfscan-link.png Adds RTF scan feature. this could probably use some more testing. Acceptable citations are in the form 2009-05-01 11:46:07 +00:00
standalone.css Don't display snapshot or link from page context menus for Standalone 2013-05-18 23:01:24 -05:00
tab.css remove "create item from current page" from tab 2011-02-12 22:18:46 +00:00
tag-automatic.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
tag-automatic@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
tag-selector-menu.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
tag-selector-menu@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
tag.png Not done yet 2006-10-02 23:46:36 +00:00
tag@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
tagColorChooser.css Tag colors, synced settings, and (stopgap) silent DB upgrades 2013-03-03 06:23:25 -05:00
textfield-dual.png Not done yet 2006-10-02 23:46:36 +00:00
textfield-single.png Not done yet 2006-10-02 23:46:36 +00:00
tick.png closes #1043, store EndNote® styles as binary blobs 2008-06-22 17:16:43 +00:00
toolbar-advanced-search.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
toolbar-advanced-search@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
toolbar-collection-add.png Not done yet 2006-10-02 23:46:36 +00:00
toolbar-collection-add@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
toolbar-collection-delete.png Add icons to context menus 2013-04-13 01:53:02 -05:00
toolbar-collection-delete@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
toolbar-collection-edit-gray.png Not done yet 2006-10-02 23:46:36 +00:00
toolbar-collection-edit.png Not done yet 2006-10-02 23:46:36 +00:00
toolbar-collection-edit@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
toolbar-fullscreen-bottom.png Zotero as a tab. This may need to be backed out for 2.1 depending on the amount of trouble it generates. 2011-01-30 09:44:01 +00:00
toolbar-fullscreen-top.png Not done yet 2006-10-02 23:46:36 +00:00
toolbar-fullscreen-top@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
toolbar-go-arrow-disabled.png Not done yet 2006-10-02 23:46:36 +00:00
toolbar-go-arrow.png Not done yet 2006-10-02 23:46:36 +00:00
toolbar-go-arrow@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
toolbar-item-add.png Not done yet 2006-10-02 23:46:36 +00:00
toolbar-item-add@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
toolbar-link-add.png Not done yet 2006-10-02 23:46:36 +00:00
toolbar-link-add@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
toolbar-lookup.png fixed the newitem from page icon (it was too bright) and created a new lookup icon...it is a magic wand. 2009-04-29 22:56:46 +00:00
toolbar-note-add.png Not done yet 2006-10-02 23:46:36 +00:00
toolbar-note-add@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
toolbar-snapshot-add.png Not done yet 2006-10-02 23:46:36 +00:00
treeitem-artwork.png Not done yet 2006-10-02 23:46:36 +00:00
treeitem-artwork@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-attachment-link.png Not done yet 2006-10-02 23:46:36 +00:00
treeitem-attachment-link@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-attachment-pdf.png Server-side translation and attachment upload, part 1 2012-04-09 00:46:50 -04:00
treeitem-attachment-snapshot.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
treeitem-attachment-web-link.png Not done yet 2006-10-02 23:46:36 +00:00
treeitem-attachment-web-link@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-audioRecording.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-audioRecording@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-bill.png Items Icons http://forums.zotero.org/discussion/8544/icon-for-presentation-icon-for-document/ 2012-05-15 19:24:36 +02:00
treeitem-bill@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-blogPost.png Items Icons http://forums.zotero.org/discussion/8544/icon-for-presentation-icon-for-document/ 2012-05-15 19:24:36 +02:00
treeitem-book.png Not done yet 2006-10-02 23:46:36 +00:00
treeitem-book@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-bookSection.png Not done yet 2006-10-02 23:46:36 +00:00
treeitem-bookSection@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-case.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-computerProgram.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
treeitem-computerProgram@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-conferencePaper.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
treeitem-dictionaryEntry.png Add new icons to items currently using blank documents. Update icons for some items. 2012-05-02 01:52:37 +02:00
treeitem-email.png Items Icons http://forums.zotero.org/discussion/8544/icon-for-presentation-icon-for-document/ 2012-05-15 19:24:36 +02:00
treeitem-encyclopediaArticle.png Add new icons to items currently using blank documents. Update icons for some items. 2012-05-02 01:52:37 +02:00
treeitem-film.png Not done yet 2006-10-02 23:46:36 +00:00
treeitem-film@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-forumPost.png Add new icons to items currently using blank documents. Update icons for some items. 2012-05-02 01:52:37 +02:00
treeitem-hearing.png Items Icons http://forums.zotero.org/discussion/8544/icon-for-presentation-icon-for-document/ 2012-05-15 19:24:36 +02:00
treeitem-instantMessage.png Add new icons to items currently using blank documents. Update icons for some items. 2012-05-02 01:52:37 +02:00
treeitem-instantMessage@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-interview.png Not done yet 2006-10-02 23:46:36 +00:00
treeitem-interview@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-journalArticle.png modified icons that work with ImageMagick (not sure why the old versions didn't) 2010-09-23 04:21:19 +00:00
treeitem-journalArticle@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-letter.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
treeitem-letter@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-magazineArticle.png Add new icons to items currently using blank documents. Update icons for some items. 2012-05-02 01:52:37 +02:00
treeitem-magazineArticle@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-manuscript.png Items Icons http://forums.zotero.org/discussion/8544/icon-for-presentation-icon-for-document/ 2012-05-15 19:24:36 +02:00
treeitem-map.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
treeitem-newspaperArticle.png Not done yet 2006-10-02 23:46:36 +00:00
treeitem-newspaperArticle@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-note-small.png On-demand download support 2011-11-26 03:45:55 -05:00
treeitem-note.png Not done yet 2006-10-02 23:46:36 +00:00
treeitem-note@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-patent.png Items Icons http://forums.zotero.org/discussion/8544/icon-for-presentation-icon-for-document/ 2012-05-15 19:24:36 +02:00
treeitem-podcast.png Items Icons http://forums.zotero.org/discussion/8544/icon-for-presentation-icon-for-document/ 2012-05-15 19:24:36 +02:00
treeitem-presentation.png Items Icons http://forums.zotero.org/discussion/8544/icon-for-presentation-icon-for-document/ 2012-05-15 19:24:36 +02:00
treeitem-radioBroadcast.png - merge WorldCat translators and fix search (for ISBNs, at least) 2009-04-15 09:15:58 +00:00
treeitem-report.png Items Icons http://forums.zotero.org/discussion/8544/icon-for-presentation-icon-for-document/ 2012-05-15 19:24:36 +02:00
treeitem-report@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem-statute.png Items Icons http://forums.zotero.org/discussion/8544/icon-for-presentation-icon-for-document/ 2012-05-15 19:24:36 +02:00
treeitem-thesis.png Items Icons http://forums.zotero.org/discussion/8544/icon-for-presentation-icon-for-document/ 2012-05-15 19:24:36 +02:00
treeitem-tvBroadcast.png Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00
treeitem-videoRecording.png Add new icons to items currently using blank documents. Update icons for some items. 2012-05-02 01:52:37 +02:00
treeitem-webpage.png Revert new webpage icon from 34f074e5 for now 2012-06-07 04:00:22 -04:00
treeitem-webpage@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treeitem.png modified icons that work with ImageMagick (not sure why the old versions didn't) 2010-09-23 04:21:19 +00:00
treeitem@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treesource-bucket.png Add Zotero Commons feature (integration between Zotero and Internet Archive). 2009-08-13 10:56:47 +00:00
treesource-collection.png Not done yet 2006-10-02 23:46:36 +00:00
treesource-collection@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treesource-commons.png Add Zotero Commons feature (integration between Zotero and Internet Archive). 2009-08-13 10:56:47 +00:00
treesource-duplicates.png Duplicate detection: 2011-07-22 21:24:38 +00:00
treesource-duplicates@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treesource-groups.png 2.0b3 megacommit 2009-05-14 18:23:40 +00:00
treesource-library.png Not done yet 2006-10-02 23:46:36 +00:00
treesource-library@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treesource-search.png Not done yet 2006-10-02 23:46:36 +00:00
treesource-search@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treesource-share.png Adds rudimentary Zeroconf support to Zotero (a.k.a. "Z(ot)eroconf") 2008-06-03 05:26:30 +00:00
treesource-trash-full.png Display trash can all the time, unless showTrashWhenEmpty is set to false 2009-01-31 06:19:14 +00:00
treesource-trash-full@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treesource-trash.png Display trash can all the time, unless showTrashWhenEmpty is set to false 2009-01-31 06:19:14 +00:00
treesource-trash@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
treesource-unfiled.png Missed file from previous commit 2011-07-22 21:50:32 +00:00
treesource-unfiled@2x.png Add 2x versions of many icons 2015-04-06 17:24:55 -04:00
upgrade.css Closes #1543, Add db integrity check for 1.0 to 2.0 upgrades 2009-12-29 22:21:54 +00:00
warning.png Rename error/warning icons 2015-05-19 22:42:43 -04:00
warning@2x.png Rename error/warning icons 2015-05-19 22:42:43 -04:00
zotero-new-z-16px.png Commit Z icon 2011-07-29 16:04:42 +00:00
zotero-new-z-48px.png First run guidance for save icon 2011-10-03 04:44:40 +00:00
zotero-z-16px-active.png Not done yet 2006-10-02 23:46:36 +00:00
zotero-z-16px.png Not done yet 2006-10-02 23:46:36 +00:00
zotero-z-24px-active.png Not done yet 2006-10-02 23:46:36 +00:00
zotero-z-24px.png Not done yet 2006-10-02 23:46:36 +00:00
zotero-z-32px-australis.svg Fix color of Z icon on OS X for current Firefox theme 2015-02-18 05:39:29 -05:00
zotero.css Merge branch '4.0' 2015-07-18 07:09:53 -04:00
zotero_z_32px.png Not done yet 2006-10-02 23:46:36 +00:00