1
0
Fork 0
Commit Graph

10971 Commits

Author SHA1 Message Date
Alan Plum 2bd0f59d9d
Bump jshint to 2.9.2 2016-05-02 14:42:09 +02:00
Alan Plum f81c946fd7
app -> service 2016-05-02 14:42:08 +02:00
Alan Plum ea7ff40a9c
Warn when specifying manifest.engine 2016-05-02 14:42:08 +02:00
hkernbach 1242eb156e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 14:39:23 +02:00
hkernbach f119e27822 hotkeys 2016-05-02 14:27:45 +02:00
Andreas Streichardt 60cf2c6357 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 14:18:44 +02:00
hkernbach 5749761a1e scss 2016-05-02 14:05:55 +02:00
hkernbach e488451142 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 14:03:43 +02:00
hkernbach b3c16e6659 query editor usability 2016-05-02 14:03:34 +02:00
Andreas Streichardt 5d7b8acba0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 14:00:50 +02:00
Andreas Streichardt 974ecdc208 Implement Current callback 2016-05-02 14:00:26 +02:00
Jan Steemann 4a8052e309 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-02 13:29:46 +02:00
Jan Steemann 2b0f3f7b57 change behavior of arithmetic operators, TO_STRING and TO_NUMBER 2016-05-02 13:29:29 +02:00
jsteemann fb912c28b6 jslint 2016-05-02 13:19:22 +02:00
Andreas Streichardt b1d4a9d9d7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 12:21:00 +02:00
Andreas Streichardt 18ea698038 Restructure code so that the installed versions are being returned by
the plan changer
2016-05-02 12:19:07 +02:00
hkernbach 043c1f1222 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 10:34:17 +02:00
hkernbach ebfa590e76 query view template 2016-05-02 10:33:54 +02:00
Alan Plum 081a6f6a7f
Collection session storage should autoUpdate by default 2016-05-02 10:29:23 +02:00
hkernbach 16fea155d3 query editor bugfix 2016-05-02 09:14:33 +02:00
hkernbach 75c2b763a0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-01 15:35:47 +02:00
jsteemann c7490a211c added fail() to tests 2016-05-01 14:46:59 +02:00
jsteemann 9c1e0fc2c6 micro optimizations 2016-05-01 14:13:34 +02:00
hkernbach 3fd54ef54a grunt 2016-04-30 00:42:58 +02:00
hkernbach 060b342f2b shortcut view 2016-04-30 00:41:04 +02:00
hkernbach 07104e02ff grunt build 2016-04-30 00:04:03 +02:00
hkernbach 0822c1d505 changed version check style, bugfixes, scss 2016-04-29 23:58:30 +02:00
hkernbach 82126f7ae9 frontend views, bugfixes 2016-04-29 22:14:29 +02:00
hkernbach b1162528be scss, error handling, notifications 2016-04-29 21:01:26 +02:00
hkernbach 5adf32b4b9 jslint 2016-04-29 19:53:12 +02:00
hkernbach 6f78846600 added a frontend event listener 2016-04-29 19:49:46 +02:00
hkernbach 5a3e931418 user management error handling, query editor, spotlight function 2016-04-29 19:12:46 +02:00
Max Neunhoeffer 907edaf5ac Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-29 18:38:13 +02:00
Max Neunhoeffer 79113bd4e9 Take external bootstrap out of testing.js. 2016-04-29 18:37:35 +02:00
hkernbach 037ec3007d query editor bugfix 2016-04-29 18:14:35 +02:00
hkernbach 18bde3282c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-29 17:03:24 +02:00
Max Neunhoeffer a8e70bd8fa Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-29 16:36:54 +02:00
Max Neunhoeffer 18b72dfdbe Fix cluster startup. 2016-04-29 16:36:41 +02:00
Alan Plum cc4ab07705
Session storage ttl should be specified in secs not mins 2016-04-29 16:36:26 +02:00
Alan Plum b83921bc62
jwt sessions: expiry -> ttl 2016-04-29 16:11:14 +02:00
hkernbach 23d780cf23 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-29 15:37:24 +02:00
hkernbach cddb11d315 added *.swp to gitignore 2016-04-29 15:37:15 +02:00
Alan Plum 841790e524
Unbreak HTTP tests 2016-04-29 15:33:17 +02:00
Alan Plum 61d35d5906
Add an errorNum to gharial ArangoErrors 2016-04-29 15:33:17 +02:00
jsteemann ea46d40bcd remove unused variable 2016-04-29 15:16:24 +02:00
Alan Plum fb2a9818e6
Session storages need both forClient and fromClient 2016-04-29 15:04:03 +02:00
Alan Plum 80dbea94a4
Make gharial behave better on errors again 2016-04-29 15:04:02 +02:00
jsteemann 3bb0f5fbe1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-29 14:52:30 +02:00
jsteemann ceb138d888 translate more errors 2016-04-29 14:30:11 +02:00
Max Neunhoeffer 0f981b560d Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-29 13:59:30 +02:00