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

2856 Commits

Author SHA1 Message Date
Jan Steemann 82c9d8cadd jslint, unglobalized functions 2015-02-10 10:04:56 +01:00
Jan Steemann 82c7522d4e test fixes 2015-02-09 20:08:06 +01:00
Michael Hackstein 67fcf3bec4 Fixed jslint 2015-02-09 08:54:13 +01:00
Jan Steemann 003d7e9112 sparse indexes, initial commit, untested 2015-02-07 03:07:41 +01:00
Michael Hackstein aad7e46f10 Merge branch 'devel' of github.com:arangodb/arangodb into foxx-pathes 
Conflicts:
	Documentation/Books/Users/SUMMARY.md
	js/actions/api-system.js
	js/common/bootstrap/modules.js
	js/server/modules/org/arangodb/foxx/manager.js
	js/server/tests/shell-routing.js
 2015-02-06 17:22:01 +01:00
Michael Hackstein ec3bfa2dc1 Removed dead code and added more tests for the App install dialog 2015-02-06 16:58:06 +01:00
Michael Hackstein c44ed65736 Fixed generation of Apps via the web interface 2015-02-06 16:57:15 +01:00
Michael Hackstein 6ba7bf6918 Increased test coverage of new foxx views. All positive pathes are now covered. Error handling not yet 2015-02-06 08:22:57 +01:00
Heiko Kernbach 9bf1bf1db2 fixed pagination when filtering collections 2015-02-05 10:48:44 +01:00
Heiko Kernbach 631cd32b5e fixed pagination when filtering collections 2015-02-05 10:45:48 +01:00
Jan Steemann c18ff7f300 use-index-for-sort rule can now remove sorts in more cases 2015-02-02 22:53:25 +01:00
Jan Steemann 875a695b22 selectivity estimates 2015-02-02 20:14:36 +01:00
Michael Hackstein d4d82e332b The webinterface now also checks if the mountpoint is valid, e.g. does not contain /APP 2015-02-02 14:23:04 +01:00
Michael Hackstein 0b44a05a1b Fixed tests for newest frontend changes 2015-02-02 12:59:41 +01:00
Michael Hackstein 6aca853065 Added an indicator for development in the App overview 2015-02-02 12:10:11 +01:00
Michael Hackstein 9a2ccfce50 Style fixes for application detail view. Now indicating development mode and disabled the configure button, if nothing to configure. 2015-02-02 11:58:01 +01:00
Jan Steemann 39603ebaf4 added selectivity estimates for some index types 2015-01-30 23:04:46 +01:00
Michael Hackstein ab42378570 Fixed swagger in new Web Interface 2015-01-30 17:18:26 +01:00
Michael Hackstein f124b3d7c4 Switching an app form production to development and back again via a single click in the WI 2015-01-30 15:24:47 +01:00
Jan Steemann 7bcf2b54c0 make explainer display warnings, too 2015-01-29 21:30:42 +01:00
Michael Hackstein 919452e83e Apps can now be configured with the web interface during runtime. Included tests 2015-01-29 18:05:06 +01:00
Frank Celler c153f72af5 moved triAGENS/ArangoDB to arangodb/arangodb 2015-01-29 17:33:02 +01:00
Michael Hackstein 44dbb8d4cd A frontend foxx model can now overwrite it's configuration information 2015-01-29 15:46:13 +01:00
Michael Hackstein fd4d9ec116 A frontend foxx model can now request it's configuration information 2015-01-29 15:38:03 +01:00
Jan Steemann 3768ca23dc added derived file 2015-01-29 15:32:15 +01:00
Michael Hackstein 368f78cda1 Added tests for the open app button 2015-01-29 15:20:16 +01:00
Michael Hackstein 6bcce430ae THe application list i now properly reloaded after installing an app. 2015-01-29 15:09:55 +01:00
Michael Hackstein fdcda2fa66 Added a template for a simple Really delete dialog 2015-01-29 14:04:34 +01:00
Michael Hackstein e742ae607a Applied some fixes to foxxManager to make app uninstable. The WebInterface is now able to uninstall an App properly. Added a test for it. 2015-01-29 14:02:31 +01:00
Michael Hackstein 1e7414a43a Web interface app install dialog and collection. Both are under basic tests. 2015-01-29 09:59:45 +01:00
Michael Hackstein 5d8a16d287 Test base-line. All tests passing. 2015-01-28 14:53:14 +01:00
Michael Hackstein 54fd833041 Started moving aardvark to new foxx-manager functionality. Confirmed: listing all apps works. 2015-01-28 14:39:08 +01:00
Max Neunhoeffer e24278828c Changes to cluster startup for mesos cooperation. 
This simplifies the cluster startup by introducing a further agency
lookup step using "local info" to find the "id". This allows an external
discovery process (see scripts/discover.js as an example) to configure
a new server in the cluster dynamically when it starts up.

