1
0
Fork 0
Commit Graph

6110 Commits

Author SHA1 Message Date
Jan Steemann 30b32f1f90 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.h
	arangod/V8Server/v8-vocbase.cpp
	js/server/tests/ahuacatl-general-graph.js
2014-08-13 16:29:57 +02:00
Jan Steemann ab080d8b73 added derived files 2014-08-13 16:02:19 +02:00
Jan Steemann 52911293f7 added special compare function to take into account floating point differences 2014-08-12 19:14:13 +02:00
Jan Steemann 413ce6c50c test fixes 2014-08-12 18:53:49 +02:00
Heiko Kernbach 462bc6112c Merge 2014-08-12 18:06:36 +02:00
Heiko Kernbach 34ee4517ab added more regex validation 2014-08-12 18:06:23 +02:00
Willi Goesgens e823314a63 Adapt #8c280e255cce88af22377bee0e3ea8669c2b6d97 and #35303ab5eb5f3d588c2c6fe276dcc3772836d89f to give us a graph in defined sequence here too. 2014-08-12 17:10:29 +02:00
Michael Hackstein 1ee7cecdd7 Enforced sorting in ahuacatl generel graph test 2014-08-12 16:38:15 +02:00
Jan Steemann 80848b62a9 make test deterministic 2014-08-12 16:28:59 +02:00
Jan Steemann 3ae6d85711 removed tests for now-unsupported functionality 2014-08-12 16:22:32 +02:00
Frank Celler 5f3c5b4798 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	js/common/bootstrap/module-console.js
2014-08-12 15:54:09 +02:00
Frank Celler 3111d7cc4c relaxed % and escaping 2014-08-12 15:49:33 +02:00
Jan Steemann d910e468f5 fixed issue with SLEEP() in test 2014-08-12 15:28:52 +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 9d4642c4b5 Fixed ahuacatl-general-graph test. It does not depend on the sorting any more 2014-08-12 14:32:30 +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
Willi Goesgens 5d495e4f64 Output the failing functions during tests. 2014-08-11 17:34:45 +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
Willi Goesgens 62d9435269 in case of we don't like the error number, output it plus the error message. 2014-08-11 16:50:56 +02:00
Heiko Kernbach b97a3d3221 added autofocus for modals 2014-08-11 16:16:30 +02:00
Willi Goesgens 4ae37d8840 If before/after Unittests fail to match results, print the query responsible. 2014-08-11 16:09:32 +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
Max Neunhoeffer 3b1d938dda Make test framework throw if results are unequal. 2014-08-11 09:33:58 +02:00
Jan Steemann 579fad3d6a added tests 2014-08-11 09:03:45 +02:00
James 5dc4f414f3 working on the tests. 2014-08-08 16:51:59 +02:00
Max Neunhoeffer 4037112858 Make AQL2 test framework work. 2014-08-08 15:33:36 +02:00
Max Neunhoeffer 3e5493a164 Fix js tests. 2014-08-08 14:40:02 +02:00
Max Neunhoeffer 9d9d3962c0 Create unittest framework for new AQL. 2014-08-08 14:39:08 +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 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