team4alfanous team mailing list archive

Thread
Date

[Branch ~team4alfanous/alfanous/alfanous-git] Rev 469: Merge branch 'new_output_django_nojquery'

To: Alfanous team <team4alfanous@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Fri, 08 Feb 2013 23:37:15 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Merge authors:
  Assem Chelli (عاصم شلي) (assem-ch)
------------------------------------------------------------
revno: 469 [merge]
committer: Assem Chelli <assem.ch@xxxxxxxxx>
timestamp: Wed 2013-01-02 17:30:45 +0100
message:
  Merge branch 'new_output_django_nojquery'
removed:
  interfaces/web/chat_bot/Readme.txt
  interfaces/web/chat_bot/index2.html
added:
  interfaces/web/chat_bot/README.rst
  src/alfanous-django/templates/results.html
  src/alfanous-django/wui/templatetags/
  src/alfanous-django/wui/templatetags/__init__.py
  src/alfanous-django/wui/templatetags/custom_filters.py
modified:
  .gitignore
  Makefile
  src/alfanous-desktop/Gui.py
  src/alfanous-django/templates/base.html
  src/alfanous-django/templates/wui.html
  src/alfanous-django/wui/static/css/screen.css
  src/alfanous-django/wui/static/js/hash.js
  src/alfanous-django/wui/views.py
  src/alfanous/Constants.py
  src/alfanous/Misc.py
  src/alfanous/Outputs.py
  src/alfanous/README.rst
  src/alfanous/configs/stats.json
  src/alfanous/console.py
  src/alfanous/setup.py
The size of the diff (2271 lines) is larger than your specified limit of 500 lines

--
lp:alfanous
https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git

Your team Alfanous team is subscribed to branch lp:alfanous.
To unsubscribe from this branch go to https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git/+edit-subscription