New GNUmakefile targets
  pack-tar-config
  pack-tar
 2015-01-28 12:58:24 +01:00
Jan Steemann b03a7a4c8f fun with custom visitors 2015-01-28 00:45:21 +01:00
Michael Hackstein 8cf4856adc Removed unused file 2015-01-27 14:00:28 +01:00
Jan Steemann 8a5d7d9085 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2015-01-27 09:25:02 +01:00
Frank Celler 6363011339 fixed routing 2015-01-26 11:59:05 +01:00
Michael Hackstein 6042b62482 Fixed imports in aardvark. It is not repaired yet but should not throw a mount error 2015-01-26 11:58:16 +01:00
Michael Hackstein d744425043 Moved the foxx generator into a server module. It is now possible to generate a new app from command line 2015-01-26 11:58:15 +01:00
Michael Hackstein be7b542e27 Fixed js makefile to new location of aardvark APP 2015-01-26 11:58:15 +01:00
Michael Hackstein f429c8af63 Moved all system apps to new folder structure 2015-01-26 11:57:08 +01:00
Michael Hackstein bf1750f589 Potential fix for the ghost, killing the frontend test from time to time. Go Jenkins, find it. 2015-01-26 09:37:58 +00:00
Michael Hackstein 6ba4e96a43 Started fixing documentsView specs. Most of them were broken 2015-01-26 09:36:30 +00:00
Michael Hackstein c19ee02a93 Added build for coverage tests. We do not want to check coverage of libraries 2015-01-26 09:35:49 +00:00
Michael Hackstein 72e1e949d7 Potential fix for the ghost, killing the frontend test from time to time. Go Jenkins, find it. 2015-01-26 09:33:37 +00:00
Michael Hackstein 31a990754c Potential fix for the ghost, killing the frontend test from time to time. Go Jenkins, find it 2015-01-25 16:18:37 +00:00
Michael Hackstein 090ebb8d0f Test code probably overwrites library instead of the mock. Should be fixed now. 2015-01-25 16:17:32 +00:00
Michael Hackstein 9f790f3aa1 Potential fix for the ghost, killing the frontend test from time to time. Go Jenkins, find it 2015-01-25 16:16:20 +00:00
Michael Hackstein fcf3760dea JSHinting grunt 2015-01-25 14:28:22 +00:00
Michael Hackstein 4e0dcba048 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-01-25 14:27:34 +00:00
Michael Hackstein b2fc293b63 Applied a fix to ace. Their implementation of require breaks arangodb require. They expect an additional argument at the beginning 2015-01-25 12:15:10 +00:00
Jan Steemann 58ddb95417 reduced number of monkeypatches affecting innocent regular objects 2015-01-24 14:23:53 +01:00
Michael Hackstein a4b34b2fe3 Modified karma tests to work with the same concatenated file delivered to the frontend. 2015-01-24 12:20:59 +00:00
Michael Hackstein cc1a52d159 Enabled concatenation and uglification of javascript code. If minified version is used, Foxx-Documentation is not working. Variable resolution not possible. 2015-01-24 12:17:04 +00:00
Michael Hackstein 274d8df801 Added a grunt task to build the css files for cluster and standalone interface 2015-01-24 12:17:04 +00:00
Michael Hackstein f540e02b26 Implemented a heatmap for querynodes to help optimizing the query. Increased font-size of descriptions. Now needs discussion what to do next 2015-01-24 12:17:03 +00:00
Michael Hackstein a4e92bc1dc Added first version of query plan viewer. Needs to be beautified. A node-only cost estimation is would be good 2015-01-24 12:17:03 +00:00
Michael Hackstein 3f5e1625bd First draft to display the result of explain on a query. Not yet beutiful 2015-01-24 12:17:03 +00:00
Jan Steemann 81db41763f foxx file upload 2015-01-23 11:23:58 +01:00
Jan Steemann f5aa621536 reverse index scan 2015-01-23 01:36:46 +01:00
Jan Steemann f9a43224cf added explainer 
Conflicts:
	js/common/modules/org/arangodb/aql/explainer.js
 2015-01-23 00:59:07 +01:00
