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

4289 Commits

Author SHA1 Message Date
hkernbach 13dc4e3637 footer, grunt config, dygraph config, navbar, dashboard 2016-04-21 10:58:16 +02:00
Alan Plum e4cfa5ec0d
Throw better errors when install fails 2016-04-20 18:11:49 +02:00
hkernbach 05578e8fbf files not needed 2016-04-20 18:11:05 +02:00
hkernbach 8ed6f3bb49 scss cleanup tiles 2016-04-20 18:08:05 +02:00
hkernbach 346363b8b8 fixed tiles 2016-04-20 18:07:52 +02:00
hkernbach 23e21904be grunt 2016-04-20 17:40:28 +02:00
hkernbach 5cde3c698d grunt 2016-04-20 17:34:50 +02:00
hkernbach 5331c317dd grunt build 2016-04-20 17:28:55 +02:00
hkernbach e27fa8ae38 new login mechanism, additional frontend changes 2016-04-20 17:26:44 +02:00
hkernbach 972367b4f7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-20 15:48:21 +02:00
hkernbach 5b7f5114f4 cleaned up grunt build 2016-04-20 15:48:11 +02:00
hkernbach fed6c3602c cleanup grunt build process 2016-04-20 15:47:35 +02:00
Alan Plum 2f2c7b5c12
Allow switching databases in login 2016-04-20 15:23:04 +02:00
Alan Plum c23d73f78c
Aardvark should always expect auth 2016-04-20 15:23:01 +02:00
hkernbach c6caacc474 modified grunt build 2016-04-20 13:56:45 +02:00
hkernbach 2a8f73593a navigation view 2016-04-20 12:54:43 +02:00
hkernbach e6a9ea7cab disabled dashboard when statistics are not available 2016-04-20 12:54:31 +02:00
hkernbach 78975ceaef dashboard scss 2016-04-20 12:52:50 +02:00
hkernbach ad0f86723a scss dashboard + dropdowns 2016-04-20 12:47:58 +02:00
hkernbach 54c8d4c700 foxx teardown route fix 2016-04-20 12:29:07 +02:00
hkernbach 2d4409e376 aardvark explain route 2016-04-20 12:06:40 +02:00
Alan Plum 69b5442181
Rebuild aardvark 2016-04-19 20:18:24 +02:00
Alan Plum 2094d1adca
Unbreaky dashboard floats 2016-04-19 20:17:34 +02:00
Jan Steemann 34923ff236 added "enabled" flag for statistics output 2016-04-19 18:19:07 +02:00
hkernbach 96d2348199 frontend, views, navbar 2016-04-19 18:01:31 +02:00
hkernbach 3d94293e3c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 16:33:28 +02:00
hkernbach bcbaa7bc72 modified nodes view 2016-04-19 16:33:17 +02:00
Alan Plum 8373c04c1a
Just no 2016-04-19 16:18:18 +02:00
hkernbach 9ac9331072 nodes view 2016-04-19 16:05:29 +02:00
Alan Plum 7ff989687c
Rebuild aardvark 2016-04-19 15:06:56 +02:00
Alan Plum 4c3319de25
Extract session storage.save 
Also fix transports
 2016-04-19 15:06:55 +02:00
Alan Plum d0ce74803c
Make sure session exists before checking it in aardvark 2016-04-19 13:58:50 +02:00
hkernbach 2bd9dfea61 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 13:16:44 +02:00
hkernbach 179e5ee7a5 scss, views 2016-04-19 13:15:16 +02:00
Alan Plum 9f25f44a87
Don't check the Foxx store unless you actually need it 2016-04-18 18:01:06 +02:00
Alan Plum 777848472d
standalone.html -> index.html 2016-04-18 18:01:05 +02:00
Alan Plum c2b6f33407
Fix aardvark redirect 2016-04-18 18:01:03 +02:00
Alan Plum fae673a7f3
Fix aardvark more 2016-04-18 18:01:02 +02:00
Alan Plum 39754d700f
Unbreaky aardvark 2016-04-18 18:01:01 +02:00
Alan Plum c1fef91659
More aardvark modernization 2016-04-18 18:01:01 +02:00
Alan Plum 954aced326
Use res.throw for aardvark auth 2016-04-18 18:00:57 +02:00
Alan Plum b4f99a3953
Remove unused Aardvark foxxTemplates.js 2016-04-18 18:00:56 +02:00
Alan Plum 45290e3d63
Port d66616d to FOTF 2016-04-18 18:00:52 +02:00
Alan Plum ead1c48493
Lint! 2016-04-18 18:00:51 +02:00
Alan Plum 87d86065d6
Make sure system collections used by aardvark always exist 2016-04-18 18:00:51 +02:00
Alan Plum 016e5c9163
Migrated gharial to FOTF 2016-04-18 18:00:50 +02:00
Alan Plum e22e656f5d
Remove _system services 
* cerberus was only used by MyArangoDB
* simple-auth is now @arangodb/foxx/auth
* sessions is replaced by @arangodb/foxx/sessions/storage/_system
* users should no longer be used anyway
 2016-04-18 18:00:48 +02:00
Alan Plum fc05c019d2
Fix aardvark auth 2016-04-18 18:00:47 +02:00
Alan Plum 5d765be524
Port Aardvark to FOTF 2016-04-18 18:00:46 +02:00
Alan Plum 926f02ace5
Use mime-types 2016-04-18 18:00:35 +02:00
Alan Plum 5a6fa4a253
Generator should support edge collections 
Fixes #1718.
 2016-04-18 18:00:35 +02:00
Alan Plum a385738601
Revert "fixed version" 
This reverts commit 034eea10b3.
 2016-04-18 18:00:17 +02:00
