1
0
Fork 0
Commit Graph

237 Commits

Author SHA1 Message Date
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