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

48 Commits

Author SHA1 Message Date
Heiko Kernbach d5a1266163 added progess indicator view 2014-08-18 17:10:03 +02:00
Claudius Weinberger 73f512e548 Dashboard redesign 
Conflicts:
	js/apps/system/aardvark/frontend/js/templates/dashboardView.ejs
	js/apps/system/aardvark/frontend/js/views/dashboardView.js
	js/apps/system/aardvark/frontend/scss/_constants.scss
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-05-04 00:33:21 +02:00
Claudius Weinberger 1682a95e8a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
 2014-05-02 17:18:26 +02:00
scottashton 6c6f27d4f6 removed unused images 2014-03-18 14:51:42 +01:00
Claudius Weinberger 964a81f928 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-07 17:28:03 +01:00
Michael Hackstein 181c7b72ff Added select2 library and selct box 2014-03-04 13:22:11 +01:00
Michael Hackstein 5ff83d8e49 Added database icon svg 2014-03-01 22:08:25 +01:00
Claudius Weinberger b712f906bc some UI changes 2014-03-01 22:04:48 +01:00
gschwab 87c44e49c0 changed icon, its size and position 2014-02-28 11:09:18 +01:00
Claudius Weinberger 573d6bf323 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-27 10:49:35 +01:00
Jan Steemann 3d5149b022 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangosh/V8Client/arangosh.cpp
 2014-02-26 21:34:34 +01:00
gschwab b89d0ed584 deleted unused icon 2014-02-26 18:13:01 +01:00
gschwab 7caed403ff status bar cleaned up 2014-02-26 17:34:30 +01:00
gschwab 1d43106cb0 status bar redesigned 2014-02-26 16:03:55 +01:00
Claudius Weinberger 44069a28b2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-25 20:29:08 +01:00
Jan Steemann 23ba186b0d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/CapConstraint/cap-constraint.c
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/frontend/scss/style.scss
	js/common/modules/org/arangodb/users-common.js
 2014-02-25 17:21:14 +01:00
gschwab 5857f616ed userManagement switched from table to tiles 2014-02-25 11:37:07 +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
Claudius Weinberger 5f8c49b51c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-21 12:48:29 +01:00
Guido Schwab 09a77d0dd2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-21 08:44:11 +01:00
Guido Schwab ea0520636c fixed userBar refresh and doing some pixelpushing 2014-02-21 08:43:29 +01:00
Heiko Kernbach 56812347d2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 23:02:59 +01:00
Heiko Kernbach 6901045535 new edit view for documents 2014-02-20 23:02:15 +01:00
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
 2014-02-20 21:02:07 +01:00
Claudius Weinberger 6af6d661d5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 20:35:17 +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
Guido Schwab 1f8bf8da2d changed default avatar image size 2014-02-20 20:30:27 +01:00
Claudius Weinberger 5541664f05 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 17:12:11 +01:00
Michael Hackstein fa6d5e72ba Removed unused logo 2014-02-20 16:58:34 +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
gschwab a70df24907 changed default logo 2014-02-19 13:25:59 +01:00
gschwab 67464b2145 more functionality for usermanagement 2014-02-19 13:13:16 +01:00
Frank Celler 066abd777c Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/js/routers/router.js
 2014-02-19 10:21:00 +01:00
Claudius Weinberger defb67e763 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-18 17:05:39 +01:00
Claudius Weinberger c50bd2599c new icons collection overview 2014-02-18 17:05:29 +01:00
Heiko Kernbach 1e964b18d0 removed old/unnecessary notifications 2014-02-18 16:31:46 +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
Claudius Weinberger c5359c18b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-17 15:19:41 +01:00
gschwab 5e90b2fe04 added user and statistic view (fakey and inactive) 2014-02-17 08:57:17 +01:00
Claudius Weinberger 5db76f75fa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-15 23:35:53 +01:00
Claudius Weinberger b26b0ed05f Layout CollectionOverView changed 2014-02-15 23:34:15 +01:00
scottashton a09b77ab55 finalized plaScenarioSelector, click events and karma tests 2014-02-12 15:55:22 +01:00
scottashton c682dae057 planner 2014-02-12 13:21:20 +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 61aeeeceae Renamed logo (missing d) and optimized navbar setup 2014-02-08 09:12:09 +01:00
Jan Steemann 2c8ef0125f ported web interface changes from devel to 1.4 2013-12-18 16:22:16 +01:00
Heiko Kernbach 0cf4ae5a8e radio buttons styling 2013-10-11 19:14:53 +02:00
Jan Steemann 729bbc44f0 use per-database directories for Foxx apps 2013-09-30 10:57:29 +02:00