hkernbach 9ecc6c6183 templates, views, scss, router 2016-04-18 16:51:32 +02:00
hkernbach 9033a36a9f added node update function 2016-04-18 15:23:38 +02:00
hkernbach 87ca2a1517 node view 2016-04-18 15:00:40 +02:00
hkernbach 2c0e6cc7f4 cluster view, footer view 2016-04-18 14:34:34 +02:00
hkernbach ac8c1b11f5 help us view, cluster state 2016-04-18 13:47:02 +02:00
hkernbach c43a5358f8 navbar, font 2016-04-18 13:22:06 +02:00
hkernbach c64e289d82 font change, scss 2016-04-18 13:21:28 +02:00
hkernbach 91e7845e6b query view caching bugfix 2016-04-18 13:21:07 +02:00
hkernbach 704ef41756 html, scss, layout, helpus view 2016-04-18 11:42:28 +02:00
hkernbach a2f57b2ca8 grunt 2016-04-15 13:49:44 +02:00
hkernbach d6d741a27a images, html 2016-04-15 13:48:16 +02:00
hkernbach cbe91c6df9 scss 2016-04-14 23:49:25 +02:00
hkernbach 0f3997d162 grunt build 2016-04-14 23:44:46 +02:00
hkernbach 8b4f0ed6e8 responsive scss changes 2016-04-14 23:41:24 +02:00
hkernbach c6f82ef3ae new edge api adjustments 2016-04-14 23:41:08 +02:00
hkernbach 06a54b5841 frontend router 2016-04-14 23:14:00 +02:00
hkernbach ff264ea01c scss 2016-04-14 23:13:51 +02:00
hkernbach e27c6d1554 grunt 2016-04-14 22:53:46 +02:00
hkernbach 5b03dfef1e new collection view + subviews 2016-04-14 22:49:39 +02:00
hkernbach 5c153730d2 view, subviews, scss 2016-04-14 21:56:43 +02:00
hkernbach b7e6b5dfca jslint frontend 2016-04-14 15:38:39 +02:00
hkernbach 128caabd92 scss lint 2016-04-14 13:54:09 +02:00
hkernbach 020c3df628 lib + frontend grunt build 2016-04-14 13:24:18 +02:00
hkernbach 163e58898b Merge remote-tracking branch 'origin/frontendmerge' into devel 2016-04-14 13:08:43 +02:00
hkernbach 526b686cc5 grunt 2016-04-14 13:01:17 +02:00
hkernbach 9d3386cc28 frontend 2016-04-14 13:00:27 +02:00
hkernbach 4ff4729e0f view, scss 2016-04-14 09:43:32 +02:00
hkernbach b9d1712fb0 scss 2016-04-13 15:12:03 +02:00
hkernbach 79a57b9fc8 view, scss, templates 2016-04-13 11:12:55 +02:00
hkernbach 83a385bd74 grunt build 2016-04-12 22:54:47 +02:00
hkernbach e8fd3fb1cb scss style changes 2016-04-12 21:23:00 +02:00
hkernbach b55bac0560 headerbar scss, fixed some view problems caused by backbone update 2016-04-12 18:24:58 +02:00
hkernbach ba147c73bd grunt 2016-04-12 17:00:43 +02:00
hkernbach 9576c3104b nodes view 2016-04-12 17:00:29 +02:00
hkernbach dbe2c17ae5 scss, updated backbone & underscore libs, views 2016-04-12 16:53:24 +02:00
hkernbach 2e2712b4bf grunt build 2016-04-12 12:35:12 +02:00
hkernbach c819c00c9b views, router 2016-04-12 12:34:46 +02:00
hkernbach 46bd354bd3 dashboard configuration 2016-04-12 12:34:31 +02:00
hkernbach 2f5bb27e4a scss 2016-04-12 12:34:01 +02:00
hkernbach a48b935be6 views 2016-04-12 12:33:47 +02:00
hkernbach be3757ccb6 updated nvd3 + d3 2016-04-12 11:50:10 +02:00
hkernbach 4857c87818 grunt build 2016-04-11 18:38:58 +02:00
hkernbach 15483723b7 added node(s) view(s) 2016-04-11 18:36:33 +02:00
hkernbach bb60cef7b3 cluster view 2016-04-08 18:31:29 +02:00
hkernbach 7992591501 fixed some routing issue, scss, fixed a graph issue 2016-04-08 17:51:17 +02:00
hkernbach 229038221c bugfix querview 2016-04-08 15:17:30 +02:00
hkernbach 1013c03e05 added subview functionality 2016-04-08 14:45:28 +02:00
hkernbach 8d7d68158e added mode check 2016-04-07 14:22:17 +02:00
hkernbach c452cb00bc issue #1793 2016-04-07 13:54:11 +02:00
hkernbach 81faa5b08b grunt 2016-04-07 12:57:53 +02:00
hkernbach f2691ba818 issue #1793 2016-04-07 12:54:16 +02:00
hkernbach 00fb467592 Merge remote-tracking branch 'origin/devel' into frontendmerge 2016-04-06 19:06:46 +02:00
hkernbach 090f5416a3 grunt 2016-04-06 17:45:33 +02:00
hkernbach 4578b66441 merging web interfaces 2016-04-06 17:44:22 +02:00
Andreas Streichardt d2d7af67fe Kickstarter and planner are dead 2016-04-05 17:45:39 +02:00
hkernbach d464d69406 query view now reacts to a killed query 2016-04-01 15:41:20 +02:00
hkernbach 5612218835 spotlight view, query view, grunt build, scss 2016-03-29 17:28:08 +02:00
hkernbach dee5e6d118 query view support mac meta key 2016-03-29 15:53:22 +02:00
hkernbach d9347f576b query view copy to editor bugfix 2016-03-29 15:23:10 +02:00
hkernbach 2a571d1f6b query view bugfix 2016-03-29 15:18:36 +02:00
hkernbach 5ae925f6e0 query view 2016-03-29 14:19:16 +02:00
hkernbach dadcee6eaa removed console logs 2016-03-29 13:46:30 +02:00
hkernbach 51678757cb frontend bugfix wrong collection type 2016-03-29 13:37:31 +02:00
hkernbach 06e40476f7 frontend memory issue #1717 2016-03-29 11:01:32 +02:00
jsteemann bc1563650b added missing function 2016-03-12 11:47:08 +01:00
hkernbach d7070bb090 issue: #1774, grunt 2016-03-08 19:55:22 +01:00
Jan Steemann 06c0b3aed8 added derived files 2016-03-07 10:49:39 +01:00
Jan Steemann c6fa638b67 fixed issue #1765, issue #1770 2016-03-07 10:49:18 +01:00
hkernbach 22da5c3b13 grunt 2016-03-01 20:07:49 +01:00
hkernbach b048c7b6c8 catch return in bindvars input field 2016-03-01 20:04:13 +01:00
hkernbach c60cfb684d added missing cache call 2016-03-01 19:02:01 +01:00
hkernbach d14108e063 scss lint 2016-03-01 18:43:40 +01:00
hkernbach d26aab4290 grunt 2016-03-01 18:41:30 +01:00
hkernbach 6a8988d3f1 scss, added copy to editor function 2016-03-01 18:38:46 +01:00
hkernbach 0ebf8a2f53 frontend system collection, multiple queries aql editor, styling, grunt 2016-03-01 13:10:37 +01:00
hkernbach f31cee26bd aardvark, grunt 2016-03-01 11:34:56 +01:00
hkernbach 87b9e0d7db fixed download query with bind params, scss, included query stats in aql editor 2016-03-01 11:07:57 +01:00
hkernbach 937478137b scss 2016-02-29 17:00:14 +01:00
hkernbach 46456b9db5 new query view 2016-02-29 16:45:48 +01:00
hkernbach ee3b3596d4 grunt 2016-02-26 16:48:05 +01:00
hkernbach 13c5d576c5 query view better feedback 2016-02-26 15:25:53 +01:00
hkernbach e18552cb20 bugfixes 2016-02-26 15:11:24 +01:00
hkernbach 18fab18ef1 scss 2016-02-26 14:58:21 +01:00
hkernbach 81167fbbab removed old styled icon 2016-02-26 14:56:08 +01:00
hkernbach c1d1e93b4a new query view, grunt 2016-02-26 13:39:52 +01:00
hkernbach 335b638670 new query view 2016-02-25 23:50:15 +01:00
hkernbach 8b58e39988 new query view, grunt 2016-02-25 17:14:19 +01:00
hkernbach 60b81c84b0 new query view better error handling 2016-02-25 12:50:34 +01:00
hkernbach 66473b991c localstorage new query view 2016-02-25 12:25:07 +01:00
hkernbach 1e78f8aae6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-25 10:34:25 +01:00
hkernbach ff2f4d089f grunt 2016-02-25 10:34:08 +01:00
hkernbach aadab3a0e4 new query view 2016-02-25 10:33:58 +01:00
Jan Steemann 382a76c784 jslint 2016-02-25 10:12:36 +01:00
hkernbach fc7fdd6572 query view 2016-02-24 23:45:38 +01:00
hkernbach f5674fd76e dev version of new aql editor, grunt 2016-02-24 19:57:08 +01:00
hkernbach 3f3dbc5391 removed old icon 2016-02-24 10:59:57 +01:00
hkernbach c66a480db9 user view bugfix, grunt 2016-02-23 19:00:56 +01:00
hkernbach cfe62a9f9a grunt 2016-02-23 13:27:35 +01:00
hkernbach fa5ece041f html, scss 2016-02-23 13:27:07 +01:00
hkernbach 24e2dd2f58 scss 2016-02-23 11:36:26 +01:00
hkernbach 9ea4e386ae removed alerts, replaced with helper errors 2016-02-23 11:22:32 +01:00
hkernbach 51cac56eaf dashboard styling 2016-02-23 11:10:00 +01:00
hkernbach 39a38ffe34 collection status 2016-02-23 11:01:38 +01:00
hkernbach 140ed385d3 grunt build 2016-02-23 10:31:52 +01:00
hkernbach 5b733abceb bugfixes webui 2016-02-22 17:46:58 +01:00
hkernbach 3b7d837f8d grunt build 2016-02-22 16:56:45 +01:00
hkernbach 7f8a9e8a49 collection view bugfix 2016-02-22 16:52:42 +01:00
hkernbach 8b43486035 scss 2016-02-22 16:29:38 +01:00
hkernbach 4329125165 fixed graph router bug 2016-02-22 15:33:20 +01:00
hkernbach a311ec9036 removed deprecated offsetWidth, offsetHeight 2016-02-22 15:11:14 +01:00
hkernbach aa382da33b removed deprecated webkitURL 2016-02-22 15:07:13 +01:00
hkernbach 5d53b15104 removed sync calls 2016-02-22 15:01:50 +01:00
hkernbach 867c1fa8c1 bugfixes, removed more sync calls 2016-02-22 13:56:12 +01:00
hkernbach ca1633357a removed sync calls 2016-02-22 12:03:14 +01:00
hkernbach fcea7af96b removed sync calls 2016-02-22 11:33:49 +01:00
hkernbach d54543bd1d doc export bugfix 2016-02-22 11:27:12 +01:00
hkernbach f26516fd93 user management view bugfix 2016-02-22 11:11:32 +01:00
hkernbach e5344ba924 removed sync calls 2016-02-22 11:08:18 +01:00
hkernbach 15bc2a96ea scss 2016-02-20 02:11:56 +01:00
hkernbach b502f858b7 rm test file 2016-02-20 02:02:34 +01:00
hkernbach c9ca22c5a5 rm test file 2016-02-20 02:01:05 +01:00
hkernbach 12aace1413 complete grunt build 2016-02-20 01:55:38 +01:00
hkernbach b182f6e48d sync to async calls 2016-02-20 01:52:57 +01:00
hkernbach 553875b691 sync calls to async 2016-02-20 01:20:29 +01:00
hkernbach 09fcdb552d road to fully async web ui 2016-02-19 23:37:19 +01:00
hkernbach e9259f1ae3 removed sync calls from user views 2016-02-19 21:39:51 +01:00
hkernbach e1af85af36 removed sync calls from router 2016-02-19 20:49:50 +01:00
hkernbach adadc04e49 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-19 20:44:32 +01:00
hkernbach 4f75fa02ac cleanup router 2016-02-19 20:44:04 +01:00
hkernbach 1ce418a7cf added missing logo event 2016-02-19 20:41:51 +01:00
hkernbach e0e4336d53 moved navi elements to the right position 2016-02-19 20:33:18 +01:00
Frank Celler 034eea10b3 fixed version 2016-02-19 20:15:39 +01:00
hkernbach 2c23eccaad removed async calls 2016-02-19 18:58:34 +01:00
hkernbach b2df2d6600 replaced sync calls from query view and regarding collection 2016-02-19 18:22:49 +01:00
hkernbach 15c071f996 replaced some sync calls with async ones 2016-02-19 16:38:54 +01:00
hkernbach 677a8937fa replaced sync call for creating collections with async call 2016-02-19 15:59:56 +01:00
hkernbach 8d2e4f8711 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-19 15:07:56 +01:00
hkernbach 468a3130f6 fixed issue: #1709 2016-02-19 15:07:08 +01:00
Alan Plum 17ef7ca5e9 Revert system app version compatibility 2016-02-19 14:46:31 +01:00
hkernbach 432f2970f6 query management view auto update 2016-02-19 13:56:19 +01:00
hkernbach 89cb11d631 collections model added missing status 2016-02-19 13:03:42 +01:00
hkernbach 53f1ee2c2d grunt build 2016-02-19 12:43:23 +01:00
hkernbach 60299e0b54 progress view 2016-02-19 12:42:56 +01:00
hkernbach 9fe0f9bea3 collection view web ui 2016-02-19 12:13:04 +01:00
hkernbach 4a903a9e6b grunt 2016-02-19 11:31:33 +01:00
hkernbach e8f544c2f0 collections view web ui 2016-02-19 11:31:18 +01:00
Kaveh Vahedipour db9d23b7ef Adapting to intel compiler 15.0 2016-02-18 23:26:45 +01:00
hkernbach 415392e747 fixed bug: ##1727 2016-02-18 17:05:21 +01:00
hkernbach fa2e8e03b9 pending jobs call only at colls view 2016-02-18 16:56:14 +01:00
hkernbach e10b3d59d8 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-18 16:36:29 +01:00
hkernbach 582d01885e responsive design, scss, readbility numbers, grunt build 2016-02-18 16:36:02 +01:00
Frank Celler 5fcc412f6f switch to 3.0.0 2016-02-18 14:44:57 +01:00
Frank Celler adaef87abf switch to 3.0.0 2016-02-18 14:41:25 +01:00
hkernbach 62a7fb57ec grunt build + jslint 2016-02-17 21:10:26 +01:00
hkernbach 9e776db8ea web ui: some collection tile state changes 2016-02-17 21:06:23 +01:00
hkernbach d4b7cf4c52 removed console log 2016-02-17 20:27:36 +01:00
hkernbach db688dcd46 fixed creation of a graph without definition 2016-02-17 20:23:51 +01:00
hkernbach 307cbdebb9 fixed select2 bug graph management tab 2016-02-17 19:57:15 +01:00
hkernbach 7bb22a3f52 grunt build 2016-02-17 19:47:58 +01:00
hkernbach ec7c8e70f8 scss 2016-02-17 19:41:03 +01:00
hkernbach 34e47326b9 added description to locked collections 2016-02-17 17:50:00 +01:00
hkernbach 2d23cf7e2b web ui, loading documents now cancelable 2016-02-17 17:07:12 +01:00
hkernbach 3b97efd20d removed old indices modal subview 2016-02-17 13:50:26 +01:00
hkernbach 1f73f0611e grunt build 2016-02-17 12:56:05 +01:00
hkernbach 3286e29f9d web ui better handling loading/unloading collections 2016-02-17 12:54:10 +01:00
hkernbach 02d3261a56 webui async creating+deleting indices 2016-02-17 11:59:05 +01:00
hkernbach 80da9faf75 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-16 20:12:43 +01:00
hkernbach 4f821750a4 grunt build 2016-02-16 20:12:36 +01:00
hkernbach 6278621804 improved webui when using big collections 2016-02-16 20:12:20 +01:00
Michael Hackstein 8295bae5b3 Added generated files 2016-02-16 14:07:10 +01:00
hkernbach 948951ebe3 remove index tab when collection not loaded 2016-02-16 09:47:28 +01:00
hkernbach e42e11d5fc grunt build 2016-02-15 17:13:31 +01:00
hkernbach f170ee0350 web ui: prep for creating and loading collections/documents async, prep for index creation check 2016-02-15 17:13:09 +01:00
Max Neunhoeffer 459a540867 Merge branch 'devel' into ClustUp2 2016-02-15 09:16:01 +01:00
hkernbach e96fc9c8fd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-15 08:53:56 +01:00
hkernbach 35c7daf223 web ui - notification used instead of error, added missing template 2016-02-15 08:53:47 +01:00
Frank Celler 8da0c61de8 fixed jslint 2016-02-14 17:14:00 +01:00
Max Neunhoeffer 4cbd99a54b Merge branch 'devel' into ClustUp2 2016-02-13 23:06:22 +01:00
Max Neunhoeffer 1065486a77 First version of getting shards in sync working. 2016-02-13 23:04:20 +01:00
hkernbach 613985443d web ui - moved indices view, added tab bar engine to modals 2016-02-12 16:16:50 +01:00
hkernbach fef3e0618d web ui - collections now using async unloading mechanism 2016-02-11 15:21:22 +01:00
hkernbach 711a7a3c4f web ui - collections now using async loading mechanism 2016-02-11 14:27:29 +01:00
hkernbach ab31d3f862 web ui - fixed bug where events were not unbound correctly 2016-02-11 11:11:15 +01:00
Max Neunhoeffer 465a117864 Merge branch 'devel' into ClustUp2 2016-02-11 09:11:29 +01:00
hkernbach 5e7c78a133 web-ui: added all-option in aql editor 2016-02-10 16:47:12 +01:00
hkernbach 1908d4659b webui work monitor changes 2016-02-10 16:10:48 +01:00
hkernbach 0fe9818807 preparation for work monitor, added some dev test view 2016-02-10 16:01:11 +01:00
Jan Steemann 196ec2593c added parentheses for explain 2016-02-10 15:21:12 +01:00
Jan Steemann cc257b90ff print brackets in explainer 2016-02-10 13:12:46 +01:00
Jan Steemann 846db2014d Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-10 12:59:11 +01:00
hkernbach 2f2ecf5595 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-10 12:15:33 +01:00
hkernbach ff26f61668 issue: #1715 2016-02-10 12:15:28 +01:00
Jan Steemann f3107bc25f Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-10 11:34:40 +01:00
Jan Steemann 5ba2432d78 remove sort in more cases 2016-02-10 11:23:11 +01:00
Max Neunhoeffer 88c2657af7 Merge branch 'devel' into ClustUp2 2016-02-10 08:38:37 +01:00
Alan Plum ac18d26c72 Always force when deleting foxxes in aardvark 
Fixes #1358.
 2016-02-09 17:29:45 +01:00
