scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-10-13 03:58:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
2451 commits 12 branches 405 tags 332 MiB
Commit graph

2451 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Stillman
133c538eaa Merged r6155 from trunk 2010-06-16 19:55:37 +00:00
Dan Stillman
95899f334e Merged [6144] and [6153] from trunk 2010-06-16 18:14:40 +00:00
Dan Stillman
8ad51f1585 Merged [6100],[6103],[6106],[6114-6117],[6126],[6128],[6130-6131] from trunk 2010-06-14 12:10:28 +00:00
Dan Stillman
84b5815b66 Merged [6084-6085], [6091] from trunk 2010-06-05 20:34:19 +00:00
Dan Stillman
e04f71f596 Merged [6086-6089] from trunk 2010-06-05 20:28:21 +00:00
Dan Stillman
6ce4aa6808 Merged updated translators from trunk 2010-05-31 18:18:56 +00:00
Dan Stillman
e4440ae0c2 Merging r6031 from trunk 2010-05-13 07:44:22 +00:00
Dan Stillman
6259bc5135 Merging r6029 from trunk 2010-05-11 19:51:32 +00:00
Dan Stillman
a20ec98459 Merging r6027 from trunk 2010-05-10 21:15:14 +00:00
Dan Stillman
c7a1ab8d9f Merging r6022 from trunk 2010-05-05 18:07:45 +00:00
Dan Stillman
16998b07e0 Merging r6020 from trunk 2010-05-05 16:08:28 +00:00
Dan Stillman
a9e8d96501 Merging r5991 from trunk 2010-05-04 22:26:43 +00:00
Dan Stillman
ecdfeafc63 Merging [6009-6010] from trunk 2010-05-04 22:25:23 +00:00
Dan Stillman
f8279416ff Merging r6014 from trunk 2010-05-04 16:29:39 +00:00
Dan Stillman
338d415eb0 Merge r6007 from trunk 2010-05-01 05:47:14 +00:00
Dan Stillman
13ec134c52 Merged r5973 from trunk 2010-04-19 05:39:19 +00:00
Dan Stillman
a8ac41e60f Merged r5962 from trunk 2010-04-12 19:43:15 +00:00
Dan Stillman
2d876c3383 Merged r5960 from trunk 2010-04-12 19:28:18 +00:00
Dan Stillman
0f39fd12a8 Merging r5958 to 2.0 branch 2010-04-12 15:34:27 +00:00
Dan Stillman
108a90b1ee Merged r5956 to 2.0 branch 2010-04-10 20:23:34 +00:00
Dan Stillman
79448e77f8 Merge r5954 from trunk 2010-04-09 16:49:03 +00:00
Dan Stillman
b7c76b1a83 Merged r5951 from trunk 2010-04-08 13:09:21 +00:00
Dan Stillman
c1c4bec343 Adjust minVersion on ISI WoK 2010-04-01 22:54:20 +00:00
Dan Stillman
01685944d4 Merging r5921-5927 from trunk 2010-04-01 22:52:50 +00:00
Dan Stillman
8731038009 Merged ISI WoK to 2.0 branch 2010-04-01 22:50:01 +00:00
Dan Stillman
8d84b96471 Merged r5934 from trunk 2010-04-01 18:02:01 +00:00
Dan Stillman
5b6b70e3d0 Merged r5900 from trunk 2010-03-24 10:01:09 +00:00
Dan Stillman
71a5d48cdf Merge r5898 from trunk, plus some metadata that SVN really wants to add 2010-03-23 19:42:14 +00:00
Dan Stillman
b3a19f1ccc Update Ovid regexp 2010-03-23 19:11:00 +00:00
Dan Stillman
bddbe2790f Fix startup error from previous commit 2010-03-23 19:09:47 +00:00
Dan Stillman
5a3329398c Merging r5891 to 2.0 branch 2010-03-22 07:06:42 +00:00
Dan Stillman
381b734c17 Update CSL symlinks for branch 2010-03-21 05:49:29 +00:00
Dan Stillman
0e8e92de05 2.0 branch 2010-03-21 05:33:03 +00:00
Dan Stillman
b1251e327f Fixes #1635, UI glitches during syncing 
New property Zotero.suppressUIUpdates is now set while processing sync data
 2010-03-18 07:06:38 +00:00
Dan Stillman
6f667f3091 - Replace "Report Error" with "Show File" in read-only file sync error dialog, and show full file path 
- Fix endless sync icon spinning after read-only file sync error
- Adjust spacing of sync error icon on Windows
 2010-03-17 07:59:43 +00:00
Dan Stillman
baa735827e Disable Reset feedback, since it causes endless sync icon spinning if the pref window is closed 2010-03-17 07:55:36 +00:00
Dan Stillman
59050a5162 Remove Zotero.wait() from previous commit 2010-03-16 23:57:26 +00:00
Dan Stillman
bccf67ab0a Add Zotero.wait() to file size calculation during sync to attempt to avoid unresponsive script warning 2010-03-16 22:45:43 +00:00
Dan Stillman
1182fa38e2 Work around an SQLite limit that can cause a 1.0->2.0 upgrade error in very rare cases (in code from July 2008) 2010-03-15 07:16:05 +00:00
Dan Stillman
e7ac87754e Update SVN version so that it's >2.0 2010-03-14 07:37:26 +00:00
Dan Stillman
ac3fae0f6e Update version number 2010-03-14 07:33:04 +00:00
Dan Stillman
4ca2048716 Data directory changing required two restarts in Firefox 3.6 on Windows 2010-03-12 22:05:18 +00:00
Dan Stillman
532853184f - Restart sync if items were changed during upload to avoid 404 file sync errors 
- Show sync status in all windows
- Don't attempt to auto-sync on Zotero pane open if a sync is already in progress
- Fix some sync process callbacks
 2010-03-12 08:29:31 +00:00
Dan Stillman
174ee723a1 Don't prompt for master password on every startup (since 2.0.1) 2010-03-12 05:28:11 +00:00
Dan Stillman
d464ec46df Rephrase conflict warning 2010-03-11 17:25:37 +00:00
Dan Stillman
89b8c83e5f Update localizer names 2010-03-10 20:49:26 +00:00
Dan Stillman
2b62e2fb64 Parse spaces and em dashes in page ranges 2010-03-10 05:35:49 +00:00
Dan Stillman
d01b5d69e4 Fix another place where incorrect mod time could be read in 2010-03-09 16:00:08 +00:00
Dan Stillman
d01e819f45 Fix restoration of full-screen mode when opening Zotero pane (does not persist across Firefox restarts) 2010-03-09 06:26:08 +00:00
Dan Stillman
d4dd05fc21 Reindex search condition ids on search load in case they're not contiguous (fixes sync error) 2010-03-09 06:07:45 +00:00