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

445 Commits

Author SHA1 Message Date
Oreste Panaia 8a95c1c2a8 update 2013-06-05 19:52:34 +08:00
Oreste Panaia 70bc62a5a5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-05-21 17:47:22 +08:00
Oreste Panaia b764b4f71e extended errors for skiplist 2013-05-21 17:45:19 +08:00
Frank Celler b4794e6655 fixed issue #530: ReferenceError: ArangoError is not a constructor 2013-05-20 00:02:25 +02:00
Jan Steemann ed77c19e16 added derived file 2013-05-17 15:59:58 +02:00
Jan Steemann 8790a69b8e jslint 2013-05-14 12:40:30 +02:00
Jan Steemann c51f70de05 removed hard-coded groups from statistics web interface 
now all statistics are dynamic
removed redundant code in statistics web interface
 2013-05-14 02:36:01 +02:00
Jan Steemann eb8325ef34 fixed typo in error message 2013-05-08 11:10:34 +02:00
Frank Celler 2d5af26466 added safeJoin 2013-05-05 21:50:43 +02:00
Frank Celler 581c667a5a fixed jslint 2013-05-04 21:52:09 +02:00
Jan Steemann ee7ab712d6 issue #495 2013-05-03 11:08:58 +02:00
Oreste Panaia 115d87196c sync windows dev 2013-04-29 23:13:06 +08:00
Oreste Panaia c42c0bf565 sync dev for windows 2013-04-29 21:49:28 +08:00
Oreste Panaia 532c7eae8e windows dev update 2013-04-29 21:24:57 +08:00
Frank Celler 186694dc22 added safety check for packages which define main with .js 2013-04-23 22:42:11 +02:00
Frank Celler fb8d8799c3 moved document of console to JSModuleConsole, added packages and node 2013-04-23 18:39:25 +02:00
Oreste Panaia 1ddbd2e4d9 update 2013-04-23 19:02:46 +08:00
Oreste Panaia b83d90f021 skiplist transaction support 2013-04-23 18:56:26 +08:00
Frank Celler cbc2ab93ba fixed _shallowCopy, fixed creating of unknown attributes 2013-04-22 16:48:36 +02:00
Frank Celler 7bfce45ece added more node modules 2013-04-21 22:00:54 +02:00
Frank Celler a75736a148 added Buffer from node 2013-04-21 21:45:39 +02:00
Frank Celler d2ea4e9bd2 added SlowBuffer from node 2013-04-21 21:32:32 +02:00
Frank Celler 79330daa90 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-17 10:47:35 +02:00
Frank Celler 68a7a55c6d fixed typo (plattform) 2013-04-17 10:46:53 +02:00
Jan Steemann b667e458fc fixed error messages 2013-04-16 11:55:17 +02:00
Jan Steemann e3d8db0b71 issue #474 2013-04-15 09:30:50 +02:00
Jan Steemann dee5adb9f5 added client side API for transactions 2013-04-12 23:18:48 +02:00
Jan Steemann 9b5849f650 updated documentation 2013-04-12 00:42:02 +02:00
Jan Steemann 229893c086 documentation for transactions 2013-04-12 00:03:05 +02:00
Jan Steemann 997c14e032 fixed jslint warnings 2013-04-11 20:24:09 +02:00
Jan Steemann b6925a7b7b transactions 2013-04-11 19:06:55 +02:00
Frank Celler f373615268 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/V8Server/v8-actions.cpp
 2013-04-10 21:47:51 +02:00
Frank Celler 828b939053 fixed isolates, made ArangoError internal 2013-04-10 21:22:09 +02:00
Jan Steemann ffb2a0f545 added generated file 2013-04-10 08:51:55 +02:00
Frank Celler d7443f5caa default path needs the type 2013-04-08 16:23:57 +02:00
Frank Celler 738a4dde75 nicer printing of objects 2013-04-08 16:23:28 +02:00
Frank Celler a0278476da Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	lib/Basics/StringUtils.cpp
 2013-04-06 10:19:09 +02:00