hkernbach 6d1efde385 front-end: fixed pagination state bug 2016-02-09 16:41:37 +01:00
Max Neunhoeffer dc63cb3874 Merge branch 'devel' into ClustUp2 2016-02-09 15:52:36 +01:00
hkernbach c94be8d88b scss 2016-02-09 15:28:06 +01:00
hkernbach c9de284769 grunt build 2016-02-09 15:24:44 +01:00
hkernbach 464394703a removed filesize plugin, added pretty bytes 2016-02-09 15:20:03 +01:00
hkernbach 0a6564d61e scss 2016-02-09 14:37:11 +01:00
hkernbach c205e3236a workaround for index modules 2016-02-09 14:26:30 +01:00
hkernbach 4a972d3f55 scss build 2016-02-09 14:21:44 +01:00
hkernbach 4304c26878 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-09 14:17:07 +01:00
Alan Plum ecd99a42a7 Use content-disposition module for all CD headers 2016-02-09 13:54:50 +01:00
Alan Plum afc9185e70 Aardvark downloads now uses prettier zip file names 2016-02-09 13:52:48 +01:00
Jan Steemann c408691e60 make drop never fail 2016-02-09 11:42:21 +01:00
hkernbach 8844e1924e scss lint 2016-02-09 11:07:28 +01:00
hkernbach c833a82b70 scss 2016-02-09 10:49:44 +01:00
hkernbach 176bb36b15 front-end: added LIKE filter, issue: #1657 2016-02-09 09:42:12 +01:00
hkernbach 33a76762d6 front-end: added NOT IN filter, issue: #1657 2016-02-08 20:30:47 +01:00
hkernbach 82fa26c79e front-end: added IN filter, issue: #1657 2016-02-08 20:20:34 +01:00
hkernbach 690a0516aa fixed issue: #1688 2016-02-08 18:20:48 +01:00
Jan Steemann 42c4bdbebb ported from 2.8 2016-02-07 19:47:37 +01:00
jsteemann 0c9e4bef18 report progress while synchronizing 2016-02-07 00:24:22 +01:00
Frank Celler 6d4b68245a added print.limitString 2016-02-06 20:20:07 +01:00
jsteemann 37c46024df print progress while synchronizing 2016-02-06 16:54:25 +01:00
Jan Steemann 040b09f303 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-05 19:47:29 +01:00
Jan Steemann 071d36c203 replication cleanup 2016-02-05 13:28:38 +01:00
Jan Steemann abd382bf19 replication cleanup 2016-02-05 13:08:12 +01:00
Jan Steemann 60d8fc594e added derived file 2016-02-05 09:37:28 +01:00
Jan Steemann 94990da5f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-04 19:18:43 +01:00
Frank Celler 7769b68d69 fixed returns 2016-02-04 16:46:29 +01:00
Frank Celler 8b6f4b8bec removed DEV_APP_PATH 2016-02-04 16:38:20 +01:00
Max Neunhoeffer 7a92f3ac0f Merge branch 'devel' into ClustUp2 2016-02-04 09:39:46 +01:00
Frank Celler bb3acf8cd5 fixed /_admin/log 2016-02-04 00:41:50 +01:00
Max Neunhoeffer ac51c221b3 Merge branch 'devel' into ClustUp2 2016-02-03 08:55:01 +01:00
jsteemann 13335d4cf9 bugfixes 2016-02-03 01:06:27 +01:00
jsteemann 60d9364e1f added derived files 2016-02-03 00:28:29 +01:00
Jan Steemann 45d9745756 fixed display of Traversals in AQL explain 2016-02-02 11:24:51 +01:00
Max Neunhoeffer 93400bfdcc Implement followerInfo. 2016-02-01 11:38:10 +01:00
Michael Hackstein 651e705ebd Introduced a new EMPTY_GRAPH error which is thrown during AQL execitions whenever the graph has no edge collections. 2016-01-28 18:07:26 +01:00
Jan Steemann 6b19a7b0a7 fixes ported from 2.8 2016-01-21 16:40:31 +01:00
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +01:00
Wilfried Goesgens 3075851004 fresh swagger. 2016-01-12 19:04:48 +01:00
Jan Steemann 7524c21f3a added derived files 2016-01-12 17:45:05 +01:00
Jan Steemann 6937dbc489 aggregate fixes 2016-01-12 17:21:18 +01:00
Jan Steemann 38c2503687 moved some documentation 2016-01-12 15:06:04 +01:00
Jan Steemann 2044cf8038 implemented aggregations for SortedCollectBlock 2016-01-12 12:05:57 +01:00
hkernbach 0859d3fa20 grunt build 2016-01-11 17:05:58 +01:00
hkernbach 85e434d757 fixed frontend issue: #1645 2016-01-11 14:28:28 +01:00
hkernbach ac2f42401c fixed frontend issue: #1646 2016-01-11 13:45:03 +01:00
Jan Steemann 8390793699 moved docu blocks into their own files 2016-01-07 16:39:19 +01:00
Jan Steemann 1e6a07426c collect refactoring 2016-01-07 14:10:32 +01:00
Jan Steemann e24c263c5e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-07 13:35:26 +01:00
Jan Steemann ad1163e3bb refactoring for Aql COLLECT 2016-01-07 13:35:12 +01:00
Alan Plum 790082aaf1 Stop system apps from whining 
Devel claims it's 2.7 so requiring 2.8 in Foxx causes warnings.
 2016-01-07 11:25:59 +01:00
