team4alfanous team mailing list archive
-
team4alfanous team
-
Mailing list archive
-
Message #00102
[Branch ~team4alfanous/alfanous/alfanous-git] Rev 293: Merge branch 'new_output_system'
Merge authors:
Assem Chelli (عاصم شلي) (assem-ch)
------------------------------------------------------------
revno: 293 [merge]
committer: Assem Chelli <assem.ch@xxxxxxxxx>
timestamp: Fri 2012-08-17 15:16:59 +0100
message:
Merge branch 'new_output_system'
Conflicts:
src/alfanous/Outputs.py
src/alfanous/QueryProcessing.py
removed:
AUTHORS
INSTALL
README
README.md
THANKS
docs/Makefile
docs/_build/
docs/_build/doctrees/
docs/_build/doctrees/environment.pickle
docs/_build/doctrees/index.doctree
docs/_build/html/
docs/_build/html/.buildinfo
docs/_build/html/_sources/
docs/_build/html/_sources/index.txt
docs/_build/html/_static/
docs/_build/html/_static/basic.css
docs/_build/html/_static/default.css
docs/_build/html/_static/doctools.js
docs/_build/html/_static/file.png
docs/_build/html/_static/jquery.js
docs/_build/html/_static/minus.png
docs/_build/html/_static/plus.png
docs/_build/html/_static/pygments.css
docs/_build/html/_static/searchtools.js
docs/_build/html/genindex.html
docs/_build/html/index.html
docs/_build/html/modindex.html
docs/_build/html/objects.inv
docs/_build/html/search.html
docs/_build/html/searchindex.js
docs/conf.py
docs/index.rst
docs/make.bat
indexes/
indexes/extend/
indexes/extend/MAIN_LOCK
indexes/extend/_MAIN_1.dci
indexes/extend/_MAIN_1.dcz
indexes/extend/_MAIN_1.pst
indexes/extend/_MAIN_1.tiz
indexes/extend/_MAIN_12.dci
indexes/extend/_MAIN_12.dcz
indexes/extend/_MAIN_12.pst
indexes/extend/_MAIN_12.tiz
indexes/extend/_MAIN_13.dci
indexes/extend/_MAIN_13.dcz
indexes/extend/_MAIN_13.pst
indexes/extend/_MAIN_13.tiz
indexes/extend/_MAIN_15.dci
indexes/extend/_MAIN_15.dcz
indexes/extend/_MAIN_15.pst
indexes/extend/_MAIN_15.tiz
indexes/extend/_MAIN_16.dci
indexes/extend/_MAIN_16.dcz
indexes/extend/_MAIN_16.pst
indexes/extend/_MAIN_16.tiz
indexes/extend/_MAIN_17.dci
indexes/extend/_MAIN_17.dcz
indexes/extend/_MAIN_17.pst
indexes/extend/_MAIN_17.tiz
indexes/extend/_MAIN_18.dci
indexes/extend/_MAIN_18.dcz
indexes/extend/_MAIN_18.pst
indexes/extend/_MAIN_18.tiz
indexes/extend/_MAIN_19.dci
indexes/extend/_MAIN_19.dcz
indexes/extend/_MAIN_19.pst
indexes/extend/_MAIN_19.tiz
indexes/extend/_MAIN_2.dci
indexes/extend/_MAIN_2.dcz
indexes/extend/_MAIN_2.pst
indexes/extend/_MAIN_2.tiz
indexes/extend/_MAIN_20.dci
indexes/extend/_MAIN_20.dcz
indexes/extend/_MAIN_20.pst
indexes/extend/_MAIN_20.tiz
indexes/extend/_MAIN_21.dci
indexes/extend/_MAIN_21.dcz
indexes/extend/_MAIN_21.pst
indexes/extend/_MAIN_21.tiz
indexes/extend/_MAIN_22.dci
indexes/extend/_MAIN_22.dcz
indexes/extend/_MAIN_22.pst
indexes/extend/_MAIN_22.tiz
indexes/extend/_MAIN_23.dci
indexes/extend/_MAIN_23.dcz
indexes/extend/_MAIN_23.pst
indexes/extend/_MAIN_23.tiz
indexes/extend/_MAIN_24.dci
indexes/extend/_MAIN_24.dcz
indexes/extend/_MAIN_24.pst
indexes/extend/_MAIN_24.tiz
indexes/extend/_MAIN_25.dci
indexes/extend/_MAIN_25.dcz
indexes/extend/_MAIN_25.pst
indexes/extend/_MAIN_25.tiz
indexes/extend/_MAIN_3.dci
indexes/extend/_MAIN_3.dcz
indexes/extend/_MAIN_3.pst
indexes/extend/_MAIN_3.tiz
indexes/extend/_MAIN_4.dci
indexes/extend/_MAIN_4.dcz
indexes/extend/_MAIN_4.pst
indexes/extend/_MAIN_4.tiz
indexes/extend/_MAIN_5.dci
indexes/extend/_MAIN_5.dcz
indexes/extend/_MAIN_5.pst
indexes/extend/_MAIN_5.tiz
indexes/extend/_MAIN_6.dci
indexes/extend/_MAIN_6.dcz
indexes/extend/_MAIN_6.pst
indexes/extend/_MAIN_6.tiz
indexes/extend/_MAIN_7.dci
indexes/extend/_MAIN_7.dcz
indexes/extend/_MAIN_7.pst
indexes/extend/_MAIN_7.tiz
indexes/extend/_MAIN_8.dci
indexes/extend/_MAIN_8.dcz
indexes/extend/_MAIN_8.pst
indexes/extend/_MAIN_8.tiz
indexes/main/
indexes/main/AYA_SPELL_LOCK
indexes/main/MAIN_LOCK
indexes/main/SUB_SPELL_LOCK
indexes/main/_AYA_SPELL_1.dcz
indexes/main/_AYA_SPELL_1.pst
indexes/main/_AYA_SPELL_1.tiz
indexes/main/_AYA_SPELL_2.dcz
indexes/main/_AYA_SPELL_2.pst
indexes/main/_AYA_SPELL_2.tiz
indexes/main/_AYA_SPELL_3.dcz
indexes/main/_AYA_SPELL_3.pst
indexes/main/_AYA_SPELL_3.tiz
indexes/main/_MAIN_1.dci
indexes/main/_MAIN_1.dcz
indexes/main/_MAIN_1.fvz
indexes/main/_MAIN_1.pst
indexes/main/_MAIN_1.tiz
indexes/main/_MAIN_1.vps
indexes/main/_SUB_SPELL_1.dcz
indexes/main/_SUB_SPELL_1.pst
indexes/main/_SUB_SPELL_1.tiz
indexes/main/_SUB_SPELL_2.dcz
indexes/main/_SUB_SPELL_2.pst
indexes/main/_SUB_SPELL_2.tiz
indexes/main/_SUB_SPELL_3.dcz
indexes/main/_SUB_SPELL_3.pst
indexes/main/_SUB_SPELL_3.tiz
indexes/main/_SUB_SPELL_5.toc
interfaces/web/TODO
interfaces/web/mobile_wui/README
resources/UI/
resources/UI/aboutDlg.ui
resources/UI/mainform.ui
resources/UI/preferencesDlg.ui
resources/configs/hints.js
resources/configs/information.js
resources/configs/recitations.js
resources/configs/stats.js
resources/configs/translations.js
src/PyCorpus/README.txt
src/alfanous-cgi/README.mediawiki
src/alfanous-cgi/alfanous_json.py
src/alfanous-cgi/json_web_service.mediawiki
src/alfanous-import/README.txt
src/alfanous/outputs.py
added:
AUTHORS.rst
FAQ.rst
INSTALL.rst
README.rst
THANKS.rst
docs/search_features.rst
interfaces/web/mobile_wui/README.rst
interfaces/web/wui/README.rst
src/PyCorpus/README.rst
src/PyZekrModels/README.rst
src/alfanous-cgi/README.rst
src/alfanous-desktop/README.rst
src/alfanous-desktop/UI/
src/alfanous-desktop/UI/aboutDlg.ui
src/alfanous-desktop/UI/mainform.ui
src/alfanous-desktop/UI/preferencesDlg.ui
src/alfanous-django/README.rst
src/alfanous-django/locale/
src/alfanous-django/locale/en/
src/alfanous-django/locale/en/LC_MESSAGES/
src/alfanous-django/locale/en/LC_MESSAGES/django.po
src/alfanous-django/media/
src/alfanous-django/media/alfanous-mobile-opensearch.xml
src/alfanous-django/media/alfanous-opensearch.xml
src/alfanous-django/media/css/
src/alfanous-django/media/css/reset.css
src/alfanous-django/media/css/screen.css
src/alfanous-django/media/fonts/
src/alfanous-django/media/fonts/ScheherazadeRegOT.ttf
src/alfanous-django/media/images/
src/alfanous-django/media/images/Django_logo.png
src/alfanous-django/media/images/Download.png
src/alfanous-django/media/images/Google_Buzz.png
src/alfanous-django/media/images/agplv3-88x31.png
src/alfanous-django/media/images/awa2-128.png
src/alfanous-django/media/images/back_g.gif
src/alfanous-django/media/images/facebook.png
src/alfanous-django/media/images/favicon.ico
src/alfanous-django/media/images/footer-bg.png
src/alfanous-django/media/images/footer.png
src/alfanous-django/media/images/gmail.png
src/alfanous-django/media/images/google.png
src/alfanous-django/media/images/greader.png
src/alfanous-django/media/images/html5-32x32.png
src/alfanous-django/media/images/icon_32.png
src/alfanous-django/media/images/jquery_logos.png
src/alfanous-django/media/images/jquery_logos_ui.png
src/alfanous-django/media/images/json_logo.png
src/alfanous-django/media/images/loading_bar.gif
src/alfanous-django/media/images/logo.png
src/alfanous-django/media/images/logo_fb.png
src/alfanous-django/media/images/main_table_02.png
src/alfanous-django/media/images/main_table_03.png
src/alfanous-django/media/images/main_table_04.png
src/alfanous-django/media/images/main_table_05.png
src/alfanous-django/media/images/main_table_06.png
src/alfanous-django/media/images/myspace.png
src/alfanous-django/media/images/next.gif
src/alfanous-django/media/images/prev.gif
src/alfanous-django/media/images/python-logo-inkscape.png
src/alfanous-django/media/images/select.gif
src/alfanous-django/media/images/share.png
src/alfanous-django/media/images/twitter.png
src/alfanous-django/media/images/yahoo.png
src/alfanous-django/media/js/
src/alfanous-django/media/js/audio-player.js
src/alfanous-django/media/js/drops.js
src/alfanous-django/media/js/hash.js
src/alfanous-django/media/js/jquery.corner.js
src/alfanous-django/media/js/jquery.sprintf.js
src/alfanous-django/media/js/jquery.tools.min.js
src/alfanous-django/media/sitemap.xml
src/alfanous-django/media/swf/
src/alfanous-django/media/swf/player.swf
src/alfanous-django/templates/
src/alfanous-django/templates/base.html
src/alfanous-django/templates/wui.html
src/alfanous-django/wui/admin.py
src/alfanous-django/wui/static/
src/alfanous-django/wui/static/alfanous-mobile-opensearch.xml
src/alfanous-django/wui/static/alfanous-opensearch.xml
src/alfanous-django/wui/static/css/
src/alfanous-django/wui/static/css/reset.css
src/alfanous-django/wui/static/css/screen.css
src/alfanous-django/wui/static/fonts/
src/alfanous-django/wui/static/fonts/ScheherazadeRegOT.ttf
src/alfanous-django/wui/static/images/
src/alfanous-django/wui/static/images/Django_logo.png
src/alfanous-django/wui/static/images/Download.png
src/alfanous-django/wui/static/images/Google_Buzz.png
src/alfanous-django/wui/static/images/agplv3-88x31.png
src/alfanous-django/wui/static/images/awa2-128.png
src/alfanous-django/wui/static/images/back_g.gif
src/alfanous-django/wui/static/images/facebook.png
src/alfanous-django/wui/static/images/favicon.ico
src/alfanous-django/wui/static/images/footer-bg.png
src/alfanous-django/wui/static/images/footer.png
src/alfanous-django/wui/static/images/gmail.png
src/alfanous-django/wui/static/images/google.png
src/alfanous-django/wui/static/images/greader.png
src/alfanous-django/wui/static/images/html5-32x32.png
src/alfanous-django/wui/static/images/icon_32.png
src/alfanous-django/wui/static/images/jquery_logos.png
src/alfanous-django/wui/static/images/jquery_logos_ui.png
src/alfanous-django/wui/static/images/json_logo.png
src/alfanous-django/wui/static/images/loading_bar.gif
src/alfanous-django/wui/static/images/logo.png
src/alfanous-django/wui/static/images/logo_en.png
src/alfanous-django/wui/static/images/logo_fb.png
src/alfanous-django/wui/static/images/main_table_02.png
src/alfanous-django/wui/static/images/main_table_03.png
src/alfanous-django/wui/static/images/main_table_04.png
src/alfanous-django/wui/static/images/main_table_05.png
src/alfanous-django/wui/static/images/main_table_06.png
src/alfanous-django/wui/static/images/myspace.png
src/alfanous-django/wui/static/images/next.gif
src/alfanous-django/wui/static/images/prev.gif
src/alfanous-django/wui/static/images/python-logo-inkscape.png
src/alfanous-django/wui/static/images/select.gif
src/alfanous-django/wui/static/images/share.png
src/alfanous-django/wui/static/images/twitter.png
src/alfanous-django/wui/static/images/yahoo.png
src/alfanous-django/wui/static/js/
src/alfanous-django/wui/static/js/audio-player.js
src/alfanous-django/wui/static/js/drops.js
src/alfanous-django/wui/static/js/hash.js
src/alfanous-django/wui/static/js/jquery.corner.js
src/alfanous-django/wui/static/js/jquery.sprintf.js
src/alfanous-django/wui/static/js/jquery.tools.min.js
src/alfanous-django/wui/static/sitemap.xml
src/alfanous-django/wui/static/swf/
src/alfanous-django/wui/static/swf/player.swf
src/alfanous-import/Parser.py
src/alfanous-import/README.rst
src/alfanous-import/Standardizer.py
src/alfanous-labs/Naq7ara/README.rst
src/alfanous-labs/PyArabic/README.rst
src/alfanous-labs/PyTanzil/README.rst
src/alfanous-labs/Qrawler/README.rst
src/alfanous/Data.py
src/alfanous/Outputs.py
src/alfanous/README.rst
src/alfanous/configs/
src/alfanous/configs/daemon.json
src/alfanous/configs/hints.json
src/alfanous/configs/recitations.json
src/alfanous/configs/stats.json
src/alfanous/configs/translations.json
src/alfanous/dynamic_resources/vocalizations_dyn.py
src/alfanous/indexes/README.rst
src/alfanous/indexes/extend/
src/alfanous/indexes/extend/MAIN_LOCK
src/alfanous/indexes/extend/_MAIN_1.dci
src/alfanous/indexes/extend/_MAIN_1.dcz
src/alfanous/indexes/extend/_MAIN_1.pst
src/alfanous/indexes/extend/_MAIN_1.tiz
src/alfanous/indexes/extend/_MAIN_10.dci
src/alfanous/indexes/extend/_MAIN_10.dcz
src/alfanous/indexes/extend/_MAIN_10.pst
src/alfanous/indexes/extend/_MAIN_10.tiz
src/alfanous/indexes/extend/_MAIN_10.toc
src/alfanous/indexes/extend/_MAIN_2.dci
src/alfanous/indexes/extend/_MAIN_2.dcz
src/alfanous/indexes/extend/_MAIN_2.pst
src/alfanous/indexes/extend/_MAIN_2.tiz
src/alfanous/indexes/extend/_MAIN_3.dci
src/alfanous/indexes/extend/_MAIN_3.dcz
src/alfanous/indexes/extend/_MAIN_3.pst
src/alfanous/indexes/extend/_MAIN_3.tiz
src/alfanous/indexes/extend/_MAIN_4.dci
src/alfanous/indexes/extend/_MAIN_4.dcz
src/alfanous/indexes/extend/_MAIN_4.pst
src/alfanous/indexes/extend/_MAIN_4.tiz
src/alfanous/indexes/extend/_MAIN_5.dci
src/alfanous/indexes/extend/_MAIN_5.dcz
src/alfanous/indexes/extend/_MAIN_5.pst
src/alfanous/indexes/extend/_MAIN_5.tiz
src/alfanous/indexes/extend/_MAIN_6.dci
src/alfanous/indexes/extend/_MAIN_6.dcz
src/alfanous/indexes/extend/_MAIN_6.pst
src/alfanous/indexes/extend/_MAIN_6.tiz
src/alfanous/indexes/extend/_MAIN_7.dci
src/alfanous/indexes/extend/_MAIN_7.dcz
src/alfanous/indexes/extend/_MAIN_7.pst
src/alfanous/indexes/extend/_MAIN_7.tiz
src/alfanous/indexes/extend/_MAIN_8.dci
src/alfanous/indexes/extend/_MAIN_8.dcz
src/alfanous/indexes/extend/_MAIN_8.pst
src/alfanous/indexes/extend/_MAIN_8.tiz
src/alfanous/indexes/extend/_MAIN_9.dci
src/alfanous/indexes/extend/_MAIN_9.dcz
src/alfanous/indexes/extend/_MAIN_9.pst
src/alfanous/indexes/extend/_MAIN_9.tiz
src/alfanous/indexes/main/MAIN_LOCK
src/alfanous/indexes/main/_MAIN_1.dci
src/alfanous/indexes/main/_MAIN_1.dcz
src/alfanous/indexes/main/_MAIN_1.fvz
src/alfanous/indexes/main/_MAIN_1.pst
src/alfanous/indexes/main/_MAIN_1.tiz
src/alfanous/indexes/main/_MAIN_1.toc
src/alfanous/indexes/main/_MAIN_1.vps
src/alfanous/indexes/word/
src/alfanous/indexes/word/MAIN_LOCK
src/alfanous/indexes/word/_MAIN_1.dcz
src/alfanous/indexes/word/_MAIN_1.pst
src/alfanous/indexes/word/_MAIN_1.tiz
src/alfanous/indexes/word/_MAIN_1.toc
src/alfanous/resources/
src/alfanous/resources/fields.json
src/alfanous/resources/fields_ar2en_mapping.json
src/alfanous/resources/information.json
src/alfanous/resources/stopwords.json
src/alfanous/resources/words_antonyms.json
src/alfanous/resources/words_derivations.json
src/alfanous/resources/words_properties.json
src/alfanous/resources/words_std2uth_mapping.json
src/alfanous/resources/words_synonyms.json
src/alfanous/resources/words_vocalizations
src/conf.py
store/Quranic_Arabic_Boundary_Corpus.txt
modified:
Makefile
resources/configs/config.ini
src/alfanous-cgi/alfanous_json2.py
src/alfanous-desktop/Gui.py
src/alfanous-desktop/setup.py
src/alfanous-django/settings.py
src/alfanous-django/urls.py
src/alfanous-django/wui/models.py
src/alfanous-django/wui/views.py
src/alfanous-import/main.py
src/alfanous-import/setup.py
src/alfanous-tests/main.py
src/alfanous/QueryProcessing.py
src/alfanous/ResultsProcessing.py
src/alfanous/console.py
src/alfanous/main.py
src/alfanous/setup.py
The size of the diff (116228 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