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

9166 Commits

Author SHA1 Message Date
CoDEmanX c4c22086e9 Alternative implementation of DATE_FORMAT() 
Conflicts:
	js/server/modules/org/arangodb/aql.js
 2015-09-14 11:31:44 +02:00
Jan Steemann 09efe111a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-14 10:53:12 +02:00
Jan Steemann 2419ec939b re-added build directory 2015-09-14 10:52:21 +02:00
Frank Celler d828ae39b4 remove rc and devel for version check 2015-09-14 10:40:37 +02:00
Jan Steemann ea4754546a clear AQL cache objects when starting a query, fixed a few TODOs in AQL date implementation 2015-09-11 21:23:07 +02:00
Jan Steemann 82fbdc326d added derived files 2015-09-11 17:29:14 +02:00
Willi Goesgens c5f513b940 don't use json strings, lean on js to generate it for us in a nice formated way. 2015-09-11 16:28:29 +02:00
Willi Goesgens 3c2b745c2b wrap long lines. 2015-09-11 15:57:02 +02:00
Willi Goesgens 8d0d1491f8 Propper highlighting and escaping for examples. 2015-09-11 15:04:55 +02:00
Willi Goesgens 29b7fdd7b1 One more place to remove json.stringify 2015-09-11 15:04:20 +02:00
Jan Steemann 5810095d24 adjusted tests 2015-09-11 12:01:35 +02:00
Willi Goesgens 73ada35a0d Fresh swagger. 2015-09-11 11:37:00 +02:00
Willi Goesgens 169c5b3aa5 Latest swagger generated file 2015-09-11 11:26:06 +02:00
Willi Goesgens ac2acabd5d Work on formatting and grammer 2015-09-11 11:25:34 +02:00
Jan Steemann 7f3cb7fc2c fixed tests 2015-09-11 10:20:18 +02:00
Jan Steemann b5e76b91cb fixed tests 2015-09-11 10:18:26 +02:00
CoDEmanX 6fba9c5284 Additional AQL date functions: DATE_DAYOFYEAR, DATE_ISOWEEK, DATE_LEAPYEAR, DATE_QUARTER, DATE_ADD, DATE_SUBTRACT, DATE_DIFF, DATE_COMPARE and DATE_FORMAT. 
Unit tests incomplete and untested. Behavior of some functions might need adjustments. ISO duration cache needs to be cleared on every AQL query to avoid a memory leak.

Please rebuild Aardvark and see TODOs in code. Also added Windows shortcuts to ignore list.
 2015-09-11 06:23:36 +02:00
Willi Goesgens 49a966234b remove stray newline. 2015-09-10 16:24:43 +02:00
Willi Goesgens cac602ff73 this api is not easily documented here, but, it was better documented before. 2015-09-10 13:38:13 +02:00
Willi Goesgens b5ddbe1240 Properly explain the explain-api. 2015-09-10 13:28:14 +02:00
Willi Goesgens 778d2c84cb Work on sub-structured data to be propper formatted for swagger. 2015-09-10 10:57:42 +02:00
Willi Goesgens e1ae661ae0 Work on multi-dimensional swagger post data 2015-09-09 17:40:51 +02:00
Willi Goesgens eb9e03f3f0 Upgrade the REST-API documentation to to swagger V2.0 
Wrap lines in examples.
 2015-09-09 15:21:18 +02:00