Alan Plum efd31e2fd4 Explicitly mark version compat in system apps 
This marks them as legacy when FOTF lands
until we update them for FOTF compatibility.
 2016-01-06 18:55:37 +01:00
Jan Steemann 10f97380be updated documentation 2016-01-04 19:10:41 +01:00
Frank Celler 1065a1bd2c added work monitor 2016-01-04 15:33:06 +01:00
Jan Steemann 0d4874a2c9 added derived file 2016-01-04 15:07:04 +01:00
jsteemann c20cf66e93 add cacheability info for explain 2016-01-03 00:52:36 +01:00
jsteemann 9b64efbc11 added generated file 2015-12-29 15:58:29 +01:00
Alan Plum 9ecc710491 Avoid _.clone 
Lodash's clone is subtlely different from underscore's and breaks with ShapedJson.
 2015-12-23 23:30:56 +01:00
Alan Plum de9ae5128a underscore -> lodash 2015-12-23 23:30:55 +01:00
hkernbach 31b23283b1 webui dashboard: graph display bugfix 2015-12-23 21:41:09 +01:00
hkernbach e649ea9522 fixed several bugs during the dashboard initialize process 2015-12-23 17:27:28 +01:00
hkernbach 05cdfb43dc web ui wrong usage of arango notification in document view 2015-12-22 18:17:25 +01:00
hkernbach 64eb028ba3 web ui better usability when creating dbs, issue: #1623' 2015-12-22 17:50:45 +01:00
hkernbach 65ed4432cf web ui modal view bugfix 2015-12-22 16:54:30 +01:00
hkernbach f3ac092c9c web ui db view event bugfix 2015-12-22 15:27:12 +01:00
hkernbach 3946ba265d web ui database view tiles event fix 2015-12-22 12:21:55 +01:00
hkernbach 7053d0d727 grunt build 2015-12-21 18:03:38 +01:00
hkernbach 185907c859 web ui database view used wrong id for binding events 2015-12-21 13:33:51 +01:00
hkernbach 374bdde9e4 web ui user management click event fix 2015-12-21 13:22:29 +01:00
hkernbach 10a736ed2a web ui dashboard broken url fix 2015-12-21 13:03:02 +01:00
hkernbach cd24e847c5 webui dashboard css fix 2015-12-21 13:02:54 +01:00
Jan Steemann 3cfd8214a9 handle id and isSystem when creating collections 2015-12-18 20:16:39 +01:00
hkernbach e2b3b16bf1 scss 2015-12-18 18:35:35 +01:00
hkernbach d004147a5c webui select2 modal fix 2015-12-18 18:35:30 +01:00
hkernbach 8d03d78c81 webui accordion fix 2015-12-18 18:35:25 +01:00
hkernbach 96d847cefa webui select2 modal fix 2015-12-18 18:35:20 +01:00
Michael Hackstein 27340deac3 Generated file 2015-12-18 16:18:19 +01:00
jsteemann fb908043ac truncate long objects 2015-12-17 22:14:52 +01:00
Jan Steemann b76c61adb1 \0 fix 2015-12-17 12:28:16 +01:00
jsteemann d0d8ec208d added derived file 2015-12-16 19:51:31 +01:00
Wilfried Goesgens ffc75f9a7a autobuilt files 2015-12-16 15:05:43 +01:00
Jan Steemann 8e18d6463f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-12-16 11:44:56 +01:00
Alan Plum b61d08efce applicationContext.foxxFilename -> applicationContext.fileName 2015-12-16 01:57:30 +01:00
hkernbach 2de1bd1ccd grunt build 2015-12-15 17:03:36 +01:00
Jan Steemann 8ed8681505 updated module name 2015-12-15 16:15:26 +01:00
Alan Plum ab0d436a3f Merge pull request #1608 from arangodb/npm-scopes 
NPM scopes (org/arangodb -> @arangodb)
 2015-12-15 15:52:36 +01:00
