The following changes since commit 147eee0e22c0e0c38ee2a918d6b8cffe4247fb76:
  Jesse Weaver (1):
        Data files for new system preferences editor

are available in the git repository at:

  git://github.com/pianohacker/koha.git prefs-submit

Jesse Weaver (4):
      Fix for markup error in sysprefs languages chooser
      Add and change preferences, change tab names in sysprefs editor
      Fix for errors introduced by previous commit
      Minor JavaScript fixes

Owen Leonard (2):
      Minor tweaks and XHTML corrections
      Reformat system pref sections as collapsible blocks

 .../intranet-tmpl/prog/en/css/preferences.css      |   38 +++++++++
 .../intranet-tmpl/prog/en/includes/prefs-menu.inc  |    6 +-
 .../intranet-tmpl/prog/en/js/pages/preferences.js  |   16 ++++
 .../prog/en/modules/admin/preferences.tmpl         |   86
+++++++++++---------
 .../prog/en/modules/admin/preferences/admin.pref   |    5 +
 .../en/modules/admin/preferences/cataloguing.pref  |   40 ++++++---
 .../en/modules/admin/preferences/circulation.pref  |   35 +++++++-
 .../prog/en/modules/admin/preferences/oai-pmh.pref |   18 ----
 .../prog/en/modules/admin/preferences/opac.pref    |   13 +++
 .../en/modules/admin/preferences/searching.pref    |   12 +++
 .../en/modules/admin/preferences/web-services.pref |   19 +++++
 11 files changed, 208 insertions(+), 80 deletions(-)
 delete mode 100644
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/oai-pmh.pref
 create mode 100644
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web-services.pref

---

Owen: I had to do a little bit of editing to resolve your patches.
Everything seems to be working, but would appreciate a quick once over if
you could.

-- 
Jesse Weaver
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches

Reply via email to