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

8897 Commits

Author SHA1 Message Date
Jan Steemann c9299d8ad5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-11-07 13:32:53 +01:00
Jan Steemann 819e9a1cb6 fixed user creation on database creation 2013-11-07 13:32:42 +01:00
Frank Celler ce25e9dbc8 Merge remote-tracking branch 'origin/1.4' into devel 2013-11-07 12:06:30 +01:00
Frank Celler a68a5d7fa9 fixed wrong replace for SYSCONFDIR, fixed wrong config file 2013-11-07 11:04:54 +00:00
Frank Celler 44ccf72f6c Merge remote-tracking branch 'origin/1.4' into devel 2013-11-06 23:35:52 +01:00
Frank Celler aa9bae1daa fixed test for sh 2013-11-06 22:34:53 +00:00
Frank Celler 5e2e2d0136 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	Makefile.in
 2013-11-06 23:30:43 +01:00
Frank Celler 7cbbdb8088 Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-11-06 22:29:25 +00:00
Frank Celler d5d56cc5f6 fixed hash bang and test 2013-11-06 22:29:08 +00:00
Frank Celler 8263781a2d fixed hash bang and test for sh 2013-11-06 23:03:57 +01:00
Frank Celler 2ee6ce33c5 config for ARM 2013-11-06 18:39:44 +01:00
Frank Celler a130e205db Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-11-06 17:09:33 +01:00
Frank Celler bae8bb1d97 use recursive make to reload changes 2013-11-06 17:08:54 +01:00
Frank Celler 8856a93455 fixed permissions 2013-11-06 16:03:47 +00:00
Frank Celler a18beb9741 generated arm conf files 2013-11-06 16:49:16 +01:00
Jan Steemann c46d6b99f4 add users when creating a database 2013-11-06 16:48:18 +01:00
Frank Celler 62cc9cf84b Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-11-06 16:44:52 +01:00
Frank Celler 0d844c3f06 generated arm conf files 2013-11-06 16:44:46 +01:00
Michael Hackstein 7bcb02f3eb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-11-06 15:46:10 +01:00
Michael Hackstein b23e163f60 Added selection view css 2013-11-06 15:46:05 +01:00
Jan Steemann fabf66d77c changed return codes 2013-11-06 11:24:13 +01:00
Jan Steemann 1d8d26b7ab added test 2013-11-06 09:34:51 +01:00
Jan Steemann d30ca7b658 added `/_api/database/user` method 2013-11-06 09:34:44 +01:00
Jan Steemann 8382e5dbb6 flush authentication cache 2013-11-06 09:33:56 +01:00
Jan Steemann 21360bfc25 free json in case of error 2013-11-06 09:33:40 +01:00
Frank Celler 0ad11bfc06 removed daemon mode when upgrading, added arm building 2013-11-06 09:16:18 +01:00
Frank Celler 6806d213b1 no daemon when upgrading 2013-11-06 09:07:12 +01:00
Michael Hackstein cb7d9d5744 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-11-05 16:22:38 +01:00
Michael Hackstein e118ba2e74 Added selection box in Admin interface to switch between databases. The user will only see databases where he has access to 2013-11-05 16:21:17 +01:00
Frank Celler 44e3c2fe10 Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-11-05 15:13:36 +00:00
Frank Celler 434ac7f921 fixed path, added exec, excluded databases 2013-11-05 15:13:30 +00:00
Frank Celler 870276dcce added package type 2013-11-05 15:24:31 +01:00
Jan Steemann 96dc8e3879 free json in case of error 2013-11-05 12:42:50 +01:00
Jan Steemann 984e3c4853 added const 2013-11-05 10:58:33 +01:00
Jan Steemann c5619d0795 removed unused resolver 2013-11-05 10:52:00 +01:00
Jan Steemann 90e7ea3f97 typecasts 2013-11-05 10:19:21 +01:00
Michael Hackstein ed46b28f7c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-11-04 23:01:36 +01:00
Michael Hackstein 792845af35 Moved resize check from navigation to router. And improved rendering of footer 2013-11-04 23:01:29 +01:00
Jan Steemann 9e78ab5af5 added NTH and POSITION 2013-11-04 18:24:03 +01:00
Jan Steemann 6c0a452c98 flush authentication cache 2013-11-04 17:43:57 +01:00
Jan Steemann 670393f660 updated CHANGELOG 2013-11-04 17:33:50 +01:00
Michael Hackstein 172e23e310 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-11-04 16:31:26 +01:00
Michael Hackstein 60026f40f2 Removed debug console.log in tests 2013-11-04 16:31:20 +01:00
Michael Hackstein 62da3a22a2 Started wrapping EJS in several view 2013-11-04 16:30:58 +01:00
Michael Hackstein bb8c34620f Finally managed to setup a karma server able to test EJS templates and everything yeah. However EJS has to be wrapped for this testing 2013-11-04 16:16:11 +01:00
Jan Steemann 834d1f2a22 updated CHANGELOG 2013-11-04 14:31:45 +01:00
Jan Steemann 37b49c2769 added test 2013-11-04 14:23:30 +01:00
Jan Steemann 7924f657d4 added `/_api/database/user` method 2013-11-04 14:22:00 +01:00
Jan Steemann 935d1edd53 issue #653: slow query 2013-11-04 13:33:26 +01:00
Michael Hackstein 48a10787a2 GraphViewer: it is now selectable to use the label for colouring. Setup is now consistent with run-time configuration 2013-11-04 12:24:01 +01:00