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

9168 Commits

Author SHA1 Message Date
hkernbach 2191a89f6f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-10-20 17:06:40 +02:00
hkernbach 74bca104e5 issue: 1515, fixed 2 and changed text 2015-10-20 17:03:59 +02:00
Jan Steemann 813048592e fixed scss building 2015-10-20 12:50:15 +02:00
hkernbach 84b32587f5 issue: #1509, temp. disabled gv outbound connections 2015-10-20 10:57:28 +02:00
Wilfried Goesgens 30be20224e Fix fluent AQL interface for fromVertices with arrays: need to use 'ArrayVariable [ * RETURN MERGE(CURRENT, other)]' instead of MERGE(ArrayVariable, other) 2015-10-19 16:40:39 +02:00
hkernbach 6005d3098e frontend cleanup & grunt build 2015-10-16 19:34:54 +02:00
hkernbach 557c1952aa removed not needed templates 2015-10-16 16:54:39 +02:00
hkernbach 0225c4d982 grunt cleanup & optimization 2015-10-16 13:47:03 +02:00
hkernbach 3f4e6cb982 grunt build 2015-10-14 00:42:30 +02:00
hkernbach 81df6ddda1 cleanup web interface 2015-10-14 00:36:05 +02:00
Jan Steemann bb0051b739 fixed hard-coded `incremental` parameter in shell implementation of `syncCollection` function in replication module 2015-10-13 09:33:15 +02:00
Jan Steemann e49064e5c4 hide `fm` variable in web interface shell 2015-10-09 15:25:56 +02:00
Frank Celler 2410437bdc be less verbose 2015-10-09 14:40:21 +02:00
Jan Steemann e71dde08b7 added derived files 2015-10-09 14:28:02 +02:00
Jan Steemann 23ae3a9693 fixes for front end 
Conflicts:
	js/apps/system/_admin/aardvark/APP/GruntFile.js
 2015-10-09 14:26:46 +02:00
Frank Celler a85c44b25e removed commented out lines, less verbose help 2015-10-09 13:51:18 +02:00
hkernbach 6cc0d4d184 new webui grunt build 2015-10-09 10:30:14 +02:00
hkernbach d066a4283c issue: #1446 2015-10-08 14:02:36 +02:00
Jan Steemann 71a25e798b mchacki: fixed development mode 2015-10-07 17:03:49 +02:00
Frank Celler 4b0911c799 added debugging header x-arango-v8-context 2015-10-07 13:37:35 +02:00
Jan Steemann d54db0e3ff do not warn verbosely 2015-10-07 10:15:34 +02:00
jsteemann 358befddde added test for issue #1521 2015-10-06 22:36:09 +02:00
Alan Plum ea44c7710c Rebuild aardvark 2015-10-06 16:35:00 +02:00
Alan Plum 3325d46211 Unbreak aardvark shell 2015-10-06 16:18:23 +02:00
Alan Plum 820e694d0c Re-implement cleanupCancelation 2015-10-06 15:10:43 +02:00
Alan Plum 5b7f3d19d0 Deprecate CS in 2.9, not 2.8 2015-10-06 12:47:58 +02:00
Jan Steemann 849dad60cd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-10-06 11:58:52 +02:00
Jan Steemann beaf3acbd3 simplifications 2015-10-06 11:58:23 +02:00
Alan Plum 7332f3803e Make org/arangodb/deprecated work in arangosh without db 2015-10-06 11:37:42 +02:00
Jan Steemann 3f622d71fb fixed some require issues 2015-10-05 10:28:44 +02:00
Wilfried Goesgens 232d0601cb fix running of arangosh tests with the proper parametrization. 2015-10-02 15:47:01 +02:00
Wilfried Goesgens a968707134 Fix foxx-manager test for running in arangosh 2015-10-02 15:39:49 +02:00
Wilfried Goesgens 3060e1d63d lintify: break lines. 2015-10-02 15:01:38 +02:00
Wilfried Goesgens 353c01f04f don't output the result json when running from an interactive shell. 2015-10-02 14:47:57 +02:00
Wilfried Goesgens a5d8c12067 unittesting framework 
- don't output xml reports if we run single tests
  - add another token to the 'this is not a testcase name' list
 2015-10-02 13:38:25 +02:00
Wilfried Goesgens 320ac8e1e8 Improve indent readability 2015-10-02 12:31:09 +02:00
hkernbach db7533acf8 jslint fix 2015-10-02 10:23:08 +02:00
hkernbach 3beb6a280f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-10-02 10:02:30 +02:00
hkernbach 51a20beef3 graph test view 2015-10-02 10:02:25 +02:00
CoDEmanX 41d6594246 Documentation formatting 2015-10-02 03:14:55 +02:00
Wilfried Goesgens 1d2cf518dd Add --skipArangoBNonConnKeepAlive to skip this part of the test for os'es that have a problem with to frequent ip connection open/close (windows, macos) 2015-10-01 17:09:43 +02:00
Wilfried Goesgens c9cee71b2c Fresh swagger docu 2015-10-01 13:30:55 +02:00
Wilfried Goesgens aa12514b5c Fix links; currently links in REST-documentation only work in the RESTDESCRIPTION :-( 2015-10-01 13:30:55 +02:00
Jan Steemann 7933fe5d4b restore 2.6 behavior for db-based modules 2015-10-01 10:51:23 +02:00
Wilfried Goesgens ab130a025f add prefix to system app contexts - they shouldn't live without namespaces. 2015-09-30 17:55:55 +02:00
Jan Steemann 1ee1a87ae0 return proper errors to caller 2015-09-30 13:49:03 +02:00
Jan Steemann 74358962b5 fixed require on Windows 2015-09-30 13:06:36 +02:00
Jan Steemann 3b0b04b179 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-29 14:59:03 +02:00
Jan Steemann 96d8c24c61 fix app thumbnails 2015-09-29 14:58:35 +02:00
Frank Celler 3f8b2a4925 changed to dot notation 2015-09-29 14:14:57 +02:00