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

4863 Commits

Author SHA1 Message Date
scottashton 1ac649cf94 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-19 08:43:01 +02:00
scottashton 4dbbc550df work in progress 2014-05-19 08:42:37 +02:00
Jan Steemann 2cb694b2d5 make test restartable 2014-05-17 13:13:30 +02:00
Jan Steemann bed37d7d11 slightly less comparisons 2014-05-17 12:04:54 +02:00
Michael Hackstein 0a73cd6823 Implemented restrict interface on edges, right now implementation is not optimized, missing cursor functionality 2014-05-17 11:27:47 +02:00
Jan Steemann e532223fcd small optimizations 2014-05-17 01:38:39 +02:00
Jan Steemann 63b287157f jshund 2014-05-17 00:55:37 +02:00
Jan Steemann 0ca849efb9 emit buffer to prevent very big string allocations/reallocations 2014-05-17 00:12:32 +02:00
Jan Steemann 1c6f63bad0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-16 20:13:33 +02:00
Jan Steemann a0ffb65b88 emit output of print function to prevent buffering of super-long strings 2014-05-16 20:11:31 +02:00
Heiko Kernbach 6582ce9b8a merge 2014-05-16 20:02:29 +02:00
Heiko Kernbach 71f8619ede karma 2014-05-16 20:01:26 +02:00
Heiko Kernbach 8aa7120dbb jslint 2014-05-16 20:01:07 +02:00
Heiko Kernbach 8172666dbb added new indicator for shortcuts help 2014-05-16 19:47:43 +02:00
Heiko Kernbach 2eaac09ec4 added hotkey modal template to manifest.json 2014-05-16 19:36:57 +02:00
Heiko Kernbach e14c87f0d7 added template for hotkeys modal 2014-05-16 19:36:37 +02:00
Heiko Kernbach 9d3b292183 new scss file for hotkeys modal 2014-05-16 19:36:23 +02:00
Heiko Kernbach a0bbd238c3 added global shortkey helper - press question mark + shift 2014-05-16 19:35:51 +02:00
Heiko Kernbach 02680a4c15 fixed arangoSpec 2014-05-16 19:35:25 +02:00
Jan Steemann 51e9059e3e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-16 19:06:26 +02:00
Jan Steemann e3f7df878e added derived file 2014-05-16 19:06:16 +02:00
Michael Hackstein 20d33b80a5 Bound collections by name to graph object. graph.v === db.v 2014-05-16 17:22:32 +02:00
Michael Hackstein f490018530 Renamed internal functionality to '_' and internal variables with equal names to '__' 2014-05-16 16:50:11 +02:00
Michael Hackstein fd939bdca2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-05-16 16:28:03 +02:00
Michael Hackstein 4824e6e914 Refactored tests to make them more dry 2014-05-16 16:27:27 +02:00
Michael Hackstein 1e9e5d3254 Fixed a bug where only collections with the name 'relationName' could be created 2014-05-16 16:26:45 +02:00
scottashton a40e2ebdfe pre merge commit 2014-05-16 16:17:02 +02:00
scottashton 1a0b0e4a49 pre merge commit 2014-05-16 16:16:48 +02:00
gschwab 55c494c81d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-05-16 16:12:40 +02:00
gschwab 1960ce34f4 added vertex and edge methods 2014-05-16 16:10:22 +02:00
Michael Hackstein a6b238c8f3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-16 15:43:30 +02:00
Michael Hackstein 69eeba2403 Commented failing tests in general graph for commit. Productive code missing, but test first 2014-05-16 15:37:05 +02:00
Heiko Kernbach b4ecbff331 fixed collections logs spec 2014-05-16 15:35:56 +02:00
Michael Hackstein e404d070f4 Fixed merge conflict on general graph tests 2014-05-16 15:31:39 +02:00
scottashton 47dfdcd75c first version of create graph 2014-05-16 15:19:16 +02:00
scottashton 11faa956a7 first version of create graph 2014-05-16 15:17:54 +02:00
Michael Hackstein 1b43b18bdc Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-16 14:56:18 +02:00
gschwab f0194b5b25 fixed jslint 2014-05-16 14:52:09 +02:00
Michael Hackstein 3c95b7564f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-16 14:50:02 +02:00
Michael Hackstein 739ab6d54c Added first tests for restrict on edges. Not working yet, preconditions are missing 2014-05-16 14:49:58 +02:00
Jan Steemann 7b44fd92f9 fixed db.collection.geo documentation 2014-05-16 14:46:13 +02:00
Heiko Kernbach bb92ebe4fc merge 2014-05-16 13:12:23 +02:00
Heiko Kernbach 70a7f1a45c removed shellviewspec from json 2014-05-16 13:11:21 +02:00
gschwab 6451af1cb4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-05-16 13:10:31 +02:00
gschwab 24871b64ef start implement edges() 2014-05-16 13:08:33 +02:00
scottashton fd944eee8e fixed jslint 2014-05-16 13:02:56 +02:00
Heiko Kernbach 969826af27 jslint 2014-05-16 13:01:34 +02:00
Heiko Kernbach 4cb82ee0b1 logs bugfix 2014-05-16 12:58:25 +02:00
Heiko Kernbach fc8003b4d7 fixed logs spec 2014-05-16 12:26:47 +02:00
Heiko Kernbach 903b3aaaeb temp commented out 2014-05-16 12:21:21 +02:00
Heiko Kernbach e5115fabfd removed console logs 2014-05-16 12:19:19 +02:00
Heiko Kernbach f5c1fcd25f added shellViewSpec, invertet order of logs showing up @ frontend 2014-05-16 12:18:19 +02:00
scottashton 266f72a253 initial checkin for new graph module 2014-05-16 11:29:22 +02:00
scottashton b74a0b18e6 added tests to new jsoneditor function 2014-05-15 16:44:30 +02:00
Jan Steemann 978c6b1991 giving up 2014-05-15 16:28:14 +02:00
Jan Steemann 7b4f8d3fd9 try to fix test 2014-05-15 16:03:06 +02:00
Michael Hackstein d3ca063b4e Added click on top row for json-editor to insert initial attribute/value pair 2014-05-15 15:45:51 +02:00
Jan Steemann 8959d9df41 adjusted test 2014-05-15 12:35:23 +02:00
Jan Steemann 824cda67e2 fixed test 2014-05-15 10:45:40 +02:00
scottashton 700480f20a adjusted all require(org/arangodb/graph) to new graph-blueprint module 2014-05-15 10:33:20 +02:00
Jan Steemann 2adeda7da3 restrict cap constraint for _statistics 2014-05-14 21:34:32 +02:00
Jan Steemann a69d93b7c9 fixed variable name 2014-05-14 21:14:15 +02:00
Jan Steemann 9984b341ac fixed comment 2014-05-14 21:12:58 +02:00
Frank Celler db566d53d9 added rewriteRequest 2014-05-14 20:15:12 +02:00
Jan Steemann ee8fe74a8a removed tabs 2014-05-14 17:41:00 +02:00
scottashton 37f81ee9d6 added new "old" module graph-blueprint and directed to that whenever graph has been required 2014-05-14 17:11:59 +02:00
scottashton 1d2fbb67ed removed tests 2014-05-14 15:44:20 +02:00
scottashton f79cd75081 Closes #851 2014-05-14 15:30:06 +02:00
Jan Steemann 8818a880bc added comments 2014-05-14 11:41:39 +02:00
Jan Steemann 2d36eb2473 removed name attribute 2014-05-14 09:47:48 +02:00
Jan Steemann 684bc82a5f fixed jslint warning 2014-05-13 18:18:32 +02:00
Jan Steemann eeedb022d0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-13 18:16:04 +02:00
Jan Steemann 299e05c0b2 fixed unrestricted queries in cluster dashboard 2014-05-13 18:15:34 +02:00
Max Kerp 2ff1218759 fixed JSLint 2014-05-13 17:59:05 +02:00
Max Kerp d0a40b8981 fixed the ace cursor bug by updating ace.js and 
setting the default font-family to courier new. Added firefox
support for the custom query name check feedback. This needs to go into
the stylesheets but i didnt't find a way to make this work just yet, cause i
don't know the styles well enough. Hope Michael or Heiko can help me
with this.
 2014-05-13 17:47:25 +02:00
