1
0
Fork 0
Commit Graph

3422 Commits

Author SHA1 Message Date
Max Neunhoeffer db91b06f7b Sort out logs directory in http/ssl server tests. 2014-02-21 14:21:56 +01:00
Max Neunhoeffer b4bd5ce665 Improve logging. 2014-02-21 13:38:33 +01:00
Max Neunhoeffer 91db141ea5 Change value of things in agency according to Sharding.md. 2014-02-21 13:19:57 +01:00
Max Neunhoeffer 76077f84e7 Report overall test result. 2014-02-21 12:44:31 +01:00
Max Neunhoeffer 3cb1784430 Reorganise unit tests.
In JS framework we now find the available test files by directory
listing. This means one can simply drop a file in the right
directory to add a test.

We use a naming convention for filenames which is explained
in the README files in the corresponding directories.

Old unit tests do not yet use this but do use the new names and
should still work as usual.
2014-02-21 11:24:31 +01:00
Max Neunhoeffer 019bb7716f Add authentication tests to js framework. 2014-02-21 10:09:50 +01:00
Jan Steemann 2c1743a732 append port 2014-02-21 10:05:40 +01:00
Michael Hackstein 734ec77cea Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-20 23:09:34 +01:00
Michael Hackstein 257617fb32 Fixed bug in the graph chart that did only coordinators, no db servers 2014-02-20 23:09:29 +01:00
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
2014-02-20 21:02:07 +01:00
Frank Celler 38f1e55f99 ignore cache 2014-02-20 20:35:18 +01:00
Michael Hackstein d0d61fb5a3 Integerated the new underscore templates in the admin interface. Performancebost of 50% yay 2014-02-20 20:31:53 +01:00
Guido Schwab 1f8bf8da2d changed default avatar image size 2014-02-20 20:30:27 +01:00
Frank Celler 730da7623a added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
Guido Schwab b7d1eebfd3 fixed dropdown item selection and dropdown hide event of user dropdown 2014-02-20 20:03:26 +01:00
Frank Celler 00490ef26d removed unnessary files 2014-02-20 20:02:00 +01:00
Guido Schwab 291011a12b img size fixed 2014-02-20 19:49:33 +01:00
Guido Schwab d109f61e32 somone put the letter 'F' in there O.o 2014-02-20 19:16:26 +01:00
Guido Schwab 45513567d7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 19:09:49 +01:00
Guido Schwab 63c722ab0c some layout changes 2014-02-20 19:09:28 +01:00
Jan Steemann affd2eff14 added derived file 2014-02-20 18:06:48 +01:00
Michael Hackstein bd5eecff85 Fixed a bug in collection settings 2014-02-20 18:00:42 +01:00
Michael Hackstein d20b758a77 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-20 17:43:41 +01:00
Michael Hackstein 168b256acb fixed a css bug, it was possible to scroll far to the right on the collections view 2014-02-20 17:43:23 +01:00
Guido Schwab 459b6dc7d7 dbdropdown refresh fixed 2014-02-20 17:23:15 +01:00
Heiko Kernbach c5f7bb4d34 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 17:22:16 +01:00
Heiko Kernbach b865bccb26 new jqconsole lib 2014-02-20 17:21:42 +01:00
Michael Hackstein f58fb5c310 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	js/apps/system/aardvark/frontend/js/templates/userProfileView.ejs
	js/apps/system/aardvark/test/karma/karma.conf.js
2014-02-20 17:11:18 +01:00
Michael Hackstein fa6d5e72ba Removed unused logo 2014-02-20 16:58:34 +01:00
Michael Hackstein 98576c9963 Massive change, removed ejs and replaced it with underscore templates. Changed template engine and some rendering functions. All templates are now included in one large index.html and are not requested sequentially 2014-02-20 16:56:24 +01:00
Heiko Kernbach 4672e6403c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 16:49:20 +01:00
Heiko Kernbach 3e87072669 ie plugin fix 2014-02-20 16:49:12 +01:00
Guido Schwab 5def66027a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 16:33:10 +01:00
Guido Schwab cb415c7652 added user profile management 2014-02-20 16:32:53 +01:00
Heiko Kernbach 808e2deae5 spelling errors 2014-02-20 16:32:52 +01:00
Max Neunhoeffer 3353245e34 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-20 16:20:33 +01:00
Max Neunhoeffer 59699a50af Start to add arangob tests to js framework. 2014-02-20 16:20:19 +01:00
Jan Steemann ad0636fc58 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	js/apps/system/aardvark/frontend/scss/_colors.scss
2014-02-20 16:05:00 +01:00
Jan Steemann 4654451fee Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-20 15:51:57 +01:00
Jan Steemann c5aedc0dbc fixed race condition on server start 2014-02-20 15:51:16 +01:00
Max Neunhoeffer 0bf2dcd17c Add foxx_manager unit test to js framework. 2014-02-20 14:49:48 +01:00
Max Neunhoeffer aeaffb5fad Add upgrade unit test to js framework. 2014-02-20 14:33:50 +01:00
Max Neunhoeffer f0dacea7a3 Please jslint. 2014-02-20 14:13:38 +01:00
Max Neunhoeffer 57813e9e32 Add import unit test to js framework. 2014-02-20 14:10:35 +01:00
Heiko Kernbach e3bb5a585a removed unused libs 2014-02-20 13:30:51 +01:00
Heiko Kernbach 77a76da9b0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 13:12:29 +01:00
Heiko Kernbach e00c398ab8 jquery update + cleanup, swagger-fix 2014-02-20 13:12:15 +01:00
Max Neunhoeffer 740eb86cdb Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-20 12:54:21 +01:00
Max Neunhoeffer 96c6298a1c Please jslint. 2014-02-20 12:54:03 +01:00
Jan Steemann 8238c0515b removed undocumented API method 2014-02-20 12:54:01 +01:00