Jan Steemann 4e7e9117bd added derived files 2015-01-22 10:30:54 +01:00
Michael Hackstein 3dbd479e7e Fixed scss lint 2015-01-20 10:36:19 +01:00
Michael Hackstein dd0f6a0e6b Added complete files list for frontend tests. Contains all deactivated files 2015-01-20 10:14:25 +01:00
Michael Hackstein 2a367c5462 Reactivated frontend tests. Fixed some tests. Excluded several tests, fix for them will be delivered later. 2015-01-20 10:13:59 +01:00
Jan Steemann b0fa21b0ce updated conventions documentation for AQL functions 2015-01-16 12:56:02 +01:00
Jan Steemann 36dab4113e stricter checking for AQL user functions 2015-01-16 12:44:59 +01:00
Michael Hackstein 6feed25079 The foxx generator in web interface will now also generate a read single document route 2015-01-15 15:52:33 +01:00
Jan Steemann 1e7a5218db fixed inability to create collections from the web ui 2015-01-13 17:11:36 +01:00
Michael Hackstein aaf8d70a83 Improved a generated general graph AQL. It now does not compute the complete set of vertices before filtering, instead it merges the examples before computing. 2015-01-13 13:19:56 +01:00
Jan Steemann acb02ad257 jslint 2015-01-09 19:51:58 +01:00
Michael Hackstein 8b1bf3b90e Style fixes for application view 2015-01-09 16:40:04 +01:00
Michael Hackstein 53aa7a6950 Improvements on the new Application Tab. It is now possible to filter all Apps by their type. It is also possible to install user mountable system apps via the App store 2015-01-09 16:40:03 +01:00
Michael Hackstein e813caaef8 Added more style to arango-store 2015-01-09 16:40:03 +01:00
Frank Celler 26d11822ab made path relative in order to avoid problems when using a different port 2015-01-07 13:43:39 +01:00
Frank Celler 49cb009186 fixed validation rules 2015-01-07 13:28:53 +01:00
Alan Plum 2b569e5db2 Ported legacy Foxx syntax to 2.4+. 2015-01-06 20:37:18 +01:00
Jan Steemann e76e649b27 added derived file 2015-01-05 09:42:24 +01:00
Max Neunhoeffer 9e7342c257 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-23 16:52:50 +01:00
Max Neunhoeffer 1cdf439845 Broken version, errors not yet fixed. 2014-12-23 16:51:48 +01:00
Heiko Kernbach 4ea60b80f0 jslint 2014-12-23 11:03:58 +01:00
Heiko Kernbach 3c0249a580 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-23 11:00:16 +01:00
Heiko Kernbach 09d14c1be4 #1065 - added option to add a key for a new document or edge 2014-12-23 11:00:08 +01:00
Heiko Kernbach bf076c8255 #1198 - added caching for user defined queries 2014-12-23 09:47:50 +01:00
Jan Steemann cc9a26c268 indicate at least some errors for failing uploads 2014-12-22 17:21:33 +01:00
Jan Steemann 406bd99800 added derived file 2014-12-22 16:15:16 +01:00
Jan Steemann cded2892ef ES6 2014-12-21 19:12:16 +01:00
Michael Hackstein 962dec57f2 The web interface now does not fail anymore if it cannot connect to github.com. Appropriate information is generated. 2014-12-20 22:40:05 +01:00
Jan Steemann 69e4665bf5 ES6 2014-12-20 21:57:30 +01:00
Jan Steemann b4454fa91a jslint 2014-12-20 21:56:42 +01:00
Michael Hackstein b076e92559 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-19 18:41:04 +01:00
Michael Hackstein c936105b04 Fixed validation of input in ModalViews. Added validation to new app tab. 2014-12-19 18:40:50 +01:00
Michael Hackstein 5a417fa209 Modal View now checks if all entries are valid before reactivating the success button 2014-12-19 17:40:28 +01:00
Jan Steemann fd5a723f30 removed deprecated methods 2014-12-19 14:00:58 +01:00
Michael Hackstein abfe71e8ce Style fixes for Application Tab. View as well as install dialog 2014-12-19 13:09:07 +01:00
Michael Hackstein 70354aee35 Replaced the AppStore with ArangoDB Store. Some minor style fixes 2014-12-19 10:49:07 +01:00
Jan Steemann d92057dd03 the great rename: array => object, list => array 2014-12-18 22:33:23 +01:00
Willi Goesgens 419e3ece51 Make jslint happy. 2014-12-17 09:22:22 +01:00
Michael Hackstein e24ad86ba0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/applicationsView.js
 2014-12-16 17:06:49 +01:00
