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

18 Commits

Author SHA1 Message Date
Jan Steemann 40c842d1cb fixed redirection 2014-03-07 09:36:23 +01:00
Michael Hackstein 81a08bf66d Implemented redirecter for index.html 2014-02-28 17:31:46 +01:00
Max Neunhoeffer f7e57a5b47 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/manifest.json
	lib/Rest/EndpointIp.cpp
	lib/Rest/EndpointUnixDomain.cpp
	lib/V8/v8-utils.cpp
 2014-02-21 15:28:21 +01:00
Heiko Kernbach c3f72c6d47 divided userbar and notifications 2014-02-21 11:09:53 +01:00
Michael Hackstein d0d61fb5a3 Integerated the new underscore templates in the admin interface. Performancebost of 50% yay 2014-02-20 20:31:53 +01:00
Michael Hackstein 98576c9963 Massive change, removed ejs and replaced it with underscore templates. Changed template engine and some rendering functions. All templates are now included in one large index.html and are not requested sequentially 2014-02-20 16:56:24 +01:00
Jan Steemann 75b4447191 removed debug stuff 2014-02-20 09:55:38 +01:00
Michael Hackstein efa911632f Merge remote-tracking branch 'origin/devel' into sharding 2014-02-19 16:12:00 +01:00
Jan Steemann 23c3ceab70 removed debug phrase 2014-02-19 15:15:35 +01:00
Michael Hackstein 4ada8bf451 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-19 14:37:27 +01:00
Michael Hackstein a7d0b59aee The general layout is now moved to a single class and the dropdowns have bin unified to one class 2014-02-19 14:36:51 +01:00
Frank Celler 726144ce39 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
 2014-02-19 14:30:46 +01:00
Frank Celler c779325b5d added frontend-development switch 2014-02-19 14:28:51 +01:00
Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	arangod/VocBase/document-collection.c
	arangosh/CMakeLists.txt
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-18 08:50:27 +01:00
gschwab 5e90b2fe04 added user and statistic view (fakey and inactive) 2014-02-17 08:57:17 +01:00
Michael Hackstein 3a9170e370 Rough version of the test planner, no style, no funcitonality yet 2014-02-11 23:40:50 +01:00
Michael Hackstein eb077df3f5 Added Head and script parts for the planner interface 2014-02-11 16:43:47 +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