1
0
Fork 0
Commit Graph

2310 Commits

Author SHA1 Message Date
Jan Steemann a589bf70b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-10-08 09:07:55 +02:00
Jan Steemann 28d2e4fa86 display correct list of installed/uninstalled aps after installation/deinstallation 2013-10-08 09:07:27 +02:00
Jan Steemann b844782d44 updated help texts for arangosh 2013-10-08 09:01:38 +02:00
Jan Steemann 1f4992a1d4 fixed display of database name in web interface 2013-10-07 23:50:57 +02:00
Jan Steemann 5275451839 select "display random vertex at startup" by default
Fixed JavaScript errors in empty graphs (no documents)
Fixed selection of "real" graphs in graph viewer startup screen (graph selection was not honored and collection selection did always "win")
2013-10-07 23:08:44 +02:00
Jan Steemann 9123554449 some more explanation for the bind parameters 2013-10-07 16:48:52 +02:00
Jan Steemann c3a4993194 fixed install/uninstall of apps via UI 2013-10-07 16:08:19 +02:00
Jan Steemann d47aab1950 allow /_api/logs only for the `_system` database 2013-10-07 14:23:48 +02:00
Jan Steemann 73f99cfa3b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-10-07 11:27:46 +02:00
Jan Steemann 0d0c3d8665 ported nvd3 fix from 0894152def 2013-10-07 11:25:47 +02:00
gschwab 2f12a5fd8f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-10-07 10:25:20 +02:00
gschwab 16f6e4bd30 multiple options allowed 2013-10-07 10:23:40 +02:00
Heiko Kernbach 81fd438b11 changed footer background-color 2013-10-04 12:54:21 +02:00
Jan Steemann dc69d6fa60 updated documentation 2013-10-02 17:54:39 +02:00
Jan Steemann 96dd9883dd removed superfluous "content" attribute from documents 2013-10-02 15:23:32 +02:00
Jan Steemann 60f6148de6 updated CHANGELOG 2013-10-02 14:43:25 +02:00
Jan Steemann d6149c9a9a added documentation for /_api/import 2013-10-02 14:22:25 +02:00
Jan Steemann e5bde25f3b make source database name configurable for replication applier 2013-10-01 17:36:30 +02:00
Jan Steemann d9a73cbb1e removed stray print 2013-10-01 09:36:34 +02:00
Jan Steemann 04df715864 applied fixes that occurred during build 2013-09-30 18:03:52 +02:00
Jan Steemann df36d28664 removed print command 2013-09-30 18:01:51 +02:00
Frank Celler 9228cbc2fa release version 1.4.0-beta1 2013-09-30 14:58:16 +02:00
Frank Celler bfb37ea1e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4 2013-09-30 14:41:03 +02:00
Jan Steemann a4861c67b4 prevent fs error 2013-09-30 14:40:21 +02:00
Frank Celler ad2d4b9d76 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4
Conflicts:
	VS2012/Arangod Binary/Arangod Binary.vcxproj
	VS2012/Arangoimp Binary/Arangoimp Binary.vcxproj
	VS2012/Arangosh Binary/Arangosh Binary.vcxproj
	arangod/Ahuacatl/ahuacatl-grammar.c
	js/actions/api-database.js
	js/apps/aardvark/api-docs/edges.json
	js/apps/aardvark/api-docs/traversal.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
