1
0
Fork 0
Commit Graph

10009 Commits

Author SHA1 Message Date
Michael Hackstein 36affeb5d7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-17 21:32:27 +01:00
Heiko Kernbach 286bcc658a notification prep. + karma fix 2014-02-17 16:46:15 +01:00
gschwab cecb40147d path fixed 2014-02-17 16:43:13 +01:00
Heiko Kernbach ee6fb3c2e6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-17 16:38:00 +01:00
Heiko Kernbach 899fa52876 added api-cmd for getting a complete user list 2014-02-17 16:37:50 +01:00
Frank Celler a0acc15808 put into separat scripts to hunt down travis problems 2014-02-17 16:19:44 +01:00
Frank Celler 9c4dafebf1 put into separat scripts to hunt down travis problems 2014-02-17 16:12:29 +01:00
Claudius Weinberger c5359c18b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-17 15:19:41 +01:00
Heiko Kernbach c9193d153f removed obsolesce test 2014-02-17 11:55:22 +01:00
Heiko Kernbach 238396e3c4 prep for new notifications, cleanup 2014-02-17 11:47:58 +01:00
Jan Steemann c40d930fa6 issue #765: added SLICE AQL function 2014-02-17 11:09:03 +01:00
gschwab 067a202104 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-17 08:57:27 +01:00
gschwab 5e90b2fe04 added user and statistic view (fakey and inactive) 2014-02-17 08:57:17 +01:00
Claudius Weinberger 8aedfd55db Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-15 23:45:13 +01:00
Frank Celler 99fbffadf7 fixed noinst 2014-02-15 23:38:25 +01:00
Claudius Weinberger 5db76f75fa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-15 23:35:53 +01:00
Frank Celler 73f2be8a33 removed check-server 2014-02-15 23:34:24 +01:00
Claudius Weinberger b26b0ed05f Layout CollectionOverView changed 2014-02-15 23:34:15 +01:00
Heiko Kernbach 2f96ac70ad new model for notification 2014-02-14 20:45:00 +01:00
Heiko Kernbach 04ab98b133 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-14 20:43:25 +01:00
Heiko Kernbach bcf587847a karma 2014-02-14 20:43:01 +01:00
Jan Steemann 89d96c6c3b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-14 18:47:59 +01:00
Jan Steemann ec0ad56f8e fix potentially dangerous function 2014-02-14 18:47:41 +01:00
Frank Celler 38cffe5401 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-14 16:52:13 +01:00
Frank Celler ddfbe9d8f9 ignore helper files 2014-02-14 16:52:01 +01:00
Heiko Kernbach 5a2a5508ef added new collection/model for notifications 2014-02-14 16:51:57 +01:00
Frank Celler 6d51527fb5 check for drive letter 2014-02-14 16:51:40 +01:00
Esteban Lombeyda e958f6052a Icon Bug fix 2014-02-14 15:12:12 +01:00
Esteban Lombeyda d6094cf5de Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-13 16:41:38 +01:00
gschwab 2111c7a98e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-13 16:35:28 +01:00
gschwab 8d8476834e tests fixed 2014-02-13 16:35:18 +01:00
Esteban Lombeyda 6ccfa1aad2 starting and killing of windows process was implemented 2014-02-13 16:30:31 +01:00
Frank Celler 6e588b468a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-13 16:26:07 +01:00
Frank Celler 2a731eee62 fixed ctrl-z 2014-02-13 16:25:50 +01:00
gschwab df7932f7ca tools dropdown fixed 2014-02-13 16:15:53 +01:00
gschwab 2bb45f052c resized page margins 2014-02-13 15:37:39 +01:00
Frank Celler 16f7d558ba added node modules semver, numeral, moment, marked 2014-02-13 15:31:48 +01:00
Michael Hackstein 0474d47a1e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-13 15:12:56 +01:00
gschwab 485958a2a2 tests fixed 2014-02-13 13:10:54 +01:00
gschwab 87a1b531e7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-13 12:55:07 +01:00
gschwab 4fefdeba7f dropdown menues fixed 2014-02-13 12:55:01 +01:00
Frank Celler 7a3176ac8d use new readline per default for mac 2014-02-13 11:03:48 +01:00
gschwab 30b9f20250 Highlighting for dropdown item fixed 2014-02-13 09:29:05 +01:00
gschwab ee1ec1b08a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-13 08:45:19 +01:00
gschwab c58342f08a changed 'blubber' to 'Tools' 2014-02-13 08:43:19 +01:00
Frank Celler 89b6ca0ba3 fixed test setup 2014-02-12 22:04:19 +01:00
gschwab 0d2f3b945f karma configuration fixed 2014-02-12 14:44:53 +01:00
gschwab ae3fa2ec77 more tests fixed 2014-02-12 14:36:27 +01:00
gschwab a21d499e51 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-12 14:12:40 +01:00
gschwab 6d55f35058 fixed test 2014-02-12 14:12:18 +01:00