Frank Celler 1d7ee507e2 added TRI_ERROR_ARANGO_DOCUMENT_KEY_MISSING 2013-04-06 10:18:29 +02:00
Jan Steemann 3a8783b26a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-04-05 15:35:23 +02:00
Jan Steemann edf513551f error handling 2013-04-05 15:35:08 +02:00
Frank Celler b50bc6dd24 added thumbnail 2013-04-05 14:48:15 +02:00
Jan Steemann ed10d9b6aa AQL user functions 2013-04-05 12:50:44 +02:00
Frank Celler dcb65a92bf fixed error messages 2013-04-04 23:19:27 +02:00
Frank Celler 37e134ff50 new Foxx 2013-04-04 18:56:38 +02:00
Jan Steemann 1417def879 disallow create/drop/rename operations inside transactions 2013-04-04 09:41:44 +02:00
Frank Celler a6be9ceaa3 added node assert module 2013-04-03 16:48:38 +02:00
Frank Celler 0ba6329a12 added trace 2013-04-03 16:32:04 +02:00
Frank Celler 711b5884d3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into HEAD 2013-04-02 17:47:33 +02:00
Frank Celler 42b92c794f fixed error messages and tests 2013-04-02 17:46:19 +02:00
Jan Steemann e2effff144 fixed doxygen errors 2013-04-02 09:34:06 +02:00
Frank Celler bae6e3666e fixed wrong name 2013-04-01 23:07:31 +02:00
Frank Celler 3921fd07c8 no strict for assign 2013-03-31 19:32:25 +02:00
Frank Celler 07bd4b2585 new module/package mechanism 2013-03-31 12:25:12 +02:00
Frank Celler 7031210a53 fixed browser 2013-03-31 00:10:48 +01:00
Frank Celler 1467b78676 cleanup of internal, fs, console 2013-03-31 00:10:48 +01:00
Frank Celler b224a399ae nice function printing 2013-03-31 00:10:47 +01:00
Frank Celler dfe3c22519 fixed wrong id 2013-03-28 22:46:14 +01:00
Frank Celler 2ed6b0145f changed app-path and dev-app-path to be just one directory 2013-03-28 21:48:52 +01:00
Frank Celler e3990f19ab added reload in dev mode 2013-03-27 16:42:32 +01:00
Frank Celler 3ea5fbe121 added dev 2013-03-27 15:28:43 +01:00
Frank Celler 7a6cdcf9b1 changing to app-id 2013-03-27 15:05:08 +01:00
Frank Celler 96a14b0b6d changed to appId 2013-03-27 13:43:04 +01:00
Frank Celler be971602f2 added install and uninstall of FOXX apps 2013-03-27 11:32:39 +01:00
Frank Celler 214c9d8386 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-26 17:47:40 +01:00
Frank Celler 111a0ed54a write mounts into _aal 2013-03-26 17:47:32 +01:00
Jan Steemann 3bb251000c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	lib/V8/v8-utils.cpp
 2013-03-26 14:13:41 +01:00
Jan Steemann 1492118545 added test cases for "fs" module 2013-03-26 14:09:20 +01:00
Frank Celler 0f6e48a38b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/server/modules/org/arangodb/foxx.js
 2013-03-26 10:01:39 +01:00
Frank Celler 877066392e foxx manager cleanup 2013-03-25 14:10:10 +01:00
Frank Celler 332b0495ca Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-25 10:22:44 +01:00
Frank Celler a8557091b8 new foxx loader 2013-03-25 10:22:35 +01:00
Jan Steemann 9cbd8e4707 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-24 18:13:26 +01:00
Jan Steemann 124d7cb29f fixed file uploads 2013-03-24 18:13:13 +01:00
Frank Celler eaa21cdfd1 fixed context 2013-03-24 17:53:53 +01:00
Frank Celler 0a488cd84b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-24 15:03:16 +01:00
Frank Celler e3de563668 requiresLibs and requiresModels 2013-03-24 15:03:01 +01:00
Jan Steemann 071144ecc0 temporary file functons 2013-03-24 14:32:09 +01:00
Frank Celler 34477c290e added installApp 2013-03-24 12:35:43 +01:00
Jan Steemann f58e1a4b9a sendFile 2013-03-24 11:44:29 +01:00
Frank Celler c6444f0510 fixed name and version 2013-03-24 10:58:42 +01:00
Frank Celler bc0d1180fb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/client/modules/org/arangodb/foxx.js
	js/common/bootstrap/module-internal.js
 2013-03-24 10:45:26 +01:00
