Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
12,029 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

4255 Commits

Author SHA1 Message Date
Jan Steemann b188cbf608 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-02 16:29:50 +02:00
Jan Steemann 7eeba86254 update routing cache all or nothing 2014-04-02 16:29:42 +02:00
gschwab 91b3358f6a initial commit of modal table 2014-04-02 16:07:50 +02:00
gschwab 69098a89b2 prepared table content 2014-04-02 15:04:38 +02:00
Michael Hackstein 58f79be9a2 Start of modal view implementation 2014-04-02 14:43:32 +02:00
gschwab 18de674c1d template for modal dialog 2014-04-02 14:04:15 +02:00
gschwab 9043a0de34 fixed dashboard modals 2014-04-02 11:52:35 +02:00
Max Neunhoeffer b0f43cf027 Fix documentation of traversals w.r.t. sorting the edges at a vertex. 2014-04-02 11:36:07 +02:00
Max Neunhoeffer 5e0280bfc7 Export sort attribute for traversals via REST. 2014-04-02 11:12:03 +02:00
gschwab 9e21ef2ba8 fixed connection check: firefox does not support async:false 2014-04-02 09:23:46 +02:00
Michael Hackstein 7549c13bc5 Created a simple change password implementation for foxx. Added Documentation 2014-04-01 17:23:09 +02:00
scottashton 35e0e1c046 jslinted overwriteAjax.js 2014-04-01 13:48:04 +02:00
scottashton a4acff49d9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-01 13:41:37 +02:00
scottashton 8f44385c43 finished router tests 2014-04-01 13:41:29 +02:00
gschwab a2c292d8ac tests added for model arangoReplicationSpec.js 2014-04-01 13:22:21 +02:00
gschwab 01f4d8840d tests added for model arangoUsers.js 2014-04-01 13:08:15 +02:00
gschwab d4cd7ab629 added missing models 2014-04-01 13:02:32 +02:00
Michael Hackstein dc3289cc31 Karma frontend integration tests: Relinked all ajax-requests to a different arangod running on port 7777 2014-04-01 12:59:28 +02:00
Michael Hackstein 9274bc76e9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/routers/router.js
	js/apps/system/aardvark/frontend/js/templates/collectionsView.ejs
 2014-04-01 12:57:20 +02:00
gschwab 30a1389426 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-31 16:15:22 +02:00
gschwab 7655ce3c18 fixed issue #800 2014-03-31 16:14:26 +02:00
scottashton f7ceebe35b reformated tests 2014-03-31 14:31:39 +02:00
scottashton 6c09b13d56 fixed tests 2014-03-31 14:21:38 +02:00
scottashton b111ffd8c2 Revert " finished router tests and reformated test files" 
This reverts commit 2352b41ba8a067eb7fb02258d322bba8ddc37809.
 2014-03-31 13:33:39 +02:00
scottashton fd88f2fc47 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-31 13:06:45 +02:00
scottashton 86dd3cc94b finished router tests and reformated test files 2014-03-31 13:05:36 +02:00
Jan Steemann 7ee2caf94e simplified usage of arango-statement 2014-03-28 16:57:59 +01:00
Jan Steemann 55f0dc5739 logfile opening/closing fixes 2014-03-28 16:45:06 +01:00
Jan Steemann 202cbcf05d pacified jslint 2014-03-28 12:04:01 +01:00
Jan Steemann b6dff63218 disable version notification 2014-03-28 11:07:13 +01:00
gschwab 58541ce436 currentUser as global var 2014-03-28 09:35:13 +01:00
gschwab dfc7ab72a1 small fix: modal dialog will be filled, when using profile-link 2014-03-28 09:17:20 +01:00
gschwab aeb75f1d08 moved edit userProfile to user management 2014-03-27 17:05:56 +01:00
Jan Steemann 9724cfec64 fixed failing test 2014-03-27 13:12:45 +01:00
Jan Steemann e2f1d0dfb6 fixed issues in arango-dfdb 2014-03-27 12:29:32 +01:00
scottashton e8904d5d93 fixed jslint 2014-03-27 12:15:13 +01:00
scottashton fd2253076e testing collections and models finished, coverage = 100% 2014-03-27 11:06:42 +01:00
scottashton 48448a6039 fixed bug in manifest 2014-03-27 09:43:42 +01:00
gschwab 23f6ece5d4 fixed wrong filename O.o 2014-03-27 09:12:42 +01:00
gschwab c81b319506 fixed line too long - jslint 2014-03-27 09:12:14 +01:00
gschwab 4fa1d8e565 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-27 08:55:12 +01:00
Frank Celler 456d089deb generateSwagger can now also parse MD files 
Conflicts:
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
	js/apps/system/aardvark/api-docs/version.json
 2014-03-26 23:09:07 +01:00
scottashton 81aaa09949 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-26 17:43:37 +01:00
scottashton 48003a69e9 cluster tests 2014-03-26 17:43:20 +01:00
gschwab eb5902b139 fixed cluster restart and cluster dashboard refresh for authentication 2014-03-26 17:20:44 +01:00
gschwab ebabd76417 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-26 15:09:45 +01:00
gschwab 08878cb42c removed unnecessary authorization handon 2014-03-26 15:09:38 +01:00
scottashton 2c1981ea1b finished frontend/collections tests 2014-03-26 14:44:06 +01:00
Jan Steemann b4a78b55db fixed failing test 2014-03-25 18:48:53 +01:00
scottashton ca5ccf9a39 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-25 17:52:22 +01:00