Alan Plum 8853ede355 org/arangodb -> @arangodb 2015-12-15 15:51:44 +01:00
hkernbach d56d09c5fb gv disabled zoom 2015-12-15 15:47:33 +01:00
hkernbach 603a176f1e gv css 2015-12-15 15:47:24 +01:00
hkernbach 6ba48c85cc web ui frame view 2015-12-15 15:47:08 +01:00
hkernbach 821b807484 webui: gv remembers now coloring and labels 2015-12-15 15:46:53 +01:00
Jan Steemann b123ffbe26 issue #1610 2015-12-15 15:41:50 +01:00
jsteemann c043f9301c changed error message 2015-12-15 13:13:31 +01:00
hkernbach dd922b3daa graph editor now using the global doc editor for nodes and edges 2015-12-14 17:15:49 +01:00
Jan Steemann 8e7ac689a2 issue #1606: fail gracefully on invalid index definitions 2015-12-14 16:58:05 +01:00
jsteemann 600c48375d added optimizer rule `sort-in-values` 2015-12-13 23:33:44 +01:00
Jan Steemann ca9a25951b removed console.log 2015-12-11 13:44:34 +01:00
Alan Plum a900077938 Lint 2015-12-11 13:35:25 +01:00
Alan Plum d93e1e91e8 User app should also not hardcode collections 2015-12-11 13:23:50 +01:00
Jan Steemann fcf978a422 do not print overly long string values 2015-12-10 17:06:25 +01:00
Alan Plum 58cf3a60cd Don't use Foxx.Repository for system sessions 
Fetching the collection dynamically helps avoid an error when the collection is removed and recreated after the app is mounted.
 2015-12-10 12:02:29 +01:00
