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

1008 Commits

Author SHA1 Message Date
Jan Steemann b1c4f75e50 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 13:29:07 +01:00
Frank Celler 2fd7bfcbc3 Merge pull request #727 from pluma/manifest-lib-default-local 
App requires should be module-relative by default. Fixes #721
 2014-01-11 02:35:31 -08:00
Michael Hackstein 9f3479f5b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	utils/Makefile.files
 2014-01-10 17:41:52 +01:00
Frank Celler 9582ea8c94 Merge pull request #723 from pluma/npm-default-package-main 
Default package "main" to "index". Fixes #719.
 2014-01-09 14:05:06 -08:00
Alan Plum 3d511060ce App requires should be module-relative by default. Fixes #721 2014-01-09 22:06:57 +01:00
Alan Plum 6c0f9ef6b0 Fixed package file resolution. Fixes #718, #720. 2014-01-09 19:06:15 +01:00
Alan Plum 1b72d07efc Default package "main" to "index". Fixes #719. 2014-01-09 18:17:20 +01:00
Jan Steemann 7a3635adf9 fixed problem with AQL functions in multiple databases 2014-01-08 09:53:03 +01:00
Max Neunhoeffer eb2afb2f04 Implement case distinction for create collection between cluster and not. 2014-01-03 16:17:34 +01:00
Jan Steemann 03b55488b6 fixed client-side implementation of function registration 2014-01-03 13:58:35 +01:00
Jan Steemann 91c52a3a2e fixed potential deadlock in global context execution 2014-01-03 13:47:11 +01:00
Michael Hackstein 920f5e6d4b Updated JSUnity, now equalitycheck for objects does not care for ordering anymore 2014-01-02 18:05:21 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Jan Steemann b903d9080d Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
 2013-12-20 15:35:50 +01:00
Jan Steemann 8bc1692d54 fixed issue #711, #687 2013-12-20 15:13:23 +01:00
Jan Steemann 55deb10126 fixed issue #711, #687 2013-12-20 15:12:21 +01:00
Jan Steemann 2c8ef0125f ported web interface changes from devel to 1.4 2013-12-18 16:22:16 +01:00
Jan Steemann 67f72b26fa split big group of statistics into 2 separate groups 
Conflicts:
	CHANGELOG
 2013-12-13 16:08:58 +01:00
Jan Steemann ed927d26c8 split big group of statistics into 2 separate groups 2013-12-13 15:58:59 +01:00
Jan Steemann 13bcc2bf7a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2013-12-11 18:39:10 +01:00
Jan Steemann 2965accb05 add current state to agency 2013-12-06 14:23:02 +01:00
Jan Steemann 44b3237882 moved server-only tests to js/server/tests 
this hopefully removes some future confusion about the tests
also moved some graph stuff into js/common as client-side graphs did not fully work

make logfile path accessible
 2013-12-04 22:05:00 +01:00
Jan Steemann 32a247aa2f added tests for creating / dropping graphs 2013-12-02 15:12:07 +01:00
Jan Steemann 28110b01e3 issue #671: make more graph-methods work client-side, too 2013-11-25 10:23:46 +01:00
Jan Steemann 6cf0fa2b4a issue #671: make other graph methods work client-side, too 2013-11-25 10:22:36 +01:00
Jan Steemann 9a1aa7a4cc removed superfluous error codes 2013-11-22 13:49:05 +01:00
Jan Steemann 0eeac02a91 removed unused error codes 2013-11-22 13:23:23 +01:00
Lucas Dohmen 2024bdf941 Graph: Fixed `getVertices` 2013-11-20 15:37:56 +01:00
Jan Steemann cf219d92d3 added debugSegfault 2013-11-20 13:15:45 +01:00
Jan Steemann 319f5f8dbd removed unused variables 2013-11-18 11:41:57 +01:00
Jan Steemann 5d9cd13c4f issue #671: Method graph.measurement does not exist 2013-11-18 10:39:39 +01:00
Jan Steemann 018bbaa01d issue #671: Method graph.measurement does not exist 2013-11-18 10:28:09 +01:00
Jan Steemann c5e9538547 Merge remote-tracking branch 'origin/devel' into inline-shapes 
Conflicts:
	arangod/VocBase/document-collection.c
 2013-11-14 01:01:24 +01:00
Jan Steemann 86ccaaaf45 do not pollute global namespace 2013-11-11 21:07:38 +01:00
Jan Steemann 9de514d000 removed unused file 2013-11-11 21:07:24 +01:00
Jan Steemann f68113a5d2 do not pollute global namespace 2013-11-11 21:05:05 +01:00
Jan Steemann 6933d66af9 fixed test for Windows 2013-11-11 20:31:11 +01:00
Jan Steemann 6a0d54f1ff fixed test for Windows 2013-11-11 20:30:10 +01:00
Jan Steemann dfe8d82f30 added test for #665 2013-11-11 16:44:39 +01:00
Jan Steemann 303abcc60d issue #665: Hash/skiplist combo madness bit my ass 2013-11-11 16:38:38 +01:00
Jan Steemann ae872007ac updated database creation API 2013-11-07 14:06:44 +01:00
Jan Steemann 819e9a1cb6 fixed user creation on database creation 2013-11-07 13:32:42 +01:00
Jan Steemann 7055299a6e removed shape collections 2013-11-06 17:05:16 +01:00
Jan Steemann 241ad73940 fixed test 2013-11-06 10:16:26 +01:00
Jan Steemann d30ca7b658 added `/_api/database/user` method 2013-11-06 09:34:44 +01:00
Jan Steemann 7924f657d4 added `/_api/database/user` method 2013-11-04 14:22:00 +01:00
Lucas Dohmen 7d7e014bfe Only drop vertices when dropping a graph if vertices aren't used 
elsewhere
 2013-10-31 16:41:49 +01:00
Lucas Dohmen 6049ef11fb Graph: Replace a given edge by ID 2013-10-31 15:16:58 +01:00
Lucas Dohmen 04c7cfce33 Graph: Replace a given vertex by ID 2013-10-31 15:16:58 +01:00
Lucas Dohmen b1f36e41f8 Graph Module: Alternatively provide ID instead of Vertex in addEdge 2013-10-31 13:14:51 +01:00