# Generated by Makefile. Do not edit.

commit f6896e37d2f113432e1cee174ebd6dd499b04e47
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Dec 23 01:40:49 2009 +0100

    Don't allow to normal users access to admin dbus api

 daemon/data/dbus/nanny-daemon.conf |   35 ++++++++++++++++++++++++++++-------
 1 files changed, 28 insertions(+), 7 deletions(-)

commit 29dd596c66938fe5ec090c81fc66f38856a7d885
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Dec 23 01:11:20 2009 +0100

    admin console use nanny icon

 .../admin/data/nanny-admin-console.desktop.in      |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit da9cf4804c663d724bc11fc9d27ce3d195e6808d
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Dec 23 01:06:01 2009 +0100

    Some debian lintian fixes

 debian/control   |   16 +++++++++-------
 debian/copyright |    3 ---
 2 files changed, 9 insertions(+), 10 deletions(-)

commit b9b70ee798c590185b6f76f975cb8d368dfcb622
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Dec 23 00:43:07 2009 +0100

    Add some nanny icons to msg dialogs

 client/gnome/admin/src/AdminConsole.py         |    3 +++
 client/gnome/admin/src/ConfigureProxyDialog.py |    6 ++++++
 2 files changed, 9 insertions(+), 0 deletions(-)

commit 1de266faac2d1f9411a4fda95f8e3051466bccff
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Dec 23 00:32:43 2009 +0100

    Add nanny icon to config proxy windows

 client/gnome/admin/src/ConfigureProxyDialog.py |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit dc6599a335265eda2a918fc44e5c01830f777d50
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Dec 23 00:21:55 2009 +0100

    Destroy add_filter_dialogs after dbusclient send msg

 client/gnome/admin/src/ConfigureProxyDialog.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

commit c5635860eb01c8dee222f909c8252de9407af76f
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Dec 23 00:10:16 2009 +0100

    Fix remove filter UI Freeze

 client/common/src/DBusClient.py                |    2 +-
 client/gnome/admin/src/ConfigureProxyDialog.py |   11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

commit a846bebdfe3e799aead3392d47a6a1f11e71aeff
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Tue Dec 22 23:42:49 2009 +0100

    Hide edit button for the moment in nac_wcf

 client/gnome/admin/data/glade/nac_wcf_dialog.glade |    2 --
 client/gnome/admin/src/ConfigureProxyDialog.py     |    3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 7cc7ff2fca6561850beb9677c2adb4333a5c08bb
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Tue Dec 22 23:34:47 2009 +0100

    Some fixes in add_custom_filter

 daemon/src/proxy/Controllers.py |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

commit 484d86e29151e9b8851dee9f022b21cf8d212813
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Tue Dec 22 23:01:54 2009 +0100

    Some SQL optimizations

 client/common/src/DBusClient.py  |    2 +-
 daemon/nanny.tap                 |    5 ++
 daemon/src/proxy/Controllers.py  |   36 +++++++++--
 daemon/src/proxy/TwistedProxy.py |  126 +++++++++++++++++++++++++++++++-------
 4 files changed, 141 insertions(+), 28 deletions(-)

commit 32cbb113a5e3f41d91a9dfb7f64e3b4275f4dd93
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Dec 21 02:14:59 2009 +0100

    Changes in i18n

 configure.ac |    2 +-
 po/es.po     |  264 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 265 insertions(+), 1 deletions(-)

commit f1b3e4aabe56595cce86bd2e75e51a07d5eb66f8
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Dec 21 02:05:53 2009 +0100

    Add files to POTFILES.in

 po/POTFILES.in |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

commit f41c09b77311c06dc072a9a8d50cd25442c848ca
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Dec 21 01:57:35 2009 +0100

    Update News

 NEWS |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

commit a8d0e9b2c2611bce69b0cb05798aeaec6cab4fb9
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Dec 21 01:52:16 2009 +0100

    Add git ChangeLog dist-hook

 Makefile.am |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