Jan Steemann f71eefce09 updated generated files 2015-12-09 19:03:37 +01:00
Jan Steemann fec29ac9c8 better compaction diagnostics 2015-12-09 19:02:22 +01:00
Jan Steemann 61dbdc03f1 added derived file 2015-12-09 13:21:12 +01:00
jsteemann 2fe6df20e3 added derived file 2015-12-08 22:58:10 +01:00
hkernbach 711e2efa3e issue: #1597 2015-12-08 14:54:05 +01:00
hkernbach 89fd6bd932 added filesize.js library 2015-12-08 14:53:49 +01:00
Jan Steemann 3ba1668473 added derived file 2015-12-08 14:51:20 +01:00
hkernbach a5fd77f789 updated imagemin version 2015-12-08 11:28:55 +01:00
Jan Steemann 6a87d8f12f added pow function 2015-12-07 18:43:06 +01:00
Jan Steemann fd18efa94e fixed cluster frontend 2015-12-07 11:19:32 +01:00
Jan Steemann 06e43fc5cb fixed explainer output for traversals 2015-12-03 14:16:01 +01:00
Jan Steemann 6c1717ec90 updated keywords list 2015-12-03 12:11:52 +01:00
Jan Steemann d572f3ed03 Merge branch 'aql-multi-modify' of https://github.com/arangodb/arangodb into devel 2015-12-03 11:38:30 +01:00
jsteemann 10a3480c35 added derived file 2015-12-03 11:25:42 +01:00
Michael Hackstein 3ea14e66a3 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-03 10:19:17 +01:00
jsteemann 9fa0f6d3a7 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-multi-modify 2015-12-02 16:38:50 +01:00
Jan Steemann 87082046b4 added derived file 2015-12-02 15:47:40 +01:00
Michael Hackstein 1d73c37312 Added generated explainer file for frontend 2015-12-02 13:37:33 +01:00
Alan Plum a1896e6dd7 Rebuild aardvark 2015-12-01 19:53:34 +01:00
Wilfried Goesgens 4b861dd44a Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-12-01 16:37:06 +01:00
Jan Steemann 69fe6bf257 updated documentation 2015-12-01 12:13:15 +01:00
Jan Steemann ae8904a5b6 added async flag for sync() and syncCollection() 2015-12-01 12:04:40 +01:00
hkernbach 6d25ac57e9 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-01 11:25:58 +01:00
Jan Steemann 459d15bb2c added cluster execution site info in explain output for AQL queries 2015-12-01 10:30:13 +01:00
jsteemann 49af794f5d Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-multi-modify 2015-12-01 01:56:46 +01:00
Michael Hackstein e9a36a3fbf Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-30 14:17:44 +01:00
Jan Steemann b71d0fdcd4 rebuilt replication front end 2015-11-30 13:13:23 +01:00
hkernbach ac8542fe07 Merge branch 'JHMH' of github.com:arangodb/arangodb into JHMH 2015-11-27 14:58:00 +01:00
hkernbach 7dd817417f jslint 2015-11-27 14:57:51 +01:00
Wilfried Goesgens bab9d07bad fresh swagger. 2015-11-27 13:24:18 +01:00
Jan Steemann a828707909 added derived file 2015-11-27 11:59:59 +01:00
Wilfried Goesgens 55b8fb0c6f Fix links not to point to .html - .md is right, else the non-html generators won't work properly. 2015-11-27 11:51:29 +01:00
Michael Hackstein a93fcac0e8 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-27 09:29:01 +01:00
Wilfried Goesgens aae19ff291 Fix dangling anchors and add checker script to the make target. 2015-11-26 18:51:39 +01:00
Wilfried Goesgens de76c096c9 Adjust explainer to new simple expressions; linting. 2015-11-25 16:50:23 +01:00
hkernbach 8a6942a299 changed graph delete example to also remove graph collections 2015-11-24 18:04:47 +01:00
hkernbach fae01d6c41 webui: delete graphs with dropCollections attribute, usability 2015-11-24 17:38:41 +01:00
hkernbach d7f8990eee added documentation link to example graphs setup 2015-11-24 15:58:01 +01:00
hkernbach 8e6bdaec65 added example graphs to webui 2015-11-24 15:35:44 +01:00
hkernbach 94d2e83981 added example graph route to aardvark 2015-11-24 15:35:01 +01:00
hkernbach 2d417e393d Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-24 13:24:12 +01:00
hkernbach 4ecd633f31 grunt build 2015-11-20 21:27:46 +01:00
hkernbach 3a7a31b850 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-11-20 21:25:14 +01:00
hkernbach ffbf9d57e8 queries started with webui are now cancelable 2015-11-20 21:25:03 +01:00
hkernbach 6f4a512a4b scss 2015-11-20 21:24:16 +01:00
hkernbach 297cdd6fb6 added some functions to progressView 2015-11-20 21:23:48 +01:00
jsteemann bcf29c0f7d added derived files 2015-11-20 21:01:25 +01:00
hkernbach e2241a77b8 navigation bugfix wenn rendering query management view first 2015-11-20 19:40:48 +01:00
hkernbach b391619b6b frontend dashboard replication status 2015-11-20 16:16:31 +01:00
hkernbach 7bf94c43b4 scss lint 2015-11-20 15:21:07 +01:00
hkernbach 922782c13f removed unnecessary parameter in explainer function 2015-11-20 15:20:26 +01:00
Jan Steemann f36cbc8eab added traversal-related keywords 2015-11-19 14:19:09 +01:00
jsteemann c6894549c7 updated AQL templates and keywords 2015-11-18 23:24:10 +01:00
jsteemann cb62c657e0 initial commit 2015-11-18 17:46:19 +01:00
Wilfried Goesgens 58dbbda09c Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-18 17:31:00 +01:00
Jan Steemann 23a1782bd8 use options 2015-11-18 17:30:46 +01:00
Michael Hackstein 7a36bbb43f Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-18 13:58:47 +01:00
hkernbach abaabb0de8 web ui added replication statistics 2015-11-17 20:37:27 +01:00
hkernbach a574f6bdac grunt build 2015-11-17 13:58:51 +01:00
hkernbach 9ac97807a4 added bind parameters to system example queries 2015-11-17 13:57:34 +01:00
hkernbach 466cd5b3fe added bind params to query editor template 2015-11-17 13:32:33 +01:00
hkernbach 068bee4c80 explain bind param support, view + aardvark 2015-11-17 13:24:21 +01:00
Jan Steemann f9ba16f8d4 fixed explainer indentation 2015-11-17 11:31:06 +01:00
Wilfried Goesgens 2d5d2d881e Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-11 11:05:06 +01:00
hkernbach 1a17c14d6e small fix using bind parameters in aql editor 2015-11-10 10:43:02 +01:00
hkernbach 3ae8eed4cb frontend grunt build 2015-11-06 20:23:22 +01:00
hkernbach 45d153ca91 added support for bind params in the frontend aql editor, issue: #1563 2015-11-06 20:21:08 +01:00
Wilfried Goesgens 7a54982eb4 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-06 13:53:21 +01:00
Jan Steemann 62195e5f09 added derived file 2015-11-05 10:59:01 +01:00
Wilfried Goesgens 179660e87c Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-04 17:07:09 +01:00
Jan Steemann 3eb6794d8f added derived file 2015-11-03 10:21:34 +01:00
Frank Celler e87cdafe73 reverted abe72bec38, fb0a309b3c, f28e829586 because of missing CLA 2015-11-03 10:19:28 +01:00
hkernbach 699e2051c8 grunt build 2015-11-03 10:19:28 +01:00
hkernbach 22288b3d40 optimized graph invalid edge error message 2015-11-03 10:19:27 +01:00
hkernbach c88ab6b49c graph viewer now able to throw some errors/notifications 2015-11-03 10:19:25 +01:00
hkernbach 3632d1e44c updated scss-lint.yml 2015-11-03 10:19:23 +01:00
hkernbach 8bba3a795a grunt build 2015-10-30 10:27:11 +01:00
hkernbach f647212224 merge 2015-10-30 10:20:00 +01:00
hkernbach 4940c80d88 optimized notifications, removed bug in document editor, css fixes 2015-10-30 10:17:53 +01:00
Jan Steemann 10612184ee added derived file 2015-10-30 10:12:34 +01:00
Frank Celler 55e940c1cd reverted 2070d7bd47 because of missing cla 2015-10-29 20:02:39 +01:00
Wilfried Goesgens bb9039c855 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-10-29 16:01:01 +01:00
Jan Steemann 01499dde43 added deadlock detection for lazy locking of collections 2015-10-29 11:57:22 +01:00
Wilfried Goesgens 327b408a22 Start implementing early filtering of paths to exclude from the result 2015-10-28 12:37:13 +01:00
Wilfried Goesgens 951165ab1e Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 
Conflicts:
	arangod/Aql/grammar.cpp
	arangod/Aql/grammar.h
	js/common/modules/org/arangodb/graph-examples/example-graph.js
 2015-10-28 11:08:18 +01:00
