initial commit for eStation2
testing git remote
Merge branch 'master' of h05-dev-vm19:/srv/www/eStation2

Conflicts:
	.gitignore
	apps/.gitignore
	apps/__init__.py
	apps/acquisition/.gitignore
	apps/acquisition/get_eumetcast.py
	apps/acquisition/get_internet.py
	apps/acquisition/ingestion.py
	apps/gui/.gitignore
	apps/gui/app.js
	apps/gui/app/app.js
	apps/gui/app/controller/Users.js
	apps/gui/app/model/User.js
	apps/gui/app/store/Users.js
	apps/gui/app/view/Viewport.js
	apps/gui/app/view/user/Edit.js
	apps/gui/app/view/user/List.js
	apps/gui/data/updateUsers.json
	apps/gui/data/users.json
	apps/gui/resources/css/ec.css
	apps/gui/resources/sass/config.rb
	apps/processing/processing.py
	cgi-bin/templates/index.html
	cgi-bin/templates/mytemplate.html
	cgi-bin/webpyservice.py
	config/es_constants.py
	database/.gitignore
	database/__init__.py
	database/crud.py
	database/dbInstall/dump_database_structure.sql
	database/importEumetCast/.gitignore
	database/importEumetCast/ImportEumetcast.js
	database/importEumetCast/ImportEumetcast.php
	database/importEumetCast/PostgreSQL.php
	database/importEumetCast/ProductsDataEumetcast.php
	database/importEumetCast/constants.php
	database/importEumetCast/dynlist_app_data_edapnav.js
	database/psql.py
	description
	lib/.gitignore
	lib/js/.gitignore
	lib/js/Ext.ux/Ext.ux.BubblePanel.js
	lib/js/Ext.ux/Ext.ux.DynScriptTagProxy.js
	lib/js/Ext.ux/Ext.ux.Exporter-all.js
	lib/js/Ext.ux/Ext.ux.Printer.js
	lib/js/Ext.ux/Ext.ux.Toast.js
	lib/js/Ext.ux/Ext.ux.grid.CheckColumn.js
	lib/js/Ext.ux/LiveSearchGridPanel.js
	lib/js/Ext.ux/statusbar/StatusBar.js
	lib/js/Ext.ux/statusbar/ValidationStatus.js
	lib/js/Ext.ux/statusbar/css/statusbar.css
	lib/python/.gitignore
	lib/python/functions.py
	lib/python/mapset.py
	lib/python/metadata.py
	lib/python/naming.py
	locals.py
	references.txt
Flask integration
Cleaning up and working on the GUI which will be added to git soon.
Cleaning up and working on the GUI which will be added to git soon.
Cleaning up and working on the GUI which will be added to git soon.
New DB dump and changes from Pull
New DB dump and changes from Pull
Fix remote_url+full_regex options
Merge branch 'master' of /srv/www/eStation2
Add ensure_sep_present()
Change test for MODIS ftp
new queries added
added for merge conflict during pull from bare repo
removed from gitgnore the directory /lib/python/image_proc because there are files in this directory that were added in the bare repo
which gave problems with merging when doing a pull from the bare.
from pull
Correct small errors (sleep overwritten + list ad GLOBAL var)
Comment/clean functions
Test name of a file MODIS properly retrieved