commit a9e2d28b9eb93948b466292eeddd5e6ce472e558
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Dec 21 01:37:45 2009 +0100

    Fix UsersManager in daemon/src/__init__.py

 daemon/src/__init__.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 910970d3e7d64656d9320747f602be81ef801ef8
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Dec 21 01:30:30 2009 +0100

    Fix some automake stuff

 client/gnome/admin/Makefile.am   |    2 ++
 client/gnome/systray/Makefile.am |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

commit 6bb7e652e6f16ec94c09b4b03e829a8a0ba0bef6
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Dec 21 01:13:35 2009 +0100

    First Commit

 .gitignore                                         |   67 ++
 AUTHORS                                            |    3 +
 COPYING                                            |  280 +++++
 ChangeLog                                          |    2 +
 INSTALL                                            |  302 +++++
 Makefile.am                                        |   26 +
 README                                             |   35 +
 autogen.sh                                         |   21 +
 client/Makefile.am                                 |    4 +
 client/common/Makefile.am                          |    1 +
 client/common/icons/16x16/Makefile.am              |   11 +
 client/common/icons/16x16/nanny.png                |  Bin 0 -> 915 bytes
 client/common/icons/22x22/Makefile.am              |   11 +
 client/common/icons/22x22/nanny.png                |  Bin 0 -> 1386 bytes
 client/common/icons/24x24/Makefile.am              |   11 +
 client/common/icons/24x24/nanny.png                |  Bin 0 -> 1563 bytes
 client/common/icons/256x256/Makefile.am            |   11 +
 client/common/icons/256x256/nanny.png              |  Bin 0 -> 39626 bytes
 client/common/icons/32x32/Makefile.am              |   11 +
 client/common/icons/32x32/nanny.png                |  Bin 0 -> 2303 bytes
 client/common/icons/48x48/Makefile.am              |   11 +
 client/common/icons/48x48/nanny.png                |  Bin 0 -> 4126 bytes
 client/common/icons/Makefile.am                    |   14 +
 client/common/icons/scalable/Makefile.am           |   11 +
 client/common/icons/scalable/nanny.svg             | 1154 ++++++++++++++++++++
 client/common/src/DBusClient.py                    |  143 +++
 client/common/src/Makefile.am                      |    5 +
 client/common/src/Singleton.py                     |   37 +
 client/common/src/Utils.py                         |   39 +
 client/common/src/__init__.py                      |    3 +
 client/gnome/Makefile.am                           |    4 +
 client/gnome/admin/Makefile.am                     |    3 +
 client/gnome/admin/NannyAdminConsole               |   41 +
 client/gnome/admin/data/Makefile.am                |    8 +
 client/gnome/admin/data/glade/Makefile.am          |    6 +
 client/gnome/admin/data/glade/nac_wcf_dialog.glade |  192 ++++
 .../admin/data/glade/nac_wcf_edit_dialog.glade     |  173 +++
 .../admin/data/glade/nanny_admin_console.glade     |  589 ++++++++++
 client/gnome/admin/data/icons/Makefile.am          |    7 +
 client/gnome/admin/data/icons/apps.png             |  Bin 0 -> 2877 bytes
 client/gnome/admin/data/icons/button-green.png     |  Bin 0 -> 297 bytes
 client/gnome/admin/data/icons/button-red.png       |  Bin 0 -> 307 bytes
 client/gnome/admin/data/icons/clock.png            |  Bin 0 -> 3322 bytes
 client/gnome/admin/data/icons/internet.png         |  Bin 0 -> 3716 bytes
 .../admin/data/nanny-admin-console.desktop.in      |   10 +
 client/gnome/admin/src/AdminConsole.py             |  354 ++++++
 client/gnome/admin/src/ConfigureProxyDialog.py     |  320 ++++++
 client/gnome/admin/src/Makefile.am                 |    5 +
 client/gnome/admin/src/ScheduleCalendar.py         |  358 ++++++
 client/gnome/admin/src/__init__.py.in              |   37 +
 client/gnome/systray/Makefile.am                   |    3 +
 client/gnome/systray/NannySystray                  |   34 +
 client/gnome/systray/data/Makefile.am              |    4 +
 client/gnome/systray/data/nanny-systray.desktop    |   15 +
 client/gnome/systray/src/Makefile.am               |    3 +
 client/gnome/systray/src/SystrayNanny.py           |  132 +++
 client/gnome/systray/src/__init__.py.in            |   11 +
 configure.ac                                       |  199 ++++
 daemon/Makefile.am                                 |    7 +
 daemon/data/Makefile.am                            |    1 +
 daemon/data/applists/Makefile.am                   |    4 +
 daemon/data/applists/browsers                      |    3 +
 daemon/data/applists/email                         |    2 +
 daemon/data/applists/im                            |    3 +
 daemon/data/dbus/Makefile.am                       |    4 +
 daemon/data/dbus/nanny-daemon.conf                 |   25 +
 daemon/data/init.d/Makefile.am                     |    1 +
 daemon/data/init.d/debian/Makefile.am              |   10 +
 daemon/data/init.d/debian/nanny                    |   74 ++
 daemon/data/init.d/redhat/Makefile.am              |    9 +
 daemon/data/init.d/redhat/nanny                    |   10 +
 daemon/data/init.d/suse/Makefile.am                |    9 +
 daemon/data/init.d/suse/nanny                      |   13 +
 daemon/nanny-no-daemon.sh                          |   10 +
 daemon/nanny.tap                                   |   26 +
 daemon/src/Chrono.py                               |  109 ++
 daemon/src/Daemon.py                               |   40 +
 daemon/src/LinuxFiltering.py                       |  118 ++
 daemon/src/LinuxSessionFiltering.py                |  158 +++
 daemon/src/LinuxUsersManager.py                    |   57 +
 daemon/src/LinuxWebContentFiltering.py             |  115 ++
 daemon/src/Makefile.am                             |   12 +
 daemon/src/NannyDBus.py                            |  131 +++
 daemon/src/QuarterBack.py                          |  417 +++++++
 daemon/src/__init__.py                             |    9 +
 daemon/src/contrib/Makefile.am                     |    3 +
 daemon/src/contrib/__init__.py                     |    1 +
 daemon/src/contrib/daemon.py                       |  183 +++
 daemon/src/proxy/Controllers.py                    |  298 +++++
 daemon/src/proxy/Importer.py                       |   91 ++
 daemon/src/proxy/Makefile.am                       |    6 +
 daemon/src/proxy/Proxy.py                          |   45 +
 daemon/src/proxy/TwistedProxy.py                   |  283 +++++
 debian/changelog                                   |    5 +
 debian/compat                                      |    1 +
 debian/control                                     |   17 +
 debian/copyright                                   |   36 +
 debian/dirs                                        |    2 +
 debian/docs                                        |    2 +
 debian/init.d                                      |   74 ++
 debian/nanny-default                               |   10 +
 debian/postinst                                    |   46 +
 debian/postrm                                      |   40 +
 debian/prerm                                       |   14 +
 debian/rules                                       |   27 +
 help/Makefile.am                                   |    5 +
 help/nanny-add-web-to-filter.png                   |  Bin 0 -> 11498 bytes
 help/nanny-browser.png                             |  Bin 0 -> 42047 bytes
 help/nanny-session.png                             |  Bin 0 -> 38165 bytes
 help/nanny-web-content-filtering.png               |  Bin 0 -> 13535 bytes
 help/nanny.xml                                     |  269 +++++
 nanny.doap                                         |   23 +
 112 files changed, 7579 insertions(+), 0 deletions(-)
