1
0
Fork 0
Commit Graph

10808 Commits

Author SHA1 Message Date
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 ac29066808
Make aql global in arangosh 2016-04-20 15:23:05 +02:00
Alan Plum 2f2c7b5c12
Allow switching databases in login 2016-04-20 15:23:04 +02:00
Alan Plum 2b0c1f6f9a
_.extend -> Object.assign 2016-04-20 15:23:03 +02:00
Alan Plum 0fff3e661f
_.extend -> Object.assign 2016-04-20 15:23:03 +02:00
Alan Plum 249dddcdf4
Optionally auto-update collection sessions 2016-04-20 15:23:02 +02:00
Alan Plum e7c0a49cfb
Don't use session.userData in system, always update lastAccess 2016-04-20 15:23:01 +02:00
Alan Plum c23d73f78c
Aardvark should always expect auth 2016-04-20 15:23:01 +02:00
Alan Plum 50ae4804f6
Spacing 2016-04-20 15:23:00 +02:00
hkernbach cb8413f174 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-20 13:57:27 +02:00
hkernbach c6caacc474 modified grunt build 2016-04-20 13:56:45 +02:00
Alan Plum 95b9f8db7e
Nevermind that 2016-04-20 13:45:17 +02:00
Alan Plum 8b7a98f2e8
global.aqlQuery -> arangodb.aql 2016-04-20 13:05:27 +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 90bd28f5fb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-20 12:29:20 +02:00
hkernbach 54c8d4c700 foxx teardown route fix 2016-04-20 12:29:07 +02:00
jsteemann 9d258f47e0 added test case 2016-04-20 12:26: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
Alan Plum 2d44ff2839
Patch Swagger-UI to fix param.type undefined error
See https://github.com/swagger-api/swagger-ui/issues/2004
2016-04-19 18:39:22 +02:00
Jan Steemann 76fa336a3b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 18:19:21 +02:00
Jan Steemann 34923ff236 added "enabled" flag for statistics output 2016-04-19 18:19:07 +02:00
Alan Plum 494d5d5855
Foxx.getExports -> legacy 2016-04-19 18:16:18 +02:00
Alan Plum 17854b57a8
Formatting 2016-04-19 18:16:18 +02:00
Alan Plum 7b76519bbe
Allow res.throw(status, args) 2016-04-19 18:16:18 +02:00
Alan Plum 8a114a58d3
queues.js -> queues/index.js 2016-04-19 18:16:18 +02:00
Jan Steemann c091031ec7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 18:12:06 +02:00
Jan Steemann 54df0ecb5b fixed statistics 2016-04-19 18:11:55 +02:00
Andreas Streichardt f7a0b10a69 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 18:11:35 +02:00
Andreas Streichardt 95a6540c2e Fix core dump windows stuff 2016-04-19 18:11:18 +02:00
hkernbach 75df0f56f7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 18:02:08 +02:00
hkernbach 96d2348199 frontend, views, navbar 2016-04-19 18:01:31 +02:00
Michael Hackstein 95662103f2 Fixed JSLint 2016-04-19 17:39:58 +02:00
Michael Hackstein 1eb1e0ee0c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 17:08:21 +02:00
Michael Hackstein 2c246c860c Fixed a bug in general-graph module. It was possible to create a graph using document collections for relations. This did lead into undefined behaviour. 2016-04-19 17:07:18 +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
Alan Plum 64289b3895
I Shall Exterminate Everything Around Me 2016-04-19 16:12:19 +02:00
hkernbach 9ac9331072 nodes view 2016-04-19 16:05:29 +02:00
Jan Steemann 2254df14f0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 15:38:37 +02:00
Jan Steemann 2533affb02 fixed crash 2016-04-19 15:38:30 +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