Jan Steemann
9724cfec64
fixed failing test
2014-03-27 13:12:45 +01:00
Jan Steemann
e2f1d0dfb6
fixed issues in arango-dfdb
2014-03-27 12:29:32 +01:00
scottashton
e8904d5d93
fixed jslint
2014-03-27 12:15:13 +01:00
scottashton
fd2253076e
testing collections and models finished, coverage = 100%
2014-03-27 11:06:42 +01:00
scottashton
48448a6039
fixed bug in manifest
2014-03-27 09:43:42 +01:00
gschwab
23f6ece5d4
fixed wrong filename O.o
2014-03-27 09:12:42 +01:00
gschwab
c81b319506
fixed line too long - jslint
2014-03-27 09:12:14 +01:00
gschwab
4fa1d8e565
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-27 08:55:12 +01:00
Frank Celler
456d089deb
generateSwagger can now also parse MD files
...
Conflicts:
js/apps/system/aardvark/api-docs/batch.json
js/apps/system/aardvark/api-docs/collection.json
js/apps/system/aardvark/api-docs/cursor.json
js/apps/system/aardvark/api-docs/database.json
js/apps/system/aardvark/api-docs/document.json
js/apps/system/aardvark/api-docs/edge.json
js/apps/system/aardvark/api-docs/edges.json
js/apps/system/aardvark/api-docs/endpoint.json
js/apps/system/aardvark/api-docs/graph.json
js/apps/system/aardvark/api-docs/index.json
js/apps/system/aardvark/api-docs/job.json
js/apps/system/aardvark/api-docs/replication.json
js/apps/system/aardvark/api-docs/simple.json
js/apps/system/aardvark/api-docs/system.json
js/apps/system/aardvark/api-docs/traversal.json
js/apps/system/aardvark/api-docs/version.json
2014-03-26 23:09:07 +01:00
scottashton
81aaa09949
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-26 17:43:37 +01:00
scottashton
48003a69e9
cluster tests
2014-03-26 17:43:20 +01:00
gschwab
eb5902b139
fixed cluster restart and cluster dashboard refresh for authentication
2014-03-26 17:20:44 +01:00
gschwab
ebabd76417
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2014-03-26 15:09:45 +01:00
gschwab
08878cb42c
removed unnecessary authorization handon
2014-03-26 15:09:38 +01:00
scottashton
2c1981ea1b
finished frontend/collections tests
2014-03-26 14:44:06 +01:00
Jan Steemann
b4a78b55db
fixed failing test
2014-03-25 18:48:53 +01:00
scottashton
ca5ccf9a39
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-25 17:52:22 +01:00
scottashton
78d7a2c18a
more tests
2014-03-25 17:52:14 +01:00
gschwab
d7dbb38587
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-25 17:16:44 +01:00
gschwab
3ef97931f2
karma test for some more models
2014-03-25 17:16:34 +01:00
scottashton
213c61d104
merged conflict
2014-03-25 16:08:17 +01:00
scottashton
1b5e31b9d7
starting collections tests
2014-03-25 16:06:37 +01:00
Frank Celler
d34832bbcf
added changePassword attribute for users
2014-03-25 11:40:13 +01:00
gschwab
444a84157b
karma test for some models, small refactoring (renaming) of ../collections/arangoStatisticsDescriptionCollection.js
2014-03-25 10:20:09 +01:00
Heiko Kernbach
24df691dd0
files now in files.json
2014-03-24 17:54:44 +01:00
scottashton
9e8cc5613c
added testSpec for arangoCollections
2014-03-24 17:39:08 +01:00
gschwab
a7c6f06fd0
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-24 16:15:44 +01:00
gschwab
416e2bcd04
conf for local coverage report
2014-03-24 16:15:39 +01:00
scottashton
a55b9e93c4
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-24 16:14:51 +01:00
scottashton
5a7379e62a
changed type of BytedSend and BytesReceived chart
2014-03-24 16:14:42 +01:00
Heiko Kernbach
afdb776b51
html->cobertura
2014-03-24 15:37:45 +01:00
Heiko Kernbach
7b53a4fe4f
karma for coverage
2014-03-24 15:13:55 +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
9dc313c61b
css refactoring: refactored screenSizes.css
2014-03-24 09:29:59 +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
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
a9920ea9ca
dont try to load datatables.css - this file has already been deleted!
2014-03-21 21:27:33 +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