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

627 Commits

Author SHA1 Message Date
Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	arangod/VocBase/document-collection.c
	arangosh/CMakeLists.txt
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-18 08:50:27 +01:00
Michael Hackstein c4b14fcfac Added strong transparency to colors, used by tiles. Also added some more attributes to tile, still some overwrites found there 2014-02-17 22:16:09 +01:00
Michael Hackstein 36affeb5d7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-17 21:32:27 +01:00
Heiko Kernbach 286bcc658a notification prep. + karma fix 2014-02-17 16:46:15 +01:00
gschwab cecb40147d path fixed 2014-02-17 16:43:13 +01:00
Michael Hackstein df7dfc0b10 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
 2014-02-17 13:50:06 +01:00
scottashton 7c12ac72f1 scss for cluster 2014-02-17 13:47:42 +01:00
scottashton 279a0c8f43 cluster 2014-02-17 13:42:01 +01:00
Michael Hackstein ae2ce12a45 Added a collect by address for dbServers and coordinators to show them based on their machine 2014-02-17 13:40:24 +01:00
Heiko Kernbach c9193d153f removed obsolesce test 2014-02-17 11:55:22 +01:00
Heiko Kernbach 238396e3c4 prep for new notifications, cleanup 2014-02-17 11:47:58 +01:00
gschwab 067a202104 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-17 08:57:27 +01:00
gschwab 5e90b2fe04 added user and statistic view (fakey and inactive) 2014-02-17 08:57:17 +01:00
scottashton b5950f1fd9 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-17 08:21:58 +01:00
scottashton dc4714538c cluster View 2014-02-17 08:21:55 +01:00
Heiko Kernbach 2f96ac70ad new model for notification 2014-02-14 20:45:00 +01:00
Heiko Kernbach bcf587847a karma 2014-02-14 20:43:01 +01:00
Jan Steemann 3fd053eb1e updated tests 2014-02-14 18:44:36 +01:00
Frank Celler 65d7d8fdab Merge remote-tracking branch 'origin/devel' into sharding 2014-02-14 17:23:33 +01:00
Heiko Kernbach 5a2a5508ef added new collection/model for notifications 2014-02-14 16:51:57 +01:00
Michael Hackstein 5cb9068719 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-14 16:36:08 +01:00
Michael Hackstein 86ae7ed443 Added a faked route to cluster js to receive the type of the network 2014-02-14 16:36:00 +01:00
scottashton 631ff08dcc clusterFrontend 2014-02-14 16:33:33 +01:00
Michael Hackstein e92f5ec5be Added svg and div into the showCluster template 2014-02-14 14:10:23 +01:00
scottashton 907f9127e9 starting clusterFrontend 2014-02-14 13:59:29 +01:00
Michael Hackstein 24d97170f9 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-14 13:40:53 +01:00
Michael Hackstein 00007a653f Fixed tests for cluster planner 2014-02-14 13:40:47 +01:00
Jan Steemann 3eab509562 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-14 10:31:07 +01:00
Jan Steemann 0f0ef8a33f updated index docs 2014-02-14 10:30:05 +01:00
Michael Hackstein a38b06c1a5 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-14 09:37:18 +01:00
Michael Hackstein dfd03e33ad Added download for the startup configuration and implemented the start of the cluster 2014-02-14 09:37:12 +01:00
Jan Steemann 44dccf582c Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 18:14:59 +01:00
Jan Steemann f8476ce0b0 fixed tests 2014-02-13 18:14:53 +01:00
Frank Celler 92172bc59a Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-13 16:38:46 +01:00
gschwab 8d8476834e tests fixed 2014-02-13 16:35:18 +01:00
scottashton 512685313d Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 16:26:40 +01:00
scottashton 7e1562fcfd fixed bug in planSymmetricView.js 2014-02-13 16:26:09 +01:00
gschwab df7932f7ca tools dropdown fixed 2014-02-13 16:15:53 +01:00
gschwab 2bb45f052c resized page margins 2014-02-13 15:37:39 +01:00
Jan Steemann bb0f591349 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 15:33:39 +01:00
Michael Hackstein 0474d47a1e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-13 15:12:56 +01:00
scottashton 9399387dac refactored planSymmetricView 2014-02-13 15:10:09 +01:00
gschwab 485958a2a2 tests fixed 2014-02-13 13:10:54 +01:00
gschwab 4fefdeba7f dropdown menues fixed 2014-02-13 12:55:01 +01:00
scottashton ebc4e96da4 finished asymmetrical and symmetrical plan 2014-02-13 12:01:52 +01:00
scottashton f196f4361d finished asymmetrical and symmetrical plan 2014-02-13 12:00:50 +01:00
Jan Steemann fc84d4c005 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 11:18:49 +01:00
Frank Celler 95472a82eb Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-13 11:07:01 +01:00
Jan Steemann 6c670f2e2e Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 11:00:26 +01:00
Jan Steemann 4fc8cae57d index creation with ids 2014-02-13 11:00:08 +01:00