Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
10,339 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

481 Commits

Author SHA1 Message Date
scottashton a09b77ab55 finalized plaScenarioSelector, click events and karma tests 2014-02-12 15:55:22 +01:00
scottashton ca08841929 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-12 13:25:07 +01:00
scottashton c682dae057 planner 2014-02-12 13:21:20 +01:00
Jan Steemann 5270f994c9 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/css/layout.css
	js/server/modules/org/arangodb/arango-collection.js
 2014-02-12 12:53:08 +01:00
scottashton dae77412a8 plannerFrontend Router setup and karma tests 2014-02-12 12:00:04 +01:00
gschwab d91a283678 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-12 10:25:52 +01:00
gschwab 2910419738 database selection moved to navigation bar, links rearranged 2014-02-12 10:25:16 +01:00
Heiko Kernbach 0a4d54440f some changes for user management 2014-02-12 10:24:53 +01:00
Heiko Kernbach b3a7c9fff3 jslint fix 2014-02-12 08:20:00 +01:00
Michael Hackstein 3a9170e370 Rough version of the test planner, no style, no funcitonality yet 2014-02-11 23:40:50 +01:00
Heiko Kernbach e128c0aca4 redirect bugfix, optimizations 2014-02-11 19:32:00 +01:00
Heiko Kernbach ef86071517 scroll to focus method 2014-02-11 18:41:05 +01:00
Heiko Kernbach 43f431d036 added missing css pointer 2014-02-11 18:00:08 +01:00
Heiko Kernbach 45917d9400 info-view bugfix, updated new icons 2014-02-11 17:18:55 +01:00
Michael Hackstein eb077df3f5 Added Head and script parts for the planner interface 2014-02-11 16:43:47 +01:00
Heiko Kernbach 7a2f404afa bugfix + jslint 2014-02-11 16:20:31 +01:00
Heiko Kernbach bbc65a3040 usability document view 2014-02-11 16:02:57 +01:00
Michael Hackstein bc16cfae86 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	Documentation/InstallationManual/Installing.md
	arangosh/CMakeLists.txt
 2014-02-11 15:52:49 +01:00
Heiko Kernbach a99815de0b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-11 14:06:33 +01:00
Heiko Kernbach 2a5e8340a4 serveral bugfixes document editing view 2014-02-11 13:57:43 +01:00
Michael Hackstein 2098eac723 The index.html of the frontend is now composed from several parts. It will be reusable for the sharding frontend then 2014-02-11 11:07:29 +01:00
Michael Hackstein f87b594a1c Added new classes for the tiles in collection overview. They should now be easily reusable for Databases and Applications 2014-02-11 09:58:09 +01:00
Michael Hackstein 232c616288 Fixed jenkins crying... 2014-02-11 08:53:20 +01:00
Michael Hackstein 849f799f30 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-10 12:02:56 +01:00
Michael Hackstein 2e3e9b6e3b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-10 11:59:36 +01:00
Michael Hackstein 4fd06a6f32 Finished with general positioning of elements in scss. Much much (much)* simpler now 2014-02-10 11:59:26 +01:00
Michael Hackstein 7094f4378e Converted footer view to scss and added resizing functionality. 2014-02-09 23:07:21 +01:00
Frank Celler 7528779137 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	CMakeLists.txt
	VERSION
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/vocbase-defaults.c
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.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/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/frontend/css/buttons.css
	js/apps/system/aardvark/frontend/css/documentsView.css
	js/apps/system/aardvark/frontend/js/templates/applicationsView.ejs
	js/apps/system/aardvark/frontend/js/templates/documentsView.ejs
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/tests/ahuacatl-graph.js
 2014-02-09 18:39:11 +01:00
Michael Hackstein d875e213fb Improvements for navbar in SCSS , simplified code and removed old navbar.css from manifest. 2014-02-09 13:28:26 +01:00
Michael Hackstein 3d9bdcc210 Navbar now completely moved to Scss 2014-02-09 13:10:26 +01:00
Michael Hackstein 61aeeeceae Renamed logo (missing d) and optimized navbar setup 2014-02-08 09:12:09 +01:00
Michael Hackstein 2670c30ef3 Started moving from css to scss for better maintanence. Also started cleanup process 2014-02-08 08:55:49 +01:00
Jan Steemann b4d9f10f17 fixed some database methods 2014-02-06 15:54:34 +01:00
Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
	js/apps/system/aardvark/frontend/css/graphlayout.css
 2014-02-06 13:18:52 +01:00
Jan Steemann b5550e17a6 updated tests and documentation 2014-02-06 12:11:17 +01:00
Michael Hackstein 4dc635e59c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-03 11:42:48 +01:00
Michael Hackstein 08858d414b Added new version of graphViewer Icons 2014-02-03 11:42:18 +01:00
Jan Steemann 4339d5aab6 removed unused variable 2014-02-02 09:21:43 +01:00
Claudius Weinberger 2748152fc5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/css/buttons.css
 2014-02-01 17:28:18 +01:00
Claudius Weinberger 7d29bfcf6a some ui improvements 2014-02-01 17:26:13 +01:00
Jan Steemann 4a99cde395 jslintified several tests 2014-02-01 01:50:58 +01:00
Jan Steemann 8be60b04db Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-01-31 23:59:01 +01:00
Jan Steemann 74c0457b4b added version check for admin interface 2014-01-31 23:58:36 +01:00
Michael Hackstein 6b12a0babc The db selection select box is now readable in firefox 2014-01-31 23:09:24 +01:00
Michael Hackstein 0c59b93390 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 22:57:47 +01:00
Michael Hackstein 7c063d3572 The graph viewer now has arrows 2014-01-31 22:57:03 +01:00
Michael Hackstein 6f44fcf00e Made unexpanded vertices semi-transparent, i am not yet happy with this 2014-01-31 21:41:40 +01:00
Michael Hackstein 7085c6cb6d The context menu in the graphviewer now has style of OSX 2014-01-31 21:38:47 +01:00
Max Neunhoeffer c2e6c16395 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-31 19:34:55 +01:00
Max Neunhoeffer b6c3600ecc Add an include needed to please the compiler on Linux. 2014-01-31 19:31:36 +01:00