1
0
Fork 0
Commit Graph

10211 Commits

Author SHA1 Message Date
Jan Steemann 88bfe4d0ff Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-26 12:37:27 +01:00
Jan Steemann ce31d754e4 fixed typo 2016-02-26 12:33:08 +01:00
Alan Plum 041ebf1542 Fix #1577 once and for all
This guarantees the module resolution doesn't break out of the ArangoDB module root (or the service's root).
2016-02-26 12:24:26 +01:00
hkernbach 335b638670 new query view 2016-02-25 23:50:15 +01:00
hkernbach 19d14e2bce Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-25 17:14:28 +01:00
hkernbach 8b58e39988 new query view, grunt 2016-02-25 17:14:19 +01:00
Frank Celler 1cd53c20a1 added generateMimetypes and generateErrorfiles 2016-02-25 13:14:06 +01:00
hkernbach 60b81c84b0 new query view better error handling 2016-02-25 12:50:34 +01:00
hkernbach 66473b991c localstorage new query view 2016-02-25 12:25:07 +01:00
Frank Celler d7bd642ed1 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-25 11:19:38 +01:00
Frank Celler 37a0a7fc05 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-25 10:56:14 +01:00
hkernbach 1e78f8aae6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-25 10:34:25 +01:00
hkernbach ff2f4d089f grunt 2016-02-25 10:34:08 +01:00
hkernbach aadab3a0e4 new query view 2016-02-25 10:33:58 +01:00
Jan Steemann 382a76c784 jslint 2016-02-25 10:12:36 +01:00
hkernbach fc7fdd6572 query view 2016-02-24 23:45:38 +01:00
hkernbach f5674fd76e dev version of new aql editor, grunt 2016-02-24 19:57:08 +01:00
Frank Celler da7955e417 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-24 19:29:01 +01:00
hkernbach 028ccfb3c7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-24 18:31:44 +01:00
Jan Steemann af367a3e13 fixed range optimizations 2016-02-24 17:43:17 +01:00
hkernbach 3f3dbc5391 removed old icon 2016-02-24 10:59:57 +01:00
jsteemann ca9f5f1709 removed redundant test 2016-02-24 00:21:20 +01:00
Frank Celler 41ab5647e6 added recover --test 2016-02-23 23:23:37 +01:00
hkernbach c66a480db9 user view bugfix, grunt 2016-02-23 19:00:56 +01:00
Frank Celler 9fca3425a1 cleanup 2016-02-23 15:28:31 +01:00
hkernbach 7a84881148 scss 2016-02-23 15:25:06 +01:00
hkernbach 9e7a2039da removed alerts, replaced with helper errors 2016-02-23 15:25:06 +01:00
hkernbach 1d5e1ff375 dashboard styling 2016-02-23 15:25:06 +01:00
hkernbach 4a76aaed80 collection status 2016-02-23 15:25:05 +01:00
hkernbach 535f61a58b grunt build 2016-02-23 15:25:05 +01:00
hkernbach 77c5e0bdc4 bugfixes webui 2016-02-23 15:25:04 +01:00
hkernbach dedd987ea5 grunt build 2016-02-23 15:25:04 +01:00
hkernbach 597a790dee collection view bugfix 2016-02-23 15:25:03 +01:00
hkernbach cfe62a9f9a grunt 2016-02-23 13:27:35 +01:00
hkernbach fa5ece041f html, scss 2016-02-23 13:27:07 +01:00
hkernbach 24e2dd2f58 scss 2016-02-23 11:36:26 +01:00
hkernbach 9ea4e386ae removed alerts, replaced with helper errors 2016-02-23 11:22:32 +01:00
hkernbach 51cac56eaf dashboard styling 2016-02-23 11:10:00 +01:00
hkernbach 39a38ffe34 collection status 2016-02-23 11:01:38 +01:00
hkernbach 140ed385d3 grunt build 2016-02-23 10:31:52 +01:00
hkernbach 5b733abceb bugfixes webui 2016-02-22 17:46:58 +01:00
hkernbach 3b7d837f8d grunt build 2016-02-22 16:56:45 +01:00
hkernbach 7f8a9e8a49 collection view bugfix 2016-02-22 16:52:42 +01:00
hkernbach 8b43486035 scss 2016-02-22 16:29:38 +01:00
hkernbach 4329125165 fixed graph router bug 2016-02-22 15:33:20 +01:00
hkernbach a311ec9036 removed deprecated offsetWidth, offsetHeight 2016-02-22 15:11:14 +01:00
hkernbach aa382da33b removed deprecated webkitURL 2016-02-22 15:07:13 +01:00
hkernbach 5d53b15104 removed sync calls 2016-02-22 15:01:50 +01:00
hkernbach 867c1fa8c1 bugfixes, removed more sync calls 2016-02-22 13:56:12 +01:00
hkernbach ca1633357a removed sync calls 2016-02-22 12:03:14 +01:00
hkernbach fcea7af96b removed sync calls 2016-02-22 11:33:49 +01:00
hkernbach d54543bd1d doc export bugfix 2016-02-22 11:27:12 +01:00
hkernbach f26516fd93 user management view bugfix 2016-02-22 11:11:32 +01:00
hkernbach e5344ba924 removed sync calls 2016-02-22 11:08:18 +01:00
Frank Celler 5ac3beb02d added sanitizer for longer timeouts 2016-02-20 12:01:31 +01:00
hkernbach 15bc2a96ea scss 2016-02-20 02:11:56 +01:00
hkernbach b502f858b7 rm test file 2016-02-20 02:02:34 +01:00
hkernbach c9ca22c5a5 rm test file 2016-02-20 02:01:05 +01:00
hkernbach 12aace1413 complete grunt build 2016-02-20 01:55:38 +01:00
hkernbach b182f6e48d sync to async calls 2016-02-20 01:52:57 +01:00
hkernbach 553875b691 sync calls to async 2016-02-20 01:20:29 +01:00
hkernbach 09fcdb552d road to fully async web ui 2016-02-19 23:37:19 +01:00
hkernbach e9259f1ae3 removed sync calls from user views 2016-02-19 21:39:51 +01:00
hkernbach e1af85af36 removed sync calls from router 2016-02-19 20:49:50 +01:00
hkernbach adadc04e49 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-19 20:44:32 +01:00
hkernbach 4f75fa02ac cleanup router 2016-02-19 20:44:04 +01:00
hkernbach 1ce418a7cf added missing logo event 2016-02-19 20:41:51 +01:00
hkernbach e0e4336d53 moved navi elements to the right position 2016-02-19 20:33:18 +01:00
Frank Celler 034eea10b3 fixed version 2016-02-19 20:15:39 +01:00
hkernbach 6525c7762b Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-19 18:58:41 +01:00
hkernbach 2c23eccaad removed async calls 2016-02-19 18:58:34 +01:00
Jan Steemann d44f280651 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-19 18:30:42 +01:00
hkernbach b2df2d6600 replaced sync calls from query view and regarding collection 2016-02-19 18:22:49 +01:00
Jan Steemann bc6283fc91 added WITH collections declarative 2016-02-19 18:20:46 +01:00
hkernbach 15c071f996 replaced some sync calls with async ones 2016-02-19 16:38:54 +01:00
hkernbach 677a8937fa replaced sync call for creating collections with async call 2016-02-19 15:59:56 +01:00
hkernbach 8d2e4f8711 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-19 15:07:56 +01:00
hkernbach 468a3130f6 fixed issue: #1709 2016-02-19 15:07:08 +01:00
Alan Plum 17ef7ca5e9 Revert system app version compatibility 2016-02-19 14:46:31 +01:00
hkernbach 432f2970f6 query management view auto update 2016-02-19 13:56:19 +01:00
hkernbach 89cb11d631 collections model added missing status 2016-02-19 13:03:42 +01:00
hkernbach 53f1ee2c2d grunt build 2016-02-19 12:43:23 +01:00
hkernbach 60299e0b54 progress view 2016-02-19 12:42:56 +01:00
hkernbach 9fe0f9bea3 collection view web ui 2016-02-19 12:13:04 +01:00
hkernbach 4a903a9e6b grunt 2016-02-19 11:31:33 +01:00
hkernbach e8f544c2f0 collections view web ui 2016-02-19 11:31:18 +01:00
Frank Celler 4dbf7be8dc check for location of etc 2016-02-19 10:44:06 +01:00
Kaveh Vahedipour db9d23b7ef Adapting to intel compiler 15.0 2016-02-18 23:26:45 +01:00
hkernbach 415392e747 fixed bug: ##1727 2016-02-18 17:05:21 +01:00
hkernbach fa2e8e03b9 pending jobs call only at colls view 2016-02-18 16:56:14 +01:00
hkernbach e10b3d59d8 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-18 16:36:29 +01:00
hkernbach 582d01885e responsive design, scss, readbility numbers, grunt build 2016-02-18 16:36:02 +01:00
Frank Celler 603afe6e5a fixed pathes 2016-02-18 16:30:52 +01:00
Frank Celler 5fcc412f6f switch to 3.0.0 2016-02-18 14:44:57 +01:00
Frank Celler adaef87abf switch to 3.0.0 2016-02-18 14:41:25 +01:00
hkernbach 62a7fb57ec grunt build + jslint 2016-02-17 21:10:26 +01:00
hkernbach 9e776db8ea web ui: some collection tile state changes 2016-02-17 21:06:23 +01:00
hkernbach d4b7cf4c52 removed console log 2016-02-17 20:27:36 +01:00
hkernbach db688dcd46 fixed creation of a graph without definition 2016-02-17 20:23:51 +01:00
hkernbach 307cbdebb9 fixed select2 bug graph management tab 2016-02-17 19:57:15 +01:00