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

688 Commits

Author SHA1 Message Date
Jan Steemann ae8904a5b6 added async flag for sync() and syncCollection() 2015-12-01 12:04:40 +01:00
hkernbach 6d25ac57e9 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-01 11:25:58 +01:00
Jan Steemann 459d15bb2c added cluster execution site info in explain output for AQL queries 2015-12-01 10:30:13 +01:00
jsteemann 49af794f5d Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-multi-modify 2015-12-01 01:56:46 +01:00
Michael Hackstein e9a36a3fbf Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-30 14:17:44 +01:00
Jan Steemann b71d0fdcd4 rebuilt replication front end 2015-11-30 13:13:23 +01:00
hkernbach ac8542fe07 Merge branch 'JHMH' of github.com:arangodb/arangodb into JHMH 2015-11-27 14:58:00 +01:00
hkernbach 7dd817417f jslint 2015-11-27 14:57:51 +01:00
Wilfried Goesgens bab9d07bad fresh swagger. 2015-11-27 13:24:18 +01:00
Jan Steemann a828707909 added derived file 2015-11-27 11:59:59 +01:00
Wilfried Goesgens de76c096c9 Adjust explainer to new simple expressions; linting. 2015-11-25 16:50:23 +01:00
hkernbach fae01d6c41 webui: delete graphs with dropCollections attribute, usability 2015-11-24 17:38:41 +01:00
hkernbach d7f8990eee added documentation link to example graphs setup 2015-11-24 15:58:01 +01:00
hkernbach 8e6bdaec65 added example graphs to webui 2015-11-24 15:35:44 +01:00
hkernbach 94d2e83981 added example graph route to aardvark 2015-11-24 15:35:01 +01:00
hkernbach 2d417e393d Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-24 13:24:12 +01:00
hkernbach 4ecd633f31 grunt build 2015-11-20 21:27:46 +01:00
hkernbach 3a7a31b850 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-11-20 21:25:14 +01:00
hkernbach ffbf9d57e8 queries started with webui are now cancelable 2015-11-20 21:25:03 +01:00
hkernbach 6f4a512a4b scss 2015-11-20 21:24:16 +01:00
hkernbach 297cdd6fb6 added some functions to progressView 2015-11-20 21:23:48 +01:00
jsteemann bcf29c0f7d added derived files 2015-11-20 21:01:25 +01:00
hkernbach e2241a77b8 navigation bugfix wenn rendering query management view first 2015-11-20 19:40:48 +01:00
hkernbach b391619b6b frontend dashboard replication status 2015-11-20 16:16:31 +01:00
hkernbach 7bf94c43b4 scss lint 2015-11-20 15:21:07 +01:00
hkernbach 922782c13f removed unnecessary parameter in explainer function 2015-11-20 15:20:26 +01:00
Jan Steemann f36cbc8eab added traversal-related keywords 2015-11-19 14:19:09 +01:00
jsteemann c6894549c7 updated AQL templates and keywords 2015-11-18 23:24:10 +01:00
jsteemann cb62c657e0 initial commit 2015-11-18 17:46:19 +01:00
Wilfried Goesgens 58dbbda09c Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-18 17:31:00 +01:00
Jan Steemann 23a1782bd8 use options 2015-11-18 17:30:46 +01:00
Michael Hackstein 7a36bbb43f Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-18 13:58:47 +01:00
hkernbach abaabb0de8 web ui added replication statistics 2015-11-17 20:37:27 +01:00
hkernbach a574f6bdac grunt build 2015-11-17 13:58:51 +01:00
hkernbach 9ac97807a4 added bind parameters to system example queries 2015-11-17 13:57:34 +01:00
hkernbach 466cd5b3fe added bind params to query editor template 2015-11-17 13:32:33 +01:00
hkernbach 068bee4c80 explain bind param support, view + aardvark 2015-11-17 13:24:21 +01:00
Jan Steemann f9ba16f8d4 fixed explainer indentation 2015-11-17 11:31:06 +01:00
Wilfried Goesgens 2d5d2d881e Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-11 11:05:06 +01:00
hkernbach 1a17c14d6e small fix using bind parameters in aql editor 2015-11-10 10:43:02 +01:00
hkernbach 3ae8eed4cb frontend grunt build 2015-11-06 20:23:22 +01:00
hkernbach 45d153ca91 added support for bind params in the frontend aql editor, issue: #1563 2015-11-06 20:21:08 +01:00
Wilfried Goesgens 7a54982eb4 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-06 13:53:21 +01:00
Jan Steemann 62195e5f09 added derived file 2015-11-05 10:59:01 +01:00
Wilfried Goesgens 179660e87c Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-04 17:07:09 +01:00
Jan Steemann 3eb6794d8f added derived file 2015-11-03 10:21:34 +01:00
Frank Celler e87cdafe73 reverted abe72bec38, fb0a309b3c, f28e829586 because of missing CLA 2015-11-03 10:19:28 +01:00
hkernbach 699e2051c8 grunt build 2015-11-03 10:19:28 +01:00
hkernbach c88ab6b49c graph viewer now able to throw some errors/notifications 2015-11-03 10:19:25 +01:00
hkernbach 3632d1e44c updated scss-lint.yml 2015-11-03 10:19:23 +01:00
hkernbach 8bba3a795a grunt build 2015-10-30 10:27:11 +01:00
hkernbach f647212224 merge 2015-10-30 10:20:00 +01:00
hkernbach 4940c80d88 optimized notifications, removed bug in document editor, css fixes 2015-10-30 10:17:53 +01:00
Jan Steemann 10612184ee added derived file 2015-10-30 10:12:34 +01:00
Frank Celler 55e940c1cd reverted 2070d7bd47 because of missing cla 2015-10-29 20:02:39 +01:00
Wilfried Goesgens bb9039c855 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-10-29 16:01:01 +01:00
Jan Steemann 01499dde43 added deadlock detection for lazy locking of collections 2015-10-29 11:57:22 +01:00
Wilfried Goesgens 327b408a22 Start implementing early filtering of paths to exclude from the result 2015-10-28 12:37:13 +01:00
Wilfried Goesgens 951165ab1e Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 
Conflicts:
	arangod/Aql/grammar.cpp
	arangod/Aql/grammar.h
	js/common/modules/org/arangodb/graph-examples/example-graph.js
 2015-10-28 11:08:18 +01:00