Jan Steemann 2c279d9c4f fixed jslint errors 2013-03-24 01:14:58 +01:00
Jan Steemann 37f364e70e added internal.download() 2013-03-24 01:04:26 +01:00
Frank Celler 4ccee5fe61 Merge remote-tracking branch 'origin/devel' into devel 
Conflicts:
	js/common/modules/org/arangodb/foxx.js
 2013-03-23 23:48:48 +01:00
Frank Celler 88f43e6e8f added app path 2013-03-23 23:47:18 +01:00
Jan Steemann 91fbb454f3 added zipFile() 2013-03-23 22:32:59 +01:00
Frank Celler 8b0c0c7662 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/common/bootstrap/module-internal.js
 2013-03-23 21:58:44 +01:00
Frank Celler 44806229f7 fixed jslint errors 2013-03-23 21:57:33 +01:00
Jan Steemann d97954e466 unzip 2013-03-23 20:52:33 +01:00
Frank Celler 8012a23744 added foxx api 2013-03-23 17:09:26 +01:00
Frank Celler 4059f31170 return error message 2013-03-23 16:42:52 +01:00
Jan Steemann 0d2fdcae58 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/bootstrap/module-fs.js
 2013-03-23 14:36:45 +01:00
Jan Steemann 6cd509c8e5 added fs.isFile() 2013-03-23 14:27:10 +01:00
Frank Celler 8a54df7419 added .arangosh.rc, added /_admin/execute 2013-03-23 14:04:08 +01:00
Frank Celler a8d5a06f57 added resetEngine 2013-03-22 18:09:01 +01:00
Frank Celler 38a5cf6a2d added development-mode 2013-03-22 17:33:25 +01:00
Frank Celler 12f0c901e5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into feature/v8cleanup 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	arangosh/V8Client/arangosh.cpp
 2013-03-22 14:47:17 +01:00
Jan Steemann 40199d64b7 fixed handling of empty and reserved attribute names in documents 
specifying an empty attribute name in a document may have led to segmentation faults
when the document was unpacked later.
 2013-03-20 11:48:33 +01:00
Jan Steemann 8155718a4c new web interface 2013-03-19 10:33:23 +01:00
Frank Celler 59184b39bd added update disclaimer for JS files 2013-03-13 17:30:14 +01:00
Frank Celler c915bfa5ff cleanup of indexes, fix for compaction (hash, cap, geo) 
Conflicts:
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
 2013-03-11 09:49:58 +01:00
Jan Steemann 1a7e6b2d5b colorize! 2013-03-08 18:36:11 +01:00
Jan Steemann e6c28d50b3 cleanup: removed TRI_HAVE_ICU and internal.HAVE_ICU (always true) 2013-03-08 16:09:47 +01:00
Jan Steemann 0769f311e7 issue #444: make colors portable 2013-03-08 15:25:18 +01:00
Jan Steemann 0a883f4076 merged some changes from trx branch into devel 2013-03-08 14:22:25 +01:00
Jan Steemann b307e4cd6d completed auto-increment key generator 2013-03-08 10:51:50 +01:00
Jan Steemann e2c0d9544a fixed jslint errors 2013-03-07 17:35:12 +01:00
a-brandt 18c05bdac6 added session errors 2013-03-06 14:05:42 +01:00
Frank Celler 7abef532f4 fixed package module loading and directory.lib entry 2013-03-05 17:23:19 +01:00
a-brandt e41847c336 moved random generators and nonce functions to internal and crypto module 2013-03-04 16:18:00 +01:00
Frank Celler 60037971dc rewrote statistics 2013-03-03 22:39:41 +01:00
Frank Celler eb8eafa4ef fixed global modules in packages 2013-02-27 14:39:07 +01:00
Frank Celler c9226054fc added tests, fixed unloadAll 2013-02-26 18:12:28 +01:00
Frank Celler 85d2e87154 added new package option 2013-02-25 18:15:32 +01:00
Jan Steemann 3fdebb38ee issue #393, issue #128 
Added a REST API for user management
The REST API exposes the functionality available in module "users" for HTTP access.

