Michael Hackstein
045321b318
Moved the selection box from navigation bar back to footer bar
2013-11-17 00:02:08 +01:00
Michael Hackstein
5b5ac93297
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-11-16 17:39:03 +01:00
Michael Hackstein
29cb5f2d8b
Started implementation of the new document editing mask
2013-11-16 17:38:56 +01:00
Michael Hackstein
71a8db7a0c
JSLint cleanup
2013-11-16 17:37:44 +01:00
Frank Celler
1c57332665
cleanup
2013-11-16 17:12:17 +01:00
Michael Hackstein
e1ab9a55f9
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-11-16 01:43:56 +01:00
Michael Hackstein
e40dcf61b0
Modified NavigationView, it is now easier to render and tests
2013-11-16 01:42:54 +01:00
Jan Steemann
6e664c927d
updated CHANGELOG
2013-11-16 01:31:48 +01:00
Jan Steemann
e23ba92b23
display internal attributes in document source view
2013-11-16 01:21:04 +01:00
Jan Steemann
4b7b0cabd3
use skiplist index in byExample
2013-11-16 01:20:33 +01:00
Michael Hackstein
dae6d03f38
Added parts of the navigation bar to the index.html this should make the other parts easier to rerender
2013-11-16 00:44:10 +01:00
Michael Hackstein
44d8e7e94e
DB Selection view is now managed by the router and not managed by navigationView any more
2013-11-16 00:43:37 +01:00
Jan Steemann
a8914abae2
fix error messages
2013-11-16 00:01:37 +01:00
Michael Hackstein
73839cc593
Moved db selection to router
2013-11-15 23:50:11 +01:00
Michael Hackstein
e7b88943f0
Fixed JSLint and added JSLint to karma tests again.
2013-11-15 21:31:15 +01:00
Jan Steemann
4c065be21a
do not migrate shapes of empty collections
2013-11-15 19:40:31 +01:00
Michael Hackstein
69c1e9c20d
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-11-15 00:06:06 +01:00
Michael Hackstein
15c2618033
Added tests for the router and fixed tests for capitalized view names
2013-11-15 00:05:30 +01:00
Michael Hackstein
68676ed217
Abstracted the app start from router, st. router can be tested without the app to be started
2013-11-15 00:01:09 +01:00
Michael Hackstein
20be7f0d4e
Implemented currentDatabase fetch and it will be fetched at app start
2013-11-15 00:00:12 +01:00
Jan Steemann
ab5f0c64c5
Merge remote-tracking branch 'origin/inline-shapes' into devel
2013-11-14 23:37:29 +01:00
Jan Steemann
d201416ac5
shape migration
2013-11-14 23:30:49 +01:00
Michael Hackstein
930234556c
Capitalized logs name
2013-11-14 23:30:43 +01:00
Jan Steemann
2bacadfd34
indentation
2013-11-14 23:29:08 +01:00
Michael Hackstein
9dfe7ec95a
Capitalized names of view classes.
2013-11-14 23:29:06 +01:00
Max Neunhoeffer
aeb98abf7f
More cleanup of skiplist indices.
...
Get rid of only partially used constants in skiplist.h.
Streamline multi skiplist code.
Finish removal of skiplistEx code.
Remove further unused static function.
Remove unused default argument in comparison function.
2013-11-14 14:22:20 +01:00
Max Neunhoeffer
929ea7bbf8
Increase a threshold because a unittest failed by coincidence.
2013-11-14 14:22:20 +01:00
Max Neunhoeffer
3e9fb1dc2f
Remove comparison callbacks for skiplist index.
2013-11-14 14:22:20 +01:00
Michael Hackstein
0996649a6e
Added implementation for a current database model
2013-11-14 13:28:12 +01:00
Michael Hackstein
2e9f38f352
Added test and method stub for curent database model. Karma tests will fail by intention (jenkins test)
2013-11-14 12:04:57 +01:00
Michael Hackstein
2c69aa70bf
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-11-14 11:09:53 +01:00
Michael Hackstein
fb922623c9
Modified Navigation bar, removed href from internal links and used the routing funtionality of backbone instead
2013-11-14 11:09:34 +01:00
Jan Steemann
ea59a12883
improve error message on startup
2013-11-14 10:38:21 +01:00
Michael Hackstein
1ea85314bc
Added a route specificly for dashboard to the router, default route is now independent of all other routes
2013-11-14 10:01:15 +01:00
Michael Hackstein
843f7acfce
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-11-14 09:58:01 +01:00
Michael Hackstein
9f05b2800f
Added a test suite for the navigation bar. Right now tests all visible tabs and their navigation funcitonality
2013-11-14 09:57:55 +01:00
Jan Steemann
bfbc96d3e8
don't complain upon usage of obsolete --database.force-sync-shapes option
2013-11-14 01:25:55 +01:00
Jan Steemann
c5e9538547
Merge remote-tracking branch 'origin/devel' into inline-shapes
...
Conflicts:
arangod/VocBase/document-collection.c
2013-11-14 01:01:24 +01:00
Jan Steemann
02a793f5ae
improve error messages on startup
2013-11-14 00:55:36 +01:00
Jan Steemann
d3f79dd700
removed unused code
2013-11-13 23:46:32 +01:00
Jan Steemann
922e4f35bf
show/hide database selector depending on number of dbs available
2013-11-13 23:40:53 +01:00
Jan Steemann
9f340c10d5
update database selector after adding/dropping databases
2013-11-13 23:18:43 +01:00
Jan Steemann
1e347a0d19
track aligned shape sizes instead of unaligned sizes
2013-11-13 23:00:22 +01:00
Jan Steemann
2914e02a0f
updated CHANGELOG
2013-11-13 21:35:33 +01:00
Jan Steemann
d6c0fb36a6
windows condition variables
2013-11-13 21:01:53 +01:00
Jan Steemann
3695b2ab3a
don't wait long in compactor if compaction lock cannot be acquired instantly
2013-11-13 21:01:43 +01:00
Jan Steemann
d05a2a050d
fixed jslint errors
2013-11-13 19:07:30 +01:00
Jan Steemann
06f6670288
simplified condition variables
2013-11-13 19:03:16 +01:00
Jan Steemann
8a5784ce87
updated derived file
2013-11-13 19:03:06 +01:00
Michael Hackstein
1aabc1ee3a
Test for Jenkins
2013-11-13 18:01:57 +01:00