1
0
Fork 0
Commit Graph

12261 Commits

Author SHA1 Message Date
gschwab 0f54351a86 removed console.log O.o 2014-04-04 14:43:25 +02:00
gschwab 584558097a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-04 14:25:42 +02:00
gschwab 0d314683d8 added 'advanced' area for modal dialog 2014-04-04 14:25:06 +02:00
gschwab 34853739ae fixed password dialog 2014-04-04 14:24:26 +02:00
Max Neunhoeffer 21e725f138 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-04-04 12:52:00 +02:00
Max Neunhoeffer 41befb9d85 Move BSON to C++. 2014-04-04 12:51:45 +02:00
Heiko Kernbach 6c06b0c52e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-04 11:44:36 +02:00
Heiko Kernbach 34f061f85c excluded libs from coverage tests 2014-04-04 11:44:27 +02:00
Michael Hackstein 5d5aa029a8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-04 11:33:24 +02:00
Jan Steemann f05c74c7ea Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-04 11:20:16 +02:00
gschwab cba524f15f refactored modal dialogs for databaseView 2014-04-04 11:13:53 +02:00
Guido Schwab 46c69736ba Merge pull request #808 from frankmayer/devel
Fixes "New Collection" window not honoring user-specified journal size.
2014-04-04 10:32:20 +02:00
Jan Steemann b922c74ab7 removed unused Url class 2014-04-04 10:23:41 +02:00
Jan Steemann 9aaeafda10 cpp 2014-04-04 10:21:54 +02:00
Max Neunhoeffer 35da05277e Fix two more char const* compiler unhappinesses. 2014-04-04 09:00:36 +02:00
Frank Mayer ddb057fa27 Fixes "New Collection" window not honoring user-specified journal size.
The tests need to be extended for this, as I didn't have a proper development environment set up for this.

Tested it manually though and it works.
2014-04-04 06:23:45 +03:00
Jan Steemann 30f9dba42f don't log nonsense errors 2014-04-03 23:23:08 +02:00
Jan Steemann 2740803d0b removed obsolete test targets 2014-04-03 23:22:50 +02:00
Jan Steemann 149f7378cb cpp 2014-04-03 23:22:32 +02:00
Jan Steemann b43bc4b657 change order of includes so it compiles 2014-04-03 20:31:42 +02:00
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