1
0
Fork 0
Commit Graph

13022 Commits

Author SHA1 Message Date
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 9c8e8c922a updated CHANGELOG 2014-05-16 19:30:06 +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
Jan Steemann d5200f26d7 moved magic number to function 2014-05-16 19:05:54 +02:00
Jan Steemann 81c68927aa remove no-ops from shape-accessor 2014-05-16 18:39:23 +02:00
Jan Steemann 6da081474c explicitly name test cases 2014-05-16 18:38:53 +02:00
Michael Hackstein ee8d942699 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-16 17:22:36 +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
Jan Steemann 2e58980d0d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-16 16:45:00 +02:00
Jan Steemann e5953ee140 reverted configuration change 2014-05-16 16:44:46 +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
Esteban Lombeyda eaa39427f9 Compiling under linux 2014-05-16 15:19:54 +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
Max Neunhoeffer 6c496866b4 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-05-16 12:58:19 +02:00
Max Neunhoeffer 3661d9bd93 Use /_admin/server/role instead of /_admin/execute for dump/restore.
This prevents a warning in the logs and is cleaner.
2014-05-16 12:57:42 +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