The following methods are available:
* GET /_api/user/username: fetch user information
* POST /_api/user: create new user
* PUT /_api/user: replace an existing user
* PATCH /_api/user: (partially) update an existing user
* DELETE /_api/user: remove an existing user

Additionally, a module "crypto" is introduced and exposed for Javascript actions.
The crypto module provides the following functions:
* require("org/arangodb/crypto").md5();
* require("org/arangodb/crypto").sha256();
* require("org/arangodb/crypto").rand();
 2013-02-20 11:56:26 +01:00
Jan Steemann 4acd777b6c fixed jslint warnings 2013-02-14 11:40:14 +01:00
Frank Celler 8cca06127c moved .dox to .md 2013-02-09 13:15:28 +01:00
Jan Steemann f16f88a2e6 added docs for CONTAINS(), added LIKE() 2013-02-06 11:40:45 +01:00
Jan Steemann 3fd6373c2f removed error 1520, replaced with standard error 1203 2013-02-04 23:04:37 +01:00
Jan Steemann d43e9b89ca issue #381: lifted restrictions on usernames 2013-01-31 13:20:39 +01:00
Jan Steemann 2cd89f3028 do not abort printing objects when toString() throws 2013-01-25 23:14:39 +01:00
Frank Celler af77d2f92e fixed unloadAll 2013-01-23 15:45:54 +01:00
Jan Steemann 376c264281 take precautions to prevent issue #365 2013-01-22 11:58:08 +01:00
Jan Steemann 3f3987e6a4 made printing nicer 2013-01-19 22:07:32 +01:00
Frank Celler 670dc221ab Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/client/client.js
	js/common/bootstrap/module-internal.js
	js/common/modules/org/arangodb/simple-query-common.js
	js/server/ahuacatl.js
 2013-01-17 23:56:31 +01:00
Frank Celler edef5feacc fixed tests 2013-01-17 23:45:19 +01:00
Frank Celler 159f613169 more cleanup 2013-01-17 18:24:58 +01:00
Frank Celler cfadf6ca06 fixed comments 2013-01-17 16:10:42 +01:00
Frank Celler 3c21a87366 more cleanup 2013-01-17 16:01:15 +01:00
Jan Steemann 7d4e93e4bd changed back printing of strings 2013-01-17 15:17:22 +01:00
Jan Steemann 8160a0183a string printing w/ color 2013-01-17 15:03:44 +01:00
Frank Celler 250726ca00 reorganisation of modules 2013-01-17 10:30:35 +01:00
Jan Steemann 32e91fddf6 renamed methods 2013-01-16 11:12:58 +01:00
Jan Steemann d10d35bf4b colors 2013-01-16 01:40:07 +01:00
Jan Steemann 40318ad926 pretty dumper 2013-01-15 15:00:17 +01:00
Jan Steemann c1ec3c49ed shut up prettifiers on demand 2013-01-15 14:53:06 +01:00
Jan Steemann 6686a075ca pretty printing fix 2013-01-15 14:46:18 +01:00
Jan Steemann 2058700697 issue #353 2013-01-15 14:35:05 +01:00
Frank Celler 12b611d102 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 2013-01-12 21:08:35 +01:00
Frank Celler 514244868d added printf 2013-01-11 22:39:03 +01:00
Frank Celler 33e3031380 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.in
	VERSION
	arangod/V8Server/v8-query.cpp
	build_posix.h
	configure
	configure.ac
 2013-01-10 18:00:25 +01:00
Frank Celler 22357a4cfa removed debug output 2013-01-09 15:46:29 +01:00
Frank Celler 128cb67c8b Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	Documentation/Examples/shell-read-document-bad-handle
	Makefile.in
	arangod/Documentation/shell-document.dox
	configure
	js/actions/system/api-collection.js
	js/actions/system/api-index.js
	js/actions/system/api-system.js
	js/common/bootstrap/modules.js
	js/common/bootstrap/print.js
	js/server/ArangoCollection.js
	lib/V8/v8-utils.cpp
 2013-01-09 15:30:21 +01:00