Alan Plum e7ddfcf38b Fixed nav link. 2015-09-09 14:03:11 +02:00
Alan Plum 1eb94a053f Rebuilt aardvark. 2015-09-09 13:39:40 +02:00
Alan Plum f54b2e52f7 Replaced embedded swagger 1 with external swagger 2. 2015-09-09 13:38:59 +02:00
Willi Goesgens a9ade74e87 Upgrade swagger. 2015-09-09 09:29:45 +02:00
Alan Plum 4d49afa4fe Updated AQB. 2015-09-08 19:08:21 +02:00
Jan Steemann 79a34e94e6 jslint 2015-09-08 17:39:01 +02:00
Jan Steemann a7b51c39da added tests 2015-09-08 17:34:14 +02:00
Michael Hackstein fdde6a69c6 Added failure tests for new implementation of HashIndex. And fixed a memleak there. 2015-09-08 15:35:21 +02:00
Michael Hackstein 9cbbd7dd0f Fixed wrong error reporting in Graph functions 2015-09-08 15:30:32 +02:00
Jan Steemann 560a039f3e added tests 2015-09-08 14:22:23 +02:00
Jan Steemann f09b11504e fix spelling 2015-09-07 21:12:51 +02:00
Jan Steemann 3e7f4b61ea added test 2015-09-07 20:54:51 +02:00
Jan Steemann 29d37eb346 added diagnosis functions 2015-09-07 20:48:42 +02:00
CoDEmanX 8aa78dcb7f Fix some more typos 2015-09-05 17:18:04 +02:00
CoDEmanX 86d58c241d Remove doc building readme, fix typos 2015-09-05 03:47:06 +02:00
Jan Steemann e602ca5662 issue #1471: document() vs documents() parameters (_key and _id) 2015-09-04 18:13:23 +02:00
Jan Steemann 47360f4511 added tests 2015-09-04 14:21:31 +02:00
CoDEmanX 3a9648d78a More Americanization 2015-09-03 22:25:43 +02:00
Jan Steemann 4d46286cf7 fancier test output 2015-09-03 14:23:56 +02:00
TJ Walker 9147856636 Fix #41469 2015-09-02 18:03:10 -07:00
TJ Walker 0c854bdc42 Fixes #1469 2015-09-02 17:59:02 -07:00
Jan Steemann 2e617ac0cc Merge branch 'american-english' of https://github.com/CoDEmanX/ArangoDB into devel 
Conflicts:
	arangod/Wal/Slots.cpp
	lib/Basics/debugging.cpp
	lib/Basics/files.cpp
 2015-09-02 13:14:49 +02:00
Jan Steemann 0e802d6438 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-02 10:20:18 +02:00
Jan Steemann a80d6635ab create fat datafiles 
This prevents SIGBUS when a sparse datafile is accessed and the disk is full. In
this case the mmapped region is not necessarily backed by physical memory, and
accessing the memory may crash the program
 2015-09-02 10:18:24 +02:00
CoDEmanX 956b396e43 Change spelling of 'initialize' to American English (actual code and files) 2015-09-01 17:29:22 +02:00
CoDEmanX b4593a7e82 Change spelling of 'initialize' to American English (comments and log messages only) 2015-09-01 17:07:21 +02:00
Michael Hackstein 25a52dac53 Disabled test for cluster mode for now 2015-09-01 10:06:26 +02:00
Jan Steemann 9c713ce181 fixed installing of Foxx apps from store 2015-08-31 23:38:19 +02:00
Alan Plum 6b3e08456b Handle ArangoCollection in aqlQuery templates. 2015-08-31 18:16:23 +02:00
Jan Steemann dd9cd8f472 made `aqlQuery` run in web interface 2015-08-30 23:12:26 +02:00
Jan Steemann 1867d6c4de added template string generator function `aqlQuery` for generating AQL queries 
This can be used to generate safe AQL queries with JavaScript parameter
variables or expressions easily:

    var name = 'test';
    var attributeName = '_key';
    var query = aqlQuery`FOR u IN users FILTER u.name == ${name} RETURN u.${attributeName}`;
    db._query(query);
 2015-08-30 22:32:26 +02:00
