1
0
Fork 0
Commit Graph

6973 Commits

Author SHA1 Message Date
Jan Steemann 8af441da56 Merge pull request #1148 from triAGENS/correct-horse-battery-staple
Dev app baseUrls should be db-relative too
2014-12-03 11:58:38 +01:00
Alan Plum 3b5b6b2249 Merge pull request #1151 from yojimbo87/devel
GET /_api/collection/{collection-name} returns also 'isSystem' attribute
2014-12-03 11:55:21 +01:00
Jan Steemann ae092f467f added derived file 2014-12-03 11:53:34 +01:00
Jan Steemann 9d197d3eb2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-03 11:39:04 +01:00
Jan Steemann 4ef82239a3 added optimizer statistics 2014-12-03 11:38:56 +01:00
Max Neunhoeffer 9a28d9914d Add new import tests to JS testsuite, fixing the "importing" target. 2014-12-03 11:27:44 +01:00
Tomas Bosak cf94fa4399 GET /_api/collection/{collection-name} returns also 'isSystem' attribute. 2014-12-03 11:24:52 +01:00
Max Neunhoeffer 8f1dd637c6 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-03 10:56:29 +01:00
Jan Steemann 8e2c5176f4 fixed segfault 2014-12-03 10:47:35 +01:00
Max Neunhoeffer 94e8bbe605 Fix error checking in unittests. 2014-12-03 10:45:51 +01:00
Alan Plum 7b01edbb4c Fixes #1146. 2014-12-03 10:24:50 +01:00
Jan Steemann e81ac9993e fixed paragraph issue 2014-12-03 09:56:15 +01:00
Alan Plum fdc4c1e810 Rename Repository#modelPrototype to avoid confusion. Added Repository#modelSchema. 2014-12-02 13:37:06 +01:00
Patrick Huber f1c6c6cc24 allow to supply args to the optional 'transform' function in Foxx.createQuery() 2014-12-02 08:18:49 +01:00
Frank Celler 7c8b0228da recreate password if missing 2014-12-01 15:36:47 +01:00
Willi Goesgens 1024750c07 Clarify whether the test is running via arangosh or arangod. 2014-12-01 14:21:00 +01:00
Michael Hackstein e5f869b97f Removed console output 2014-11-28 17:11:34 +01:00
Michael Hackstein fd8e3783c9 Fixed a bug with two identically named check boxes and click events that were not correctly unbound 2014-11-28 17:06:31 +01:00
Michael Hackstein 288f174011 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-11-28 16:49:53 +01:00
Michael Hackstein cedfea877f Removed unused frontend libraries ColVis and dataTables 2014-11-28 16:38:25 +01:00
Michael Hackstein a593ad7587 Replaced datatables by own implementation, less overhead easier to handle and not broken in Firefox 2014-11-28 16:31:24 +01:00
Max Neunhoeffer 85d3c43ab0 Revert "More error output if update() in foxx manager fails."
This reverts commit 3e6822a3917eb18ad45b6a0f145c87ca686fc54c.
2014-11-28 16:16:16 +01:00
Max Neunhoeffer faef09a576 Cleanup cleanupDirectories list after cleanup of directories. 2014-11-28 15:22:01 +01:00
Max Neunhoeffer 5f217c5781 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-11-28 14:43:54 +01:00
Max Neunhoeffer b44b98c8ee More error output if update() in foxx manager fails.
This is a temporary output to track down the continuous testing
problems.
2014-11-28 14:43:09 +01:00
Jan Steemann ac36c0cd7a added mergeArrays attribute 2014-11-28 13:58:49 +01:00
Jan Steemann b3d46923f2 jslint 2014-11-27 13:08:09 +01:00
Lucas Dohmen 919e6c5d0f Update to FoxxGenerator 0.5.1 2014-11-27 11:52:00 +01:00
Jan Steemann e7c7f774e0 added tests 2014-11-26 20:24:28 +01:00
Alan Plum d4ee5dbc0b Updated joi to 4.9.0. 2014-11-26 15:53:47 +01:00
Jan Steemann 513ae2b3dd fixed jslint warnings 2014-11-26 15:24:03 +01:00
Jan Steemann 57aefb988d fix optimization of subqueries 2014-11-26 15:01:55 +01:00
Jan Steemann e5adbf4f56 properly display required pathParams in Foxx documentation
do not restrict route summary to 60 characters
2014-11-26 11:21:14 +01:00
Jan Steemann a8282f8220 fixed never-disappearing "query is operating" display 2014-11-26 10:50:03 +01:00
Jan Steemann 37026e8c84 Merge pull request #1121 from triAGENS/appcontext-base-url
Expose root-relative mount URL on applicationContext
2014-11-26 10:28:42 +01:00
Jan Steemann c69fa0b0dc fixed invalid optimization, added test cases 2014-11-25 23:18:24 +01:00
Alan Plum a947b909a4 Expose root-relative mount URL as appContext.baseUrl. 2014-11-25 13:35:41 +01:00
Jan Steemann efa8d2b32b fixed tests 2014-11-24 12:55:49 +01:00
Thomas Schmidts 953fcd209e Another dead link in the documentation fixed 2014-11-21 09:48:34 +01:00
Thomas Schmidts c6b8e1a569 Fixed some dead links in the documentation 2014-11-21 09:13:50 +01:00
Jan Steemann 4f74ed429c issue #1109: added *bytes* unit to API description where missing 2014-11-20 15:04:40 +01:00
Jan Steemann ed919090ea renamed function, updated documentation 2014-11-20 14:46:32 +01:00
Jan Steemann 620274047f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-functions
Conflicts:
	CHANGELOG
2014-11-20 14:23:01 +01:00
scottashton 6d170ab3f5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-20 11:06:56 +01:00
scottashton e36aa92f58 fixed a test 2014-11-20 11:06:50 +01:00
Jan Steemann d55f1cdec2 added derived file 2014-11-20 10:27:06 +01:00
scottashton fef641be02 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-20 09:54:00 +01:00
scottashton 401157edd1 jslinted 2014-11-20 09:53:50 +01:00
fagnercarvalho e26c2295fb Fixing collection help output misspelled errors 2014-11-20 09:36:06 +01:00
Jan Steemann 18bc51ab18 added derived file 2014-11-20 09:29:54 +01:00