Max Neunhoeffer
c683fde9ba
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
2014-03-24 14:04:59 +01:00
Max Neunhoeffer
dde446fb28
Optimise hash tables by no longer using % for wraparound.
2014-03-24 14:04:24 +01:00
Heiko Kernbach
5f1443a527
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-24 11:48:02 +01:00
Heiko Kernbach
2aef561e51
changed delay for notifications
2014-03-24 11:47:55 +01:00
gschwab
fa06331b7e
css refactoring: refactored screenSizes.css - adjusted manifest.json
2014-03-24 09:49:32 +01:00
gschwab
59b16a63a0
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-24 09:30:04 +01:00
gschwab
9dc313c61b
css refactoring: refactored screenSizes.css
2014-03-24 09:29:59 +01:00
Jan Steemann
d3baa53f52
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-24 09:29:21 +01:00
Jan Steemann
a1e300d934
assume disable-authentication=false when a username is specified on the command-line
2014-03-24 09:28:49 +01:00
gschwab
cb95204e61
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-24 09:19:58 +01:00
gschwab
527d88747b
added connection check for multi machine cluster
2014-03-24 09:19:50 +01:00
Jan Steemann
2aef412cd4
use sizeHint for hash index, too
2014-03-21 22:59:41 +01:00
Jan Steemann
3ad15e3ac1
fixed non-working "save" button in collection edit view of web interface
...
clicking the save button did nothing. one had to press enter in one of the input fields to send modified form data
Conflicts:
js/apps/system/aardvark/frontend/js/views/collectionView.js
2014-03-21 22:44:37 +01:00
Jan Steemann
52be4acba6
adjusted the help texts
2014-03-21 22:40:02 +01:00
Jan Steemann
a9920ea9ca
dont try to load datatables.css - this file has already been deleted!
2014-03-21 21:27:33 +01:00
Jan Steemann
5a3f2aaa49
improved job API
...
* added REST API method HTTP GET `/_api/job/job-id` to query the status of an
async job without potentially fetching it from the list of done jobs
* fixed non-intuitive behaviour in jobs API: previously, querying the status
of an async job via the API HTTP PUT `/_api/job/job-id` removed a currently
executing async job from the list of queryable jobs on the server.
Now, when querying the result of an async job that is still executing,
the job is kept in the list of queryable jobs so its result can be fetched
by a subsequent request.
2014-03-21 21:19:45 +01:00
Jan Steemann
3bbe709397
compiler rant
2014-03-21 19:54:33 +01:00
Jan Steemann
e3e53258ee
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-21 18:27:24 +01:00
Jan Steemann
e8b91ccf85
remove logfiles
2014-03-21 18:27:14 +01:00
Heiko Kernbach
1fcbd582b3
logs pagination bugfix, when totalPages are zero
2014-03-21 17:21:10 +01:00
Heiko Kernbach
09c2060969
removed console logs
2014-03-21 17:12:47 +01:00
Heiko Kernbach
71ca2fee1f
new icons for pagination (scss)
2014-03-21 17:05:39 +01:00
Heiko Kernbach
5107cbb694
removed old snippet css
2014-03-21 15:51:47 +01:00
Heiko Kernbach
085d3de302
snippet css to scss
2014-03-21 15:50:47 +01:00
Heiko Kernbach
a2d80c2b9e
dataTables scss lint
2014-03-21 15:48:53 +01:00
Heiko Kernbach
3824fe5fdb
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-21 15:44:13 +01:00
Heiko Kernbach
faa9317db5
removed unused glyphicons
2014-03-21 15:44:00 +01:00
scottashton
149d90e78b
merged
2014-03-21 15:33:08 +01:00
scottashton
0e3da446d1
kill modal.css
2014-03-21 15:32:24 +01:00
Heiko Kernbach
a409acd013
dataTables scss lint
2014-03-21 15:17:25 +01:00
Heiko Kernbach
c84d284a90
cleanup css
2014-03-21 15:09:42 +01:00
Heiko Kernbach
4aef4877a5
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-21 15:09:28 +01:00
Heiko Kernbach
31a69dba67
dataTables css -> scss
2014-03-21 15:09:18 +01:00
Jan Steemann
03118a179c
updated CHANGELOG
2014-03-21 14:54:06 +01:00
Jan Steemann
c12264427c
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-21 14:53:58 +01:00
Jan Steemann
8da51546c8
little refactoring
2014-03-21 14:53:42 +01:00
scottashton
355c1100eb
_collection.scss
2014-03-21 14:16:53 +01:00
scottashton
690a2afe81
fixed merge bug
2014-03-21 14:00:33 +01:00
scottashton
d61f1e4e0c
merged
2014-03-21 13:47:58 +01:00
scottashton
7a1a905f4d
jslinted the dashboardView
2014-03-21 13:39:09 +01:00
scottashton
28029236d1
fixed dashboard bugs
2014-03-21 13:24:56 +01:00
scottashton
51c1072b42
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-21 13:24:22 +01:00
Michael Hackstein
1c825f12b3
I am to stupid to use a keyboard...
2014-03-21 11:22:36 +01:00
Michael Hackstein
ef0562149a
Fixed karma ui tests
2014-03-21 11:18:33 +01:00
Michael Hackstein
0b266d1dd5
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2014-03-21 11:13:36 +01:00
Michael Hackstein
1c4d9f14e5
Fixed SCSS-Lint warnings for graphViewer.scss
2014-03-21 11:13:33 +01:00
Michael Hackstein
a875353eb4
Removed now empty file
2014-03-21 11:08:30 +01:00
Michael Hackstein
55f0c0357c
Finished moving graphViewer.css to scss, will now cleanup scss-lint
2014-03-21 11:07:51 +01:00
Heiko Kernbach
7ee66c908c
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-21 11:06:07 +01:00
scottashton
f5ff718ed0
merged
2014-03-21 10:58:11 +01:00