hkernbach 9a25bc2783 edited graph edit modal, js+css 2015-10-27 13:58:44 +01:00
hkernbach ea6903ee33 issue #1537: from and to vertices always visible 2015-10-23 18:53:59 +02:00
hkernbach a4bdf8d38c grunt build 2015-10-23 18:27:13 +02:00
hkernbach 7caac2edae webui: added some cursors to indicate actions 2015-10-23 18:24:46 +02:00
Jan Steemann afc3de16ed re-grunted 2015-10-23 14:03:08 +02:00
Jan Steemann 731fb9e1c5 moved frontend files 2015-10-23 14:02:08 +02:00
Jan Steemann 0d2197e77f changed documentation for index creation methods 2015-10-21 14:59:45 +02:00
Wilfried Goesgens dae95de667 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-10-21 14:54:01 +02:00
Jan Steemann 4edc3d11f5 re-grunted 2015-10-21 13:07:30 +02:00
Jan Steemann 74edccbcde Merge branch 'aql-jmmh-conditions' of https://github.com/arangodb/arangodb into devel 2015-10-21 12:56:51 +02:00
Jan Steemann 3396214a63 added db._explain() convenience function 2015-10-21 12:52:40 +02:00
Jan Steemann 509ab83ed5 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-21 10:18:16 +02:00
hkernbach 179ecd341b added html cluster min files 2015-10-20 18:14:07 +02:00
hkernbach 86e4bf1a3a added missing cluster minify option 2015-10-20 18:13:16 +02:00
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
Jan Steemann 1f8b5e54af Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-20 12:34:33 +02:00
hkernbach 84b32587f5 issue: #1509, temp. disabled gv outbound connections 2015-10-20 10:57:28 +02:00
Jan Steemann d6cad3bac6 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-19 18:55:36 +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
jsteemann 82b3acdf17 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-16 22:50:32 +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
Jan Steemann 0ffb11c25e do not use sparse indexes for sorting 2015-10-14 12:03:52 +02:00
Jan Steemann 8f150e942e Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 
Conflicts:
	CHANGELOG
 2015-10-14 09:57:24 +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
jsteemann 29b3741156 reworked cost calculations 2015-10-12 22:23:03 +02:00
Jan Steemann ffa777979c make IN values unique and sort em 2015-10-12 15:34:41 +02:00
Jan Steemann 8c6d284cc3 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-09 16:17:18 +02:00
Jan Steemann e49064e5c4 hide `fm` variable in web interface shell 2015-10-09 15:25:56 +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
Jan Steemann 7bfbbfd77f Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-09 09:42:28 +02:00
Jan Steemann d572655d84 fixed compile warning 2015-10-08 16:28:04 +02:00
Jan Steemann 6a4e9658c5 fixes for explainer and condition 2015-10-08 16:22:52 +02:00