1
0
Fork 0
Commit Graph

5617 Commits

Author SHA1 Message Date
Lucas Dohmen 4f43bed2f6 Foxx, special @fceller edition 2013-03-23 22:01:13 +01:00
Frank Celler 8b0c0c7662 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	js/common/bootstrap/module-internal.js
2013-03-23 21:58:44 +01:00
Frank Celler 44806229f7 fixed jslint errors 2013-03-23 21:57:33 +01:00
Jan Steemann faf450e570 added zip functionality 2013-03-23 20:55:19 +01:00
Jan Steemann 6648735f4d fixed make doxygen 2013-03-23 20:54:49 +01:00
Jan Steemann 6e8fb71d61 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-23 20:52:59 +01:00
Jan Steemann d97954e466 unzip 2013-03-23 20:52:33 +01:00
Frank Celler 6f8e8ffbd1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-23 19:50:43 +01:00
Frank Celler b99ee9517f cached collection in db 2013-03-23 19:50:31 +01:00
Jan Steemann 6388eb1d4a ignore zlib 2013-03-23 19:15:38 +01:00
Jan Steemann fd446bac1a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-23 19:14:02 +01:00
Jan Steemann 5cf913b2ca zlib 2013-03-23 19:13:31 +01:00
Frank Celler c3cbf1d4cd fixed typo 2013-03-23 19:03:45 +01:00
Frank Celler 6c0785aa04 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-23 18:58:36 +01:00
Frank Celler 20f024bb30 added require 2013-03-23 18:58:22 +01:00
Lucas Dohmen 9971a4bfb5 Ohhhhh. 2013-03-23 18:49:02 +01:00
Lucas Dohmen 5e0da254f3 Oh man... Strings. 2013-03-23 18:34:59 +01:00
Lucas Dohmen af07fdf6ad Fix? 2013-03-23 18:11:24 +01:00
Frank Celler 10ae00e494 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-23 18:07:48 +01:00
Frank Celler d1dab99248 more debug info 2013-03-23 18:07:37 +01:00
Lucas Dohmen 5427faf930 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-23 18:05:55 +01:00
Lucas Dohmen 6f15daf6b9 Fixing the tests by commenting them 2013-03-23 18:05:44 +01:00
Frank Celler a1429ef749 more debug info 2013-03-23 18:03:17 +01:00
Frank Celler 57e7224494 fixed ordering 2013-03-23 17:54:35 +01:00
Frank Celler 961552b753 added trace for failed conversion 2013-03-23 17:32:32 +01:00
Frank Celler 8012a23744 added foxx api 2013-03-23 17:09:26 +01:00
Lucas Dohmen 92b8b7a5cf Fuxx: Documentation Confusion.
Found by @fceller. He read it :cheer:
2013-03-23 16:58:21 +01:00
Lucas Dohmen 0f2cfa75c6 Reality. 2013-03-23 16:53:46 +01:00
Frank Celler 629a519ca7 added gitignore 2013-03-23 16:45:45 +01:00
Frank Celler 55da3b7de2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-23 16:42:59 +01:00
Frank Celler 4059f31170 return error message 2013-03-23 16:42:52 +01:00
Jan Steemann 4c3092e4fd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-23 16:02:35 +01:00
Jan Steemann cddf9607d8 fixed paths 2013-03-23 16:02:14 +01:00
Lucas Dohmen 0dd44d82aa Foxx: Added the params function 2013-03-23 16:01:21 +01:00
Jan Steemann 1759b7d85a argl 2013-03-23 14:40:31 +01:00
Jan Steemann 189c3d87ec added configure 2013-03-23 14:39:38 +01:00
Jan Steemann 0d2fdcae58 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	js/common/bootstrap/module-fs.js
2013-03-23 14:36:45 +01:00
Jan Steemann 6cd509c8e5 added fs.isFile() 2013-03-23 14:27:10 +01:00
Jan Steemann d07bee0bde removed generated files 2013-03-23 14:26:36 +01:00
Jan Steemann 1dfc90bf0d added zlib 2013-03-23 14:24:01 +01:00
Lucas Dohmen 55ab432c4b Foxx: Request Body 2013-03-23 14:09:59 +01:00
Lucas Dohmen abb2ed0476 Always use strict. 2013-03-23 14:09:59 +01:00
Frank Celler 07b087b8ef Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	js/common/modules/org/arangodb/foxx.js
	js/common/modules/org/arangodb/fuxx.js
	js/server/modules/org/arangodb/fuxx.js
2013-03-23 14:06:52 +01:00
Frank Celler 8a54df7419 added .arangosh.rc, added /_admin/execute 2013-03-23 14:04:08 +01:00
Lucas Dohmen 61ac216571 Low and behold, there is Foxx#start 2013-03-23 13:25:20 +01:00
Lucas Dohmen 2a79049bbe Hackathon 😹 2013-03-23 12:42:44 +01:00
Lucas Dohmen 5b2595fa56 Merge branch 'fuxx_vendor' into devel
Conflicts:
	UnitTests/Makefile.unittests
2013-03-23 12:41:25 +01:00
Jan Steemann c473e42f77 fixed memleak 2013-03-22 18:38:17 +01:00
Frank Celler a8d5a06f57 added resetEngine 2013-03-22 18:09:01 +01:00
Frank Celler f1c7852eb4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-22 17:33:34 +01:00