1
0
Fork 0
Commit Graph

420 Commits

Author SHA1 Message Date
Frank Celler 42b92c794f fixed error messages and tests 2013-04-02 17:46:19 +02:00
Frank Celler 3512fa6ff0 fixed error handling 2013-04-02 15:00: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
Frank Celler 7031210a53 fixed browser 2013-03-31 00:10:48 +01:00
Frank Celler e1125421a9 added generated 2013-03-31 00:10:48 +01:00
Frank Celler 1467b78676 cleanup of internal, fs, console 2013-03-31 00:10:48 +01:00
Michael Hackstein 37997691a1 Removed unused aardvark assets 2013-03-29 13:15:54 +01:00
Michael Hackstein 17be310972 Append newlines to the end of lib files in order to avoid concatinated keywords 2013-03-29 13:13:22 +01:00
Jan Steemann a4bab2b264 framed 2013-03-29 02:01:34 +01:00
Jan Steemann 0807016cf5 printTable 2013-03-29 01:53:16 +01:00
Jan Steemann 82cbde7886 printTable() 2013-03-29 01:31:23 +01:00
Frank Celler 2ed6b0145f changed app-path and dev-app-path to be just one directory 2013-03-28 21:48:52 +01:00
Jan Steemann 096e41ad0f fixed cross-collection navigation 2013-03-28 20:58:34 +01:00
Jan Steemann 8e14661404 added sorting options for collections view in web interface 2013-03-28 20:41:57 +01:00
Jan Steemann fed6d0a64e allow using multiple searchwords 2013-03-28 20:20:19 +01:00
Michael Hackstein 0283ec4525 Frontend: Templates are now requested using a relative path 2013-03-28 16:02:25 +01:00
Michael Hackstein 34c73aa876 Arrdvark-Frontend: Adapted hardcoded image-pathes 2013-03-28 15:11:18 +01:00
Lucas Dohmen f1b5f20fab Foxx: Also using ArangoDB Mimetype Lookup for the other way around 2013-03-28 14:01:04 +01:00
Jan Steemann c3b0caaca8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-28 13:49:09 +01:00
Jan Steemann b04c33f1ec generate reverse map of mimetypes 2013-03-28 13:48:57 +01:00
Michael Hackstein 4c2991be98 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-28 13:42:51 +01:00
Jan Steemann a53a6afa92 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-28 13:27:27 +01:00
Jan Steemann ac2b7ec470 removed dead code 2013-03-28 13:27:11 +01:00
Lucas Dohmen 8261a46577 Added a Mimetype 2013-03-28 13:25:30 +01:00
Michael Hackstein e14f38e27c Frontend: Renamed Swagger to Documentation 2013-03-28 12:57:36 +01:00
Michael Hackstein d115a56485 Frontend: Changed routes to new schema: Available: Foxx known to the Arango, Installed: Foxx mounted at some path 2013-03-28 12:39:27 +01:00
Michael Hackstein acc7d2ebdd Added Save button, disabled all fields that do not yet work 2013-03-28 12:38:33 +01:00
Michael Hackstein e952cca6dc Frontend: Adapted aardvark to offer activate/deactivate and uninstall, yet only uninstall is implemented in backend 2013-03-28 12:29:33 +01:00
Michael Hackstein 79659893aa Frontend: Fixed an inconsistency. If a Modal-Dialog was open and the URL was changed manually the Dialog is kept. When closing the dialog the URL was changed but there was no redirection. Now redirection is triggered 2013-03-28 11:10:13 +01:00
Michael Hackstein 0884078a25 mend 2013-03-28 10:42:19 +01:00
Michael Hackstein ccc90d35ce Frontend: Added other Route to Modal foxx edit view 2013-03-28 10:41:58 +01:00
Michael Hackstein 93557543f0 Frontend: Added viewController for model Foxx-Edit view 2013-03-28 10:32:45 +01:00
Michael Hackstein de21a03908 Frontend: Template for modal edit Foxx view 2013-03-28 10:15:33 +01:00
Michael Hackstein b458b0e233 Frontend: Replaced Jans findWhere replacement with the correct function, which is available after update of backbone 2013-03-28 09:54:56 +01:00
Michael Hackstein 10f4a0f488 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-28 09:51:32 +01:00
Michael Hackstein 99e8b7118d Frontend: Upgraded Backbone to version 1.0.0, started implementing edit of installed foxxes 2013-03-28 09:51:11 +01:00
Jan Steemann af4cb50e59 issue #464 2013-03-28 09:38:51 +01:00
Michael Hackstein 8e52bc6143 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-28 09:06:19 +01:00
Michael Hackstein 5c1a0337fa Frontend: Added Edit-Icon to running foxxes, but no functionality yet, Foxxes are now reloaded whenever application is opened, no reload of Admin-Interface necessary anymore. 2013-03-27 19:30:18 +01:00
Michael Hackstein fa28f7ddc6 Frontend: Added badge for Foxxes 2013-03-27 19:15:04 +01:00
Michael Hackstein 26a9e5527b Frontend: Removed the ugly bar below the swagger documentation 2013-03-27 18:58:37 +01:00
Michael Hackstein 064d93f822 Applications Overview: Added a placeholder icon, will be replaced as soon as real icons are implemented 2013-03-27 18:53:20 +01:00
Michael Hackstein f081a8f50c Removed old unused views 2013-03-27 18:15:11 +01:00
Jan Steemann f3798dcf02 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-27 18:14:47 +01:00
Michael Hackstein fa3cf90321 Removed old unused views 2013-03-27 18:14:37 +01:00
Jan Steemann 0de9252f57 issue #463 2013-03-27 18:14:34 +01:00
Michael Hackstein bebc93d12f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-27 15:54:18 +01:00
Jan Steemann db432bebac Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-27 15:35:33 +01:00
Michael Hackstein eb5e181bbe Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-27 15:35:26 +01:00
Jan Steemann a67e97978e set highlighting mode to JSON for query results 2013-03-27 15:35:14 +01:00