mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
1556 commits 9 branches 364 tags 290 MiB
Commit graph

400 commits

Author SHA1 Message Date
Dan Stillman
337b16361a Merge [3617-3838] from branch to trunk 2008-11-30 20:18:48 +00:00
Dan Stillman
6456b6f561 Adds partial collection conflict resolution support -- items are auto-merged, and an alert is displayed. Support for collection metadata and collection hierarchy conflicts is forthcoming, and the alert will be fed to a new notifications system. 2008-11-30 19:30:15 +00:00
Dan Stillman
49a7537fa6 Much improved storage syncing (theoretically) 
Metadata sync now always runs before storage sync, and file transfers can be stopped.

Needs testing
 2008-11-29 14:13:29 +00:00
Dan Stillman
e161f19272 Clarify the 990 2008-11-26 08:42:45 +00:00
Dan Stillman
5d7b37a157 Account for other bound parameters in statement when setting max 2008-11-26 07:45:55 +00:00
Dan Stillman
d387f99710 Merge r3824 to trunk 2008-11-25 21:54:08 +00:00
Dan Stillman
5cd824136e Fix translator error reporting on trunk (inRepository property was missing on Zotero.Translator objects) 2008-11-25 17:13:57 +00:00
Dan Stillman
6078eb1d59 Update schema migration comments 2008-11-24 09:12:49 +00:00
Dan Stillman
ca30ea2ff8 Register difference between tags if linked items change 2008-11-21 08:32:49 +00:00
Dan Stillman
9e8d822b90 Fix another problem with Sakai's href attribute handling 2008-11-20 21:29:54 +00:00
Dan Stillman
c942afb2b0 Until it's fixed, add a proper error message when trying to duplicate an item 2008-11-18 00:06:36 +00:00
Dan Stillman
7c081170d5 Fix error replacing non-empty export directory 2008-11-16 13:36:59 +00:00
Dan Stillman
63c90f2ae7 Display error icon and message on sync attempt if browser is offline 2008-11-15 21:01:23 +00:00
Dan Stillman
e45ee36117 Fix invalid progress values due to Firefox bug (fixed in 3.1) 2008-11-15 20:26:36 +00:00
Dan Stillman
6a9b372e66 Fixes #1204, Automatic proxy code gets stuck in a loop 2008-11-15 16:35:02 +00:00
Dan Stillman
3d615f2b9c - Fix errors when auto-saving proxies with transparent setting off (due to proxy variable not being set) 
- Fixed display of proxy settings validation failure window
- Tweaked validation failure window title
 2008-11-14 19:15:18 +00:00
