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

30719 Commits

Author SHA1 Message Date
hkernbach 05025e5e7f dashboard view loading view fix 2016-06-03 08:56:36 +02:00
Andreas Streichardt 54de1a5e52 fix jslint 2016-06-02 19:55:05 +02:00
Andreas Streichardt 465252e415 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-02 19:51:47 +02:00
Andreas Streichardt 0129e968df Fix authentication_parameters 2016-06-02 19:51:38 +02:00
Wilfried Goesgens 8502bfa4d3 Refactor windows service infrastructure 2016-06-02 18:30:23 +02:00
Andreas Streichardt a1f9b94bce Remove session stuff 2016-06-02 17:56:26 +02:00
jsteemann a9451e09d9 removed now-invalid asserts 2016-06-02 17:35:36 +02:00
Kaveh Vahedipour 8c882c6b3b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-02 17:22:17 +02:00
Kaveh Vahedipour 6f62f5baa3 checking before range loops for emptyness 2016-06-02 17:22:12 +02:00
Andreas Streichardt 1534f2f123 add grants 2016-06-02 16:39:57 +02:00
Andreas Streichardt d95d023c25 Merge remote-tracking branch 'origin/devel' into jwt 2016-06-02 16:35:11 +02:00
Andreas Streichardt cdb04e42e4 Merge remote-tracking branch 'origin/FMH' into jwt 2016-06-02 16:29:38 +02:00
Jan Steemann bcf7cf4370 adjusted markdown 2016-06-02 15:30:18 +02:00
Andreas Streichardt a3d5ce8d16 Merge remote-tracking branch 'origin' into jwt 2016-06-02 14:45:21 +02:00
Andreas Streichardt 1084d4c14a Fix jwt authentication 2016-06-02 14:44:19 +02:00
jsteemann b247a6e08c added --hund option 2016-06-02 13:54:53 +02:00
Frank Celler 572e2524fa added config 2016-06-02 12:52:35 +02:00
Jan Steemann a9bd836fbf updated documentation 2016-06-02 12:24:40 +02:00
Kaveh Vahedipour f56d36d168 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-02 12:17:40 +02:00
Kaveh Vahedipour 2e87f59218 Testing supervision 2016-06-02 12:17:35 +02:00
Jan Steemann c8cfed1113 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-02 12:04:45 +02:00
Jan Steemann 268c349dee added new AQL functions for syntax highlighting 2016-06-02 12:04:30 +02:00
jsteemann ec79aba2fd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-02 12:00:50 +02:00
jsteemann b7ebadc055 make some RocksDB options available to ArangoDB 2016-06-02 12:00:36 +02:00
Jan Steemann 80ffc0ae26 added RocksDB to licenses file 2016-06-02 11:39:04 +02:00
Frank Celler 8c9055f3fd Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-06-02 11:13:23 +02:00
Frank Celler c57ba92de3 fixed access 2016-06-02 11:12:35 +02:00
Jan Steemann b2c000ab8b added tests 2016-06-02 10:24:40 +02:00
jsteemann 222c57ed32 renamed "rocksdb" index to "persistent" index 2016-06-02 10:23:30 +02:00
Kaveh Vahedipour e53bd53def Removed exception handling around run in supervision in expectation that all errors have been handled 2016-06-02 10:14:27 +02:00
Frank Celler 397623460e WIP 2016-06-02 09:49:36 +02:00
Frank Celler b476122344 added use database 2016-06-02 09:28:37 +02:00
Mark b469ceaf35 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-02 08:47:05 +02:00
Frank Celler 22b454800d WIP 2016-06-01 23:03:00 +02:00
Simran Brucherseifer 400c384ac8 Sort numeric functions alphabetically 2016-06-01 20:42:40 +02:00
Frank Celler 70db2ede15 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-06-01 17:59:29 +02:00
Andreas Streichardt 74719c76a6 Merge branch 'devel' into jwt 2016-06-01 17:59:10 +02:00
Frank Celler d7df0ee667 updated doc 2016-06-01 17:57:20 +02:00
Andreas Streichardt b00322b2e1 Classic 2016-06-01 17:54:14 +02:00
Andreas Streichardt 021b71a7c1 Frontend is working 2016-06-01 17:51:39 +02:00
Frank Celler 783eddd91a added grant database and revoke database 2016-06-01 17:46:13 +02:00
Jan Steemann 2003d507a8 added tests 2016-06-01 17:29:17 +02:00
Mark 69f622d5af Compiler-Option /MP (multiple processes) added 2016-06-01 17:22:42 +02:00
Frank Celler 0954dbf2d5 Merge branch 'FMH' of https://github.com/arangodb/arangodb into FMH 2016-06-01 17:15:00 +02:00
Frank Celler 80df233daa WIP 2016-06-01 17:14:29 +02:00
Jan Steemann dcd449119c added C++ implementation of CONCAT_SEPARATOR 2016-06-01 17:10:16 +02:00
Jan Steemann c3da3692bc removed unused implementation of nextBabies() 2016-06-01 17:09:58 +02:00
Jan Steemann 192caed889 fix Visual Studio compile warnings 2016-06-01 17:09:43 +02:00
Frank Celler 6f09122da2 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-06-01 16:25:21 +02:00
Frank Celler 1e25e5d262 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 
Conflicts:
	arangod/Cluster/HeartbeatThread.cpp
	arangod/RestServer/RestServerFeature.cpp
 2016-06-01 16:25:13 +02:00