hkernbach 9a25bc2783 edited graph edit modal, js+css 2015-10-27 13:58:44 +01:00
hkernbach ea6903ee33 issue #1537: from and to vertices always visible 2015-10-23 18:53:59 +02:00
hkernbach a4bdf8d38c grunt build 2015-10-23 18:27:13 +02:00
hkernbach 7caac2edae webui: added some cursors to indicate actions 2015-10-23 18:24:46 +02:00
Jan Steemann afc3de16ed re-grunted 2015-10-23 14:03:08 +02:00
Jan Steemann 731fb9e1c5 moved frontend files 2015-10-23 14:02:08 +02:00
Jan Steemann 0d2197e77f changed documentation for index creation methods 2015-10-21 14:59:45 +02:00
Wilfried Goesgens dae95de667 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-10-21 14:54:01 +02:00
Jan Steemann 4edc3d11f5 re-grunted 2015-10-21 13:07:30 +02:00
Jan Steemann 74edccbcde Merge branch 'aql-jmmh-conditions' of https://github.com/arangodb/arangodb into devel 2015-10-21 12:56:51 +02:00
Jan Steemann 3396214a63 added db._explain() convenience function 2015-10-21 12:52:40 +02:00
Jan Steemann 509ab83ed5 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-21 10:18:16 +02:00
Alan Plum f40cb79040 Fix internal session storage lastAccess for non-system apps 2015-10-20 19:29:20 +02:00
hkernbach 179ecd341b added html cluster min files 2015-10-20 18:14:07 +02:00
hkernbach 86e4bf1a3a added missing cluster minify option 2015-10-20 18:13:16 +02:00
hkernbach 2191a89f6f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-10-20 17:06:40 +02:00
hkernbach 74bca104e5 issue: 1515, fixed 2 and changed text 2015-10-20 17:03:59 +02:00
Jan Steemann 813048592e fixed scss building 2015-10-20 12:50:15 +02:00
Jan Steemann 1f8b5e54af Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-20 12:34:33 +02:00
hkernbach 84b32587f5 issue: #1509, temp. disabled gv outbound connections 2015-10-20 10:57:28 +02:00
Jan Steemann d6cad3bac6 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-19 18:55:36 +02:00
Wilfried Goesgens 30be20224e Fix fluent AQL interface for fromVertices with arrays: need to use 'ArrayVariable [ * RETURN MERGE(CURRENT, other)]' instead of MERGE(ArrayVariable, other) 2015-10-19 16:40:39 +02:00
jsteemann 82b3acdf17 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-16 22:50:32 +02:00
hkernbach 6005d3098e frontend cleanup & grunt build 2015-10-16 19:34:54 +02:00
hkernbach 557c1952aa removed not needed templates 2015-10-16 16:54:39 +02:00
hkernbach 0225c4d982 grunt cleanup & optimization 2015-10-16 13:47:03 +02:00
Jan Steemann 0ffb11c25e do not use sparse indexes for sorting 2015-10-14 12:03:52 +02:00
Jan Steemann 8f150e942e Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 
Conflicts:
	CHANGELOG
 2015-10-14 09:57:24 +02:00
