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

2356 Commits

Author SHA1 Message Date
Michael Hackstein c9006424cb issue #611: Implemented rerendering after collection switch. 2013-10-16 14:39:31 +02:00
Michael Hackstein a0bd8a850c GraphViewer Solved mergeconflict in arangoAdapter 2013-10-16 14:29:30 +02:00
Michael Hackstein 84df09fec5 Minor JSLint fixes in GraphViewer 2013-10-16 14:26:44 +02:00
Jan Steemann 89f9bf2bb0 hide div in footer 2013-10-16 12:44:48 +02:00
Jan Steemann a6b7f7a6b1 issue #603 2013-10-16 12:42:23 +02:00
Jan Steemann ac776a982f issue #611: more preselection 2013-10-16 10:42:22 +02:00
Jan Steemann dd8fef21a4 issue #611: a bit more preselection in the graph viewer 2013-10-16 09:51:36 +02:00
Jan Steemann 9bb89bb654 fixed "error with AQL in user function" 2013-10-16 09:43:24 +02:00
Jan Steemann 671b1e850b added tests for dump/restore 2013-10-15 16:47:37 +02:00
Jan Steemann 81b18e1018 fixed #607: console was redefined 2013-10-15 15:35:57 +02:00
Jan Steemann c0dd3aba28 adjusted message 2013-10-15 11:49:36 +02:00
Frank Celler 9fb0c75544 regenerated swagger 2013-10-14 14:07:47 +02:00
Frank Celler d8ea801111 regenerated swagger 2013-10-14 14:05:38 +02:00
Frank Celler be162a1e35 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4 
Conflicts:
	CHANGELOG
	Documentation/Manual/NewFeatures14.md
	Documentation/Manual/NewFeatures14TOC.md
	Documentation/Manual/Upgrading14.md
	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/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.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
	js/apps/system/aardvark/api-docs/traversal.json
 2013-10-14 14:00:29 +02:00
Jan Steemann 089caeebcd make console a default object 2013-10-14 13:47:49 +02:00
Jan Steemann 79f70c7eea replication applier will now preferrably use collection names instead of collection ids when applying events 2013-10-14 13:45:44 +02:00
Jan Steemann 3c2a0507fd report status at end 2013-10-14 09:59:41 +02:00
Jan Steemann 27bb0f5ebf added database selection to arango-dfdb 2013-10-14 09:56:51 +02:00
Heiko Kernbach b71f0de891 changed new styling for foxx-docu view 2013-10-11 19:28:34 +02:00
Heiko Kernbach 0cf4ae5a8e radio buttons styling 2013-10-11 19:14:53 +02:00
Heiko Kernbach c0ee8f2c0a visual status for replication state 2013-10-11 18:45:31 +02:00
Heiko Kernbach 2db1711413 removed aboutView-links 2013-10-11 17:45:44 +02:00
Heiko Kernbach 87c98ce5d8 css 2013-10-11 16:45:03 +02:00
Heiko Kernbach 715dce6437 css 2013-10-11 15:58:39 +02:00
Heiko Kernbach ee9cb07e8f removed old background, changed some css 2013-10-11 14:58:18 +02:00
Heiko Kernbach ba02f18d4c collections settings menu no autoclose added 2013-10-11 14:46:14 +02:00
Heiko Kernbach dce5061357 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-10-11 14:36:42 +02:00
Heiko Kernbach f18720a882 OpenSans font, css changes 2013-10-11 14:36:24 +02:00
Jan Steemann b5f8b27e47 updated docs 2013-10-11 14:35:59 +02:00
Heiko Kernbach 4317db4a31 fixed header in aql modals 2013-10-11 13:20:59 +02:00
Heiko Kernbach 6d2a7fed91 updated navigate route 2013-10-11 13:17:42 +02:00
Heiko Kernbach b0620b91e5 delay for tooltips, updated nav-routes 2013-10-11 12:51:38 +02:00
Heiko Kernbach 7634c53d0f green glow for searchInput + width 2013-10-11 12:34:20 +02:00
Heiko Kernbach 04fb84cb5e removed tooltips for small charts 2013-10-11 12:07:42 +02:00
Heiko Kernbach 79e172fd3d api button styling 2013-10-11 11:56:18 +02:00
Heiko Kernbach e78dc408d6 dashboard new main-page 2013-10-11 11:52:23 +02:00
Jan Steemann 5b2820a3e8 worked around arguments.callee 2013-10-10 08:40:43 +02:00
Jan Steemann e3df92d929 fix Windows file handling 2013-10-09 14:07:21 +02:00
Heiko Kernbach 62de199b78 foxxcss 2013-10-08 23:31:48 +02:00
Heiko Kernbach b7235c33b4 css fixes for apps-view and docs-view 2013-10-08 23:29:53 +02:00
Heiko Kernbach 0e83c32548 dashboard label fix for detailedgraph 2013-10-08 22:44:17 +02:00
Heiko Kernbach 9087af2e61 more transparency, new api style 2013-10-08 21:57:35 +02:00
Heiko Kernbach 2a7803d673 more transparency, new api style 2013-10-08 21:56:55 +02:00
Heiko Kernbach 777afe2547 footer optimized 2013-10-08 19:52:30 +02:00
Jan Steemann ab4f5aad69 fixed foxx manager for windows 2013-10-08 14:53:16 +02:00
Jan Steemann 4c8e0db434 fixed typo in method name 2013-10-08 13:56:20 +02:00
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