Show
Ignore:
Timestamp:
05/26/08 15:52:40 (5 months ago)
Author:
erickson
Message:

Merged revisions 9671-9672,9675,9677-9678,9684-9686,9695,9698-9699,9703-9707 via svnmerge from
svn://svn.open-ils.org/ILS/trunk

........

r9671 | miker | 2008-05-22 15:44:21 -0400 (Thu, 22 May 2008) | 1 line


teach JS about the shortname field on slim org lists

........

r9672 | miker | 2008-05-22 15:54:45 -0400 (Thu, 22 May 2008) | 1 line


adding locale param to org unit fetcher

........

r9675 | miker | 2008-05-22 17:18:10 -0400 (Thu, 22 May 2008) | 1 line


use the configured identifier field

........

r9677 | miker | 2008-05-22 17:32:52 -0400 (Thu, 22 May 2008) | 1 line


further fix for Identifier support

........

r9678 | miker | 2008-05-22 17:44:00 -0400 (Thu, 22 May 2008) | 1 line


identifier is class based

........

r9684 | miker | 2008-05-22 22:20:41 -0400 (Thu, 22 May 2008) | 1 line


Stop being Dan's problem

........

r9685 | dbs | 2008-05-22 22:27:40 -0400 (Thu, 22 May 2008) | 3 lines


Avoid uninitialized variable warning if no locale has been passed in
(Yes, it's okay to have the trailing . in the no-locale situation)

........

r9686 | miker | 2008-05-22 22:43:39 -0400 (Thu, 22 May 2008) | 1 line


start of code map admin interfaces

........

r9695 | phasefx | 2008-05-25 01:14:19 -0400 (Sun, 25 May 2008) | 1 line


I18N version of a patch from Bill Ott for a New Window button on the login window. Thanks!

........

r9698 | phasefx | 2008-05-25 02:47:49 -0400 (Sun, 25 May 2008) | 1 line


remove redundant (and broken) code so alternate pull list works again; thanks to Ryan Laverdiere and Dan Scott

........

r9699 | miker | 2008-05-25 08:58:23 -0400 (Sun, 25 May 2008) | 1 line


add a copy of the DCO for convenience

........

r9703 | dbs | 2008-05-26 12:05:02 -0400 (Mon, 26 May 2008) | 2 lines


Fix missing close-quote character (regression introduced in r9650)

........

r9704 | dbs | 2008-05-26 12:28:56 -0400 (Mon, 26 May 2008) | 2 lines


miker's bane: typo: visiblity -> visibility

........

r9705 | dbs | 2008-05-26 13:25:00 -0400 (Mon, 26 May 2008) | 2 lines


Typo: Fromat -> Format (and a reminder to self to figure out how to i18n-ize this)

........

r9706 | dbs | 2008-05-26 13:33:12 -0400 (Mon, 26 May 2008) | 3 lines


Django admin is dead; alas, multi-db branch was never merged to Django core
Long live Conify in its place!

........

r9707 | dbs | 2008-05-26 14:17:52 -0400 (Mon, 26 May 2008) | 1 line


Merge from svn

........

Location:
branches/acq-experiment
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/acq-experiment

    • Property svnmerge-integrated changed from /trunk:1-9669 to /trunk:1-9707
    • Property bzr:revision-id:v3-trunk0 set to
      8490 dscott@laurentian.ca-20080526181745-56agjebce7qcrvs4
    • Property bzr:revision-info set to
      timestamp: 2008-05-26 14:17:45.812000036 -0400
      committer: Dan Scott <dscott@laurentian.ca>
      properties:
      branch-nick: mainline

  • branches/acq-experiment/Open-ILS/examples/apache/eg_vhost.conf

    r9507 r9708  
    262262</Location> 
    263263 
    264  
    265 # ---------------------------------------------------------------------------------- 
    266 # Django admin interface (experimental) 
    267 #  - requires mod_python and django 
    268 #  - requires a symlink from WEBROOT/media to  
    269 #  /usr/lib/python2.4/site-packages/django/contrib/admin/media/ (or similar) 
    270 # ---------------------------------------------------------------------------------- 
    271 #<Location /ils_setup/> 
    272 #   Order deny,allow 
    273 #   Deny from all 
    274 #   Allow from 10.0.0.0/8 
    275 #   SetHandler mod_python 
    276 #   PythonHandler django.core.handlers.modpython 
    277 #   SetEnv DJANGO_SETTINGS_MODULE ils_admin.settings 
    278 #   PythonDebug On 
    279 #   PythonPath "['/openils/var/admin/', '/usr/lib/python2.4/site-packages/'] +sys.path" 
    280 #   PythonAutoReload On 
    281 #</Location> 
    282  
    283