hkernbach 3f4e6cb982 grunt build 2015-10-14 00:42:30 +02:00
hkernbach 81df6ddda1 cleanup web interface 2015-10-14 00:36:05 +02:00
Jan Steemann bb0051b739 fixed hard-coded `incremental` parameter in shell implementation of `syncCollection` function in replication module 2015-10-13 09:33:15 +02:00
jsteemann 29b3741156 reworked cost calculations 2015-10-12 22:23:03 +02:00
Jan Steemann ffa777979c make IN values unique and sort em 2015-10-12 15:34:41 +02:00
Jan Steemann 8c6d284cc3 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-09 16:17:18 +02:00
Jan Steemann e49064e5c4 hide `fm` variable in web interface shell 2015-10-09 15:25:56 +02:00
Jan Steemann e71dde08b7 added derived files 2015-10-09 14:28:02 +02:00
Jan Steemann 23ae3a9693 fixes for front end 
Conflicts:
	js/apps/system/_admin/aardvark/APP/GruntFile.js
 2015-10-09 14:26:46 +02:00
Frank Celler a85c44b25e removed commented out lines, less verbose help 2015-10-09 13:51:18 +02:00
hkernbach 6cc0d4d184 new webui grunt build 2015-10-09 10:30:14 +02:00
Jan Steemann 7bfbbfd77f Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-09 09:42:28 +02:00
Jan Steemann d572655d84 fixed compile warning 2015-10-08 16:28:04 +02:00
Jan Steemann 6a4e9658c5 fixes for explainer and condition 2015-10-08 16:22:52 +02:00
Jan Steemann 0d80a17002 generalize condition handling 2015-10-08 15:10:28 +02:00
hkernbach d066a4283c issue: #1446 2015-10-08 14:02:36 +02:00
Jan Steemann a1de2bfcc1 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 
Conflicts:
	CHANGELOG
 2015-10-07 10:18:21 +02:00
Alan Plum ea44c7710c Rebuild aardvark 2015-10-06 16:35:00 +02:00
Alan Plum 3325d46211 Unbreak aardvark shell 2015-10-06 16:18:23 +02:00
Jan Steemann 7d4c379598 small modifications, temporarily disabled interchange-adjacent-enumerations 2015-10-02 19:53:35 +02:00
Jan Steemann 8247ec0dff Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-02 12:59:13 +02:00
hkernbach db7533acf8 jslint fix 2015-10-02 10:23:08 +02:00
hkernbach 3beb6a280f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-10-02 10:02:30 +02:00
hkernbach 51a20beef3 graph test view 2015-10-02 10:02:25 +02:00
Jan Steemann 4175463248 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-01 16:00:13 +02:00
Wilfried Goesgens c9cee71b2c Fresh swagger docu 2015-10-01 13:30:55 +02:00
Wilfried Goesgens aa12514b5c Fix links; currently links in REST-documentation only work in the RESTDESCRIPTION :-( 2015-10-01 13:30:55 +02:00
Jan Steemann 9205739f6a added IndexNode 2015-09-30 14:10:04 +02:00
Jan Steemann 1ee1a87ae0 return proper errors to caller 2015-09-30 13:49:03 +02:00
Jan Steemann 3b0b04b179 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-29 14:59:03 +02:00
Jan Steemann 96d8c24c61 fix app thumbnails 2015-09-29 14:58:35 +02:00
Frank Celler f8c79f1ab0 added ARANGODB_DEFAULT_ROOT_PASSWORD 2015-09-29 13:15:25 +02:00
Jan Steemann 7bd9f03cb1 issue #1510: Fix bug in the user app's storage in resolve function 2015-09-28 12:54:04 +02:00
Alan Plum 8c24b0c28b Fixed missing thumbnail 2015-09-25 16:40:03 +02:00
Jan Steemann 3ce21453c3 added derived files 2015-09-25 16:01:36 +02:00
Jan Steemann ace5bd8ec2 some fixes for the web interface 2015-09-25 16:01:13 +02:00
Jan Steemann 0ebf0be777 fixed Gruntfile to include cluster stuff 2015-09-25 15:07:24 +02:00