Michael Hackstein d9156bc921 Changed hardcoded error num in web interface to generated error object 2014-12-16 17:03:55 +01:00
Jan Steemann 61f799ecf0 satisfy jslint 2014-12-16 15:37:15 +01:00
Michael Hackstein d8ad93f1b6 Moved fishbowl update from client to common module of foxx manager. Offered update in server-side foxx manager and used it in Web Interface 2014-12-16 14:10:15 +01:00
Michael Hackstein 3fdffe3367 Added view templates for generated Foxx apps 2014-12-16 14:10:15 +01:00
Michael Hackstein 275503224e Added some Error notification for Foxx App install failures. Added download for Zipfile as well as information for your development path. 2014-12-16 14:10:15 +01:00
Michael Hackstein 520541fa7e Added styling for disabled buttons and the drag and drop upload dialog 2014-12-16 14:10:14 +01:00
Michael Hackstein 6bb51ab851 Added templates for setup and teardown. Added a model for the configuration 2014-12-16 14:10:14 +01:00
Michael Hackstein 88e304fce0 Added a drag & drop upload zip field. Added explaination texts for zip and github 2014-12-16 14:10:14 +01:00
Michael Hackstein 2c026cecb4 Fixed a forgotten todo variable name 2014-12-16 14:10:14 +01:00
Michael Hackstein 85da13197d Added an automatic dev app reloading. 2014-12-16 14:10:14 +01:00
Michael Hackstein 987dec185e Created code for setup and teardown. Also dev setup will be executed in development mode. 2014-12-16 14:10:13 +01:00
Michael Hackstein dc15329e64 Improved the optics of the Apllication install View. Also now shows Devel as version number for dev apps. 2014-12-16 14:10:13 +01:00
Lucas Dohmen d3987063a5 Bugfixing 2014-12-16 14:10:13 +01:00
Lucas Dohmen 51f3c853ad Build Manifest correctly 2014-12-16 14:10:13 +01:00
Lucas Dohmen 597e61b928 Generate controllers 2014-12-16 14:10:13 +01:00
Michael Hackstein 4f4b4c59da The web interface now sends information to fill the templates for generating an app 2014-12-16 14:10:13 +01:00
Lucas Dohmen 5e41c1798a Create folder structure, models and repositories 2014-12-16 14:10:12 +01:00
Michael Hackstein ca99f19d7d First draft of a create my own app template generator 2014-12-16 14:10:12 +01:00
Lucas Dohmen 0ad5395d53 Add paths to the manifest 2014-12-16 14:10:12 +01:00
Lucas Dohmen 7f20de5f41 Template Engine refactored 2014-12-16 14:10:12 +01:00
Michael Hackstein 13d0ff1169 Added the most complicated and non documented pluralizer npm module we ever found in Lucas life 2014-12-16 14:10:12 +01:00
Michael Hackstein ac6dee8011 Fixed attribute/s bug 2014-12-16 14:10:12 +01:00
Lucas Dohmen 93f520b723 First steps towards generating a Foxx app 2014-12-16 14:10:12 +01:00
Lucas Dohmen 8914c18561 applicationDetailView 2014-12-16 14:10:11 +01:00
Michael Hackstein 586382c010 The FoxxManager now updates before delivering the fishbowl list to the WebInterface 2014-12-16 14:10:11 +01:00
Lucas Dohmen 53ec81a101 Enable button if the app is neither devel nor system 2014-12-16 14:10:11 +01:00
Lucas Dohmen 0c5ca609da Delete Apps 2014-12-16 14:10:11 +01:00
Lucas Dohmen c0b6e801b1 Show link to download documentation for all non-development apps 2014-12-16 14:10:11 +01:00
Lucas Dohmen 8c08e6c8c6 Select menu item for applicationDetailView 2014-12-16 14:10:10 +01:00
Lucas Dohmen 6e6069a9bf Add Repository info to all system apps 2014-12-16 14:10:10 +01:00
Lucas Dohmen 2db72f990c Show Git Repositories 2014-12-16 14:10:10 +01:00
Lucas Dohmen e9153b0dbf Show Mountpath in title of application 2014-12-16 14:10:10 +01:00
Lucas Dohmen a0a04ade13 Rescue the case of missing contributors and authors 2014-12-16 14:10:10 +01:00
Michael Hackstein 7f74892480 Added a template for the fishbowl list of apps 2014-12-16 14:10:09 +01:00
Michael Hackstein 5e6e8caeaa Added proof of concept implementation of Foxx App template generator 2014-12-16 14:10:09 +01:00
Michael Hackstein 3ab1fcf4b6 Allows to install apps from fishbowl in web interface. 2014-12-16 14:10:09 +01:00
Michael Hackstein 38564a1709 Sorted list from fishbowl 2014-12-16 14:10:09 +01:00
Lucas Dohmen 303e4e6d94 Only one applicationDetailView 2014-12-16 14:10:09 +01:00
Lucas Dohmen cb5374e293 Disable open button when there's nothing to open 2014-12-16 14:10:09 +01:00
Lucas Dohmen 3154c1ae1b Open an app 2014-12-16 14:10:09 +01:00
Lucas Dohmen 03a827cf12 Design for applicationDetailView 
* Open and Delete App Buttons Fake implementation
* Breadcrumb for applicationDetailView
 2014-12-16 14:10:08 +01:00