Frank Celler 812360145e added flush 2013-01-09 11:47:17 +01:00
Jan Steemann a05edcdccc fixed JS print output 2013-01-08 00:28:12 +01:00
Frank Celler f5b1476d78 fixed jslint warnings 2013-01-06 11:05:28 +01:00
Frank Celler fb881581e1 fixed GUI 2013-01-06 01:31:32 +01:00
Frank Celler 3826a4603e removed print.js 2013-01-06 00:23:40 +01:00
Frank Celler 337cee7606 fixed jslint warnings 2013-01-05 23:59:44 +01:00
Frank Celler 7be1c01bda removed linked in JavaScript code, separate files for 'fs' and 'console' 2013-01-05 23:24:10 +01:00
Frank Celler 89a7cac605 added listTree 2013-01-05 22:45:09 +01:00
Frank Celler 0549528325 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.in
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-vocbase.cpp
	html/admin/js/master.js
	js/actions/system/api-collection.js
	js/common/bootstrap/errors.js
	js/server/version-check.js
	lib/BasicsC/errors.dat
	lib/BasicsC/logging.c
	lib/BasicsC/voc-errors.c
	lib/BasicsC/voc-errors.h
 2013-01-05 11:16:50 +01:00
Jan Steemann 6dce10de80 slightly fixed the print function for arrays & objects 2013-01-04 15:50:55 +01:00
Frank Celler f9dba124dd Merge remote-tracking branch 'origin/issue317' into 1.1 
Conflicts:
	js/common/bootstrap/modules.js
 2013-01-03 18:57:18 +01:00
Frank Celler 06e191877a added jslint target 2013-01-03 17:45:35 +01:00
Frank Celler 114de14816 fixed duplicate 2013-01-03 17:16:25 +01:00
Frank Celler 53364b7f15 updated error codes 2013-01-03 16:31:55 +01:00
Jan Steemann ea48388726 issue #335 2013-01-02 14:12:44 +01:00
Jan Steemann b48d039e3f issue #327 2012-12-27 18:26:04 +01:00
Jan Steemann 110fb8ade6 issue #327 2012-12-27 18:14:19 +01:00
Jan Steemann d562c52fd7 backport of issue #300 2012-12-22 03:38:29 +01:00
Jan Steemann 599428859e issue #330 2012-12-21 22:01:51 +01:00
Jan Steemann 2b84d417f8 issue #330 2012-12-21 21:54:55 +01:00
Jan Steemann ec9f72f227 return appropriate error codes 2012-12-07 10:49:06 +01:00
Jan Steemann 1ffa8e702c more tests and documentation for fulltext indexes 2012-12-05 16:12:33 +01:00
Frank Celler 051705c7b9 Merge branch '1.1' of github.com:triAGENS/ArangoDB 
Conflicts:
	.gitignore
	CHANGELOG
	Doxygen/Examples.ArangoDB/arangosh-options
	Doxygen/arango-html.doxy
	Doxygen/arango-latex.doxy
	Doxygen/arango-xml.doxy
	Doxygen/arango.template
	Makefile.in
	UnitTests/HttpInterface/api-collection-spec.rb
	VERSION
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/Documentation/first-steps-arangodb.dox
	arangod/Documentation/user-manual.dox
	arangod/HashIndex/compare.h
	arangod/HashIndex/hasharray.c
	arangod/HashIndex/hasharray.h
	arangod/HashIndex/hashindex.h
	arangod/V8Server/v8-actions.cpp
	arangod/VocBase/simple-collection.c
	arangosh/V8Client/V8ClientConnection.cpp
	arangosh/V8Client/V8ClientConnection.h
	arangosh/V8Client/arangoimp.cpp
	arangosh/V8Client/arangosh.cpp
	configure
	configure.ac
	html/admin/css/layout.css
	html/admin/index.html
	html/admin/js/master.js
	js/actions/system/api-system.js
	js/common/bootstrap/js-modules.h
	js/server/js-ahuacatl.h
	js/server/js-server.h
	js/server/server.js
	lib/BasicsC/voc-errors.c
	lib/V8/v8-globals.h
 2012-12-05 12:34:08 +01:00
