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

19665 Commits

Author SHA1 Message Date
Frank Celler b346b35ad4 release version 2.5.0-alpha5 2015-02-18 23:14:12 +01:00
Frank Celler 6190bb7994 Merge branch 'devel' of github.com:arangodb/arangodb into 2.5 2015-02-18 21:50:33 +01:00
Michael Hackstein 7844b9eebd Fixed JSLint 2015-02-18 20:39:43 +01:00
Michael Hackstein c23b633a05 Added generated grunt files 2015-02-18 19:35:39 +01:00
Michael Hackstein a98975ad53 Fixed forgotten imports of files for karma 2015-02-18 19:29:10 +01:00
Michael Hackstein ce28642473 Changed label of the development /production button in WI. Suggested different mode 2015-02-18 19:19:41 +01:00
Michael Hackstein 9b592c1bd0 Added generated files from grunt 2015-02-18 19:14:44 +01:00
Michael Hackstein 908be9905c Added generated files from grunt 2015-02-18 19:14:06 +01:00
Michael Hackstein f5b1315066 Merge branch 'gruntingAardvark' of github.com:arangodb/arangodb into devel 2015-02-18 19:09:11 +01:00
Michael Hackstein 72f15f2ed0 Merge branch 'gruntingAardvark' of github.com:arangodb/arangodb into gruntingAardvark 
Conflicts:
	js/apps/system/_admin/aardvark/APP/manifest.json
	js/apps/system/aardvark/frontend/html/scripts.html.part
	js/apps/system/aardvark/frontend/js/arango/templateEngine.js
	js/apps/system/aardvark/frontend/js/routers/startApp.js
	js/apps/system/aardvark/frontend/js/views/queryView.js
	js/apps/system/aardvark/test/karma/files.json
 2015-02-18 19:07:03 +01:00
Michael Hackstein 9612ca2b5e Moved spec for coverage tests to concatenated files 2015-02-18 19:04:58 +01:00
Michael Hackstein ea148c895c Added a list of files for karma coverage tests 2015-02-18 19:04:00 +01:00
Michael Hackstein 82cf2cc531 Added Node modules for WebInterface 2015-02-18 19:03:33 +01:00
Michael Hackstein 4c17d7b211 Finished rebase of gruntingAardvark to devel. 2015-02-18 19:02:39 +01:00
Heiko Kernbach 6915c416e9 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-02-18 18:42:50 +01:00
Heiko Kernbach e2f32b631f fixed tests 2015-02-18 18:42:42 +01:00
Michael Hackstein 18550aa70e Started fixing documentsView specs. Most of them were broken 2015-02-18 17:58:48 +01:00
Michael Hackstein 066fdc398e Added build for coverage tests. We do not want to check coverage of libraries 2015-02-18 17:58:46 +01:00
Michael Hackstein fe9898ecb5 Test code probably overwrites library instead of the mock. Should be fixed now. 2015-02-18 17:58:45 +01:00
Michael Hackstein e70dabfdc1 JSHinting grunt 2015-02-18 17:58:43 +01:00
Michael Hackstein e32f1ea081 Adapted karma tests to use the combined file generated via grunt instead of a self concatenated file. The test is now much closer to reality and the files are not stored redundantly 2015-02-18 17:58:43 +01:00
Michael Hackstein 0516be7f64 Applied a fix to ace. Their implementation of require breaks arangodb require. They expect an additional argument at the beginning 2015-02-18 17:58:41 +01:00
Michael Hackstein 4721b445ec Modified karma tests to work with the same concatenated file delivered to the frontend. 2015-02-18 17:58:40 +01:00
Michael Hackstein 433be5bc0e Enabled concatenation and uglification of javascript code. If minified version is used, Foxx-Documentation is not working. Variable resolution not possible. 2015-02-18 17:57:48 +01:00
Michael Hackstein 29a2f505de Added a grunt task to build the css files for cluster and standalone interface 2015-02-18 17:56:34 +01:00
Michael Hackstein 301c2f0e44 Implemented a heatmap for querynodes to help optimizing the query. Increased font-size of descriptions. Now needs discussion what to do next 2015-02-18 17:56:33 +01:00
Michael Hackstein 2bee6660f5 Added first version of query plan viewer. Needs to be beautified. A node-only cost estimation is would be good 2015-02-18 17:56:31 +01:00
Michael Hackstein bdf62fac3b First draft to display the result of explain on a query. Not yet beutiful 2015-02-18 17:56:27 +01:00
Michael Hackstein 3a12886f74 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-02-18 17:19:15 +01:00
Michael Hackstein 07038cf20c Added debugging example output to respective chapters 2015-02-18 17:19:02 +01:00
Heiko Kernbach b1e4904a31 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-02-18 17:11:19 +01:00
Heiko Kernbach 87115f2559 stop ajax calls to _system if user has no permission 2015-02-18 17:10:16 +01:00
Michael Hackstein 5ddd5a7019 Fixed style of mountpoint input in modal view 2015-02-18 17:08:52 +01:00
Michael Hackstein d84463aae7 Improved output of upgrade script for app migration 2015-02-18 16:57:45 +01:00
Jan Steemann 02f331a140 optionally disable sync for testing 2015-02-18 16:49:46 +01:00
Jan Steemann ea285705fa Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-02-18 16:40:54 +01:00
Jan Steemann ac638e1872 fixed tests 2015-02-18 16:40:48 +01:00
Jan Steemann cfab5418ae fixed grep command in make gitjslint 2015-02-18 16:40:25 +01:00
Jan Steemann 83ea75fa8f removed unused config options 2015-02-18 16:40:15 +01:00
Michael Hackstein b06bb28737 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-02-18 15:53:43 +01:00
Michael Hackstein 7dde898684 Added style to the setup and teardown triggers in web interface. 2015-02-18 15:53:39 +01:00
Jan Steemann cb08c6f891 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-02-18 15:48:53 +01:00
Jan Steemann 595837f5b2 updated index docs 2015-02-18 15:48:46 +01:00
Michael Hackstein 79d587a812 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-02-18 15:38:51 +01:00
Michael Hackstein bac394d76c Removing the folder in tests is now try and catched to avoid failures 2015-02-18 15:38:30 +01:00
Heiko Kernbach 7864dbf50d font awesome upgrade 4.0.3 to 4.3.0 2015-02-18 15:31:24 +01:00
Jan Steemann f29591135a adjusted geo index API 2015-02-18 14:59:46 +01:00
Michael Hackstein 76bb6a52c9 Fixed upgrade script. Now moves and mounts dev apps correctly 2015-02-18 14:39:04 +01:00
Michael Hackstein 8c4587d4ef Tests will now create their own app path which will be deleted after each run 2015-02-18 14:05:50 +01:00
Michael Hackstein d710047ddb Fixed a bug in foxx manager that refilled the cache but did not make use of it 2015-02-18 14:05:30 +01:00