Jan Steemann adf9092744 fixed jslint warnings 2014-05-13 14:05:59 +02:00
Max Kerp fcc223a1b1 Implemented a check for invalid query names. 
Now prohibiting saving names with special html characters while giving
visual feedback.
 2014-05-13 13:42:30 +02:00
Jan Steemann 4cf29af60a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-12 13:56:12 +02:00
Jan Steemann 204a16c224 fixed compiler warning 2014-05-12 13:55:58 +02:00
scottashton 00a4c8b27e fixed scss bug 2014-05-12 12:55:11 +02:00
scottashton 5b644570d9 fixed scsslint errors 2014-05-12 11:51:26 +02:00
scottashton 1bb91230f0 adjusted tests 2014-05-12 11:02:07 +02:00
Jan Steemann c47058c6de issue #860: Documentation: Wrong example 2014-05-12 09:57:43 +02:00
Frank Celler e83c7b3a34 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 2014-05-12 00:44:58 +02:00
Frank Celler c12831a361 fixed interval 2014-05-12 00:44:44 +02:00
Frank Celler 9127ed2ac5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-05-12 00:07:46 +02:00
Claudius Weinberger 109c6d6304 redesign dashboard 2014-05-11 23:45:36 +02:00
Claudius Weinberger 86cd2a8390 redesign dashboard 2014-05-11 23:43:09 +02:00
Claudius Weinberger 1e32c7a2d2 redesign dashboard 2014-05-11 23:22:41 +02:00
Claudius Weinberger 3740035736 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/dashboardView.js
 2014-05-11 22:43:48 +02:00
Claudius Weinberger 14256b504e redesign dashboard 2014-05-11 22:42:49 +02:00
Frank Celler a315c7cc16 better history 2014-05-11 22:39:42 +02:00
Claudius Weinberger cb28bb478a design Dashboard 2014-05-11 20:58:28 +02:00
Claudius Weinberger 22344c9b66 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 2014-05-11 15:12:52 +02:00
Claudius Weinberger 71c50b9942 redesign dashbaord 2014-05-11 15:12:27 +02:00
Frank Celler d376c70b20 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/dashboardView.js
 2014-05-11 15:04:42 +02:00
Frank Celler 7044757739 fixed order (big number on top) 2014-05-11 15:03:31 +02:00
Claudius Weinberger 1b1241f91e Merge branch 'devel' of github.com:fceller/ArangoDB into devel 2014-05-11 00:41:54 +02:00
Claudius Weinberger ea487051c4 redesign dashboard 2014-05-11 00:41:36 +02:00
Frank Celler d1172f7f48 added cutoff 2014-05-11 00:16:42 +02:00