Merged revisions 10837-10838,10841-10853 via svnmerge from

Merged revisions 10837-10838,10841-10853 via svnmerge from
svn://svn.open-ils.org/ILS/trunk

........
  r10837 | erickson | 2008-10-15 21:09:18 -0400 (Wed, 15 Oct 2008) | 1 line

  by default, wait less time for added content data to return (to prevent apache process exhaustion), but be more forgiving of errors
........
  r10838 | dbs | 2008-10-15 23:54:49 -0400 (Wed, 15 Oct 2008) | 3 lines

  Add a quick Dojo resource bundle <-> POT roundtripping script
  Ensure Dojo resource bundles adhere to JSON formatting specs
........
  r10841 | erickson | 2008-10-16 11:36:04 -0400 (Thu, 16 Oct 2008) | 1 line

  removed import of non-public packages.   testing showed they were not required and they change with dojo 1.2
........
  r10842 | erickson | 2008-10-16 12:06:41 -0400 (Thu, 16 Oct 2008) | 1 line

  added vandelay menu label and copy-location editor hold verify labels
........
  r10843 | dbs | 2008-10-16 12:19:56 -0400 (Thu, 16 Oct 2008) | 1 line

  Enable localization of Conify
........
  r10844 | phasefx | 2008-10-16 12:35:31 -0400 (Thu, 16 Oct 2008) | 1 line

  change the titlebar for the login window to indicate the target server version
........
  r10845 | phasefx | 2008-10-16 12:46:39 -0400 (Thu, 16 Oct 2008) | 1 line

  exercise the No Propogate Search option when staff opens a new catalog search tab
........
  r10846 | phasefx | 2008-10-16 12:54:06 -0400 (Thu, 16 Oct 2008) | 56 lines

  Patch to better handle migration of settings on the filesystem.  Thanks Jeff!

  ===
  Greetings-

  I found that when using open-ils.write_in_user_chrome_directory set to
  true, the staff client would store local settings in the application
  chrome directory, but the next time the client was run, it would
  inappropriately attempt to migrate the settings from the application
  chrome directory to the user chrome directory.

  If you allowed the settings to be migrated, on the third run, things would
  get even more confused.

  The attached patch causes the migration check in main_init() to respect
  the open-ils.write_in_user_chrome_directory preference, and not migrate
  the local settings out of the application chrome directory if the
  preference dictates that they should remain there.

  DCO inline below, patch is attached. Feedback welcome!

  -jeff

  Developer's Certificate of Origin 1.1

  By making a contribution to this project, I certify that:

  (a) The contribution was created in whole or in part by me and I
     have the right to submit it under the open source license
     indicated in the file; or

  (b) The contribution is based upon previous work that, to the best
     of my knowledge, is covered under an appropriate open source
     license and I have the right under that license to submit that
     work with modifications, whether created in whole or in part
     by me, under the same open source license (unless I am
     permitted to submit under a different license), as indicated
     in the file; or

  (c) The contribution was provided directly to me by some other
     person who certified (a), (b) or (c) and I have not modified
     it.

  (d) I understand and agree that this project and the contribution
     are public and that a record of the contribution (including all
     personal information I submit with it, including my sign-off) is
     maintained indefinitely and may be redistributed consistent with
     this project or the open source license(s) involved.

  Signed-off-by: Jeff Godin <jeff@tcnet.org>
  --
  Jeff Godin <jeff@tcnet.org>
  Traverse Area District Library
........
  r10847 | erickson | 2008-10-16 13:53:55 -0400 (Thu, 16 Oct 2008) | 1 line

  dummied up a native catalog z-source config blob
........
  r10848 | dbs | 2008-10-16 14:10:40 -0400 (Thu, 16 Oct 2008) | 1 line

  Add Conify i18n build rules and POT files
........
  r10849 | phasefx | 2008-10-16 14:37:18 -0400 (Thu, 16 Oct 2008) | 1 line

  use the xul service row for native-evergreen-catalog since it's I18N'ized
........
  r10850 | phasefx | 2008-10-16 15:03:06 -0400 (Thu, 16 Oct 2008) | 1 line

  we're going to let the middle layer completely handle the limit for past circ retrieval
........
  r10851 | erickson | 2008-10-16 15:04:09 -0400 (Thu, 16 Oct 2008) | 1 line

  if no max is configured and no valid count from the SC, default to 4, which was the previous default
........
  r10852 | phasefx | 2008-10-16 15:57:47 -0400 (Thu, 16 Oct 2008) | 1 line

  rough cut of Checkout interface using checkout.full method.  Appears to work, but at least one rough spot with redundant override dialogs
........
  r10853 | erickson | 2008-10-16 16:27:04 -0400 (Thu, 16 Oct 2008) | 1 line

  during precats, assume override on checkout.full
........

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@10856 dcc99617-32d9-48b4-a31d-7c20da2025e4