Frank Celler
a0278476da
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
...
Conflicts:
lib/Basics/StringUtils.cpp
2013-04-06 10:19:09 +02:00
Frank Celler
1d7ee507e2
added TRI_ERROR_ARANGO_DOCUMENT_KEY_MISSING
2013-04-06 10:18:29 +02:00
Michael Hackstein
6c2a260b83
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-04-05 17:15:21 +02:00
Michael Hackstein
a2ca984bdb
Frontend: Now Loaded App can be installed via the frontend
2013-04-05 17:14:56 +02:00
Michael Hackstein
c3855a3eab
Frontend: The aardvark now supports thumbnails
2013-04-05 15:53:50 +02:00
Jan Steemann
313680418f
do not complain about non-defined thumbnails
2013-04-05 15:52:47 +02:00
Jan Steemann
3a8783b26a
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2013-04-05 15:35:23 +02:00
Jan Steemann
edf513551f
error handling
2013-04-05 15:35:08 +02:00
Michael Hackstein
a8f8df00f9
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-04-05 14:49:48 +02:00
Frank Celler
b50bc6dd24
added thumbnail
2013-04-05 14:48:15 +02:00
Michael Hackstein
a5f8b6fe92
Front-end: Changed documentation overview, basePath is now determined and apps with long pathes are shown, however only last segment of path is displayed, might be a Swagger issue
2013-04-05 14:38:52 +02:00
Frank Celler
71bf83be1b
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-04-05 13:25:04 +02:00
Frank Celler
0ea88d8ebf
use different sandbox
2013-04-05 13:24:55 +02:00
Jan Steemann
d0002011bc
fixed error messages
2013-04-05 13:23:13 +02:00
Jan Steemann
ed10d9b6aa
AQL user functions
2013-04-05 12:50:44 +02:00
Jan Steemann
31f4edde25
added test case
2013-04-05 11:28:57 +02:00
Jan Steemann
bee1ded051
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2013-04-05 11:28:20 +02:00
Jan Steemann
ce4ec381fc
updated list of HTTP status codes
2013-04-05 11:28:06 +02:00
Lucas Dohmen
0e5a47fc73
Foxx: Documentation
2013-04-05 10:46:11 +02:00
Lucas Dohmen
8515b6df9c
Foxx: Adjusted Tests to @fceller's changes
2013-04-05 10:01:58 +02:00
Frank Celler
dcb65a92bf
fixed error messages
2013-04-04 23:19:27 +02:00
Frank Celler
fd8db96123
fixed syntax errors
2013-04-04 23:19:16 +02:00
Frank Celler
94e1cd1823
uppercase
2013-04-04 22:58:43 +02:00
Frank Celler
21589bc6c6
new foxx
2013-04-04 22:56:41 +02:00
Frank Celler
a872e09869
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-04-04 18:56:50 +02:00
Frank Celler
37e134ff50
new Foxx
2013-04-04 18:56:38 +02:00
Lucas Dohmen
314022ef2a
Foxx: Documentation Fixes
2013-04-04 18:19:45 +02:00
Michael Hackstein
0e4b3ae62f
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-04-04 15:58:02 +02:00
Michael Hackstein
2e43dbfb14
Aardvark: Adapted new Foxx interface
2013-04-04 15:56:02 +02:00
Lucas Dohmen
ea1d88b04b
Crazy Documentation Fixes. Doxygen is so awesome.
...
/thx @jsteemann
2013-04-04 14:19:06 +02:00
Lucas Dohmen
33fd20ea51
Foxx: Introducing Repositories
2013-04-04 13:42:12 +02:00
Lucas Dohmen
d4d2957d9a
Foxx: Introducing Model
2013-04-04 11:17:22 +02:00
Jan Steemann
1417def879
disallow create/drop/rename operations inside transactions
2013-04-04 09:41:44 +02:00
Frank Celler
531b665ff3
added version overview
2013-04-03 16:48:55 +02:00
Frank Celler
a6be9ceaa3
added node assert module
2013-04-03 16:48:38 +02:00
Frank Celler
0ba6329a12
added trace
2013-04-03 16:32:04 +02:00
Frank Celler
e68080a638
fixed wrong call to length
2013-04-03 16:31:53 +02:00
Lucas Dohmen
0b7b34d09b
Foxx: Breaking API Changes 💣
...
* Removed the old concept of models entirely.
* Manifest Files
* models has been removed
* Uses lib now as base path for all requires
* FoxxApplication is now called Application
* Changes to Application:
* requiresLibs is now requires
* requiresModels has been removed
2013-04-03 14:56:17 +02:00
Frank Celler
0c1e20cb1b
fixed wrong import
2013-04-02 18:28:35 +02:00
Frank Celler
7e7eefe4f6
use function to set result
2013-04-02 18:25:54 +02:00
Frank Celler
711b5884d3
Merge branch 'devel' of github.com:triAGENS/ArangoDB into HEAD
2013-04-02 17:47:33 +02:00
Frank Celler
42b92c794f
fixed error messages and tests
2013-04-02 17:46:19 +02:00
Frank Celler
3512fa6ff0
fixed error handling
2013-04-02 15:00:55 +02:00
Frank Celler
576410df1c
changed to details
2013-04-02 10:09:07 +02:00
Thomas Richter
f876e30816
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2013-04-02 09:38:45 +02:00
Jan Steemann
e2effff144
fixed doxygen errors
2013-04-02 09:34:06 +02:00
Frank Celler
271cc3949d
more logging
2013-04-01 23:39:23 +02:00
Frank Celler
14956d865c
removed print.js
2013-04-01 23:38:55 +02:00
Frank Celler
33ea5e0941
use printTable
2013-04-01 23:13:16 +02:00
Frank Celler
bae6e3666e
fixed wrong name
2013-04-01 23:07:31 +02:00
Frank Celler
3921fd07c8
no strict for assign
2013-03-31 19:32:25 +02:00
Frank Celler
74166761a1
Merge branch 'feature/commonjs' of github.com:triAGENS/ArangoDB into devel
2013-03-31 12:50:18 +02:00
Frank Celler
7def1cf29f
Merge remote-tracking branch 'origin/feature/commonjs' into devel
...
Conflicts:
apps/aardvark/manifest.json
apps/aardvark/manifestComplete.json
etc/arangodb/arangod.conf.in
etc/relative/arangod.conf
html/admin/js/bootstrap/module-internal.js
js/apps/aardvark/assets/collections/foxxCollection.js
js/apps/aardvark/assets/index.html
js/apps/aardvark/assets/lib/backbone.js
js/apps/aardvark/assets/lib/jquery.js
js/apps/aardvark/assets/lib/underscore.js
js/apps/aardvark/assets/models/foxx.js
js/apps/aardvark/assets/views/foxxListView.js
js/apps/aardvark/assets/views/foxxView.js
js/apps/aardvark/index.html
js/apps/aardvark/manifest.json
js/common/bootstrap/module-internal.js
2013-03-31 12:46:16 +02:00
Frank Celler
07bd4b2585
new module/package mechanism
2013-03-31 12:25:12 +02:00
Frank Celler
7031210a53
fixed browser
2013-03-31 00:10:48 +01:00
Frank Celler
1467b78676
cleanup of internal, fs, console
2013-03-31 00:10:48 +01:00
Frank Celler
b224a399ae
nice function printing
2013-03-31 00:10:47 +01:00
Frank Celler
17bcc80c69
fixed return value, no double path
2013-03-31 00:10:47 +01:00
Frank Celler
2275152c19
fixed redirect
2013-03-31 00:10:46 +01:00
Michael Hackstein
37997691a1
Removed unused aardvark assets
2013-03-29 13:15:54 +01:00
Jan Steemann
a4bab2b264
framed
2013-03-29 02:01:34 +01:00
Jan Steemann
0807016cf5
printTable
2013-03-29 01:53:16 +01:00
Jan Steemann
82cbde7886
printTable()
2013-03-29 01:31:23 +01:00
Frank Celler
af7a1a2253
fixed wrong id
2013-03-28 23:04:41 +01:00
Frank Celler
3928975435
moved apps to js
...
Conflicts:
Makefile.in
2013-03-28 23:04:25 +01:00
Frank Celler
dfe3c22519
fixed wrong id
2013-03-28 22:46:14 +01:00
Frank Celler
ee2b40208c
moved apps to js
2013-03-28 22:41:42 +01:00
Frank Celler
345d32c2cb
jslint bugs
2013-03-28 22:24:16 +01:00
Frank Celler
f9cbc00763
print fishbowl
2013-03-28 22:15:12 +01:00
Frank Celler
2ed6b0145f
changed app-path and dev-app-path to be just one directory
2013-03-28 21:48:52 +01:00
Frank Celler
4d07fce914
changed app-path and dev-app-path to be just one directory
2013-03-28 21:47:05 +01:00
Frank Celler
1c68025bae
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-03-28 20:30:18 +01:00
Jan Steemann
0fc4d233a1
extended documentation on key generators
2013-03-28 16:56:27 +01:00
Jan Steemann
03fcdf1aa0
fixed firstExample with _id & _key attributes
2013-03-28 16:22:29 +01:00
Lucas Dohmen
f1b5f20fab
Foxx: Also using ArangoDB Mimetype Lookup for the other way around
2013-03-28 14:01:04 +01:00
Lucas Dohmen
1daf7a8367
Foxx: Check the format of nicknames
2013-03-28 14:01:04 +01:00
Jan Steemann
b04c33f1ec
generate reverse map of mimetypes
2013-03-28 13:48:57 +01:00
Jan Steemann
a53a6afa92
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2013-03-28 13:27:27 +01:00
Lucas Dohmen
dfecc58d5c
Foxx: Using the new ArangoDB mimetype lookup
2013-03-28 13:25:30 +01:00
Lucas Dohmen
8261a46577
Added a Mimetype
2013-03-28 13:25:30 +01:00
Frank Celler
532bf7c033
fixed simple query on _key field
2013-03-28 11:23:11 +01:00
Jan Steemann
014d8e4a6d
removed dead code
2013-03-28 09:56:22 +01:00
Frank Celler
54e7305060
added flushModuleCache for resetEngine
2013-03-28 09:53:20 +01:00
Frank Celler
e3990f19ab
added reload in dev mode
2013-03-27 16:42:32 +01:00
Frank Celler
a88cbde90d
added installDevApp
2013-03-27 16:31:00 +01:00
Frank Celler
13de8a0fd7
added dev install
2013-03-27 16:29:24 +01:00
Lucas Dohmen
1aecbd3f84
Foxx: Nope, this should not be in the routing info
...
Don't ask me why I put it there.
2013-03-27 15:40:41 +01:00
Frank Celler
fe8ab5fa8c
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-03-27 15:34:21 +01:00
Frank Celler
3ea5fbe121
added dev
2013-03-27 15:28:43 +01:00
Jan Steemann
17e46826f6
fixed doxygen errors
2013-03-27 15:24:42 +01:00
Frank Celler
440170c144
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-03-27 15:05:22 +01:00
Frank Celler
7a6cdcf9b1
changing to app-id
2013-03-27 15:05:08 +01:00
Thomas Richter
f77fa798c8
generateArangoshRun db._collections() error fixed
2013-03-27 14:37:28 +01:00
Jan Steemann
bfe232c299
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2013-03-27 14:24:19 +01:00
Jan Steemann
4bb32107ba
triAGENS/ArangoDB-PHP#55
...
optimiser may have mis-optimised duplicate filter statements with limit
2013-03-27 14:22:49 +01:00
Frank Celler
db54d5453c
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-03-27 13:57:33 +01:00
Lucas Dohmen
eaf2559b25
Adjustments to Frank's changes
2013-03-27 13:55:39 +01:00
Frank Celler
96a14b0b6d
changed to appId
2013-03-27 13:43:04 +01:00
Lucas Dohmen
ee0278dcad
Foxx: Adjusted to the format of Swagger's parameters
2013-03-27 13:19:42 +01:00
Lucas Dohmen
fb4a223cb0
Foxx: Introducing errorResponse
2013-03-27 13:19:41 +01:00
Lucas Dohmen
30f23c22e6
Foxx: Automatically add the httpMethod to the documentation
2013-03-27 13:19:41 +01:00
Lucas Dohmen
1494286143
Foxx: Introducing nickname, summary, notes
2013-03-27 13:19:41 +01:00
Lucas Dohmen
1466429e88
Foxx: Introducing queryParam
2013-03-27 13:19:41 +01:00
Lucas Dohmen
847783a151
Foxx: Bugfixes
2013-03-27 13:19:41 +01:00
Lucas Dohmen
fad025bda4
Foxx: Tiny refactoring
2013-03-27 13:19:41 +01:00
Frank Celler
94969db56f
fixed typo
2013-03-27 11:49:36 +01:00
Frank Celler
d8159a990e
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-03-27 11:32:52 +01:00
Frank Celler
be971602f2
added install and uninstall of FOXX apps
2013-03-27 11:32:39 +01:00
Jan Steemann
7a70cb3ed3
use property
2013-03-27 10:43:58 +01:00
Jan Steemann
59b6ef99ae
finalised mimetypes
2013-03-27 10:38:34 +01:00
Jan Steemann
3fd4fd984b
mimetypes w/ charsets
2013-03-27 10:31:30 +01:00
Jan Steemann
909c316e22
added mimetype generation file
2013-03-27 10:11:56 +01:00
Frank Celler
214c9d8386
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-03-26 17:47:40 +01:00
Frank Celler
111a0ed54a
write mounts into _aal
2013-03-26 17:47:32 +01:00
Lucas Dohmen
2f3894f715
Foxx: Introducing pathParam
2013-03-26 17:17:53 +01:00
Lucas Dohmen
f59084a433
Foxx: Introducing the new `constrain` concept
2013-03-26 17:17:53 +01:00
Lucas Dohmen
8940df0480
Removing Old Constraints
2013-03-26 17:17:53 +01:00
Jan Steemann
3bb251000c
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
...
Conflicts:
lib/V8/v8-utils.cpp
2013-03-26 14:13:41 +01:00
Jan Steemann
1492118545
added test cases for "fs" module
2013-03-26 14:09:20 +01:00
Frank Celler
a8d9a14e7d
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-03-26 13:58:20 +01:00
Frank Celler
557184631d
more fox-manager, added files section
2013-03-26 13:58:00 +01:00
Lucas Dohmen
517b530684
Foxx: Default '/' to index.html
2013-03-26 11:27:22 +01:00
Lucas Dohmen
e0bf7018fc
Foxx: Add the `del` alias for `delete`
...
Aliasing in JavaScript is a sickness.
2013-03-26 11:27:21 +01:00
Frank Celler
0f6e48a38b
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
...
Conflicts:
js/server/modules/org/arangodb/foxx.js
2013-03-26 10:01:39 +01:00
Thomas Richter
9a08a1d609
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
...
work in progress swagger
2013-03-26 09:14:05 +01:00
Jan Steemann
f3bffb2553
fixed test that failed on the client
2013-03-25 17:29:29 +01:00
Lucas Dohmen
c7c032e5f7
Foxx: UserManual
2013-03-25 16:34:09 +01:00
Lucas Dohmen
616f397d13
Foxx: JSLint
2013-03-25 16:34:08 +01:00
Jan Steemann
0e6c21e4e7
removed NEW_BORN collection status in server
2013-03-25 15:51:42 +01:00
Frank Celler
5e473ad6df
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-03-25 14:10:20 +01:00
Frank Celler
877066392e
foxx manager cleanup
2013-03-25 14:10:10 +01:00
Jan Steemann
01c0da5238
fixed more tests
2013-03-25 12:40:07 +01:00
Jan Steemann
9598aebc59
fixed tests and make them not rely on on-the-fly-collection-creation
2013-03-25 12:36:01 +01:00
Jan Steemann
60fa94e5b4
fixed errors in arangosh (browser)
2013-03-25 12:00:15 +01:00
Frank Celler
332b0495ca
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-03-25 10:22:44 +01:00
Frank Celler
a8557091b8
new foxx loader
2013-03-25 10:22:35 +01:00
Lucas Dohmen
74e23f8670
Foxx: Starting with the Foxx User Documentation
2013-03-25 09:50:54 +01:00
Jan Steemann
a2990be8da
jslintified
2013-03-24 18:40:02 +01:00
Jan Steemann
9cbd8e4707
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2013-03-24 18:13:26 +01:00
Jan Steemann
124d7cb29f
fixed file uploads
2013-03-24 18:13:13 +01:00
Frank Celler
eaa21cdfd1
fixed context
2013-03-24 17:53:53 +01:00
Frank Celler
0a488cd84b
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-03-24 15:03:16 +01:00
Frank Celler
e3de563668
requiresLibs and requiresModels
2013-03-24 15:03:01 +01:00
Jan Steemann
e37043c47c
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2013-03-24 14:32:25 +01:00
Jan Steemann
071144ecc0
temporary file functons
2013-03-24 14:32:09 +01:00
Lucas Dohmen
8871849300
Fuxx: Adjusted Expectation
2013-03-24 13:33:01 +01:00
Lucas Dohmen
44a97317ba
Fuxx: We now always need an urlPrefix
2013-03-24 13:27:31 +01:00
Lucas Dohmen
9c9739af80
Foxx: Fixed the JSLint errors caused by @fceller
2013-03-24 13:15:55 +01:00
Lucas Dohmen
4bded1da55
Foxx: Fix for the Frank
2013-03-24 13:13:57 +01:00
Lucas Dohmen
d6498a2b8d
Foxx: Yes! Foxx is back on track. Like a sir.
2013-03-24 12:57:53 +01:00