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

8925 Commits

Author SHA1 Message Date
Jan Steemann 68465ebba5 Merge branch 'collection-not-loaded' of https://github.com/arangodb/arangodb into devel 
Conflicts:
	js/apps/system/_admin/aardvark/APP/frontend/build/app.js.gz
	js/apps/system/_admin/aardvark/APP/frontend/build/app.min.js
	js/apps/system/_admin/aardvark/APP/frontend/build/app.min.js.gz
	js/apps/system/_admin/aardvark/APP/frontend/build/scripts.html.part
	js/apps/system/_admin/aardvark/APP/frontend/build/standalone-min.html
	js/apps/system/_admin/aardvark/APP/frontend/build/standalone-min.html.gz
	js/apps/system/_admin/aardvark/APP/frontend/build/standalone.html
 2015-08-11 14:16:12 +02:00
Jan Steemann b78dadfe9f fixed documentation generation 2015-08-11 14:10:51 +02:00
Willi Goesgens ad75a69e26 fix syntax in documentation. 2015-08-11 14:09:59 +02:00
Willi Goesgens 40ba3dcffc Improve error message if module doesn't have a callback hook. 2015-08-11 14:08:32 +02:00
Jan Steemann 6a26f9bc55 display indexBuckets in web interface 2015-08-11 14:00:15 +02:00
Alan Plum 5c6484d3ed Deprecated controller.addInjector. 2015-08-11 13:26:32 +02:00
Alan Plum 5e4630d31d Class-based controllers, models, repos and request contexts. 2015-08-11 13:08:41 +02:00
Alan Plum ae103ac39f Rebuilt aardvark. 2015-08-11 13:08:06 +02:00
Alan Plum 1031a3d4e9 Added optional Foxx deps. 2015-08-11 13:08:06 +02:00
Jan Steemann 434d6167db added configuration option `--database.throw-collection-not-loaded-error` 2015-08-11 12:31:42 +02:00
Jan Steemann e642ce972f throw error if collection not yet loaded 2015-08-10 17:08:41 +02:00
Alan Plum a8516913a2 Revert "added updateDeps" 2015-08-10 14:56:01 +02:00
Michael Hackstein 675766490b Fixed a failure test that was not deterministic 2015-08-07 14:56:57 +02:00
Alan Plum fa552c3a52 Removed stray type option from session tests. 2015-08-05 14:07:14 +02:00
Alan Plum 7bd08e29aa Deprecated CS. 2015-08-05 12:48:27 +02:00
Jan Steemann bdf1cb0cdb added derived file 2015-08-05 11:53:22 +02:00
Willi Goesgens b4675448c2 remove stray test of removed foxx-feature. 2015-08-05 09:48:08 +02:00
Willi Goesgens f44d246a34 Lintify. 2015-08-05 09:19:10 +02:00
Alan Plum 9f31b0eb57 Removed session opts.type from test. 2015-08-04 21:13:21 +02:00
Alan Plum f6a01f3e67 Removed session opts.type. 2015-08-04 21:12:09 +02:00
Alan Plum 2a17f87e38 Removed Foxx JWT tests. 2015-08-04 21:08:22 +02:00
hkernbach 796bebbfdb merge 2015-08-04 19:42:09 +02:00
hkernbach 7e3d14232e css web ui 2015-08-04 19:41:41 +02:00
Willi Goesgens 021d01e4fe Rework index documentation; add more executed examples. 2015-08-04 18:42:44 +02:00
Willi Goesgens a5337ccdcb fix usage of db._query() when generating documentation. 2015-08-04 18:41:37 +02:00
Alan Plum a37248e2d2 Yak shaved. 2015-08-04 18:12:37 +02:00
hkernbach ae17532ee3 Merge 2015-08-04 17:34:51 +02:00
hkernbach b328fe6faa added missing contributer attr in manifest 2015-08-04 17:25:23 +02:00
Alan Plum 1a2b17bce7 Added org/arangodb/deprecated. 2015-08-04 16:57:54 +02:00
Jan Steemann b591706484 fixed locking 2015-08-04 15:42:39 +02:00
Jan Steemann c163d602ff updated documentation for `indexBuckets` 2015-08-04 14:13:01 +02:00
Jan Steemann f89af3f6f4 adjusted tests for indexBuckets 2015-08-04 14:02:04 +02:00
Willi Goesgens 8130368f43 Work on re-grouping the index documentation, using automated examples. 2015-08-04 13:44:25 +02:00
hkernbach c5a048fe25 merge 2015-08-04 12:53:21 +02:00
hkernbach 9ffd6bdcba web ui 2015-08-04 12:52:22 +02:00
hkernbach 10d4749637 web ui footer css 2015-08-04 12:45:37 +02:00
hkernbach 7bdc077cf7 graphViewer bugfix 2015-08-04 12:44:54 +02:00
Jan Steemann 7a3d49be88 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-04 10:30:28 +02:00
Jan Steemann 5dab23a3b7 CXX implementation of AQL `LIKE` 2015-08-04 10:30:18 +02:00
Max Neunhoeffer edfc933eb5 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-08-04 09:33:39 +02:00
Max Neunhoeffer 88518dd4ba Fix tests for new ClusterInfo: call ClusterInfo::flush after test. 2015-08-04 09:33:19 +02:00
Jan Steemann d7cb705d58 make foxx-queue-mananger poll list of databases less often 2015-08-04 09:25:12 +02:00
Willi Goesgens db38b4f63a move skiplist documentation back into the source. 2015-08-03 17:34:47 +02:00
Willi Goesgens c9ccb0ce00 Properly generate examples for cap constraints. 2015-08-03 16:50:41 +02:00
Willi Goesgens 8b47ac11d5 remove the endDocuBlock of the broken documentation too. 2015-08-03 16:45:41 +02:00
Willi Goesgens 59868bb4d2 Remove duplicated / broken documentation of deprecated modules. 2015-08-03 16:01:48 +02:00
Willi Goesgens 3766ab9f59 de-duplicate documentation of geo-indices. 2015-08-03 14:42:11 +02:00
Willi Goesgens c53bade3c1 fix jslint 2015-08-03 14:12:22 +02:00
Willi Goesgens a7d40a19ea increase timeout of benchmark tests 2015-08-03 12:42:41 +02:00
Heiko Kernbach dcc501ca00 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-08-03 12:29:52 +02:00
Heiko Kernbach d42f7ffaaf grunt package json, ui 2015-08-03 12:26:48 +02:00
Jan Steemann 79524e721e added generated file 2015-08-03 10:59:26 +02:00
Jan Steemann 9c97800adf Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-03 10:54:57 +02:00
Jan Steemann 38802d9d71 try to fix example 2015-08-03 10:54:49 +02:00
Willi Goesgens 651c77685c Fix Errormessage: add collection name. 2015-08-03 10:41:27 +02:00
Jan Steemann fa1f1e3485 added example 2015-08-03 09:42:38 +02:00
Heiko Kernbach a19af68830 navbar dropdowns web ui 2015-07-31 18:46:08 +02:00
Heiko Kernbach 3b98fb0fd0 jslint, ui 2015-07-31 18:28:15 +02:00
Heiko Kernbach f9e9aa1ddf ui changes frontend 2015-07-31 17:55:47 +02:00
Heiko Kernbach a85ffc14b1 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-07-31 15:35:51 +02:00
Heiko Kernbach 7678d29ac8 css 2015-07-31 15:34:53 +02:00
Alan Plum 72fefa71fc 400 -> 422 2015-07-30 19:00:25 +02:00
Alan Plum 668f78c4af BadRequest -> UnprocessableEntity. Fixes #1420. 2015-07-30 18:28:06 +02:00
Heiko Kernbach 5aed4c7f55 select2 css 2015-07-30 14:17:58 +02:00
Heiko Kernbach 425fc48032 dashboard ui 2015-07-30 12:52:53 +02:00
Jan Steemann 81f0935662 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-07-30 09:36:03 +02:00
Jan Steemann dc68b78bb6 improve error message output for Foxx 2015-07-30 09:31:22 +02:00
Jan Steemann 5bd31e8004 added DISTINCT keyword, removed SKIPLIST function 2015-07-30 00:08:23 +02:00
Jan Steemann 2d8777bc6c make the optimizer create less plans 2015-07-30 00:07:32 +02:00
Heiko Kernbach 007a691772 ui: tabs, modals, dropdowns, header, breadcrumb 2015-07-29 18:53:57 +02:00
Heiko Kernbach 1d0dfad48c Merge branch 'devel' of github.com:arangodb/arangodb into web-ui 2015-07-29 16:46:03 +02:00
Heiko Kernbach c679674105 ui 2015-07-29 16:45:43 +02:00
Heiko Kernbach 7d4d1b38d6 grunt file 2015-07-28 16:02:54 +02:00
Heiko Kernbach 86123c4b10 cleanup 2015-07-28 16:00:01 +02:00
Heiko Kernbach f5ccad83de jslint 2015-07-28 15:49:39 +02:00
Heiko Kernbach 4063a7854c ui 2015-07-28 15:36:12 +02:00
Heiko Kernbach 41c19e75ab some cleanup, more gzip support 2015-07-28 15:22:41 +02:00
Heiko Kernbach 72c42fb523 added css gzip, removed unused css 2015-07-28 15:07:14 +02:00
Heiko Kernbach 92ae28ef8a added frontend gzip support 2015-07-28 14:43:45 +02:00
Michael Hackstein 25f7b25206 Fixed failing failure-tests 2015-07-28 13:21:54 +02:00
Heiko Kernbach 9b98d74c7b minify 2015-07-27 17:24:59 +02:00
Heiko Kernbach fbcb686e34 css 2015-07-27 17:15:22 +02:00
Heiko Kernbach 1ddb2b59fb compressed img, css 2015-07-27 16:39:30 +02:00
Heiko Kernbach cd232bb521 img 2015-07-27 16:23:07 +02:00
Heiko Kernbach 25e2ea3b36 ui, compressed images 2015-07-27 16:16:04 +02:00
Heiko Kernbach 0ce663f08b ui 2015-07-27 15:56:28 +02:00
Heiko Kernbach 6826506a84 ui 2015-07-27 15:16:21 +02:00
Heiko Kernbach 0d3922246e ui 2015-07-27 14:54:58 +02:00
Heiko Kernbach 3ddd2a7aed ui + gv 2015-07-27 14:26:03 +02:00
Heiko Kernbach 932d02df67 web ui 2015-07-27 12:51:14 +02:00
Jan Steemann 5f4b0eeacb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-07-27 08:50:30 +02:00
Jan Steemann b6b277d94a require file on initialization 2015-07-27 08:50:12 +02:00
Heiko Kernbach 7fafacd2f9 web ui 2015-07-24 16:45:38 +02:00
Heiko Kernbach 9f2703c7e5 tabs 2015-07-24 16:32:57 +02:00
Heiko Kernbach b14bf85264 web ui 2015-07-24 16:30:38 +02:00
Michael Hackstein a0e3ea9c7b Fixed Neighbor tests in cluster 2015-07-24 16:05:49 +02:00
Jan Steemann 5a393e1705 fixed tests 2015-07-24 14:02:06 +02:00
Heiko Kernbach 959040d3c5 ui borders 2015-07-24 13:51:29 +02:00
Jan Steemann dbb740a705 activate distinct test 2015-07-24 13:41:01 +02:00
Jan Steemann 38b2d6caea Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-07-24 13:21:49 +02:00