Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 

Conflicts:
	CHANGELOG
This commit is contained in:
Frank Celler 2013-01-03 09:07:14 +01:00
parent 503e0ff8fe 9bb15dcf45
commit c982962fd4
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -140,6 +140,8 @@ v1.1.2 (XXXX-XX-XX)
* fixed issue #332: arangoimp --use-ids parameter seems to have no impact * fixed issue #332: arangoimp --use-ids parameter seems to have no impact
* fixed issue #337: "WaitForSync" on new collection does not work on Win/X64
* fixed issue #336: Collections REST API docs * fixed issue #336: Collections REST API docs
* fixed issue #335: mmap errors due to wrong memory address calculation * fixed issue #335: mmap errors due to wrong memory address calculation

7
arangosh/V8Client/arangosh.cpp
View File

@ -843,6 +843,12 @@ static void RunShell (v8::Handle<v8::Context> context, bool promptError) {
string goodPrompt; string goodPrompt;
string badPrompt; string badPrompt;
#ifdef __APPLE__
// MacOS uses libedit, which does not support ignoring of non-printable characters in the prompt
// using non-printable characters in the prompt will lead to wrong prompt lengths being calculated
// we will therefore disable colorful prompts for MacOS.
goodPrompt = badPrompt = string("arangosh> ");
#else
if (BaseClient.colors()) { if (BaseClient.colors()) {
goodPrompt = string(ArangoClient::PROMPT_IGNORE_START) + string(ArangoClient::COLOR_BOLD_GREEN) + string(ArangoClient::PROMPT_IGNORE_END) + goodPrompt = string(ArangoClient::PROMPT_IGNORE_START) + string(ArangoClient::COLOR_BOLD_GREEN) + string(ArangoClient::PROMPT_IGNORE_END) +
string("arangosh>") + string("arangosh>") +
@ -857,6 +863,7 @@ static void RunShell (v8::Handle<v8::Context> context, bool promptError) {
else { else {
goodPrompt = badPrompt = string("arangosh> "); goodPrompt = badPrompt = string("arangosh> ");
} }
#endif
cout << endl; cout << endl;

2
html/admin/js/master.js
View File

@ -1348,7 +1348,7 @@ var lastFormatQuestion = true;
type: "PUT", type: "PUT",
async: false, // sequential calls! async: false, // sequential calls!
url: "/_api/collection/" + newColName + "/properties", url: "/_api/collection/" + newColName + "/properties",
data: '{"waitForSync":' + JSON.stringify(wfs) + ',"journalSize":' + JSON.stringify(journalSize) + '}', data: '{"waitForSync":' + (wfs ? "true" : "false") + ',"journalSize":' + JSON.stringify(journalSize) + '}',
contentType: "application/json", contentType: "application/json",
processData: false, processData: false,
success: function(data) { success: function(data) {