Dan Stillman
03a0cced19 New expiry date 2008-11-14 18:39:06 +00:00
Dan Stillman
cdcb7533b2 Apply the rest of r3775 to trunk 2008-11-14 17:20:21 +00:00
Dan Stillman
4438ef9ee8 Fix display error in metadata pane if Abstract or Extra was stored as integer 2008-11-14 17:19:30 +00:00
Dan Stillman
c6ae811dde Remove temp directory on shutdown 2008-11-14 13:43:01 +00:00
Dan Stillman
6f9033d206 Resolve some compatibility issues with Jungle Disk (though none that would've caused failures, as far as I can tell) 
Storage username/password are no longer required, since JungleDiskMonitor doesn't require them
 2008-11-14 12:55:47 +00:00
Dan Stillman
ecfc779b2d Fix breakage in post-3.0.4 Firefox builds due to SQLite 3.6.4 upgrade (due to 'indexed' keyword from new INDEXED BY syntax) 2008-11-14 11:40:15 +00:00
Dan Stillman
a76eaef5bf Fixes #1214, different translator behavior on the branch and the trunk 
Fix error when creator name field is left blank in two-field mode
 2008-11-13 15:30:03 +00:00
Dan Stillman
79a89184d2 Upload objects earlier than earliest object mod time on server -- with any luck, this will fix the majority of "Invalid response" sync errors 2008-11-12 09:58:20 +00:00
Dan Stillman
11f2810586 Fix "New Zotero.Item objects shouldn't be accessed after save" warning during sync 2008-11-10 09:42:57 +00:00
Dan Stillman
fdcc02d953 Add mod time mismatch debugging 2008-11-10 06:34:47 +00:00
Dan Stillman
0cece91741 Better sync/storage error handling 2008-11-08 09:55:57 +00:00
Dan Stillman
12fdfe7dc4 Fix problem changing item types 2008-11-08 08:34:08 +00:00
Dan Stillman
81622ea56f Fix devious id-assignment bug 2008-11-08 08:24:21 +00:00
Dan Stillman
4f2583f1df Fix a few bugs in csl.js 2008-11-06 08:59:30 +00:00
Dan Stillman
79cedb822c Allow periods in sync usernames 2008-11-05 17:28:28 +00:00
Simon Kornblith
2117745a63 - fix bookmarks mode in OOo plug-in 
- disable bookmarks mode for note-based styles
- display an error when attempting to insert a bookmark into a footnote
- closes #1201, Keyboard focus stays in Word when creating or editing a citation
 2008-11-03 10:11:47 +00:00
Dan Stillman
5bb3529c0e Closes #1200, Keyboard focus should go to note 2008-11-01 13:24:58 +00:00
Dan Stillman
c06dd16ffa Fix web-based installation of non-small styles 2008-10-31 19:46:10 +00:00
Dan Stillman
4d7bca4f43 Fix for some numeric directories being left behind during upgrade process, except this time maybe for real 2008-10-31 00:29:04 +00:00
Dan Stillman
b8b75dd115 Don't report any "Unrecognized command line flag" errors 2008-10-30 20:53:47 +00:00
Dan Stillman
a24200b30c Imported snapshot path wasn't being set properly 2008-10-30 19:57:51 +00:00
Dan Stillman
d951bab1be Remove extraneous debugging 2008-10-30 07:15:16 +00:00
Dan Stillman
6f4414ed4d More accurate error message on server error (instead of "Empty response from server") 2008-10-29 19:01:32 +00:00
Simon Kornblith
92ea15948f closes #1186, ask before upgrading field codes 
adds field code warning to Word plug-in and updates API version
 2008-10-29 06:57:34 +00:00
Dan Stillman
9c02d05c33 Update About panel 2008-10-29 04:26:49 +00:00
Dan Stillman
051581cbb0 Make storage sync a bit more open-minded about 20x response codes for PUTs 2008-10-28 21:57:22 +00:00
Dan Stillman
cf644465e3 Fix a couple more potential upgrade errors with space trimming 2008-10-28 06:18:11 +00:00
Dan Stillman
fa2a8bb30e Fix note import 2008-10-28 05:33:54 +00:00
Dan Stillman
e52ea34e2b Fix obj.isAttachment() sync error (which really should be a "Reconciliation unimplemented" error) 2008-10-28 05:18:55 +00:00
Dan Stillman
094fe1c6a2 Fix export error (broken by r3603) 2008-10-28 05:14:06 +00:00
Dan Stillman
b9430a5fb1 Fix potential upgrade error 2008-10-27 22:45:07 +00:00
Dan Stillman
6b82ca8aa6 Fix creator glue 2008-10-27 19:08:04 +00:00
Dan Stillman
2197efc2df Add creator XML as glue if not already included in sync session 2008-10-27 18:48:41 +00:00
Dan Stillman
41a3756102 Restore EndNote® import 2008-10-27 18:16:45 +00:00
Dan Stillman
95024e50d5 Update sync expiry 2008-10-27 18:04:54 +00:00
Dan Stillman
8070a22d08 Load TinyMCE as chrome to avoid NoScript blockage 2008-10-27 16:39:18 +00:00
Dan Stillman
11b05a5a41 Fix upgrade error with empty data values and tags 2008-10-26 22:58:44 +00:00
Dan Stillman
8660095c54 Fixes #1182, Translator priority is ignored 2008-10-25 20:55:02 +00:00
Dan Stillman
5688acbdc9 Fix truncated default terms when using custom <terms> element (http://forums.zotero.org/discussion/4384/) 2008-10-25 10:51:01 +00:00
Dan Stillman
d2118dc5fc Apparently we still use this (in csledit.xul and cslpreview.xul) 2008-10-25 10:47:01 +00:00
Dan Stillman
310e233480 Merged r3581-3616 from 1.0 branch, plus some report tweaks 2008-10-25 08:01:43 +00:00
Dan Stillman
01edde493f Fix error toggling RIS/Refer intercept pref 2008-10-25 07:39:32 +00:00
Dan Stillman
93bbed579e Missed file from r3450-3580 merge from 1.0 branch 2008-10-25 07:38:50 +00:00
Dan Stillman
0f0c531247 Merged r3450-3580 from 1.0 branch 2008-10-25 07:37:47 +00:00
Dan Stillman
f50a5fe603 Run storage server verification automatically when clicking sync button 
If there's a storage error, it either needs to be resolved or file sync needs to be disabled for regular sync to proceed.
 2008-10-25 04:01:36 +00:00
Dan Stillman
99f9bcb79d More tag/space handling 2008-10-25 03:10:50 +00:00
Dan Stillman
6a20d690e0 Fix errors adding tags with leading or trailing spaces to items (since yesterday) 2008-10-25 02:47:47 +00:00
Dan Stillman
7a6656ae5c Fix error from previous commit 2008-10-25 02:09:59 +00:00
Dan Stillman
4f2bcb15d5 Fix error when purging tags that have already been erased 2008-10-24 23:03:53 +00:00
Dan Stillman
56eb416e3e Fix error in doc prefs window if lastStyle is set to an invalid style 2008-10-24 21:08:44 +00:00
Dan Stillman
7a2d7594d4 Fixes #1194, RDF Export fails to export files in 1.5 2008-10-24 20:11:34 +00:00
Dan Stillman
a7f73f0d82 Fix sync regression from previous commit 2008-10-24 11:29:08 +00:00
Dan Stillman
85087c4859 Fix upgrade error from previous commit 2008-10-24 11:14:16 +00:00
Dan Stillman
108fd304ab Fixed lots of sync bugs 
- All string values are now trimmed going into the DB (with a migration step for existing values) -- this fixes erroneous conflicts due to leading/trailing whitespace in sync XML being ignored
- Case disambiguation fixed on server
- Added basic diff ability to collections and tags so that identical objects won't trigger conflicts
- Fixed various other bugs that could cause erroneous conflicts
- Moved string fields in serialize() objects into a 'fields' object for consistency with Zotero.Item

Upshot of most of the above is that identical pre-upgrade libraries should now merge cleanly

Also reorganized/simplified/modularized parts of the sync code
 2008-10-24 11:10:05 +00:00
Dan Stillman
3fdb212dd6 Fix for some attachment directories not being properly migrated to keys 
Also migrates remaining files for past upgrades on the trunk (assuming their ids haven't been changed by syncing--if the item that has a given id already has a directory or if there is no attachment item with that id, the directory will be moved to orphaned-files)
 2008-10-22 07:45:27 +00:00
Dan Stillman
25f8b8350c Fix broken note window when opened without an associated item 2008-10-21 19:19:18 +00:00
Dan Stillman
405c5114b8 Debugging for TinyMCE page load 2008-10-20 22:11:33 +00:00
Dan Stillman
7c0bc7035b Some debug lines for key upgrade process testing 2008-10-17 21:49:43 +00:00
Dan Stillman
0c01dc2d6e - Fix note saving on Windows 
- Remove some extra stuff from read-only note page
 2008-10-17 20:39:39 +00:00
Elena Razlogova
cda9ced2a5 Adds "sub verbo" locator to the trunk 2008-10-17 18:18:27 +00:00
Dan Stillman
df8d13df84 Revert unnecessary change from r3562 2008-10-17 17:37:33 +00:00
Dan Stillman
9373e19aa8 Fix error saving automatic tags 2008-10-17 17:31:34 +00:00
Dan Stillman
d5215618aa Additional debugging for setStorageModificationTime() error 2008-10-17 00:33:22 +00:00
Dan Stillman
994de2e65c Fix TinyMCE in XPI builds 2008-10-16 22:29:26 +00:00
Dan Stillman
4de529c03f Fixed a couple tag-related errors (from caching change) 2008-10-16 17:12:33 +00:00
Dan Stillman
1fad45da63 Fix erroneous caching of attachment path after relinking 2008-10-15 06:27:52 +00:00
Dan Stillman
5b3a3a1ad2 Fix missing space after formatted words in custom citations 2008-10-15 06:14:12 +00:00
Dan Stillman
ad5ac7ba64 - Fix error saving attachments 
- Increase default separate note window height
 2008-10-15 05:30:59 +00:00
Dan Stillman
1d6dea45ec Remove our plaintext timed textarea 2008-10-15 05:26:16 +00:00
Dan Stillman
2bbf3d7c80 - Restored read-only mode for notes (using a separate HTML file, for lack of a better way) 
- HTML file is now loaded on-demand the first time it's required
 2008-10-15 05:24:38 +00:00
Dan Stillman
5e1ca7172a - Reduced TinyMCE to two rows 
- Removed font-family, font-size, full justify
- Restored outdent and indent
- Some style improvements, including quotation marks around blockquotes
 2008-10-14 03:02:26 +00:00
Dan Stillman
31ef0eab13 Moved 'tiny_mce' directory to 'tinymce' 2008-10-13 23:31:53 +00:00
Dan Stillman
ea5d51b93d - Remove indent/outdent buttons 
- Remove extraneous debugging
 2008-10-13 23:27:57 +00:00
Dan Stillman
9dfca12594 Fix creator breakage from object caching changes 2008-10-13 22:33:28 +00:00
Dan Stillman
8f2a7524e7 Fix error during creator add (since data caching change) 2008-10-13 22:05:27 +00:00
Dan Stillman
47285a0567 Convert plaintext notes on the fly, to deal with multi-version syncing issues 2008-10-13 21:12:55 +00:00
Dan Stillman
71ca2c1b2c Fix previous commit 2008-10-13 20:12:19 +00:00
Dan Stillman
80dc7be1be Allow SVN builds without SVN root to still start 2008-10-13 20:11:43 +00:00
Dan Stillman
651bcf2380 Adds rich text support to notes 
- Still a few issues
- Converts plaintext notes to HTML on upgrade
 2008-10-13 19:51:53 +00:00
Dan Stillman
b46860f6a4 - Switch to uncompressed JS files for TinyMCE so we can debug and make changes if necessary 
- Add utils directory containing scripts needed for various features
 2008-10-12 07:51:40 +00:00
Dan Stillman
7f1677d726 Fix error on object delete 2008-10-11 22:11:15 +00:00
Dan Stillman
1434b8aa7a Reworked and standarized data object caching -- this should fix problems of long-term references containing stale, orphaned versions of data objects 2008-10-10 01:48:19 +00:00
Dan Stillman
5f0aa6aa9f Better handling of missing attachments and empty attachment paths 2008-10-08 18:49:48 +00:00
Dan Stillman
675184d160 Firefox 3.1 compatibility fix (from Simon) 2008-10-07 02:56:06 +00:00