1
0
Fork 0
Commit Graph

6132 Commits

Author SHA1 Message Date
Frank Celler 3111d7cc4c relaxed % and escaping 2014-08-12 15:49:33 +02:00
Heiko Kernbach 00761a36e6 merge 2014-08-12 15:11:28 +02:00
Heiko Kernbach 039f7884aa added functionality to validate modals content 2014-08-12 15:11:14 +02:00
Frank Celler f6e242039d relaxed % and escaping 2014-08-12 14:53:59 +02:00
Michael Hackstein 2622f00915 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-08-12 14:31:23 +02:00
Michael Hackstein dc998e3116 Fixed ahuacatl-general-graph test. It does not depend on the sorting any more 2014-08-12 14:31:18 +02:00
Frank Celler 0cc3bc6f1a fixed foxx initialisation when creating a new database 2014-08-12 12:19:30 +02:00
Frank Celler ec3d0452f3 better names 2014-08-12 10:45:06 +02:00
Frank Celler 3322b3c4f9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-08-12 09:58:48 +02:00
Frank Celler 7a6d5413a1 database version is now AABBCC, where AA = major, BB = minor, CC = patch 2014-08-12 09:58:42 +02:00
Heiko Kernbach db04ef88a5 changed the look of the import query feature 2014-08-11 18:18:20 +02:00
Heiko Kernbach c4006bdec8 _from and _to links in documenView are now clickable and redirecting to their destination 2014-08-11 17:08:38 +02:00
Heiko Kernbach b97a3d3221 added autofocus for modals 2014-08-11 16:16:30 +02:00
Heiko Kernbach 679db54c5a merge 2014-08-11 15:54:58 +02:00
Heiko Kernbach 46657fee1d changed look and feel of document editor + delete function added 2014-08-11 15:54:41 +02:00
Frank Celler cc91cd1cb0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-08-11 12:43:47 +02:00
Heiko Kernbach 836e7f23bd added a bug where query collection not recognizing current user 2014-08-08 14:25:45 +02:00
Heiko Kernbach d6f62ac834 js/collections/arangoQueries.js 2014-08-08 14:25:13 +02:00
Heiko Kernbach cc440aaaaa jslint 2014-08-08 13:28:31 +02:00
Heiko Kernbach 0c716ab129 modified query collection so that name of query must be unique 2014-08-08 13:27:17 +02:00
Heiko Kernbach cbcca7cb51 merge 2014-08-08 13:04:56 +02:00
Heiko Kernbach 124906435e added import/export feature. aql queries now stored in user collection 2014-08-08 13:04:39 +02:00
Heiko Kernbach 2fe601e97d added event when document cannot be saved 2014-08-08 13:00:34 +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
Frank Celler be06ef7f25 new upgrade-database (formely known as version-check) and new startup procedure 2014-08-07 14:12:19 +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 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
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
Heiko Kernbach cee3035d70 manage dbs: removed unnecessary divider if not needed 2014-07-31 17:53:09 +02:00
Heiko Kernbach ad51f9797f changed Graph Management label to Graphs 2014-07-31 17:47:30 +02:00
Heiko Kernbach 134975f5f1 changed copyright to arangodb gmbh 2014-07-31 17:37:46 +02:00
scottashton fba85a7c6c GRAPH_VERTICES now returns orphans 2014-07-30 11:23:10 +02:00
Michael Hackstein 83d49c0d9d Fixed a minor bug where it was not allowed to remove a vertex from a graph by its key 2014-07-30 09:41:57 +02:00
Alan Plum 0f5c65e636 gharial: added missing body params. 2014-07-25 16:23:34 +02:00
scottashton 6d2e3acd13 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-25 16:09:45 +02:00
scottashton 0a15993322 jslinted filed 2014-07-25 16:09:40 +02:00
Michael Hackstein 516fdaa3dc Added a cleanup before empty graph test 2014-07-25 16:04:59 +02:00
Michael Hackstein 28f2ca58ac Added a regression test for restricted edges on non existing edges. Yes 2014-07-25 16:04:29 +02:00
scottashton 8776a84447 fixed bug with edgeCollectionRestrictions 2014-07-25 15:55:45 +02:00
Alan Plum edccd22286 Fixed aardvark config not showing falsey defaults and formatting. 2014-07-25 15:36:45 +02:00
Frank Celler 026121dadd fixed sandbox 2014-07-24 16:06:06 +02:00
Frank Celler 55e1ee43bd added createLocations 2014-07-24 16:06:06 +02:00
Alan Plum 05ce0037da Fixed printRecursive for null. 2014-07-24 15:56:27 +02:00
Heiko Kernbach 83ccb3c339 changed lib to minified version 2014-07-24 14:14:05 +02:00
Heiko Kernbach a0648b9f86 merge 2014-07-24 14:13:02 +02:00
Heiko Kernbach a09f66cb4f fixed select2 modal bug 2014-07-24 14:06:06 +02:00
Heiko Kernbach 796b407d51 moved back to previous version 2014-07-24 14:05:51 +02:00
Alan Plum facd7dc515 Fixed #961. Undocumented bodies should never throw. 2014-07-24 11:22:30 +02:00
Heiko Kernbach e7f4d396a6 new select2 version, fixed a bug where using backspace results in frontend inusability 2014-07-24 10:38:01 +02:00
Jan Steemann 2943ac073c added derived file 2014-07-24 09:15:13 +02:00
Frank Celler 5f695d327b Merge pull request #942 from triAGENS/enjoi-all-the-apps
Convert gharial and aardvark to joi
2014-07-23 20:25:57 +02:00
Frank Celler a8bccbf8e3 Merge pull request #959 from triAGENS/saner-recursive-print
Allow printing any object recursively that doesn't override toString.
2014-07-23 20:24:14 +02:00
Alan Plum 28cd18a8dd Linting. 2014-07-23 19:41:59 +02:00
Jan Steemann 328e3c209c fixed another test 2014-07-23 18:50:45 +02:00
Jan Steemann a91af39243 make test succeed after Max's optimization 2014-07-23 17:15:13 +02:00
Jan Steemann 8cb85fd973 optimization for AQL queries with limit 2014-07-23 17:15:01 +02:00
Alan Plum 9e13e84b31 Workaround for booleans-as-numbers (thank you, PHP). 2014-07-23 17:05:04 +02:00
Alan Plum e7e9ec33c5 Handle Object.create(null). 2014-07-23 16:29:48 +02:00
Alan Plum 80070b9e83 Allow printing any object recursively that doesn't override toString. 2014-07-23 16:15:04 +02:00
scottashton db5887f2b5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-23 13:49:06 +02:00