1
0
Fork 0
Commit Graph

2756 Commits

Author SHA1 Message Date
Michael Hackstein 2e43dbfb14 Aardvark: Adapted new Foxx interface 2013-04-04 15:56:02 +02:00
Frank Celler 14956d865c removed print.js 2013-04-01 23:38:55 +02:00
Frank Celler 7def1cf29f Merge remote-tracking branch 'origin/feature/commonjs' into devel
Conflicts:
	apps/aardvark/manifest.json
	apps/aardvark/manifestComplete.json
	etc/arangodb/arangod.conf.in
	etc/relative/arangod.conf
	html/admin/js/bootstrap/module-internal.js
	js/apps/aardvark/assets/collections/foxxCollection.js
	js/apps/aardvark/assets/index.html
	js/apps/aardvark/assets/lib/backbone.js
	js/apps/aardvark/assets/lib/jquery.js
	js/apps/aardvark/assets/lib/underscore.js
	js/apps/aardvark/assets/models/foxx.js
	js/apps/aardvark/assets/views/foxxListView.js
	js/apps/aardvark/assets/views/foxxView.js
	js/apps/aardvark/index.html
	js/apps/aardvark/manifest.json
	js/common/bootstrap/module-internal.js
2013-03-31 12:46:16 +02:00
Michael Hackstein 37997691a1 Removed unused aardvark assets 2013-03-29 13:15:54 +01:00
Frank Celler 3928975435 moved apps to js
Conflicts:
	Makefile.in
2013-03-28 23:04:25 +01:00
Frank Celler ee2b40208c moved apps to js 2013-03-28 22:41:42 +01:00