2013-09-30 14:39:59 +02:00
Jan Steemann b4cdc79697 added db._id() 2013-09-30 13:44:28 +02:00
Jan Steemann 674468b768 updated documentation 2013-09-30 13:43:20 +02:00
Jan Steemann 742a9b8b0a added aardvark app on upgrade 2013-09-30 11:56:13 +02:00
Jan Steemann 729bbc44f0 use per-database directories for Foxx apps 2013-09-30 10:57:29 +02:00
Jan Steemann 83e00a2eff updated docs 2013-09-28 00:55:04 +02:00
Jan Steemann 709198c340 updated docs for /_api/jobs 2013-09-28 00:44:03 +02:00
Jan Steemann 288f318d5e removed debug output 2013-09-26 18:47:28 +02:00
Jan Steemann 137e1672ba delete previous foxx-application descriptions when updating from fishbowl 2013-09-26 14:39:10 +02:00
Jan Steemann 5c1554061f added foxx-manager.config() method 2013-09-26 13:20:29 +02:00
Jan Steemann 6422be9fc7 changed repository name to arangodb/foxx-apps 2013-09-26 12:02:00 +02:00
Jan Steemann 106fedd615 several errors fixed 2013-09-26 09:44:50 +02:00
Jan Steemann fd9228d84b issue #595 2013-09-25 17:20:11 +02:00
Jan Steemann e722418fe5 updated documentation 2013-09-24 18:43:03 +02:00
Jan Steemann d7b9add4db removed current-database API 2013-09-24 17:34:35 +02:00
Jan Steemann 7a1f3ae756 updated documentation, added tests 2013-09-24 17:27:52 +02:00
Jan Steemann 8e627fd3fa updated documentation 2013-09-24 13:40:58 +02:00
Jan Steemann cbd2ed60f4 issue #564: better automatic mimetype detection for assets
also added possibility to override automatic detection with hard-coded value from manifest
2013-09-23 23:26:11 +02:00
Jan Steemann 324d7fab03 documentation 2013-09-23 17:49:25 +02:00
Jan Steemann fb22796acf issue #592 2013-09-23 17:24:14 +02:00
Jan Steemann 73f0405ead added documentation for endpoints 2013-09-23 16:21:02 +02:00
Jan Steemann 67f3c3c469 changed HTTP return code for not-found cursors 2013-09-23 15:29:03 +02:00
Jan Steemann 568ef4141c fixed manifest linting in dev mode 2013-09-23 13:41:47 +02:00
Jan Steemann 9155b16252 caching for db[...] 2013-09-21 00:12:35 +02:00
Frank Celler fa8bc7299a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-09-20 17:47:04 +02:00
Frank Celler ae9bc9f9b3 added sinon, upgraded underscore and coffe-script 2013-09-20 17:46:52 +02:00
Frank Celler 9ab5df78e3 removed trailing comma 2013-09-20 17:46:32 +02:00
Frank Celler 95f6cf1275 fix require bug for modules 2013-09-20 17:46:07 +02:00
Jan Steemann 1525e344f5 remove old action 2013-09-20 17:32:26 +02:00
Jan Steemann 0587e80e3e fixed jslint warnings 2013-09-20 17:28:17 +02:00
Jan Steemann 8a9ce4e86d fixed memory allocation inefficiency 2013-09-20 17:26:26 +02:00
Jan Steemann 43a4464daf grr 2013-09-20 13:33:24 +02:00
Jan Steemann ed163164c4 fixed queue naming 2013-09-20 13:17:32 +02:00
Lucas Dohmen 6add03669b Foxx: Documentation of the new Model capabilities 2013-09-18 17:17:50 +02:00
Lucas Dohmen 5eed92d7a5 Foxx: Use defaults in models 2013-09-18 17:00:00 +02:00
Lucas Dohmen 0b89b92efa Foxx: Whitelist Attributes via Model Annotation 2013-09-18 16:22:00 +02:00
Lucas Dohmen efc5ee16dd Foxx: Provide the Model 2013-09-18 15:32:41 +02:00
Lucas Dohmen bac776ef17 Foxx: Little Refactoring 2013-09-18 14:38:59 +02:00
Lucas Dohmen f5a177932e Foxx: bodyParam 2013-09-18 14:28:24 +02:00
Lucas Dohmen 53746deca7 Foxx: Models can have a Schema now 2013-09-18 12:53:45 +02:00
Jan Steemann f7c18c4ddd added generated errors 2013-09-17 17:41:21 +02:00
Jan Steemann 4aee2df2f3 force usage of --upgrade 2013-09-17 15:56:24 +02:00
Lucas Dohmen 43988bb3ae Foxx Repository: Save, Replace, ReplaceById return the model
For convenience, this is quite useful in some cases
2013-09-17 14:37:50 +02:00
Lucas Dohmen fba6c94671 Foxx Repository: replaceById 2013-09-17 14:19:06 +02:00
Jan Steemann 9eba5d4f7a unify collection names 2013-09-17 13:16:29 +02:00
Jan Steemann aec7b1f8e8 fixed cursors for use in multi-database env 2013-09-17 09:23:05 +02:00
Jan Steemann d91022235e added tests for collections caching 2013-09-17 09:00:18 +02:00
Jan Steemann a9a746b676 less tasks run when initialising a new database 2013-09-17 08:38:11 +02:00
Jan Steemann 0563ec380e fixed typo 2013-09-16 19:07:57 +02:00
Jan Steemann 25d7a3a0db issue #590 2013-09-16 19:02:10 +02:00
Jan Steemann 0318948d35 issue #590: check a manifest and print proper errors 2013-09-16 18:55:59 +02:00
Jan Steemann 3e85159700 jslintified 2013-09-16 18:55:47 +02:00
Lucas Dohmen 172307182d Foxx Repository: Updated Documentation for the new methods 2013-09-16 17:34:57 +02:00
Lucas Dohmen 0b83a9a9b0 Repository: Replace 2013-09-16 17:25:40 +02:00
Lucas Dohmen d8a8b9bd4e Foxx Repository: firstExample 2013-09-16 16:28:49 +02:00
Lucas Dohmen 7d432a8911 Foxx Repository: byExample 2013-09-16 16:23:07 +02:00
Lucas Dohmen cdf9415650 Do this in one spec, this is just duplication 2013-09-16 16:06:43 +02:00
Lucas Dohmen 6618ac6801 Foxx Repository: Also check the returned object of byId 2013-09-16 15:49:05 +02:00
Lucas Dohmen 70c6b403b2 Pushed the constructor mocking to the module 2013-09-16 15:08:57 +02:00
Lucas Dohmen bbcd9a152a Foxx Repository: byId (Test: Ugly) 2013-09-16 15:08:57 +02:00
Jan Steemann ca6244ccc5 jslintified 2013-09-16 13:54:33 +02:00
Jan Steemann d23a8f352f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-16 13:51:56 +02:00
Jan Steemann 0bdae05b96 changed reference counting for cursors 2013-09-16 13:51:33 +02:00
Lucas Dohmen 709821e196 Foxx Repository: removeByExample 2013-09-16 13:28:52 +02:00
Lucas Dohmen 27f522aa03 expect docs 2013-09-16 13:28:52 +02:00
Lucas Dohmen 25b87ed3dc Mock: Take arguments instead of array 2013-09-16 13:28:52 +02:00
Lucas Dohmen ae8d0e2be2 expect with fluent interface 2013-09-16 13:28:51 +02:00
Lucas Dohmen 2301cdc930 Converted allow to fluent interface 2013-09-16 13:28:51 +02:00
Lucas Dohmen 9c4c0164e7 Simplifying the two tests 2013-09-16 13:28:51 +02:00
Lucas Dohmen c1bf1b1d11 Moved stub_and_mock to its own module 2013-09-16 13:28:51 +02:00
Lucas Dohmen 1a273e136c Mini Stub and Mock Framework started
I need my sanity.
2013-09-16 13:28:51 +02:00
Lucas Dohmen b0661f8dc7 Foxx Repository: removeById 2013-09-16 13:28:51 +02:00
Lucas Dohmen 983212cc9d Foxx Repository: Save 2013-09-16 13:28:51 +02:00
Jan Steemann 894180dc20 added test cases 2013-09-13 18:25:28 +02:00
Jan Steemann b97e4c014a reset vocbase earlier in requests 2013-09-13 15:29:05 +02:00
Jan Steemann 64741f8a8d added test cases for endpoints 2013-09-13 14:07:30 +02:00
Jan Steemann 7f8909b63b fixed jslint warnings 2013-09-13 09:31:56 +02:00
Jan Steemann a120a4dbe6 reverted name change for _graphs collection 2013-09-12 18:15:34 +02:00
Jan Steemann 6ff314de0e runtime addition and removal of endpoints 2013-09-12 18:07:39 +02:00
Jan Steemann 2046e18ec9 updated docs 2013-09-11 17:31:32 +02:00
Jan Steemann 3a6cabfe44 creating/dropping 2013-09-11 17:16:43 +02:00
Jan Steemann 5bc1e5ecea dropping databases, unfinished 2013-09-11 12:47:27 +02:00
Jan Steemann 803bd32ebc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-11 11:42:54 +02:00
Jan Steemann 42441b208f refactoring of multiple databases, intermediate commit 2013-09-11 11:42:34 +02:00
Lucas Dohmen cabbaeafaf Foxx Repository: Changed API 2013-09-10 10:47:13 +02:00
Lucas Dohmen ad2013e5c4 Foxx: Model#set can now also set multiple attributes 2013-09-10 10:32:08 +02:00
Lucas Dohmen 3d88b57687 Foxx: Removed Repository#all 2013-09-09 14:21:06 +02:00
Lucas Dohmen 545e896e23 Foxx: Repository#save 2013-09-09 14:07:13 +02:00
Lucas Dohmen 768322e3b3 JSLint 2013-09-09 12:59:14 +02:00
Lucas Dohmen 7a7d972069 Foxx: Added the same for onlyIf and onlyIfAuthenticated 2013-09-09 12:20:28 +02:00
Lucas Dohmen 3e033be395 Crazy Refactoring 2013-09-09 12:13:47 +02:00
Lucas Dohmen 5cab0ab025 Foxx: Controller-wide errorResponse 2013-09-09 12:08:10 +02:00
Jan Steemann ac4ed728c0 renamed collection `_graphs` to `arangodb_graphs` 2013-09-09 11:07:10 +02:00
Lucas Dohmen ef6c905cc2 Foxx: Documentation Review 2013-09-09 09:47:23 +02:00
Michael Hackstein 3a171cbc96 GraphViewer: Fixed Button Layout 2013-09-06 13:18:42 +02:00
Michael Hackstein 27a22536dc GraphViewer: Updated CSS to newest version 2013-09-06 13:13:31 +02:00
Jan Steemann f65911de53 removed unused error code 2013-09-06 00:55:34 +02:00
Jan Steemann d37b21375b attempt to fix travis build 2013-09-05 14:51:15 +02:00
Frank Celler 055e172bdb Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4
Conflicts:
	arangod/Replication/Syncer.cpp
	arangod/VocBase/index-garbage-collector.c
	build_posix.h
	html/admin/api-docs/traversal.json
	js/apps/aardvark/api-docs/collection.json
	js/apps/aardvark/api-docs/cursor.json
	js/apps/aardvark/api-docs/document.json
	js/apps/aardvark/api-docs/edge.json
	js/apps/aardvark/api-docs/edges.json
	js/apps/aardvark/api-docs/graph.json
	js/apps/aardvark/api-docs/index.json
	js/apps/aardvark/api-docs/replication.json
	js/apps/aardvark/api-docs/simple.json
	js/apps/aardvark/api-docs/system.json
