1
0
Fork 0
Commit Graph

12261 Commits

Author SHA1 Message Date
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
Jan Steemann 9a6cab4386 cpp 2014-04-07 14:30:51 +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 e646b4be02 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-07 12:46:14 +02:00
Jan Steemann 182344f7d3 renamed 2014-04-07 12:02:04 +02:00
Jan Steemann 987292de34 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-07 11:56:14 +02:00
Jan Steemann 37c8413a44 cpp 2014-04-07 11:56:08 +02:00
Jan Steemann 87b31f9793 VS fixes 2014-04-07 11:50:52 +02:00
gschwab 517b2d96af fixed tests 2014-04-07 11:49:20 +02:00
Jan Steemann 80c236193b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-07 11:25:17 +02:00
Jan Steemann 87af8420fe cpp 2014-04-07 11:25:11 +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
Max Neunhoeffer d8509eceda Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-04-07 10:27:30 +02:00
Max Neunhoeffer ac20acbda3 Draft of BsonHelper done. 2014-04-07 10:27:04 +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
Jan Steemann e8d61b0c01 set report interval to zero so loop isn't woken up permanently 2014-04-05 00:21:20 +02:00
Jan Steemann 049bcd82f3 disable no-op 2014-04-05 00:21:02 +02:00
Jan Steemann 16edd4b767 variable alignment 2014-04-05 00:20:41 +02:00
Jan Steemann 7f637ba12d use empty instead of size check 2014-04-05 00:20:21 +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
Michael Hackstein cdfc19741c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-04 18:11:42 +02:00
Michael Hackstein 3ea2aacba9 Minor refactoring of collections. Still a lot to do 2014-04-04 18:11:38 +02:00
Heiko Kernbach cba8ae626d merge conflict 2014-04-04 17:54:22 +02:00
Heiko Kernbach 557a9b8365 refactoring logs 2014-04-04 17:53:11 +02:00
Michael Hackstein da0e807e16 Removed foxxEdit and Mount Views(which are now embedded modals 2014-04-04 17:38:29 +02:00
Michael Hackstein 838b198267 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-04 17:29:59 +02:00
Jan Steemann 1673878654 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-04 17:22:47 +02:00
Jan Steemann 03ee5cc3c4 better description of some figures 2014-04-04 17:22:24 +02:00
Jan Steemann 06fa64b671 fixed jslint complaint 2014-04-04 17:22:16 +02:00
Max Neunhoeffer d3df2a16e9 Improve the documentation of _create with respect to shardKeys. 2014-04-04 17:13:49 +02:00
Max Neunhoeffer 78f72f76ad Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-04-04 16:57:24 +02:00
Max Neunhoeffer 7410545842 First version of C++ frontend for libbson.
Appending and setup OK.
Read access not yet done.
2014-04-04 16:56:49 +02:00
Jan Steemann 0f5ae9b4eb use WorkingSetSize instead of PeakWorkingSetSize 2014-04-04 16:43:38 +02:00
gschwab 9a1872597a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-04 16:39:44 +02:00
gschwab 51fe592572 removed test view 2014-04-04 16:39:39 +02:00
scottashton f4cd6dcea7 removed unsused cluster views 2014-04-04 16:25:47 +02:00
Jan Steemann a33261fac5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-04 14:57:29 +02:00
Jan Steemann 282f510e34 fixed race conditions 2014-04-04 14:57:14 +02:00
scottashton b5f1253ac4 finished documentViewTest 2014-04-04 14:47:04 +02:00