1
0
Fork 0
Commit Graph

10257 Commits

Author SHA1 Message Date
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
Kaveh Vahedipour cdc37d65fc Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-03-29 15:50:32 +02:00
Kaveh Vahedipour 1154a0db96 bug in increment and decrement in agency solved. 2016-03-29 15:49:33 +02:00
Kaveh Vahedipour a48b795b44 bug in increment and decrement in agency solved. 2016-03-29 15:48:49 +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
Kaveh Vahedipour 0257162f82 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-29 14:13:12 +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
Kaveh Vahedipour 7959f01d4a Merge branch 'agency' of https://github.com/arangodb/arangodb into agency 2016-03-29 11:10:24 +00:00
hkernbach 06e40476f7 frontend memory issue #1717 2016-03-29 11:01:32 +02:00
Jan Steemann ecf2deadb8 jslint 2016-03-24 19:35:37 +01:00
Kaveh Vahedipour 1f9e40fbf6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-24 17:54:13 +01:00
Kaveh Vahedipour afad06d1d0 updating tests 2016-03-24 17:54:02 +01:00
Andreas Streichardt 9ba72b4412 Properly update current collection 2016-03-24 16:55:15 +01:00
Andreas Streichardt 3f9f03bb38 Remove debug 2016-03-24 14:26:12 +01:00
Kaveh Vahedipour 8bc6d193c4 Remerge from devel into agency for integration into cluster 2016-03-24 11:17:59 +01:00
Andreas Streichardt 8cdf8eebad More python fixes 2016-03-23 18:36:22 +01:00
Kaveh Vahedipour 7254ad4c9e Fixing issues 2016-03-23 15:16:47 +01:00
Kaveh Vahedipour 9677db67a6 turning off lights in agency? 2016-03-23 11:44:46 +01:00
Michael Hackstein 46f4d627e6 Added some tests for Traversals in subqueries 2016-03-23 11:03:54 +01:00
Kaveh Vahedipour e3cc35ccf6 pulling into devel 2016-03-23 08:43:06 +01:00
Kaveh Vahedipour ccb517fac7 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-22 08:15:33 +01:00
Kaveh Vahedipour 4a86d26f19 need to find out how to define the headers properly 2016-03-21 18:23:14 +01:00
Frank Celler ad5828f122 fixed shebang test 2016-03-21 12:04:05 +01:00
Kaveh Vahedipour 2583c00859 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-21 10:41:15 +01:00
Kaveh Vahedipour eba9a26891 writing test 2016-03-21 08:42:35 +01:00
Kaveh Vahedipour 3beb3450b1 catch malformed input. 2016-03-21 08:00:54 +01:00
Frank Celler 34164794cf fixed call 2016-03-20 22:26:02 +01:00
Frank Celler d3658aefe6 fixed valgrind 2016-03-20 21:28:27 +01:00
Frank Celler b736282bbc fixed non shebang 2016-03-20 18:56:50 +01:00
Frank Celler c2451cbf02 added missing wait 2016-03-20 13:31:13 +01:00
Frank Celler e6e367c1ca fixed chmod 2016-03-19 23:21:59 +01:00
Frank Celler 6dd99abe65 flag --skipShebang 2016-03-19 20:57:21 +01:00
Frank Celler 9707129b2f fix for travis 2016-03-19 19:38:33 +01:00
Frank Celler 6fa973d87d added shebang test 2016-03-19 16:17:55 +01:00
Frank Celler 3fb8685d09 only run suites if the exists 2016-03-18 21:18:03 +01:00
Frank Celler 5a1e8fd6fe Merge branch 'devel' of github.com:arangodb/arangodb into v8 2016-03-18 20:20:15 +01:00
Frank Celler e51e764fb5 added ruby locator 2016-03-18 20:18:15 +01:00
Kaveh Vahedipour 3d3fb23a62 writing test 2016-03-18 18:59:06 +01:00
Frank Celler a7361dca7f added rspec option 2016-03-18 18:33:36 +01:00
jsteemann f12320277f bugfixes 2016-03-18 16:56:05 +01:00
Frank Celler 33e2b7b844 Merge branch 'devel' of github.com:arangodb/arangodb into v8 2016-03-18 15:35:01 +01:00
Andreas Streichardt f37b8cbcf3 Disable loopfunc warnings (not helpful..decided in quorum) 2016-03-18 10:58:50 +00:00
Frank Celler def5b35a84 jslint fixes 2016-03-18 11:02:42 +01:00
Frank Celler 6d19bdbbfe Merge branch 'devel' of github.com:arangodb/arangodb into v8 2016-03-18 09:50:20 +01:00
Frank Celler 970f38390b removed transaction key 2016-03-18 09:34:49 +01:00
Andreas Streichardt 14ce41435b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-17 22:40:00 +00:00