Jan Steemann cdbb96788f issue #313 2012-12-03 15:30:01 +01:00
Jan Steemann 8c7ca55512 issue #300 2012-12-01 03:15:39 +01:00
Jan Steemann ad855bd2bd fixed doxygen errors 2012-11-21 18:10:45 +01:00
Jan Steemann f3b87fbe1f fixed documentation 2012-11-21 17:52:44 +01:00
Jan Steemann a2b404123a load monkeypatches on all occasions 2012-11-20 16:50:15 +01:00
Jan Steemann b159a0539b moved monkeypatches.js to bootstrap folder and load it at all occasions, allowing graph usage from arangosh 2012-11-20 15:36:19 +01:00
a-brandt 78aacd35da printing issues fixed 2012-11-19 15:20:34 +01:00
Jan Steemann ace85c43c9 nesting transactions from v8-vocbase... 2012-11-15 18:55:52 +01:00
Jan Steemann 1ff2430e39 transaction refactoring 2012-11-15 13:53:11 +01:00
Jan Steemann 12d76b8306 introduced additional transaction type for import 2012-11-15 09:52:47 +01:00
Jan Steemann 30ba8771a7 pluggable key generators 2012-11-14 12:44:56 +01:00
Frank Celler 19d4125e80 fixed issue #275: strange error message in arangosh 1.0.3 at startup 
Conflicts:
	CHANGELOG
	js/common/bootstrap/js-modules.h
 2012-11-12 17:50:51 +01:00
Frank Celler 57d1d5e59c fixed issue #275: strange error message in arangosh 1.0.3 at startup 2012-11-12 17:39:07 +01:00
Jan Steemann dacd2fb70c some cleanup 2012-11-06 19:24:27 +01:00
Jan Steemann 59791248bf some refactoring of v8-vocbase, trx integration 2012-11-06 19:02:09 +01:00
Jan Steemann 203560d30b moved transactions into javascript object 2012-11-06 14:42:52 +01:00
a-brandt 7daa018969 removed "reuseID" 2012-10-26 12:36:13 +02:00
Jan Steemann f60f71718b issue #262 2012-10-25 11:00:53 +02:00
Jan Steemann 67c0ac2e2c issue #262 2012-10-25 10:57:51 +02:00
Jan Steemann bbd3dc8e23 issue #262 2012-10-25 10:57:26 +02:00
Jan Steemann d4cb1b5399 issue #262: more verbose error messages when loading broken modules 2012-10-22 16:21:04 +02:00
Jan Steemann 6796b9516b issue #262: more verbose error messages when loading broken modules 2012-10-22 16:20:07 +02:00
Jan Steemann 6c033bb7f9 issue #262: more verbose errors when loading broken modules 2012-10-22 16:16:13 +02:00
Frank Celler 0499d8b4e2 ixed wrong attribute 
Conflicts:
	js/common/bootstrap/js-modules.h
 2012-10-20 22:46:59 +02:00
Frank Celler 2589a8e800 fixed wrong attribute 2012-10-20 22:45:01 +02:00
Frank Celler 61856501ea changed .module to .content for modules in collection _modules 
Conflicts:
	js/common/bootstrap/js-modules.h
 2012-10-20 22:17:54 +02:00
Frank Celler 5e3216d4c5 changed .module to .content for modules in collection _modules 2012-10-20 22:15:37 +02:00
Jan Steemann be54759314 issue #245 2012-10-17 14:24:31 +02:00
Frank Celler 195d6903c1 added generated files 2012-10-14 16:23:48 +02:00
Frank Celler bbd9698d22 removed generated files 2012-10-11 16:20:08 +02:00
Frank Celler 939c5ece15 Merge branch '1.0' of github.com:triAGENS/ArangoDB 
Conflicts:
	CHANGELOG
	CONTRIBUTING.md
	Doxygen/arango-html.doxy
	Doxygen/arango-latex.doxy
	Doxygen/arango-xml.doxy
	Doxygen/arango.template
	Makefile.in
	Makefile.local
	Makefile.unittests
	VERSION
	config/config.sub
	configure
	configure.ac
	js/actions/system/api-system.js
	js/client/js-client.h
	js/common/bootstrap/js-modules.h
	js/server/js-ahuacatl.h
	packetize.sh
 2012-10-11 15:19:44 +02:00
Oreste Panaia 5d79b618c7 strings converted to char* 2012-10-01 18:36:42 +08:00
Frank Celler a5f83c3e8d create modules collection 2012-10-01 12:00:43 +02:00
Oreste Panaia eabf79704a VS 2012-09-28 23:45:16 +08:00