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

126 Commits

Author SHA1 Message Date
Frank Celler 832be07319 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.in
	lib/BasicsC/logging.c
	utils/arango-upgrade.in
 2012-11-27 12:37:41 +01:00
Frank Celler 6e94eeb36f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-11-27 12:35:12 +01:00
Frank Celler 249492a89c Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	CHANGELOG
	Documentation/Manual/GlossaryCollectionName.md
	Documentation/Manual/NewFeatures11.md
	Documentation/UserManual/FirstStepsArangoDB.md
	VERSION
	arangod/Documentation/api-blueprints.dox
	arangod/HashIndex/hasharray.c
	arangod/RestHandler/RestVocbaseBaseHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	configure.ac
	html/admin/js/master.js
	js/server/ahuacatl.js
	js/server/arango-upgrade.js
	lib/BasicsC/voc-errors.h
	lib/V8/V8LineEditor.cpp
	lib/V8/v8-utils.cpp
 2012-11-27 12:34:58 +01:00
Jan Steemann ad6489c2b7 issue #295 2012-11-27 12:30:12 +01:00
Jan Steemann f45dfd542a issue #295 2012-11-27 12:27:49 +01:00
Jan Steemann 5cd15369ca issue #268: removed reference from 1.1 docs 2012-11-27 11:50:29 +01:00
Frank Celler 56c3a4fd18 added web interface description 2012-11-25 20:19:31 +01:00
Jan Steemann f812408a7e documentation for collection names / keys 2012-11-23 19:41:14 +01:00
Frank Celler da4534bdb0 fixed more links, moved Glossary to markdown 2012-11-23 13:34:44 +01:00
Frank Celler 708ac517fc fixed more links, moved Glossary to markdown 2012-11-23 13:33:26 +01:00
Frank Celler f9ea4d5755 started adding links 2012-11-23 12:36:19 +01:00
Frank Celler bd64d7e6a1 started adding links 2012-11-23 12:35:07 +01:00
Frank Celler 3d4f5d1bb2 move features and upgrading back to manual 2012-11-23 11:33:59 +01:00
Frank Celler e68444b406 move features and upgrading back to manual 2012-11-23 11:33:20 +01:00
Frank Celler c3bc85826a renamed Manual to UserManual, fixed references, removed First section 2012-11-23 11:31:54 +01:00
Frank Celler c68dc92809 renamed Manual to UserManual, fixed references, removed First section 2012-11-23 11:28:43 +01:00
Jan Steemann 3627e1e674 changed order of new features in docs 2012-11-23 11:18:16 +01:00
Jan Steemann e7f8543d81 moved documentation changes from 1.1 to devel 2012-11-23 10:18:47 +01:00
Jan Steemann 2b9e7d134d documentation fix 2012-11-23 10:02:51 +01:00
Jan Steemann 483cf6cbb1 update manual 2012-11-23 09:37:32 +01:00
Jan Steemann 4cb14d7537 fixed documentation 2012-11-23 09:32:52 +01:00
Jan Steemann 5d9ad9da33 added description of new features 2012-11-23 00:54:41 +01:00
Jan Steemann ad1c204f3a added upgrade notes in devel, too 2012-11-21 19:34:27 +01:00
Jan Steemann f73364354d updaded upgrading notes in documentation 2012-11-21 19:26:33 +01:00
Frank Celler cccb3511c5 fixed documentation again 2012-11-21 17:42:13 +01:00
Frank Celler 18bfd048ef fixed documentation 2012-11-21 10:58:29 +01:00