Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
10,801 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

3525 Commits

Author SHA1 Message Date
scottashton c1707b054b dashboard refactoring 2014-02-21 23:50:09 +01:00
Michael Hackstein c965238579 Imported buttons scss 2014-02-21 23:35:19 +01:00
Heiko Kernbach 026ce33eec http db group 2014-02-21 23:18:29 +01:00
Heiko Kernbach f50d1c8fda removed render charts+templates 2014-02-21 23:07:26 +01:00
scottashton 1b61ec4d55 dashboard refactoring 2014-02-21 22:47:27 +01:00
scottashton 9010c96bf8 dashboard refactoring 2014-02-21 22:32:53 +01:00
Heiko Kernbach ebd4af33b3 merge dashboardview 2014-02-21 22:31:41 +01:00
Heiko Kernbach c444654859 render functions for dashboardview 2014-02-21 22:19:36 +01:00
scottashton 4e02b6dd36 dashboard refactoring 2014-02-21 21:44:34 +01:00
Guido Schwab 760baf44bd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-21 21:41:58 +01:00
Guido Schwab 1416860832 some pixelpushing 2014-02-21 21:41:50 +01:00
Michael Hackstein 008496b3fc Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-02-21 21:25:34 +01:00
Michael Hackstein 9dda1559bb Some css fixes 2014-02-21 21:24:05 +01:00
Michael Hackstein 14ba49ac10 Fixed some button styles and fixed applications view, it is now much more intuitive to install an app 2014-02-21 21:21:49 +01:00
Michael Hackstein 6020b914b8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-21 20:59:31 +01:00
Michael Hackstein e3ee4d8f86 Added buttons to scss 2014-02-21 20:59:23 +01:00
Heiko Kernbach 34fc4092b6 router merge fix 2014-02-21 20:46:04 +01:00
scottashton f658dc67a9 dashboard refactoring 2014-02-21 20:08:06 +01:00
Florian Bartels f037fc0ca6 dashboard refactoring 2014-02-21 20:00:21 +01:00
Guido Schwab f57514a933 nav bar spacer modified 2014-02-21 19:17:43 +01:00
Jan Steemann 1bdcc145b4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-21 17:44:53 +01:00
Jan Steemann 00d8a9023f Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-21 17:40:38 +01:00
Jan Steemann 7a0aac82e2 re-create database objects on coordinator now, and switch into them 2014-02-21 17:40:00 +01:00
Michael Hackstein f71ede2d17 Added a view for the shard distribution 2014-02-21 17:04:19 +01:00
Guido Schwab 1dd358e5ec restricted max length of db name in navbar - shortened 2014-02-21 16:43:15 +01:00
Guido Schwab 85d1f6af3d restricted max length of db name in navbar - fixed caret 2014-02-21 16:38:39 +01:00
Guido Schwab 43e59bf946 restricted max length of db name in navbar 2014-02-21 16:18:46 +01:00
Max Neunhoeffer 25e4ac19ed Nicer print of pid. 2014-02-21 16:04:45 +01:00
Guido Schwab 7e08be3f33 finally fixed links in DB-menu 2014-02-21 15:52:29 +01:00
Max Neunhoeffer f7e57a5b47 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/manifest.json
	lib/Rest/EndpointIp.cpp
	lib/Rest/EndpointUnixDomain.cpp
	lib/V8/v8-utils.cpp
 2014-02-21 15:28:21 +01:00
Guido Schwab cfb5ca5953 fixed links in DB-menu 2014-02-21 15:28:00 +01:00
Guido Schwab 0d44c33812 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-21 15:19:07 +01:00
Guido Schwab afc41567da some pixelpushing 2014-02-21 15:19:00 +01:00
Max Neunhoeffer db91b06f7b Sort out logs directory in http/ssl server tests. 2014-02-21 14:21:56 +01:00
Heiko Kernbach 57caee1fa7 display status when document is saved 2014-02-21 14:21:01 +01:00
Max Neunhoeffer b4bd5ce665 Improve logging. 2014-02-21 13:38:33 +01:00
Heiko Kernbach df2cda71b4 max width for tooltips added 2014-02-21 13:28:28 +01:00
Max Neunhoeffer 91db141ea5 Change value of things in agency according to Sharding.md. 2014-02-21 13:19:57 +01:00
Heiko Kernbach d3457e61eb optimized notificatins 2014-02-21 12:49:42 +01:00
Max Neunhoeffer 76077f84e7 Report overall test result. 2014-02-21 12:44:31 +01:00
Heiko Kernbach 9e6ce24ac6 notificatin css update 2014-02-21 12:34:58 +01:00
Heiko Kernbach 14c9343e06 fixed wrong template name 2014-02-21 12:19:44 +01:00
Heiko Kernbach 5c1e74ccc3 fixed checkboxes in collectionsview-toggle-menue 2014-02-21 12:12:52 +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
Heiko Kernbach 0ebf849509 merge conflict 2014-02-21 11:21:05 +01:00
Guido Schwab eac41f5bd5 fixed wrong commit 2014-02-21 11:18:16 +01:00
Heiko Kernbach 8650ab9f99 merge conflict 2014-02-21 11:16:18 +01:00
Guido Schwab 07d3ec2cde Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-21 11:14:28 +01:00
Guido Schwab 2aa3f49bb1 moved 'user management' to 'tools' dropdown 2014-02-21 11:14:23 +01:00
Heiko Kernbach c3f72c6d47 divided userbar and notifications 2014-02-21 11:09:53 +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
Jan Steemann 35c00ce592 jslint ist unser freund 2014-02-21 09:07:22 +01:00
Guido Schwab 09a77d0dd2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-21 08:44:11 +01:00
Guido Schwab ea0520636c fixed userBar refresh and doing some pixelpushing 2014-02-21 08:43:29 +01:00
Heiko Kernbach 3e559d9afd cleanup old source view 2014-02-20 23:23:13 +01:00
Heiko Kernbach ba14989b22 jslint 2014-02-20 23:19:46 +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
Heiko Kernbach a189b8136d cleanup 2014-02-20 23:07:15 +01:00
Heiko Kernbach 56812347d2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 23:02:59 +01:00
Heiko Kernbach 6901045535 new edit view for documents 2014-02-20 23:02:15 +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