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

2693 Commits

Author SHA1 Message Date
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
Jan Steemann f1f13a4284 added several AQL functions 2014-11-18 11:26:42 +01:00
Jan Steemann 8c67805c50 issue #1103: Error while importing user queries 2014-11-18 09:16:33 +01:00
Jan Steemann 80556c80f2 issue #1103: Error while importing user queries 2014-11-18 09:14:27 +01:00
Frank Celler 47766aa72c release version 2.3.0 2014-11-18 07:13:36 +01:00
Jan Steemann d290dd1de6 added derived file 2014-11-18 07:03:02 +01:00
Jan Steemann 548f8137cc issue #1099: do not fail if general-graph.remove is used inside a transaction 2014-11-18 07:02:47 +01:00
Jan Steemann fc0b63967f fixed WITHIN_RECTANGLE for cluster 2014-11-18 07:02:08 +01:00
Jan Steemann a77b6c73fa added derived file 2014-11-17 16:37:04 +01:00
Jan Steemann a71bf1819c issue #1099: do not fail if general-graph.remove is used inside a transaction 2014-11-17 15:47:39 +01:00
Jan Steemann 675e2a0d40 fixed WITHIN_RECTANGLE for cluster 2014-11-17 12:32:43 +01:00
Frank Celler c9fb8f1a5b release version 2.3.0 2014-11-15 21:41:16 +01:00
Frank Celler 39dab81292 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.3 2014-11-14 23:04:16 +01:00
Frank Celler a5ed1d8fab Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-11-14 22:53:44 +01:00
Jan Steemann 7f6d6f9142 issue #1069: Add 'raw' link to swagger ui so that the raw swagger json can easily be retrieved 
Added *Raw* link in documentation overview
 2014-11-14 21:54:05 +01:00
Jan Steemann 1fe0ce481e sort list of collections when creating a graph 2014-11-14 21:31:43 +01:00
Frank Celler 5a99807ae0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-11-14 18:38:19 +01:00
Jan Steemann 67356de499 issue #1098: some tests for error checking 2014-11-14 17:14:33 +01:00
Jan Steemann d37f4593b0 fixed grammar 2014-11-14 17:00:06 +01:00
Jan Steemann 2c0f5b96c9 issue #1098: added better error checking 2014-11-14 16:56:25 +01:00
Jan Steemann 777f70c8e2 fixed error message 2014-11-14 16:45:51 +01:00
Jan Steemann 0390ea34e6 hide system applications by default 2014-11-13 11:31:12 +01:00
Jan Steemann 7cd1eb5474 more warnings 2014-11-12 14:52:54 +01:00
Jan Steemann d4084e97e4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-12 14:51:35 +01:00
scottashton f8bd383808 show warnings in aql result 2014-11-12 13:59:04 +01:00
Jan Steemann 81c1919f44 minor adjustments for task API 2014-11-12 11:27:47 +01:00
Frank Celler 88d1f78464 Merge remote-tracking branch 'origin/2.3' into devel 
Conflicts:
	CHANGELOG
 2014-11-12 04:57:41 +01:00
Jan Steemann 04a78c95c4 added functions to highlighter 2014-11-11 23:14:24 +01:00
Jan Steemann 82331b290a issue #1083: do not show just 7 document attributes 2014-11-10 12:00:46 +01:00
Michael Hackstein fc2a4d82d0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-11-08 22:38:00 +00:00
Frank Celler f74849611d release version 2.3.0-beta2 2014-11-07 19:38:08 +01:00
Frank Celler ca15a1d22b Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.3 
Conflicts:
	CHANGELOG
	Documentation/Books/Users/NewFeatures/NewFeatures23.mdpp
	Documentation/Books/Users/Upgrading/Upgrading23.mdpp
	Documentation/Books/Users/Upgrading/UpgradingChanges23.mdpp
	js/apps/system/aardvark/frontend/js/views/foxxActiveView.js
	js/apps/system/aardvark/frontend/js/views/queryView.js
 2014-11-07 19:12:42 +01:00
Heiko Kernbach d9d6d5a062 added new shortcut to shortcut list 2014-11-07 17:30:35 +01:00
Heiko Kernbach 8f62bd4e24 added tooltip help for importing documents 2014-11-07 16:52:56 +01:00
Heiko Kernbach 6db183c681 bugfix: user extra attribuet now called userData 2014-11-07 16:19:24 +01:00
Heiko Kernbach 3c13953b23 added remove prog view button 2014-11-07 16:05:47 +01:00
Heiko Kernbach e7132b2009 removed download query button if current query is broken 2014-11-07 16:02:21 +01:00
Heiko Kernbach 912a9d2026 changed docs progress view delay 2014-11-07 15:37:37 +01:00
Heiko Kernbach 10368540ad added feature for truncating a collection 2014-11-07 14:49:45 +01:00
Heiko Kernbach 2e9a4a649a added feature for truncating a collection 2014-11-07 14:49:25 +01:00
Heiko Kernbach 34e6ac17e7 added ctrl+return and cmd+return for saving a document using the json editor 2014-11-07 14:19:19 +01:00
Heiko Kernbach 9da7e32c16 added edit database menu for small navigation bar 2014-11-06 17:41:22 +01:00
Heiko Kernbach f2699f1304 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-11-06 17:38:04 +01:00
Heiko Kernbach e261ff5242 jslint 2014-11-06 17:37:48 +01:00
Heiko Kernbach afbec2aa2b added delay for progress view 2014-11-06 17:35:17 +01:00
Michael Hackstein 3fecf7d4cb Fixed document view tests 2014-11-06 14:54:11 +00:00
Michael Hackstein 166407d4f9 Fixed user management view test 2014-11-06 14:45:24 +00:00
Michael Hackstein 8483a8bd45 Fixed aardvark router test 2014-11-06 14:36:09 +00:00
Heiko Kernbach c6f8e6c201 fixed wrong styling of active submenu 2014-11-06 15:35:35 +01:00
Heiko Kernbach afe860262b changed icons for importing and exporting json collections 2014-11-06 15:32:07 +01:00
Heiko Kernbach 7e99c16f01 fixed type, fixed event not triggering refiltering documents 2014-11-06 15:09:28 +01:00
Michael Hackstein 6ae3f3958c Made karma.conf again jenkins compatible 2014-11-06 13:41:48 +00:00
Michael Hackstein 4e5438f374 Removed JSLint warning in Frontend 2014-11-06 13:41:12 +00:00
Heiko Kernbach fb98a3ca96 fixed firefox pagination styling bug 2014-11-06 14:01:07 +01:00
Jan Steemann c61d8d9035 grammar 2014-11-06 13:42:57 +01:00
Michael Hackstein dc6314481e Removed console output 2014-11-05 16:36:10 +00:00
Michael Hackstein c3f35a5a37 The swagger JSON file is now opened in a new tab/window by default 2014-11-05 16:33:47 +00:00
Michael Hackstein e4f15f3632 Reverted my changes for Swagger URL Export 2014-11-05 16:25:21 +00:00
Michael Hackstein 715920f57e Added all files to karma again 2014-11-05 11:32:22 +00:00