1
0
Fork 0
Commit Graph

6064 Commits

Author SHA1 Message Date
Jan Steemann c7350c4c06 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-08-07 16:12:14 +02:00
Jan Steemann 099ec8db60 reallow attribute names starting with underscores 2014-08-07 15:52:58 +02:00
Michael Hackstein d64a45e23d Added generated swagger files 2014-08-07 14:58:05 +02:00
Michael Hackstein 8dde9e7531 Fixed a bug in the automatic retry collection, it does not show the prompt for the user to enter cluster credentials 2014-08-07 14:53:03 +02:00
Michael Hackstein a5b35f224a Fixed REST API documentation. Some values were not recognized as paramters by swagger script 2014-08-07 14:52:55 +02:00
Jan Steemann a324d8c6fc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-06 18:37:52 +02:00
Jan Steemann dbf2842a28 much better exception handling 2014-08-06 18:37:37 +02:00
Jan Steemann 1015404edc working on AQL function calls and error handling 2014-08-06 16:19:43 +02:00
Heiko Kernbach e96a51f44d merge 2014-08-06 14:29:34 +02:00
Heiko Kernbach 64f3dba10c query view frontend 2014-08-06 14:28:54 +02:00
Jan Steemann dbe107ce65 jslint 2014-08-06 13:50:21 +02:00
Jan Steemann 55e0622e06 throw "real" exceptions when passing bad parameters to update/replace/remove/exists 2014-08-06 13:38:33 +02:00
Michael Hackstein 919f713ca5 Added an upgrade cluster button when cluster is shutdown. And further adoption to asynchronous code
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/clusterDownView.js

Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/collections/clusterShards.js
2014-08-06 11:48:58 +02:00
Heiko Kernbach abf221ed82 merge 2014-08-06 09:36:13 +02:00
Heiko Kernbach 2d1c62903d prep for import and export of aql queries 2014-08-06 09:35:45 +02:00
Michael Hackstein 4a815d6730 Added automatic retry file to karma tests 2014-08-06 09:20:55 +02:00
Michael Hackstein ba08d7e5fd Fixed a bug in cluster dashboard, which made it impossible to view the dashboard for a multi machine cluster. #883 2014-08-06 09:18:28 +02:00
Michael Hackstein 53abe18fe5 Fixed cluster dashboard on server failure 2014-08-06 09:18:19 +02:00
Michael Hackstein b3dedc10c9 Fixed a redircetion bug (Dead Coordinator -> Revive Coordinator -> Dead Coordinator -> Revive Coordinator) did not load cluster interface twice 2014-08-06 09:18:00 +02:00
Michael Hackstein 15f535ed61 Fixed a bug with retrying whenever the connection was lost
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/collections/clusterShards.js
2014-08-06 09:17:34 +02:00
Michael Hackstein 2a9c88e85b Added unreachable view 2014-08-06 09:16:50 +02:00
Michael Hackstein db5b7c2086 If no coordinator is available the interface will tell you. Screen needs to be prettified. Still some issues when interface comes back, null-pointer exceptions 2014-08-06 09:16:36 +02:00
Michael Hackstein 7aa7697ded Continued implementing async functionality in cluster dashboard
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
2014-08-06 09:16:08 +02:00
Michael Hackstein 06e9a949d5 Cluster Servers and Coordinators are now working async. It is now possible to contact a cluster even if some of the coordinators are down 2014-08-06 09:14:42 +02:00
Michael Hackstein 9d85b25674 Started moving synchronous cluster implementation to asynchronous one. Synchronous is broken on some browsers as soon as one coordinator is dead
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
2014-08-06 09:14:28 +02:00
Jan Steemann fe4d83e80b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	Documentation/Books/Users/Aql/README.mdpp
	Documentation/Books/Users/AqlExtending/README.mdpp
2014-08-05 15:09:28 +02:00
Jan Steemann c7e2ccee51 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-08-05 10:13:03 +02:00
Jan Steemann 3a4cf3eac5 added derived file 2014-08-05 10:12:32 +02:00
Jan Steemann 0e8949f8b3 unify function behavior in shell and server 2014-08-05 09:07:28 +02:00
Max Neunhoeffer 8b640be8ac Add Filter node. 2014-08-04 15:11:51 +02:00
Heiko Kernbach 21629e8284 karma jslint 2014-08-01 20:44:13 +02:00
Heiko Kernbach d3af798a5c karma jslint error 2014-08-01 20:40:18 +02:00
Heiko Kernbach 342c8f00d8 added missing karma config entries 2014-08-01 20:38:47 +02:00
Heiko Kernbach 2caa3b7a60 merge 2014-08-01 20:20:15 +02:00
Heiko Kernbach b477843b27 added model, collection, view, css for custom query storage 2014-08-01 20:20:01 +02:00
Alan Plum 069644a2e4 Added flatten method. 2014-08-01 20:02:54 +02:00
Alan Plum d9b80d5ae1 Added exponential back-off helper. 2014-08-01 20:02:53 +02:00
Heiko Kernbach bef094db2e merge 2014-08-01 18:20:44 +02:00
Heiko Kernbach acecadb2e1 jslint fixes 2014-08-01 18:20:28 +02:00
Heiko Kernbach 9ead031a73 added visual feedback for user editing a document or edge 2014-08-01 18:16:06 +02:00
Max Neunhoeffer 7beb1beb23 Take out a cout. 2014-08-01 17:06:57 +02:00
Max Neunhoeffer 390f0fe605 Implement distributeShardsLike 2014-08-01 17:05:04 +02:00
Heiko Kernbach 5700394a69 fixed specs for documentsViewSpec 2014-08-01 15:15:56 +02:00
Heiko Kernbach 3b51bbe26f fixed and cleaned up tooltips 2014-08-01 15:01:22 +02:00
Heiko Kernbach 5abdc1e4b4 removed console log 2014-08-01 14:39:28 +02:00
Heiko Kernbach ad318b0ab9 fixed karma spec 2014-08-01 14:35:32 +02:00
Heiko Kernbach 1f41d215fd fixed divider bug in dbSelectionView templaet 2014-08-01 14:26:15 +02:00
Heiko Kernbach ff3d95746f changed keywords in aql-theme for ace editor 2014-07-31 19:10:49 +02:00
Heiko Kernbach 4a3796186d added new functions and keywords into aql theme for ace editor 2014-07-31 18:40:41 +02:00
Heiko Kernbach 198b152970 fixed dbselectionviewspec 2014-07-31 18:25:33 +02:00