Jan Steemann
1bdcc145b4
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
2014-02-21 17:44:53 +01:00
Jan Steemann
b35906f4eb
?como me llamo?
2014-02-21 17:43:08 +01:00
Jan Steemann
00d8a9023f
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
2014-02-21 17:40:38 +01:00
Jan Steemann
7a0aac82e2
re-create database objects on coordinator now, and switch into them
2014-02-21 17:40:00 +01:00
Guido Schwab
1dd358e5ec
restricted max length of db name in navbar - shortened
2014-02-21 16:43:15 +01:00
Guido Schwab
85d1f6af3d
restricted max length of db name in navbar - fixed caret
2014-02-21 16:38:39 +01:00
Guido Schwab
43e59bf946
restricted max length of db name in navbar
2014-02-21 16:18:46 +01:00
Max Neunhoeffer
267ee74d9a
Fix a namespace problem with a new file.
2014-02-21 16:11:00 +01:00
Guido Schwab
7e08be3f33
finally fixed links in DB-menu
2014-02-21 15:52:29 +01:00
Max Neunhoeffer
f7e57a5b47
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding
...
Conflicts:
js/apps/system/aardvark/frontend/scss/generated.css
js/apps/system/aardvark/manifest.json
lib/Rest/EndpointIp.cpp
lib/Rest/EndpointUnixDomain.cpp
lib/V8/v8-utils.cpp
2014-02-21 15:28:21 +01:00
Guido Schwab
cfb5ca5953
fixed links in DB-menu
2014-02-21 15:28:00 +01:00
Guido Schwab
0d44c33812
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-02-21 15:19:07 +01:00
Guido Schwab
afc41567da
some pixelpushing
2014-02-21 15:19:00 +01:00
Max Neunhoeffer
4e847c508c
Fix a comment.
2014-02-21 15:15:40 +01:00
Max Neunhoeffer
f3abfaa1b1
Fix a deadlock situation in the SimpleHttpClient if the server dies.
2014-02-21 15:14:43 +01:00
Jan Steemann
512999c030
updated manual
2014-02-21 15:04:40 +01:00
Jan Steemann
50b3ec2999
fixed compiler warnings
2014-02-21 14:45:15 +01:00
Jan Steemann
8a832fe815
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-02-21 14:44:59 +01:00
Jan Steemann
211b0da24b
moved options --server.reuse-address and --server.no-reuse-address into ApplicationEndpointServer
2014-02-21 14:44:18 +01:00
Max Neunhoeffer
db91b06f7b
Sort out logs directory in http/ssl server tests.
2014-02-21 14:21:56 +01:00
Heiko Kernbach
57caee1fa7
display status when document is saved
2014-02-21 14:21:01 +01:00
Max Neunhoeffer
b4bd5ce665
Improve logging.
2014-02-21 13:38:33 +01:00
Heiko Kernbach
df2cda71b4
max width for tooltips added
2014-02-21 13:28:28 +01:00
Max Neunhoeffer
91db141ea5
Change value of things in agency according to Sharding.md.
2014-02-21 13:19:57 +01:00
Heiko Kernbach
d3457e61eb
optimized notificatins
2014-02-21 12:49:42 +01:00
Max Neunhoeffer
76077f84e7
Report overall test result.
2014-02-21 12:44:31 +01:00
Heiko Kernbach
9e6ce24ac6
notificatin css update
2014-02-21 12:34:58 +01:00
Heiko Kernbach
14c9343e06
fixed wrong template name
2014-02-21 12:19:44 +01:00
Heiko Kernbach
5c1e74ccc3
fixed checkboxes in collectionsview-toggle-menue
2014-02-21 12:12:52 +01:00
Max Neunhoeffer
6a91ba63f2
Add a convencience script to run unittests as follows:
...
scripts/run scripts/unittest.js all
2014-02-21 11:26:29 +01:00
Max Neunhoeffer
3cb1784430
Reorganise unit tests.
...
In JS framework we now find the available test files by directory
listing. This means one can simply drop a file in the right
directory to add a test.
We use a naming convention for filenames which is explained
in the README files in the corresponding directories.
Old unit tests do not yet use this but do use the new names and
should still work as usual.
2014-02-21 11:24:31 +01:00
Heiko Kernbach
0ebf849509
merge conflict
2014-02-21 11:21:05 +01:00
Guido Schwab
eac41f5bd5
fixed wrong commit
2014-02-21 11:18:16 +01:00
Heiko Kernbach
8650ab9f99
merge conflict
2014-02-21 11:16:18 +01:00
Guido Schwab
07d3ec2cde
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-02-21 11:14:28 +01:00
Guido Schwab
2aa3f49bb1
moved 'user management' to 'tools' dropdown
2014-02-21 11:14:23 +01:00
Heiko Kernbach
c3f72c6d47
divided userbar and notifications
2014-02-21 11:09:53 +01:00
Max Neunhoeffer
019bb7716f
Add authentication tests to js framework.
2014-02-21 10:09:50 +01:00
Jan Steemann
2c1743a732
append port
2014-02-21 10:05:40 +01:00
Jan Steemann
2e03f01a25
moved implementation of DBServerJob into own file
2014-02-21 09:09:21 +01:00
Jan Steemann
35c00ce592
jslint ist unser freund
2014-02-21 09:07:22 +01:00
Jan Steemann
2f6f59e228
fixed startup race condition
2014-02-21 08:47:24 +01:00
Guido Schwab
09a77d0dd2
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-02-21 08:44:11 +01:00
Guido Schwab
ea0520636c
fixed userBar refresh and doing some pixelpushing
2014-02-21 08:43:29 +01:00
Guido Schwab
779b3aaddb
ignore .sass-cache/
2014-02-21 08:36:52 +01:00
Guido Schwab
48d23be18f
ignore .sass-cache
2014-02-21 08:34:13 +01:00
Max Neunhoeffer
060fb00626
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
2014-02-20 23:59:15 +01:00
Max Neunhoeffer
2e81a722b1
Fix relaunch script.
2014-02-20 23:59:03 +01:00
Heiko Kernbach
3e559d9afd
cleanup old source view
2014-02-20 23:23:13 +01:00
Heiko Kernbach
ba14989b22
jslint
2014-02-20 23:19:46 +01:00