[commits] Horde branch master updated. dcc01dc126b0ffad60054d1b65b1c8a38513fcec
Michael J. Rubinsky
mrubinsk at horde.org
Mon Aug 19 03:51:13 UTC 2013
The branch "master" has been updated.
The following is a summary of the commits.
from: 3a4c2c14189ad0f823f0f2b2a481c8b11777db1a
4188fa4 Update the JobType selects when the job type list changes.
59400b3 Fix highlighting the current sidebar link.
99391c5 Improve JobType admin form.
83d3567 Initial support for managing Deliverables in Dynamic view.
9e81fde Some css/layout tweaks.
35a59fe Make these collapsable
68eb08e Check for proper values before submitting.
a0503e9 Fix class name
b0e4749 wrap
dcc01dc Merge branch 'hermes_2_0'
-----------------------------------------------------------------------
commit 4188fa4678948161f89d74aaaddbc47657f85e6d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Aug 18 02:23:21 2013 -0400
Update the JobType selects when the job type list changes.
hermes/js/hermes.js | 27 ++++++++++++++++++++++++++-
hermes/lib/Ajax.php | 1 +
2 files changed, 27 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/4188fa4678948161f89d74aaaddbc47657f85e6d
-----------------------------------------------------------------------
commit 59400b3b576c1d164dec8c7539008b08bcb26574
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Aug 18 02:47:09 2013 -0400
Fix highlighting the current sidebar link.
hermes/js/hermes.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/59400b3b576c1d164dec8c7539008b08bcb26574
-----------------------------------------------------------------------
commit 99391c55a4dbc261feb6c575aed69d1750257603
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Aug 18 19:47:51 2013 -0400
Improve JobType admin form.
hermes/js/hermes.js | 88 ++++++++++++++++++++++++------
hermes/lib/Ajax/Application/Handler.php | 19 ++++++-
hermes/lib/Hermes.php | 9 +++-
hermes/templates/dynamic/jobtypes.inc | 63 ++++++++++++++-------
hermes/themes/default/dynamic/screen.css | 41 ++++++++++----
5 files changed, 167 insertions(+), 53 deletions(-)
http://git.horde.org/horde-git/-/commit/99391c55a4dbc261feb6c575aed69d1750257603
-----------------------------------------------------------------------
commit 83d3567afd77e5f641c537ebe0eb244f330ba707
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Aug 18 22:56:06 2013 -0400
Initial support for managing Deliverables in Dynamic view.
Eventually you will be able to see basic reports/stats on each cost object
from these views. For now, just exposes admin actions.
hermes/js/hermes.js | 200 ++++++++++++++++++++++++++---
hermes/lib/Ajax/Application/Handler.php | 62 +++++++++
hermes/templates/dynamic/deliverables.inc | 43 ++++++
hermes/templates/dynamic/index.inc | 1 +
hermes/templates/dynamic/jobtypes.inc | 6 +-
hermes/templates/dynamic/sidebar.html.php | 6 +
hermes/themes/default/dynamic/screen.css | 53 ++++++--
7 files changed, 335 insertions(+), 36 deletions(-)
create mode 100644 hermes/templates/dynamic/deliverables.inc
http://git.horde.org/horde-git/-/commit/83d3567afd77e5f641c537ebe0eb244f330ba707
-----------------------------------------------------------------------
commit 9e81fdec722b04476e7e7db556a95e9a2e9a0cbc
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Aug 18 23:19:57 2013 -0400
Some css/layout tweaks.
hermes/js/hermes.js | 2 +-
hermes/templates/dynamic/deliverables.inc | 24 ++++++++++++------------
hermes/templates/dynamic/jobtypes.inc | 6 +++---
hermes/themes/default/dynamic/screen.css | 12 ++++++------
4 files changed, 22 insertions(+), 22 deletions(-)
http://git.horde.org/horde-git/-/commit/9e81fdec722b04476e7e7db556a95e9a2e9a0cbc
-----------------------------------------------------------------------
commit 35a59feca56f7c2121d6d01b1259d5490e451960
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Aug 18 23:36:59 2013 -0400
Make these collapsable
hermes/js/hermes.js | 5 +++--
hermes/lib/Ajax/Application/Handler.php | 4 ++--
hermes/templates/dynamic/deliverables.inc | 4 +++-
hermes/templates/dynamic/jobtypes.inc | 2 +-
hermes/templates/dynamic/slices.inc | 2 +-
5 files changed, 10 insertions(+), 7 deletions(-)
http://git.horde.org/horde-git/-/commit/35a59feca56f7c2121d6d01b1259d5490e451960
-----------------------------------------------------------------------
commit 68eb08e7a934e95e82b8c6de0fcdef8e70cdbfac
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Aug 18 23:44:17 2013 -0400
Check for proper values before submitting.
hermes/js/hermes.js | 9 +++++++++
hermes/lib/Ajax.php | 3 ++-
2 files changed, 11 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/68eb08e7a934e95e82b8c6de0fcdef8e70cdbfac
-----------------------------------------------------------------------
commit a0503e970f71f98ddca7d328d40a3239c1d8e612
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Aug 18 23:47:48 2013 -0400
Fix class name
hermes/js/hermes.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/a0503e970f71f98ddca7d328d40a3239c1d8e612
-----------------------------------------------------------------------
commit b0e474915864a456daa5cac1dcb5254c2f2e40ec
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Aug 18 23:47:58 2013 -0400
wrap
hermes/themes/default/dynamic/screen.css | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/b0e474915864a456daa5cac1dcb5254c2f2e40ec
-----------------------------------------------------------------------
commit dcc01dc126b0ffad60054d1b65b1c8a38513fcec
Merge: 3a4c2c1 b0e4749
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Aug 18 23:50:23 2013 -0400
Merge branch 'hermes_2_0'
Conflicts:
hermes/js/hermes.js
hermes/lib/Ajax.php
hermes/js/hermes.js | 290 +++++++++++++++++++++++++----
hermes/lib/Ajax.php | 3 +-
hermes/lib/Ajax/Application/Handler.php | 81 ++++++++-
hermes/lib/Hermes.php | 9 +-
hermes/templates/dynamic/deliverables.inc | 45 +++++
hermes/templates/dynamic/index.inc | 1 +
hermes/templates/dynamic/jobtypes.inc | 63 ++++--
hermes/templates/dynamic/sidebar.html.php | 6 +
hermes/templates/dynamic/slices.inc | 2 +-
hermes/themes/default/dynamic/screen.css | 73 ++++++--
10 files changed, 500 insertions(+), 73 deletions(-)
http://git.horde.org/horde-git/-/commit/dcc01dc126b0ffad60054d1b65b1c8a38513fcec
More information about the commits
mailing list