hkernbach 5c9bab6802 web ui: css, validation bug, graph view optimized 2015-08-28 14:50:40 +02:00
Michael Hackstein 90db96a6dc Merge branch 'devel' of github.com:arangodb/arangodb into primary_eimer 2015-08-28 10:45:50 +02:00
Michael Hackstein d87748f64e Another graph test depending on unguranteed ordering 2015-08-28 10:45:30 +02:00
Michael Hackstein e909c79794 Fixed a graph unit test. It assumed a specific ordering which is not guaranteed 2015-08-28 10:14:07 +02:00
hkernbach e30d6d42b9 web ui: css, scss-lint, services bugfix & optimization 2015-08-28 09:47:02 +02:00
hkernbach ebe1c36561 web ui: css, bugfixes 2015-08-27 18:39:57 +02:00
hkernbach 8d563ee7f9 web ui: css, updated font awesome to 4.4, dropdown bug, graph viewer 2015-08-27 17:13:54 +02:00
hkernbach b3b2b235c8 web ui: css, query editor, scss 2015-08-27 14:44:02 +02:00
Alan Plum aca2072477 Fixed session default values. 2015-08-27 13:41:24 +02:00
Willi Goesgens 34e8a8fc9f debug printing for misterious ignore of skip 2015-08-26 15:39:02 +02:00
Michael Hackstein 4effa2291e Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing 2015-08-26 10:41:27 +02:00
hkernbach 443a30742a css 2015-08-26 09:25:14 +02:00
Jan Steemann 9374a25822 removed unused error code 2015-08-25 19:55:48 +02:00
hkernbach b18f744682 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-08-25 18:57:51 +02:00
hkernbach 5c83c6d7c5 web ui: css, design 2015-08-25 18:57:42 +02:00
Willi Goesgens 7b081fb6f3 print usefull error if we fail to start procdump. 2015-08-25 17:14:44 +02:00
Michael Hackstein 40c1361244 Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing 2015-08-25 16:40:31 +02:00
hkernbach 9ed2e4b3b1 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-08-25 13:54:00 +02:00
hkernbach 63903bc1bf webui: loginView, css 2015-08-25 13:53:46 +02:00
Jan Steemann b71c880bbd Merge branch 'replication' of https://github.com/arangodb/arangodb into devel 2015-08-25 13:19:24 +02:00
Jan Steemann 1af238a6d5 added tests for requireFromIncluded 2015-08-25 12:50:58 +02:00
hkernbach 98a5108a27 scss lint 2015-08-25 09:17:51 +02:00
hkernbach b5c3c1b09a web ui radio, checkboxes 2015-08-24 18:37:18 +02:00
Jan Steemann 0cbff7b75a Merge branch 'devel' of https://github.com/arangodb/arangodb into replication 2015-08-24 17:40:19 +02:00
hkernbach b2e9fa4576 login view, authentication web ui bug, scss-lint 2015-08-24 16:39:00 +02:00
hkernbach 8d49d01cb2 userlogo web ui bugfix, scss lint 2015-08-24 15:36:22 +02:00
hkernbach 4d9d3f4c07 scss lint 2015-08-24 15:22:43 +02:00
Jan Steemann 91b8ad757a Merge branch 'devel' of https://github.com/arangodb/arangodb into replication 2015-08-24 15:20:28 +02:00
hkernbach 0d154ea124 web ui, scss lint 2015-08-24 14:52:24 +02:00
hkernbach 5988f06377 updated jsoneditor lib, fixed issue 1446 2015-08-24 11:44:13 +02:00
Jan Steemann b08713d768 added tests and documentation 2015-08-24 11:05:26 +02:00
Jan Steemann 893f9592f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into replication 2015-08-24 09:58:04 +02:00
hkernbach 15876a591e web ui design 2015-08-24 09:54:41 +02:00
Jan Steemann 387e3e9cd4 make removeByExample, replaceByExample and updateByExample use AQL internally 2015-08-22 23:22:24 +02:00
Jan Steemann b58ecfe206 added firstTick() 2015-08-21 17:11:40 +02:00
Jan Steemann 9e08b1ebc5 add tickRanges() function 2015-08-21 17:00:32 +02:00
Jan Steemann 31a6547d4c fix replication resumption 2015-08-21 15:57:24 +02:00
Michael Hackstein b708a7ae68 Merge remote-tracking branch 'origin/devel' into array_indexing 2015-08-21 15:34:49 +02:00
Michael Hackstein c26be36e61 Added tests for Sparse indexes 2015-08-21 15:04:01 +02:00
Willi Goesgens b785c44a5d fix docublock syntax. 2015-08-20 18:30:30 +02:00
Michael Hackstein a2d26056b2 Added a test file for array indexing 2015-08-20 15:48:11 +02:00
Jan Steemann 4b7d04de47 added missing whitespace 2015-08-20 01:46:21 +02:00
Jan Steemann cb434ea863 added derived file 2015-08-19 11:20:23 +02:00
Willi Goesgens 01a1273a87 Merge pull request #1444 from aurelijusb/documentation 
Small documentation improvements
 2015-08-19 10:23:36 +02:00
Jan Steemann bc7e0f7bbd issue #1445: Object literal simplificatin does not support pseudo-variables NEW and OLD 2015-08-19 09:25:46 +02:00
Willi Goesgens 8992b99ec5 add possibility to skip benchmark tests 2015-08-18 17:02:28 +02:00
Michael Hackstein 527120a3ea Removed outdated documentation, has been replased by a newer version earlier 2015-08-18 16:36:13 +02:00
Michael Hackstein 3f90914397 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-08-18 16:15:42 +02:00
Michael Hackstein 602c3d0d59 Improved the documentation for Foxx controller 2015-08-18 16:14:39 +02:00
Alan Plum 80b92488f8 Don't warn about Foxx app versions at all. 2015-08-18 13:42:47 +02:00
Michael Hackstein 580066fe8a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-08-18 13:12:49 +02:00
Michael Hackstein b81ac9be43 Foxx: controller.allRoutes can now use functions defined by extending the controller. 2015-08-18 13:12:40 +02:00
Jan Steemann 76e85ffc1f added test case 2015-08-18 12:09:30 +02:00
Jan Steemann 4e771b2728 replication improvements 2015-08-17 18:41:05 +02:00
Alan Plum 02a72800f3 Removed obsolete test. 2015-08-17 03:24:30 +02:00
Jan Steemann a8e6b1f6a6 added comment 2015-08-16 22:07:16 +02:00
Alan Plum 09723c4757 Foxx non-semver version should merely warn. 2015-08-16 22:05:21 +02:00
Aurelijus Banelis 9c075561f4 Documentation: collection.updateByExample can append not only change 
From example it was not clear, that old fields are left unchanged.
So it is not confused with replace whole document: replaceByExample
 2015-08-16 17:25:27 +03:00
