1
0
Fork 0
Commit Graph

7798 Commits

Author SHA1 Message Date
Michael Hackstein ab5a5d643b Added newest versions of all libs to package.json 2015-02-22 21:20:17 +01:00
Michael Hackstein 21cfcb9b74 Node modules in aardvark are contained in package.json. They can be installed locally if required by issuing npm install in APP folder 2015-02-22 21:19:57 +01:00
Michael Hackstein 3f02e8829a Fixed query view spec 2015-02-21 15:26:09 +01:00
Michael Hackstein 72afc08ddb Removed obsolete test files 2015-02-21 15:24:04 +01:00
Michael Hackstein 6ecdb1bfed Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-02-20 16:26:03 +01:00
Michael Hackstein 545f78f7a7 Added a tests that verifies installing of different foxx apps on different Mountpoints using the same mountpoint 2015-02-20 16:25:57 +01:00
Jan Steemann 2ac736b36e added visitor test
Conflicts:
	js/server/tests/aql-graph-visitors.js
2015-02-20 15:48:18 +01:00
Jan Steemann e3a4ee8a7b strip illegal characters from collection names 2015-02-20 15:46:27 +01:00
Willi Goesgens cd9ad14160 Fix error handling in directory creation: only catch errors of directory existing; throw meaningfull error message. 2015-02-20 12:55:46 +01:00
Michael Hackstein d5af90ec9e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-02-20 11:48:54 +01:00
Michael Hackstein 28c0498330 Module fs circus 2015-02-20 11:47:49 +01:00
Heiko Kernbach 03d78c45bb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-02-20 10:53:05 +01:00
Heiko Kernbach b41008c336 added grunt build files 2015-02-20 10:52:55 +01:00
Michael Hackstein 3d8a4584dc Addded a wrapper around FS move that is actually able to move directories accross mountpoints and on FAT file systems 2015-02-20 10:49:40 +01:00
Michael Hackstein ca35d0c610 The foxx manager now reinstalls all system apps on startup 2015-02-19 18:39:01 +01:00
Michael Hackstein 5bede81469 The app.js is now requested with a differente version to avoid caching by browsers 2015-02-19 18:37:39 +01:00
Michael Hackstein 1370c28b4c Included grunt-text-replace module 2015-02-19 18:20:00 +01:00
Michael Hackstein 101985516a Removed not working code. Will be reincluded in future 2015-02-19 18:19:37 +01:00
Michael Hackstein a641df37cb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-02-19 18:08:33 +01:00
Heiko Kernbach 5d971cf60f grunt support for cluster frontend 2015-02-19 18:07:51 +01:00
Michael Hackstein dcb127205d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-02-19 18:07:17 +01:00
Willi Goesgens 989e2a5b9e - lintify
- output error message too when outputting backtrace in errors.
2015-02-19 17:58:51 +01:00
Willi Goesgens 90c96203f9 Indent to Arango style 2015-02-19 17:58:13 +01:00
Michael Hackstein f2db5833ba Removed unused static file exports from manifest 2015-02-19 17:51:41 +01:00
Michael Hackstein be5352441f Added modified gruntfile and manifest for the query view fix 2015-02-19 17:16:03 +01:00
Michael Hackstein bc7b3e3a57 Fixed syntax highlighting of query editor and hide away the explainor 2015-02-19 17:07:33 +01:00
Michael Hackstein da436c8a8c Applied a fix to ace editor 2015-02-19 17:06:20 +01:00
Michael Hackstein 6920330009 Removed invalid *css properties. Compatbility to IE6 is not possible anyways with many other features 2015-02-19 16:31:49 +01:00
Michael Hackstein 1acc13ba8b Removed unnecessary files 2015-02-19 15:05:20 +01:00
Michael Hackstein b64f515f61 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-02-19 14:53:32 +01:00
Michael Hackstein 571b146fe3 Fixed a caching problem in the foxx manager 2015-02-19 14:53:24 +01:00
Jan Steemann 871bfd4655 updated functions list 2015-02-19 14:51:32 +01:00
Michael Hackstein daa9ef0e60 Fixed options parameter for foxx manager uninstall 2015-02-19 11:29:57 +01:00
Michael Hackstein 7844b9eebd Fixed JSLint 2015-02-18 20:39:43 +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 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 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