mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1604 commits 9 branches 362 tags 278 MiB
Commit graph

1062 commits

Author SHA1 Message Date
Dan Stillman
b9121177e5 Display prompt on locked session 2009-01-02 06:45:40 +00:00
Dan Stillman
3b0f20c493 Add initial implementations of "Restore to Server" and "Restore from Server" to the Sync pref pane 2009-01-02 00:35:09 +00:00
Dan Stillman
d26eed03dc Update expiry date 2008-12-31 20:22:41 +00:00
Dan Stillman
3122339d8a Adding as new file 2008-12-29 21:03:52 +00:00
Dan Stillman
93474c1e80 This is annoying. 2008-12-29 21:02:06 +00:00
Dan Stillman
3e9437dcbd Re-copying arrow-down.gif from branch 2008-12-29 20:58:43 +00:00
Dan Stillman
72670ad446 Trying to fix another annoying SVN auth issue/bug 2008-12-29 20:57:46 +00:00
Dan Stillman
a28b54bae6 Use SQL that actually works with SQLite 2008-12-29 10:33:32 +00:00
Dan Stillman
2468ad5dfc Fix a potential upgrade error due to the initial 1.5 migration step not adding a UNIQUE index to key in syncDeleteLog 2008-12-29 10:31:29 +00:00
Dan Stillman
38be4790a1 Merged r3901 from branch 2008-12-29 09:38:58 +00:00
Dan Stillman
f2cd272786 Merged r3888 from branch 2008-12-29 09:35:11 +00:00
Dan Stillman
8512ba8d39 Merge revisions from branch 2008-12-29 07:57:20 +00:00
Dan Stillman
f2d8c72ec1 Fixes #1255, Link to parent file in note title broken 2008-12-29 07:09:21 +00:00
Dan Stillman
8ad23d7eea - Abstract attachment info pane into XBL binding 
- Add attachment conflict resolution
 2008-12-29 06:18:41 +00:00
Dan Stillman
1d972ae92c If a tag is deleted remotely and modified locally, keep local and display warning 2008-12-27 07:24:55 +00:00
Dan Stillman
c7b2c84869 - Add automatic merging of collection and tag metadata and associated items, with warning alerts (eventually to be converted to logged notifications) 
- Switch to using only keys for deleted items
- Fix various tag-related problems
- Probably other things
 2008-12-27 05:42:52 +00:00
Dan Stillman
b4c0df32cc Fix one or two tag errors resulting from an uncleared cache 2008-12-26 01:10:55 +00:00
Dan Stillman
2cfcec4d8e Fix error when renaming tag to an existing tag with no associated items 2008-12-25 21:46:21 +00:00
Dan Stillman
7e5eecae6e Add 1/4-second delay to advanced search autocomplete 2008-12-24 14:57:37 +00:00
Dan Stillman
107c1bdf4b Keep focus in creator field when using two-field autocomplete 2008-12-22 09:48:25 +00:00
Simon Kornblith
f5fb1fa806 don't download snapshots when snapshot is given as a document object and automaticSnapshots preference is false 2008-12-21 18:16:31 +00:00
Dan Stillman
574e6197a2 Fixes bug in test for quoted string when value is numeric 2008-12-20 16:16:01 +00:00
Dan Stillman
9d9d4faffb Fixes #1244, duplicating changes editors into authors 2008-12-20 07:00:41 +00:00
Dan Stillman
573dea6dcd Addresses #1262, Broken pluralization with et al. + other issues 
Values enclosed in double quotes now fail is-numeric test, and the double quotes are stripped on output to CSL -- if any fields actually need enclosing quotes, this could be limited to certain fields such as edition.
 2008-12-20 01:18:15 +00:00
Dan Stillman
2689f92335 Fixes #1265, Year suffix disambiguation doesn't scale 
Patch seems to work (tested with "2007z", "2007aa", "2007ab") -- applying to branch and trunk
 2008-12-19 23:15:52 +00:00
Dan Stillman
bac79ed2ac Addresses #1262, Broken pluralization with et al. + other issues 
Patch 1 from Frank -- Names using "et al." were incorrectly being considered singular
 2008-12-19 22:40:09 +00:00
Dan Stillman
dbb07937f0 Fix for attachment/note tag popup not displaying in Firefox 3 if there wouldn't be enough space on screen -- now auto-adjusts, though possibly with some artifacts after closing on OS X 2008-12-17 10:14:12 +00:00
Dan Stillman
b5f3448304 Fixes #1253, Note export generates invalid RDF 
In Item.toArray(), use toArray() for descendants as well
 2008-12-15 05:51:35 +00:00
Dan Stillman
16f98f76e0 Disable duplication only for tagged items, not all items 2008-12-02 09:36:41 +00:00
Dan Stillman
c95ce030ba Work around createUnique() brokenness on Windows (fixed in Fx3.0.5, but that's a couple weeks off) that was causing schema upgrade errors 2008-12-02 07:50:24 +00:00
Dan Stillman
f95291af88 Fix broken doc prefs window 2008-12-01 20:51:16 +00:00
Dan Stillman
8012d08354 Not going to deal with merging locales right now 2008-12-01 08:57:46 +00:00
Dan Stillman
39fd9b55d7 Updated comments 2008-12-01 08:33:07 +00:00
Dan Stillman
727426fd4f Fix erroneous conflict after deleting an item and then deleting the collection it was in 2008-12-01 08:31:59 +00:00
Dan Stillman
faa9f2345c Update expiry date 2008-11-30 20:22:13 +00:00
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
2a1caa7227 Missing icon from previous commit 2008-11-29 14:14:53 +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
04ea113823 Change invalid style warning to allow for non-CSL styles 2008-10-28 17:53:30 +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