1
0
Fork 0
Commit Graph

14304 Commits

Author SHA1 Message Date
Michael Hackstein fa9376d1aa Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-23 15:53:36 +02:00
Michael Hackstein 7e3d0be402 Beautified examples of gharial 2014-06-23 15:53:31 +02:00
Frank Celler ff556bd866 fixed wrong path for js files
Conflicts:
	Makefile.in
2014-06-23 15:51:08 +02:00
Thomas Schmidts 6dacbe1b29 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-23 15:16:10 +02:00
Thomas Schmidts af1805b627 Fixed small spelling errors 2014-06-23 15:15:50 +02:00
Michael Hackstein cff6bd9380 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
2014-06-23 15:15:18 +02:00
Michael Hackstein 57a77b4420 Changed all examples so they use graph_module and graph as variable names 2014-06-23 15:14:39 +02:00
gschwab e799d7d04a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 15:14:21 +02:00
gschwab 56d8db54aa docu 2014-06-23 15:14:16 +02:00
scottashton 4e717d5430 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 15:11:54 +02:00
scottashton e2fc348467 fixed broken links and typos in general-graph 2014-06-23 15:11:36 +02:00
Esteban Lombeyda 681d4ee89d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-23 15:08:33 +02:00
Thomas Schmidts 10a5b782fd Some changes in the documentation code 2014-06-23 14:55:14 +02:00
Jan Steemann 34a80c08b1 fixed assertion 2014-06-23 14:53:23 +02:00
gschwab 70ebd88298 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 14:52:05 +02:00
gschwab b69b016f87 layout 2014-06-23 14:44:07 +02:00
Lucas Dohmen c67b1d9d5a Foxx: Fix Model.fromClient 2014-06-23 14:43:58 +02:00
scottashton 5e2fa60521 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 14:42:41 +02:00
scottashton da1cb2e62d minor docu fixes 2014-06-23 14:42:38 +02:00
Jan Steemann 73cecaeef6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 14:32:19 +02:00
Jan Steemann 82bd150a11 dump 2014-06-23 14:32:06 +02:00
Jan Steemann b31c2330d4 exclude collections 2014-06-23 14:24:12 +02:00
Lucas Dohmen f62ce6cd7f Foxx: Fix error for `body()` when body is empty 2014-06-23 14:16:13 +02:00
gschwab 38e4853a99 deleted tmp file 2014-06-23 14:12:19 +02:00
Michael Hackstein a496978622 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-23 14:08:34 +02:00
Michael Hackstein af6a4b64f0 Added the graph http module to documentation generation makefile 2014-06-23 14:08:30 +02:00
Frank Celler 34908e450b hidden for http examples 2014-06-23 14:04:16 +02:00
Lucas Dohmen 8831f91f9d Foxx Model: Allow to access the whitelisted attributes from ancestor 2014-06-23 13:52:29 +02:00
Esteban Lombeyda d429e850ab cleaning compilere warnings 2014-06-23 13:48:21 +02:00
gschwab 898311c23b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:44:24 +02:00
gschwab 0b09442ad9 typos 2014-06-23 13:44:04 +02:00
scottashton 7efc5b77cf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:35:01 +02:00
scottashton 371bfabf67 spellchecked gitbook for general-graph and ahuacatl 2014-06-23 13:34:44 +02:00
gschwab a954b7a781 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:34:18 +02:00
Alan Plum 61b37c7261 Fixed chapter refs, whitespace. 2014-06-23 13:32:34 +02:00
Jan Steemann 6707468c95 excluded collection 2014-06-23 13:27:27 +02:00
gschwab a053e70b18 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:23:14 +02:00
gschwab 35b645ba1a deleted print O.o 2014-06-23 13:23:09 +02:00
Jan Steemann c930740862 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:22:56 +02:00
Jan Steemann 3b0d8b15d6 re-added replication 2014-06-23 13:22:38 +02:00
Thomas Schmidts 7b11a3e9f3 Changed some comments in code 2014-06-23 13:22:02 +02:00
gschwab 19191b5a1b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:20:18 +02:00
gschwab 4651fbd34a deleted print 2014-06-23 13:20:12 +02:00
Michael Hackstein 658fa5cc25 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-23 13:18:06 +02:00
Michael Hackstein 7e3bebead7 Sorted export ordering of graph functions in ahuacatl. First deprecated modules are exported, afterwards general graph functions 2014-06-23 13:18:00 +02:00
Michael Hackstein 273eaf95fb Added graph specific deprecation information to DEPRECATED.md 2014-06-23 13:17:20 +02:00
gschwab 8b347c6714 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:02:00 +02:00
gschwab cda1eb462c sorting for edgeDefinitions added 2014-06-23 13:01:55 +02:00
Alan Plum 4905cde9e7 Whitespace, spelling. 2014-06-23 12:48:00 +02:00
Esteban Lombeyda 96dd32cdd3 bug fix: autocompletion and tab 2014-06-23 12:28:30 +02:00