Willi Goesgens f36dc42a0e fix docublock syntax 2015-08-14 14:46:28 +02:00
Jan Steemann 1cf67a9df2 fix linting 2015-08-14 13:34:39 +02:00
Jan Steemann 18ba2d5659 fail if a task with non-parsable code is registered 2015-08-14 11:56:54 +02:00
Jan Steemann 15b5d89e10 added derived file 2015-08-13 21:26:54 +02:00
Willi Goesgens 994d850a79 remove toket that is not used anymore. 2015-08-13 18:42:11 +02:00
Willi Goesgens 7ae7c67a83 Fix docu block syntax 2015-08-13 18:41:08 +02:00
Willi Goesgens 1dd4d2b326 Disarm deprecated documentation tokens, we won't fix them before deleting them. 2015-08-13 18:40:29 +02:00
Jan Steemann e1bdca6997 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-13 15:48:57 +02:00
Willi Goesgens 662b3e76c7 Unify the usage of docublocks for the foxx-queues 2015-08-13 15:44:38 +02:00
Jan Steemann 9f9a158419 do not execute OOM tests in cluster case, where they cannot fire 2015-08-13 15:38:01 +02:00
Jan Steemann 5b82096145 honor indexBuckets attribute in restore operation of collection 2015-08-13 15:37:32 +02:00
Jan Steemann 6845321737 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
Conflicts:
	js/server/tests/shell-foxx-manager-spec.js
 2015-08-13 13:21:55 +02:00
Jan Steemann 1aeca516f2 fix jslint 2015-08-13 13:18:02 +02:00
Willi Goesgens b322ede0f7 lintit 2015-08-13 13:11:56 +02:00
Jan Steemann 743d3914d3 enough is enough: disable failing test until properly fixed 2015-08-13 12:41:37 +02:00
Michael Hackstein ca7ca679ee Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-08-13 11:22:12 +02:00
Michael Hackstein 90d089f49f Fixed an issue with neighborExamples in GRAPH_EDGES 2015-08-13 11:22:06 +02:00
Jan Steemann a1d0c4e431 fixed g++5.1 compile error, added tests 2015-08-13 11:14:50 +02:00
Jan Steemann 5838e8c8aa fixed wrong usage of errors 2015-08-13 00:17:18 +02:00
Jan Steemann 589e67357f issue #1434: return more meaningful error message from org/arangodb/general-graph::_fromVertex() 2015-08-12 21:36:27 +02:00
Jan Steemann 33c2e9a8cc issue #1434: graph traversal config: collection _graphs does not exist?! (Aardvark JS Shell) 2015-08-12 19:45:43 +02:00
Frank Celler 9de6bd39db moved to strings, fixed #1432: arangosh doesn't ignore prefixed ....> on paste 2015-08-12 17:54:14 +02:00
Willi Goesgens f5d301a814 Move documentation into the source files. 2015-08-12 17:38:41 +02:00
Willi Goesgens bbb8198d2b Add a @brief to all descriptions, remove stray markup. 2015-08-12 16:58:06 +02:00
Jan Steemann d2b1305d36 issue #1435: Aardvark: Collection settings toggles broken? 2015-08-12 16:46:29 +02:00
Michael Hackstein c43d72f2cf Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-08-12 13:08:58 +02:00
Michael Hackstein 36cd02065f Fixed a bug where it was not possible to get any error information from Foxx Apps being installed through the WebInterface. 2015-08-12 13:08:49 +02:00
Max Neunhoeffer b844ff3468 Finish the role "SECONDARY" in a cluster. Configure replication automatically. 2015-08-12 10:54:30 +02:00
Alan Plum 398a868ea6 Add support for joi options. Fixes #1425. 2015-08-11 16:12:11 +02:00
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