Jan Steemann
521c939f80
fix compiler warnings
2014-04-03 20:21:07 +02:00
Jan Steemann
a63b27d94a
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-04-03 19:59:05 +02:00
Jan Steemann
9c9f5f4edd
VS
2014-04-03 17:58:13 +02:00
Jan Steemann
bb24068029
cpp
2014-04-03 17:50:38 +02:00
Michael Hackstein
06093ab5a5
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2014-04-03 17:46:34 +02:00
Michael Hackstein
5e8f283841
Moved edit app modal to the centralized version
2014-04-03 17:46:29 +02:00
gschwab
3edbd02655
fixed jslint
2014-04-03 17:13:16 +02:00
gschwab
1a1f4558f1
refactored modal dialogs for userManagement
2014-04-03 16:40:46 +02:00
scottashton
f891d7d253
documentsViewSpec
2014-04-03 16:34:25 +02:00
Max Neunhoeffer
eb6b74f18a
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
2014-04-03 16:22:20 +02:00
Max Neunhoeffer
72a30221f0
Run autogen.sh for libbson compilation.
2014-04-03 16:21:58 +02:00
Jan Steemann
6baeaf606d
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-04-03 16:14:19 +02:00
Jan Steemann
17bf8ebafb
fixed VS warnings
2014-04-03 16:13:56 +02:00
Max Neunhoeffer
5a2debd863
Add a first version (only 2 funcs) of tri-bson.h
2014-04-03 15:55:51 +02:00
Max Neunhoeffer
c33fd1395b
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
2014-04-03 15:52:15 +02:00
Michael Hackstein
5884e27879
Added conv function for password
2014-04-03 15:41:25 +02:00
Michael Hackstein
906f40e57e
Fixed user profile route test
2014-04-03 15:40:05 +02:00
Michael Hackstein
c606c0fd2a
Fixed JSLint
2014-04-03 15:36:30 +02:00
Michael Hackstein
4caa3c50c6
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2014-04-03 15:27:26 +02:00
Michael Hackstein
d69d4b5d03
Added some more conv. functions to modalview
2014-04-03 15:27:22 +02:00
gschwab
3c37ce38cd
added mandatory field
2014-04-03 15:24:24 +02:00
Jan Steemann
c9485cb9bc
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-04-03 15:23:28 +02:00
Jan Steemann
ccf7bbb173
cpp
2014-04-03 15:23:20 +02:00
Michael Hackstein
3bc50edc2f
Improved createText convenience function in modal view
2014-04-03 15:19:11 +02:00
Michael Hackstein
cf53a9aafa
Removed unnecessary request for an unused image in css
2014-04-03 15:16:17 +02:00
Michael Hackstein
6cda5ae849
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2014-04-03 14:38:09 +02:00
Michael Hackstein
f742a979d1
Moved install Foxx Modal to global singleton
2014-04-03 14:38:05 +02:00
Max Neunhoeffer
b488e508a2
Add today's git version of libbson to 3rdParty.
2014-04-03 14:09:24 +02:00
Jan Steemann
c1916b1825
bumped version number
2014-04-03 14:08:28 +02:00
Jan Steemann
a325df8982
fixed test
2014-04-03 13:50:21 +02:00
Jan Steemann
32237dd7b2
bumped version number from 2.0 to 2.1
2014-04-03 13:42:55 +02:00
Jan Steemann
23dffa05a7
change parameter name to avoid compiler warnings
2014-04-03 13:34:55 +02:00
Jan Steemann
37ee77427d
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-04-03 13:29:48 +02:00
Jan Steemann
182e8a7b92
updated CHANGELOG
2014-04-03 13:29:35 +02:00
Jan Steemann
100e514841
issue #798 : Lower case http headers from arango
...
This change allows returning capitalized HTTP headers, e.g.
`Content-Length` instead of `content-length`.
The HTTP spec says that headers are case-insensitive, but
in fact several clients rely on a specific case in response
headers.
This change will capitalize HTTP headers if the `X-Arango-Version`
request header is sent by the client and contains a value of at
least `20100` (for version 2.1). The default value for the
compatibility can also be set at server start, using the
`--server.default-api-compatibility` option.
2014-04-03 13:24:59 +02:00
Michael Hackstein
fdaacdb209
Added a few convenience functions for the new modalView singleton
2014-04-03 13:04:29 +02:00
Michael Hackstein
af406257a8
Sorted cancel button as second from right always
2014-04-03 11:03:09 +02:00
gschwab
98636cf1df
first try with modals: some small bugs fixed
2014-04-03 10:53:04 +02:00
Michael Hackstein
f9a5548e03
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2014-04-03 10:22:15 +02:00
Michael Hackstein
377f9fec1d
Added test for the delete button and actually showed and hided the dialog
2014-04-03 10:22:12 +02:00
gschwab
83f4bfb5d3
added id to modal dialog
2014-04-03 10:21:02 +02:00
gschwab
07fd17b364
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-04-03 09:57:52 +02:00
gschwab
1af661d13f
some scss refactoring for modals
2014-04-03 09:57:44 +02:00
scottashton
ddca991a3c
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-04-03 09:54:32 +02:00
scottashton
52b48fe586
fixed routerspec and removed unneccesary logs
2014-04-03 09:54:24 +02:00
Michael Hackstein
5c884282db
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2014-04-03 09:46:44 +02:00
gschwab
4cebb1a752
added confirmation div
2014-04-03 09:46:17 +02:00
Michael Hackstein
e647e5e8e1
Added test for delete button
2014-04-03 09:43:09 +02:00
Michael Hackstein
c6d4d7de08
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2014-04-02 17:58:41 +02:00
Michael Hackstein
21f8ae668c
Fixed jslint warnings
2014-04-02 17:58:19 +02:00