Michael Hackstein c62cfb31cd Now shows all apps from appstore 2014-12-16 14:10:08 +01:00
Michael Hackstein 4363ae15be Implemented multiple repeated indentical zip file uploads 2014-12-16 14:10:08 +01:00
Lucas Dohmen 04ad61967b Starting design of applicationDetailView 2014-12-16 14:10:08 +01:00
Lucas Dohmen d0000ec0cb Add Documentation to the Foxx Detail View 2014-12-16 14:10:08 +01:00
Lucas Dohmen 392b6a6b1e Remove removed file from manifest 2014-12-16 14:10:08 +01:00
Lucas Dohmen ab0885f0ef Show License and Version for each of the apps 2014-12-16 14:10:07 +01:00
Lucas Dohmen 3b1c5b640e Show contributors 2014-12-16 14:10:07 +01:00
Lucas Dohmen 9726aebeba Adjusted authors and contributors for all system apps 2014-12-16 14:10:07 +01:00
Lucas Dohmen 14bc13bee6 Collect information for the applicationDetailView 2014-12-16 14:10:07 +01:00
Lucas Dohmen 552014bf2f Application View skeleton 2014-12-16 14:10:07 +01:00
Michael Hackstein 83004b08f4 Finished implementing upload and mount by github repo. This includes a checked dialog for configuration. This is reusable for zip / appstore as well 2014-12-16 14:10:06 +01:00
Michael Hackstein 37dd5cd218 Allowed foxxmanager to not throw an error if an app from github is already loaded but returns it id instead. Aardvark now pipes through the AppID plus a configuration 2014-12-16 14:10:06 +01:00
Lucas Dohmen 89b2283423 Cleanup foxxActiveView 2014-12-16 14:10:06 +01:00
Lucas Dohmen 111b89f1c6 foxxActiveView 2014-12-16 14:10:06 +01:00
Michael Hackstein 027bda9ded Adjusted to new plan 2014-12-16 14:10:06 +01:00
Lucas Dohmen e484afc93c Remove parts of the Application View we don't need anymore 2014-12-16 14:10:06 +01:00
Michael Hackstein 6d2b664883 Started implementing the new modal dialog to install foxx apps 2014-12-16 14:10:05 +01:00
Jan Steemann bcdeabd3ab Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
 2014-12-15 21:53:51 +01:00
Heiko Kernbach c181bc7d9f issue: #1168 2014-12-12 11:05:26 +01:00
Heiko Kernbach e855e0faeb issue: #1161 fixed 2014-12-12 10:52:08 +01:00
Jan Steemann 9b15228676 fixed broken documentation 2014-12-11 12:30:41 +01:00
Lucas Dohmen a3a566bc87 Fix bug in the user app's storage 2014-12-10 15:14:43 +01:00
Jan Steemann 22928c1bb5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
 2014-12-09 22:45:55 +01:00
Jan Steemann 959631c4d9 issue #1173: AQL Editor "Save current query" resets user password 
Conflicts:
	CHANGELOG
 2014-12-09 20:52:51 +01:00
Jan Steemann a86cf09f7f issue #1173: AQL Editor "Save current query" resets user password 
Conflicts:
	CHANGELOG
 2014-12-09 20:50:18 +01:00
