Jan Steemann
7540059f36
uint32_t => uint64_t
2015-08-25 15:08:09 +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
52af8c5781
added comments
2015-08-25 13:16:07 +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
Jan Steemann
03fa10dad8
less initial syncing when resuming replication
2015-08-24 17:39:11 +02:00
hkernbach
b2e9fa4576
login view, authentication web ui bug, scss-lint
2015-08-24 16:39:00 +02:00
hkernbach
3ea73722d4
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2015-08-24 15:36:29 +02:00
hkernbach
8d49d01cb2
userlogo web ui bugfix, scss lint
2015-08-24 15:36:22 +02:00
Willi Goesgens
3f5ad7c52d
Work on VS2015 compatibility
2015-08-24 15:28:31 +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
e00a0e6971
merge
2015-08-24 14:52:40 +02:00
hkernbach
0d154ea124
web ui, scss lint
2015-08-24 14:52:24 +02:00
Willi Goesgens
65cd1b68f3
pull variables out of the batch files together into the makefile - so the user can override the default settings.
2015-08-24 13:56:18 +02:00
Jan Steemann
37da76546c
re-introduced tracking of replication "clients"
2015-08-24 12:02:57 +02:00
hkernbach
e2727c7297
merge
2015-08-24 11:44:31 +02:00
hkernbach
5988f06377
updated jsoneditor lib, fixed issue 1446
2015-08-24 11:44:13 +02:00
Jan Steemann
bbd8a643bd
Merge branch 'devel' of https://github.com/arangodb/arangodb into replication
2015-08-24 11:10:01 +02:00
Jan Steemann
b08713d768
added tests and documentation
2015-08-24 11:05:26 +02:00
Willi Goesgens
89c58351d2
Merge pull request #1453 from CoDEmanX/devel
...
Improvements to documentation building
2015-08-24 10:19:17 +02:00
Jan Steemann
893f9592f8
Merge branch 'devel' of https://github.com/arangodb/arangodb into replication
2015-08-24 09:58:04 +02:00
Jan Steemann
deafaf7c2d
updated CHANGELOG
2015-08-24 09:57:47 +02:00
hkernbach
15876a591e
web ui design
2015-08-24 09:54:41 +02:00
Jan Steemann
0defef6e0b
do not fetch vocbase in loop
2015-08-22 23:24:36 +02:00
Jan Steemann
387e3e9cd4
make removeByExample, replaceByExample and updateByExample use AQL internally
2015-08-22 23:22:24 +02:00
CoDEmanX
23db2af78a
Improvements to documentation building
...
Fix sed parameter error that creates additional files on Windows/Cygwin, support Python 2.6, fix font for deprecated summary entries and add author/description to book.
2015-08-22 04:18:02 +02:00
Jan Steemann
b58ecfe206
added firstTick()
2015-08-21 17:11:40 +02:00
Willi Goesgens
b88a69713c
Add missing example
2015-08-21 17:03:16 +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
Jan Steemann
20af58dd09
Merge branch 'devel' of https://github.com/arangodb/arangodb into replication
2015-08-21 09:30:16 +02:00
Willi Goesgens
25fb1c3e6f
Merge pull request #1450 from CoDEmanX/devel
...
Make version more prominent in documentation
2015-08-21 09:29:41 +02:00
CoDEmanX
183adccbd9
Make version more prominent in documentation
...
Many ebook readers (and reading apps) generate covers from meta data like the book title. Therefore it makes sense to place the version string there instead of the first paragraph.
2015-08-21 00:18:32 +02:00
Jan Steemann
f5e5977eca
colors only for ttys
2015-08-20 22:26:39 +02:00
Jan Steemann
8ee12f7a27
binary-safe back-references
2015-08-20 21:01:43 +02:00
Jan Steemann
82ba366eef
removed non-existing paths
2015-08-20 20:39:53 +02:00
Jan Steemann
bd3449ad1d
updated documentation
2015-08-20 20:35:28 +02:00
Jan Steemann
ffde050e0d
check for empty collections list
2015-08-20 20:25:01 +02:00
Willi Goesgens
b785c44a5d
fix docublock syntax.
2015-08-20 18:30:30 +02:00
Jan Steemann
f0ef3d450f
refactoring
2015-08-20 18:25:47 +02:00
Jan Steemann
82f2f07346
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-08-20 15:32:27 +02:00
Willi Goesgens
6b575c96d9
Add the version into the body of the document, since the header isn't rendered into pdf & ebook.
2015-08-20 14:34:25 +02:00
Jan Steemann
f9167b0b69
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2015-08-20 12:00:32 +02:00
Jan Steemann
2068136118
updated CHANGELOG
2015-08-20 12:00:25 +02:00
Willi Goesgens
61eb1e6002
Fix vs 2015 compile issue.
2015-08-20 11:34:01 +02:00
Willi Goesgens
7b41912489
Merge pull request #1448 from CoDEmanX/devel
...
Fixes for Windows (.sh line endings, ignored files, remove bad file)
2015-08-20 09:37:31 +02:00
CoDEmanX
f35bd8728f
Fix target path for js files
...
Folder must be omitted from destination path, or a another folder will be created as parent and break file structure.
2015-08-20 03:23:14 +02:00