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

4362 Commits

Author SHA1 Message Date
Michael Hackstein bcf1878888 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-09 16:06:47 +02:00
Michael Hackstein d39e306d38 First version of newest dashboard design 2014-04-09 16:06:43 +02:00
gschwab 51ff024337 removed userProfileView.* 2014-04-09 09:48:36 +02:00
gschwab 83da043073 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-09 09:42:48 +02:00
gschwab eb0b685bd4 refactored modals of manage graph 2014-04-09 09:42:35 +02:00
Jan Steemann ba8e38d6e5 bugfix for AQL query optimiser 
the following type of query was too eagerly optimised, leading to errors in code-generation:

   LET a = (FOR i IN [] RETURN i) LET b = (FOR i IN [] RETURN i) RETURN 1

the problem occurred when both lists in the subqueries were empty. In this case invalid code
was generated and the query couldn't be executed.
 2014-04-08 23:26:55 +02:00
Michael Hackstein 0829bc490b Fixed JSLint warnings 2014-04-08 18:26:56 +02:00
scottashton ab3da3d2ce removed window.* from documentsView and refactored router 2014-04-08 18:07:56 +02:00
scottashton 9143834bc3 100% coverage of _paginationView 2014-04-08 14:58:33 +02:00
scottashton cead527a19 fixed merge conflict 2014-04-08 14:38:45 +02:00
scottashton 7c0c57c914 view refactoring 2014-04-08 14:32:54 +02:00
gschwab 0cbec72e9e fixed some css for modals (info icon) 2014-04-08 14:11:34 +02:00
Jan Steemann 3711669d90 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-08 13:21:16 +02:00
Jan Steemann ad64c52e28 issue #796: fixed potential issue with newlines treated slightly differently in different parts of AQL 2014-04-08 13:20:26 +02:00
gschwab acf585df22 fixed modal layout 2014-04-08 13:06:57 +02:00
Michael Hackstein 58baf0fbfe Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-08 10:22:58 +02:00
Michael Hackstein f47673752b Fixed karma tests 2014-04-08 10:22:55 +02:00
gschwab a1f2b6814f fixed id 2014-04-08 10:22:05 +02:00
scottashton 027351f739 refactoring documentsview 2014-04-08 09:15:42 +02:00
Michael Hackstein e8cac58918 Fixed some frontend tests and jslint warning 2014-04-08 09:09:00 +02:00
Heiko Kernbach 7477da64c7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-07 22:05:25 +02:00
Heiko Kernbach 8a6cdde372 newlog spec 2014-04-07 22:04:23 +02:00
Jan Steemann 23e844f8eb removed unused variables 2014-04-07 22:02:34 +02:00
Heiko Kernbach b9924c4fb8 documentViewSpec 2014-04-07 20:23:51 +02:00
Michael Hackstein 4bb8e6ec18 Removed hack for spies that caused side-effects. Some tests now fail, will be fixed soon 2014-04-07 18:14:25 +02:00
Michael Hackstein d27eac7cf9 Started fixing broxxen tests for arangoDocumentSpec 2014-04-07 18:09:34 +02:00
Michael Hackstein 1fd2fc854e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-07 16:41:22 +02:00
Michael Hackstein df5952e6dd Further refactoring of frontend 2014-04-07 16:41:17 +02:00
gschwab 4b0e0e930b added IDs for readonly entries in modal 2014-04-07 16:16:25 +02:00
Michael Hackstein d85ec9ea3c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-07 15:36:58 +02:00
Michael Hackstein c5daa94cd0 Inserted the paginatedCollection 2014-04-07 15:36:54 +02:00
Michael Hackstein 358ed60a46 Fixed a missing function getTotal. ArangoDocuments will now fetch their total amount on col change 2014-04-07 15:35:07 +02:00
Heiko Kernbach 10a3c0f153 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-07 14:40:21 +02:00
Heiko Kernbach 2dee04e24a documentViewSpec 2014-04-07 14:39:34 +02:00
Michael Hackstein 1e48d44050 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/collections/arangoDocuments.js
 2014-04-07 14:38:07 +02:00
Michael Hackstein f3b267db95 Further impl of arangoDocuments. Warning all tests broken, ongoing work 2014-04-07 14:36:20 +02:00
Heiko Kernbach b2eaf848cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-07 13:30:18 +02:00
Heiko Kernbach 446a2baaa2 css logs 2014-04-07 13:29:56 +02:00
gschwab 517b2d96af fixed tests 2014-04-07 11:49:20 +02:00
gschwab 2f56c946fa refactored modalDialogs for adding collections 2014-04-07 11:22:00 +02:00
scottashton d889ba7d69 jslinted file 2014-04-07 11:14:44 +02:00
scottashton 9179e2caaf moved uploadFile to documentscollection 2014-04-07 11:07:17 +02:00
Michael Hackstein bc8716c059 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-07 09:52:07 +02:00
Michael Hackstein 7a8f6cf0c1 Moved pagination to a more general collection, logs is now extending it 2014-04-07 09:52:03 +02:00
gschwab ed30df6c17 added SELECT2 entry for modal view 2014-04-07 09:14:03 +02:00
Michael Hackstein fb3eab315d Minor fixes in new arangoLogs, just cosmetics 2014-04-07 09:07:02 +02:00
Heiko Kernbach 36ace5297e refactored log view 2014-04-04 19:34:54 +02:00
Heiko Kernbach 33e3fa7267 scss 2014-04-04 19:28:51 +02:00
Heiko Kernbach d9a31855af Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-04 19:28:04 +02:00
Heiko Kernbach be8c91c603 scss + lint 2014-04-04 19:27:53 +02:00