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

191 Commits

Author SHA1 Message Date
Michael Hackstein fb02eb07f3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-03-18 18:32:27 +01:00
Michael Hackstein 1eb45e7e9a Almost finished with documentsView.css however still some stuff to cleanup left. System is at least in a stable state. Layout of buttons in headerbar has slightly changed (they were off by 1px) 2014-03-18 18:26:14 +01:00
gschwab 444518dc3b deleted unused css 2014-03-18 17:04:37 +01:00
gschwab edb7d4ab13 deleted unused css-file 2014-03-18 16:46:10 +01:00
gschwab ca1d1c7eb5 deleted dead code 2014-03-18 16:12:31 +01:00
Michael Hackstein b8ce2a5b70 Fixed layout bug in graph layout 2014-03-18 16:05:02 +01:00
gschwab 4ae7297eaa merged 2014-03-18 15:25:45 +01:00
gschwab 98bc899807 css refactoring: queryView.css => _queryView.scscc 2014-03-18 15:17:20 +01:00
Michael Hackstein e4f14f0130 Contiuned porting documentView.css. Almost done, there is one too general rule left 2014-03-18 13:45:29 +01:00
Michael Hackstein 8bef15ce62 Started translating docmentView.css created tabViews and jsonEditor.scss on the way 2014-03-18 12:57:53 +01:00
Michael Hackstein ff144f5395 REmoved now empty collectionView.css 2014-03-18 08:29:57 +01:00
Michael Hackstein 888c299257 Moved collectionView.css to scss 2014-03-18 08:29:19 +01:00
Michael Hackstein 20f7a05cf7 Removed the now empty collectionsItemView.css 2014-03-17 16:30:51 +01:00
Michael Hackstein 58a9b5dc85 Moved collectionsItemView.css to scss reduction 100% so basicly removed 2014-03-17 16:30:17 +01:00
Michael Hackstein 296278cfbc Removed the empty collectionsView.css 2014-03-17 16:09:47 +01:00
Michael Hackstein 64f3e3b332 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-17 16:08:24 +01:00
Michael Hackstein 578097a345 Moved collections.css to scss, reduction: 50% 2014-03-17 16:08:17 +01:00
gschwab ec6ab8811e removed dead code 2014-03-17 15:15:24 +01:00
gschwab fe5d2096fa css refactoring: deleted general.css; already backuped by scss 2014-03-17 10:27:23 +01:00
gschwab 9810780ebe css refactoring: moved content of loginView.css to _login.scss: not used yet, so not active in style.scss 2014-03-17 09:21:34 +01:00
Michael Hackstein f33b3cf76a Fixed a syntax error in css 2014-03-16 22:42:00 +01:00
Heiko Kernbach b6c4a87055 new shortcuts class added to aqleditor 2014-03-11 17:45:42 +01:00
gschwab 96aa5f0b26 fixed icon-size of query/result view 2014-03-10 13:10:08 +01:00
gschwab 847074329f database management and graph management changed to tile view 2014-03-07 14:58:37 +01:00
gschwab 4437b0b123 reverted to older version... 2014-03-07 14:38:24 +01:00
gschwab 43b0e8c692 css refactoring: deleted .thumbnails2 and appearences 2014-03-06 14:19:56 +01:00
Michael Hackstein 861afb4e5e Fixed merge conflicts 2014-03-04 13:31:41 +01:00
Michael Hackstein 181c7b72ff Added select2 library and selct box 2014-03-04 13:22:11 +01:00
gschwab 4358ed553f deleted inline css 2014-03-04 12:28:43 +01:00
gschwab 66e8d281fb deleted some unused css, preparing for migration to scss 2014-03-04 11:57:34 +01:00
Michael Hackstein 992dbf828d Fixed a type in bootstrap 2014-03-01 18:37:16 +01:00
Claudius Weinberger 17ee3ef0ac some UI changes 2014-03-01 14:20:12 +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 4b8e9565ae fixed css for node list 2014-02-25 14:11:08 +01:00
Michael Hackstein d938bed8ea Merged devel and regenerated scss 2014-02-22 16:44:50 +01:00
gschwab 031cf6dc3e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/templates/queryView.ejs
 2014-02-22 15:36:32 +01:00
gschwab 1790ee4dd9 git commit --amend --reset-author 2014-02-22 15:28:07 +01:00
Michael Hackstein ed5399cd3f Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-22 12:28:01 +01:00
Heiko Kernbach d8e1520b26 d3 graph 2014-02-22 12:09:44 +01:00
Michael Hackstein 8cb5a1e07c Merge remote-tracking branch 'origin/devel' into sharding 
And regenerated scss

Conflicts:
	js/apps/system/aardvark/frontend/js/templates/foxxInstalledView.ejs
	js/apps/system/aardvark/frontend/scss/_buttons.scss
	js/apps/system/aardvark/frontend/scss/_colors.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-02-22 11:42:18 +01:00
Michael Hackstein 5fc5922349 Fixed graphviewer dropdown menu and several other css mismatches 2014-02-22 11:11:58 +01:00
Michael Hackstein e9d8392e48 Fixed dropdown layout which was broken for imports 2014-02-22 08:15:55 +01:00
Michael Hackstein c965238579 Imported buttons scss 2014-02-21 23:35:19 +01:00
Michael Hackstein 6020b914b8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-21 20:59:31 +01:00
Michael Hackstein e3ee4d8f86 Added buttons to scss 2014-02-21 20:59:23 +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 57caee1fa7 display status when document is saved 2014-02-21 14:21:01 +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 a189b8136d cleanup 2014-02-20 23:07:15 +01:00