Commit Graph

6 Commits

Author SHA1 Message Date
Jannis Moßhammer d71d15c822 Merge branch 'master' of ssh://git.icinga.org/icinga2-web into feature/history-api-4303
Conflicts:
	public/js/icinga/components/actionTable.js
	public/js/icinga/components/mainDetail.js
	public/js/icinga/container.js
	public/js/icinga/util/async.js
2013-06-27 10:20:46 +02:00
Jannis Moßhammer 677593cf8c Fix empty module folder causing errors, fix var naming
Fix a wrongly named class causing ClassNotFound issues,
also added additional checks for empty module folder and
added en moduleFolder directive to configure module location

refs #4092
2013-06-26 16:05:01 +02:00
Jannis Moßhammer e759911b09 Add javascript autoloading
the js/modules/%modulename%/%file% is now mapped to the module
path (if existing). To prevent name clashing, the modules folder
has been renamed to components.
2013-06-21 11:36:12 +02:00
Jannis Moßhammer fd489484e1 Move ModuleController from incubator
The Notification dependency is removed and uses exceptions now,
otherwise it's mostly the same like in the incubator

refs #4092
2013-06-21 09:54:55 +02:00
Jannis Moßhammer fc4b42e3e0 Add history api and modify js for tests
All JS Files now call 'requirejs' instead of 'require', also
the holder.js reference is removed and the history api added.
Tests are following in the next commit

refs #4303
refs #4315
2013-06-19 13:22:01 +02:00
Marius Hein c905b1f490 Test and move bootstrapping/web code to source tree
Move code from incubator to web. Only files needed to show
welcome moved.

refs #4249
2013-06-17 08:49:27 +02:00