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

11913 Commits

Author SHA1 Message Date
gschwab 286261c2d1 fixed scsslint errors 2014-03-20 13:28:22 +01:00
gschwab cdd2051f25 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 13:22:17 +01:00
gschwab 463f5bde2b css refactoring: finished layout.css 2014-03-20 13:22:06 +01:00
Esteban Lombeyda 23d395c027 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 12:12:10 +01:00
Esteban Lombeyda d163d8eb57 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	Installation/Windows/Templates/NSIS.InstallOptions.ini.in
 2014-03-20 12:10:20 +01:00
Frank Celler f053670ecc fixed install for etcd 2014-03-20 12:01:43 +01:00
Esteban Lombeyda beccde4cd1 Bug fix: too many new lines in arango shell are removed 2014-03-20 11:59:53 +01:00
gschwab dabe3a2d3a css refactoring: started layout.css - cont. 2014-03-20 11:27:11 +01:00
gschwab b1ebb75202 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 10:40:37 +01:00
Michael Hackstein f5b6142f98 Fixed path to fontawesome 2014-03-20 10:39:54 +01:00
gschwab 3808fccf14 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 09:39:57 +01:00
Frank Celler 1865e2c895 fixed wording for install script 
Conflicts:

	Installation/Windows/Templates/NSIS.InstallOptions.ini.in
 2014-03-20 09:36:35 +01:00
gschwab 333ed0dc17 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 09:17:13 +01:00
scottashton 78fbcc7e17 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 09:17:10 +01:00
gschwab e21af4e3f0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 09:15:55 +01:00
Michael Hackstein 300d8aa517 Added missing semicolon 2014-03-20 09:15:14 +01:00
gschwab e2616ee5dd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 09:10:55 +01:00
gschwab 6ef198f6d6 css refactoring: started layout.css 2014-03-20 09:10:51 +01:00
scottashton c783b41e17 renamed api.scss 2014-03-20 09:08:39 +01:00
Michael Hackstein 33a9bcfb5a Moved content from graphView to graphlayout.css, cleanup will be done in one flow 2014-03-20 08:55:12 +01:00
Esteban Lombeyda 27a274f72d Bug Fix: orthographical error 2014-03-19 18:20:36 +01:00
Michael Hackstein 0905ca2833 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-19 17:32:21 +01:00
Michael Hackstein 9bc623ff3a Removed now empty foxxView.css 2014-03-19 17:31:49 +01:00
Michael Hackstein 1d2c7fa6b5 Moved foxxView.css to scss: reduction 100% ...all unused 2014-03-19 17:30:50 +01:00
scottashton c4a8e69453 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 17:27:23 +01:00
scottashton 9603efa7cb got rid of api.css 2014-03-19 17:27:13 +01:00
Michael Hackstein 299e848567 Moved font-awesome from css to scss 2014-03-19 17:03:45 +01:00
Michael Hackstein d5003db6b8 Fixed js-lint 2014-03-19 16:52:14 +01:00
Michael Hackstein 61dac9b2ce Fixed scss-lint warnings 2014-03-19 16:38:21 +01:00
scottashton cf5c1538b6 scss-css, removes shellView.css 2014-03-19 16:32:47 +01:00
scottashton 84737c30db Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 16:13:14 +01:00
scottashton 815112bc7a scss css refactoring 2014-03-19 16:12:58 +01:00
Michael Hackstein b544c69f93 Fixed scss-lint warnings 2014-03-19 16:10:42 +01:00
Michael Hackstein bd6677c42b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_colors.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-03-19 15:31:20 +01:00
Michael Hackstein bcceb5cb5a Fixed pagination, buttons, a table in documents view and scss-lint warning 2014-03-19 15:30:35 +01:00
scottashton 85645e3cf3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 14:54:25 +01:00
scottashton cd49e6defa css scss refactoring 2014-03-19 14:54:04 +01:00
gschwab 4faa60c65d fixed scsslint bug 2014-03-19 13:51:22 +01:00
gschwab 878365778e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 13:49:25 +01:00
gschwab fe16832e01 css refactoring: started layout.css 2014-03-19 13:49:16 +01:00
scottashton d5f3352411 css refactoring 2014-03-19 13:39:22 +01:00
Esteban Lombeyda f0a401c4d8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 13:11:54 +01:00
Esteban Lombeyda 542cca7dc5 support of utf-8 output for windows 2014-03-19 13:10:54 +01:00
Jan Steemann 2ad7a8425a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 10:43:53 +01:00
Jan Steemann 87a2a5beb1 fix Windows compile error 2014-03-19 10:43:42 +01:00
scottashton 3fb3b82e79 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 10:30:22 +01:00
scottashton df8d2dbd89 removed 2 unused css files and fixed minor dashboard bug 2014-03-19 10:30:14 +01:00
gschwab 23905b1d7a css refactoring: fixed scsslint 2014-03-19 10:00:21 +01:00
gschwab 21633d77cc css refactoring: footerView.css 2014-03-19 09:58:45 +01:00
Michael Hackstein 3ca5dd163c Added generated css 2014-03-19 09:19:02 +01:00