Jan Steemann 5c9e52ea20 pass query parameters 2014-12-09 17:16:03 +01:00
Jan Steemann cd17c393ab Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
	arangod/Aql/grammar.cpp
 2014-12-08 12:37:13 +01:00
Jan Steemann a018ccaed7 added derived file 2014-12-08 11:23:53 +01:00
Jan Steemann 0203c8ca7c added derived files 2014-12-05 19:03:34 +01:00
Heiko Kernbach d85586a1de fixed issue: #1083 2014-12-04 15:48:46 +01:00
Frank Celler 77f544a554 Merge pull request #1144 from triAGENS/less-confusing-http-naming 
Renamed mergeArrays->mergeObjects (because it's actually about objects, not arrays)
 2014-12-03 14:48:04 +01:00
Jan Steemann 29cd807fe6 fixed caps 2014-12-03 12:23:17 +01:00
Jan Steemann ae092f467f added derived file 2014-12-03 11:53:34 +01:00
Alan Plum 41ab3aa4d6 Renamed mergeArrays->mergeObjects to make API less confusing. 2014-12-02 17:03:03 +01:00
Frank Celler 9bd960fb21 release version 2.3.1 2014-11-28 20:01:19 +01:00
Michael Hackstein 3698fc590f Removed console output 2014-11-28 17:57:20 +01:00
Michael Hackstein 68924f3f92 Fixed a bug with two identically named check boxes and click events that were not correctly unbound 2014-11-28 17:57:15 +01:00
Michael Hackstein b2b8b28712 Removed unused frontend libraries ColVis and dataTables 2014-11-28 17:57:10 +01:00
Michael Hackstein 9072e234eb Replaced datatables by own implementation, less overhead easier to handle and not broken in Firefox 2014-11-28 17:57:05 +01:00
Jan Steemann 06af1d3af2 added several AQL functions 2014-11-28 17:34:29 +01:00
Jan Steemann 9fb20d5859 added derived file 2014-11-28 17:32:50 +01:00
Jan Steemann 2b22ea0d0b fixed WITHIN_RECTANGLE for cluster 
Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/simple-query-common.js
	js/common/modules/org/arangodb/simple-query-common.js
 2014-11-28 17:31:03 +01:00
Michael Hackstein e5f869b97f Removed console output 2014-11-28 17:11:34 +01:00
Frank Celler 1fd8c791f4 Merge branch '2.3' of github.com:triAGENS/ArangoDB into 2.3 2014-11-28 17:10:32 +01:00
Michael Hackstein fd8e3783c9 Fixed a bug with two identically named check boxes and click events that were not correctly unbound 2014-11-28 17:06:31 +01:00
Michael Hackstein 288f174011 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-11-28 16:49:53 +01:00
Michael Hackstein cedfea877f Removed unused frontend libraries ColVis and dataTables 2014-11-28 16:38:25 +01:00
Michael Hackstein a593ad7587 Replaced datatables by own implementation, less overhead easier to handle and not broken in Firefox 2014-11-28 16:31:24 +01:00
Jan Steemann 7ef8097fe1 added mergeArrays 2014-11-28 14:07:36 +01:00
Jan Steemann ac36c0cd7a added mergeArrays attribute 2014-11-28 13:58:49 +01:00
Frank Celler 8529d0714b added generated files 2014-11-28 11:59:39 +01:00
Jan Steemann a8282f8220 fixed never-disappearing "query is operating" display 2014-11-26 10:50:03 +01:00
Jan Steemann 8f0b5cbe05 fixed never-disappearing "query is operating" display 2014-11-26 10:49:00 +01:00
Jan Steemann 620274047f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-functions 
Conflicts:
	CHANGELOG
 2014-11-20 14:23:01 +01:00
Jan Steemann d55f1cdec2 added derived file 2014-11-20 10:27:06 +01:00
fagnercarvalho cbe78e3b1f Fixing collection help output misspelled errors 2014-11-20 09:36:51 +01:00
fagnercarvalho e26c2295fb Fixing collection help output misspelled errors 2014-11-20 09:36:06 +01:00
Jan Steemann 18bc51ab18 added derived file 2014-11-20 09:29:54 +01:00
Frank Celler ff17e53bae release version 2.3.0 2014-11-18 15:20:44 +01:00
Jan Steemann baba563a78 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-functions 2014-11-18 11:27:06 +01:00