1
0
Fork 0
Commit Graph

8974 Commits

Author SHA1 Message Date
TJ Walker 9147856636 Fix #41469 2015-09-02 18:03:10 -07:00
TJ Walker 0c854bdc42 Fixes #1469 2015-09-02 17:59:02 -07:00
Jan Steemann 2e617ac0cc Merge branch 'american-english' of https://github.com/CoDEmanX/ArangoDB into devel
Conflicts:
	arangod/Wal/Slots.cpp
	lib/Basics/debugging.cpp
	lib/Basics/files.cpp
2015-09-02 13:14:49 +02:00
Jan Steemann 0e802d6438 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-02 10:20:18 +02:00
Jan Steemann a80d6635ab create fat datafiles
This prevents SIGBUS when a sparse datafile is accessed and the disk is full. In
this case the mmapped region is not necessarily backed by physical memory, and
accessing the memory may crash the program
2015-09-02 10:18:24 +02:00
CoDEmanX 956b396e43 Change spelling of 'initialize' to American English (actual code and files) 2015-09-01 17:29:22 +02:00
CoDEmanX b4593a7e82 Change spelling of 'initialize' to American English (comments and log messages only) 2015-09-01 17:07:21 +02:00
Michael Hackstein 25a52dac53 Disabled test for cluster mode for now 2015-09-01 10:06:26 +02:00
Jan Steemann 9c713ce181 fixed installing of Foxx apps from store 2015-08-31 23:38:19 +02:00
Alan Plum 6b3e08456b Handle ArangoCollection in aqlQuery templates. 2015-08-31 18:16:23 +02:00
Jan Steemann dd9cd8f472 made `aqlQuery` run in web interface 2015-08-30 23:12:26 +02:00
Jan Steemann 1867d6c4de added template string generator function `aqlQuery` for generating AQL queries
This can be used to generate safe AQL queries with JavaScript parameter
variables or expressions easily:

    var name = 'test';
    var attributeName = '_key';
    var query = aqlQuery`FOR u IN users FILTER u.name == ${name} RETURN u.${attributeName}`;
    db._query(query);
2015-08-30 22:32:26 +02:00
hkernbach 5c9bab6802 web ui: css, validation bug, graph view optimized 2015-08-28 14:50:40 +02:00
Michael Hackstein 90db96a6dc Merge branch 'devel' of github.com:arangodb/arangodb into primary_eimer 2015-08-28 10:45:50 +02:00
Michael Hackstein d87748f64e Another graph test depending on unguranteed ordering 2015-08-28 10:45:30 +02:00
Michael Hackstein e909c79794 Fixed a graph unit test. It assumed a specific ordering which is not guaranteed 2015-08-28 10:14:07 +02:00
hkernbach e30d6d42b9 web ui: css, scss-lint, services bugfix & optimization 2015-08-28 09:47:02 +02:00
hkernbach ebe1c36561 web ui: css, bugfixes 2015-08-27 18:39:57 +02:00
hkernbach 8d563ee7f9 web ui: css, updated font awesome to 4.4, dropdown bug, graph viewer 2015-08-27 17:13:54 +02:00
hkernbach b3b2b235c8 web ui: css, query editor, scss 2015-08-27 14:44:02 +02:00
Alan Plum aca2072477 Fixed session default values. 2015-08-27 13:41:24 +02:00
Willi Goesgens 34e8a8fc9f debug printing for misterious ignore of skip 2015-08-26 15:39:02 +02:00
Michael Hackstein 4effa2291e Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing 2015-08-26 10:41:27 +02:00
hkernbach 443a30742a css 2015-08-26 09:25:14 +02:00
Jan Steemann 9374a25822 removed unused error code 2015-08-25 19:55:48 +02:00
hkernbach b18f744682 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-08-25 18:57:51 +02:00
hkernbach 5c83c6d7c5 web ui: css, design 2015-08-25 18:57:42 +02:00
Willi Goesgens 7b081fb6f3 print usefull error if we fail to start procdump. 2015-08-25 17:14:44 +02:00
Michael Hackstein 40c1361244 Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing 2015-08-25 16:40:31 +02:00
hkernbach 9ed2e4b3b1 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-08-25 13:54:00 +02:00
hkernbach 63903bc1bf webui: loginView, css 2015-08-25 13:53:46 +02:00
Jan Steemann b71c880bbd Merge branch 'replication' of https://github.com/arangodb/arangodb into devel 2015-08-25 13:19:24 +02:00
Jan Steemann 1af238a6d5 added tests for requireFromIncluded 2015-08-25 12:50:58 +02:00
hkernbach 98a5108a27 scss lint 2015-08-25 09:17:51 +02:00
hkernbach b5c3c1b09a web ui radio, checkboxes 2015-08-24 18:37:18 +02:00
Jan Steemann 0cbff7b75a Merge branch 'devel' of https://github.com/arangodb/arangodb into replication 2015-08-24 17:40:19 +02:00
hkernbach b2e9fa4576 login view, authentication web ui bug, scss-lint 2015-08-24 16:39:00 +02:00
hkernbach 8d49d01cb2 userlogo web ui bugfix, scss lint 2015-08-24 15:36:22 +02:00
hkernbach 4d9d3f4c07 scss lint 2015-08-24 15:22:43 +02:00
Jan Steemann 91b8ad757a Merge branch 'devel' of https://github.com/arangodb/arangodb into replication 2015-08-24 15:20:28 +02:00
hkernbach 0d154ea124 web ui, scss lint 2015-08-24 14:52:24 +02:00
hkernbach 5988f06377 updated jsoneditor lib, fixed issue 1446 2015-08-24 11:44:13 +02:00
Jan Steemann b08713d768 added tests and documentation 2015-08-24 11:05:26 +02:00
Jan Steemann 893f9592f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into replication 2015-08-24 09:58:04 +02:00
hkernbach 15876a591e web ui design 2015-08-24 09:54:41 +02:00
Jan Steemann 387e3e9cd4 make removeByExample, replaceByExample and updateByExample use AQL internally 2015-08-22 23:22:24 +02:00
Jan Steemann b58ecfe206 added firstTick() 2015-08-21 17:11:40 +02:00
Jan Steemann 9e08b1ebc5 add tickRanges() function 2015-08-21 17:00:32 +02:00
Jan Steemann 31a6547d4c fix replication resumption 2015-08-21 15:57:24 +02:00
Michael Hackstein b708a7ae68 Merge remote-tracking branch 'origin/devel' into array_indexing 2015-08-21 15:34:49 +02:00