2013-09-05 13:03:07 +02:00
Jan Steemann b9fbbc85ea Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-05 12:43:17 +02:00
Jan Steemann 369433f1e2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/SimpleHttpClient/SimpleHttpClient.cpp
2013-09-05 12:34:45 +02:00
Frank Celler bbab760a54 renamed foxx-manager to foxx/manager 2013-09-05 10:02:31 +02:00
Lucas Dohmen 4f283d39f4 Foxx: Controller#register 2013-09-04 18:06:52 +02:00
Jan Steemann ca2f5feb4b fixed redirect URLs 2013-09-04 17:30:37 +02:00
Jan Steemann 3a4532cd71 fixed jslint warnings 2013-09-04 16:07:48 +02:00
Jan Steemann b4efb78f7c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-04 15:58:49 +02:00
Jan Steemann 435e949462 fixed redirections in web interface 2013-09-04 15:58:41 +02:00
Lucas Dohmen 69286b5742 Foxx: Foxx Transformer is now Foxx Preprocessor 2013-09-04 15:08:15 +02:00
Lucas Dohmen f5bbae992c Names 2013-09-04 14:15:25 +02:00
Lucas Dohmen 9c86586014 Var Rage 2013-09-04 14:14:55 +02:00
Lucas Dohmen d946c0fe59 Whitespace Rage 2013-09-04 14:05:41 +02:00
Lucas Dohmen 87c9175db6 Authentication Module – Signs of a Struggle 2013-09-04 13:56:05 +02:00
Lucas Dohmen 610f0ee4cb Pushing stuff down 2013-09-04 13:43:17 +02:00
Lucas Dohmen 34cade4344 Foxx: Pulling some stuff out of the Foxx Controller 2013-09-04 13:32:42 +02:00
Jan Steemann 42660cbb5a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-04 13:04:30 +02:00
Jan Steemann 897412b4de initial dropping of databases 2013-09-04 13:04:13 +02:00
Lucas Dohmen d1f7d25aa8 Foxx: Some refinements for `.login` and `.logout` 2013-09-04 13:01:56 +02:00
Lucas Dohmen d9213af5ec Foxx: Manifest File apps -> controllers [BREAKING CHANGE]
Adjusted to the new vocabulary
2013-09-04 11:12:09 +02:00
Lucas Dohmen 94a151ec2f Adjusted Aardvark to new version of Foxx 2013-09-04 10:51:14 +02:00
Lucas Dohmen afef07b425 Foxx: Foxx.Application is now Foxx.Controller [BREAKING CHANGE]
The naming was confusing, because Foxx Application had two meanings.
Now we are using the terminology used in MVC frameworks.
2013-09-04 10:43:39 +02:00
Lucas Dohmen 95e409763d Foxx: Upgrade Alpha Routes. Fixes #589 2013-09-04 10:24:46 +02:00
Frank Celler 65705428f1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-09-03 21:35:49 +02:00
Frank Celler bde36da436 fixed collection prefix 2013-09-03 21:35:43 +02:00
Heiko Kernbach 12fdc3f711 css 2013-09-03 20:15:57 +02:00
Heiko Kernbach 2d953847af css db 2013-09-03 19:38:21 +02:00
Heiko Kernbach 316d8705cc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-03 19:03:37 +02:00