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

4230 Commits

Author SHA1 Message Date
gschwab cb95204e61 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-24 09:19:58 +01:00
gschwab 527d88747b added connection check for multi machine cluster 2014-03-24 09:19:50 +01:00
Jan Steemann 3ad15e3ac1 fixed non-working "save" button in collection edit view of web interface 
clicking the save button did nothing. one had to press enter in one of the input fields to send modified form data

Conflicts:
	js/apps/system/aardvark/frontend/js/views/collectionView.js
 2014-03-21 22:44:37 +01:00
Jan Steemann a9920ea9ca dont try to load datatables.css - this file has already been deleted! 2014-03-21 21:27:33 +01:00
Heiko Kernbach 1fcbd582b3 logs pagination bugfix, when totalPages are zero 2014-03-21 17:21:10 +01:00
Heiko Kernbach 09c2060969 removed console logs 2014-03-21 17:12:47 +01:00
Heiko Kernbach 71ca2fee1f new icons for pagination (scss) 2014-03-21 17:05:39 +01:00
Heiko Kernbach 5107cbb694 removed old snippet css 2014-03-21 15:51:47 +01:00
Heiko Kernbach 085d3de302 snippet css to scss 2014-03-21 15:50:47 +01:00
Heiko Kernbach a2d80c2b9e dataTables scss lint 2014-03-21 15:48:53 +01:00
Heiko Kernbach 3824fe5fdb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-21 15:44:13 +01:00
Heiko Kernbach faa9317db5 removed unused glyphicons 2014-03-21 15:44:00 +01:00
scottashton 149d90e78b merged 2014-03-21 15:33:08 +01:00
scottashton 0e3da446d1 kill modal.css 2014-03-21 15:32:24 +01:00
Heiko Kernbach a409acd013 dataTables scss lint 2014-03-21 15:17:25 +01:00
Heiko Kernbach c84d284a90 cleanup css 2014-03-21 15:09:42 +01:00
Heiko Kernbach 4aef4877a5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-21 15:09:28 +01:00
Heiko Kernbach 31a69dba67 dataTables css -> scss 2014-03-21 15:09:18 +01:00
scottashton 355c1100eb _collection.scss 2014-03-21 14:16:53 +01:00
scottashton 690a2afe81 fixed merge bug 2014-03-21 14:00:33 +01:00
scottashton d61f1e4e0c merged 2014-03-21 13:47:58 +01:00
scottashton 7a1a905f4d jslinted the dashboardView 2014-03-21 13:39:09 +01:00
scottashton 28029236d1 fixed dashboard bugs 2014-03-21 13:24:56 +01:00
scottashton 51c1072b42 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-21 13:24:22 +01:00
Michael Hackstein 1c825f12b3 I am to stupid to use a keyboard... 2014-03-21 11:22:36 +01:00
Michael Hackstein ef0562149a Fixed karma ui tests 2014-03-21 11:18:33 +01:00
Michael Hackstein 0b266d1dd5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-21 11:13:36 +01:00
Michael Hackstein 1c4d9f14e5 Fixed SCSS-Lint warnings for graphViewer.scss 2014-03-21 11:13:33 +01:00
Michael Hackstein a875353eb4 Removed now empty file 2014-03-21 11:08:30 +01:00
Michael Hackstein 55f0c0357c Finished moving graphViewer.css to scss, will now cleanup scss-lint 2014-03-21 11:07:51 +01:00
Heiko Kernbach 7ee66c908c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-21 11:06:07 +01:00
scottashton f5ff718ed0 merged 2014-03-21 10:58:11 +01:00
Heiko Kernbach 576a173b9f scss lint 2014-03-21 10:54:04 +01:00
Heiko Kernbach 8f486d1abb removed old unused font 2014-03-21 10:52:48 +01:00
Michael Hackstein a53ded4645 Removed now empty CSS files 2014-03-21 10:42:52 +01:00
Michael Hackstein 9b7034e3c0 Continued moving the graphViewer from css to scss 2014-03-21 10:41:08 +01:00
Michael Hackstein 4607522e8d Solved merge conflict 2014-03-21 10:39:26 +01:00
Jan Steemann 7c28db24af added tests for coffee script 2014-03-21 09:22:20 +01:00
Jan Steemann 2d7a586cc6 added derived file 2014-03-21 08:59:50 +01:00
scottashton aa2a4ba800 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-21 08:39:00 +01:00
scottashton 411f91f8ca merged 2014-03-21 08:38:39 +01:00
Frank Celler 11fb42e722 removed SYS_TEST_PORT from global namespace 2014-03-20 23:05:17 +01:00
Frank Celler e25945aaba fixed javascript.execute for coffee-script 2014-03-20 22:51:30 +01:00
Jan Steemann 0ac6928e0f prevent `body length: -9223372036854775808` being printed 2014-03-20 20:45:06 +01:00
Frank Celler e3df90d2c3 coffee script fix 
Conflicts:
	js/server/modules/org/arangodb/foxx/manager.js
 2014-03-20 19:36:42 +01:00
Heiko Kernbach 83ba5f313c JSLint 2014-03-20 19:09:34 +01:00
Heiko Kernbach 44bfa51f5d scss lint 2014-03-20 19:03:08 +01:00
Heiko Kernbach dbc2d81000 prep 2014-03-20 18:53:26 +01:00
Heiko Kernbach 66deff7d73 merge conflict 2014-03-20 17:33:23 +01:00
Heiko Kernbach f77a28f632 transfer documentView.css to scss 2014-03-20 17:31:59 +01:00
Heiko Kernbach c3e23ed8ee test 2014-03-20 17:31:11 +01:00
scottashton 4a3c27af88 fixed minor dashboardbugs 2014-03-20 17:07:28 +01:00
gschwab 43797c5af1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 16:45:22 +01:00
gschwab bb02f28607 css-refactoring: logsView.css finished 2014-03-20 16:41:10 +01:00
scottashton d76083ce82 another bugfix for jan 2014-03-20 16:40:31 +01:00
Heiko Kernbach 55467b3a3c scss-lint 2014-03-20 16:28:31 +01:00
Heiko Kernbach 78127b823d notification css fix 2014-03-20 16:25:19 +01:00
scottashton 6b45a98e5e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 16:02:05 +01:00
Heiko Kernbach 4fb7409cd9 fixed visual bugs in scss 2014-03-20 16:00:42 +01:00
scottashton 32874937b1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 15:58:44 +01:00
scottashton 6116fce553 fixed bug jan found, always show 20 min of history 2014-03-20 15:57:33 +01:00
gschwab 286261c2d1 fixed scsslint errors 2014-03-20 13:28:22 +01:00
gschwab 463f5bde2b css refactoring: finished layout.css 2014-03-20 13:22:06 +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 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
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
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
Michael Hackstein 0ade3e15f7 Fixed the save document info text, was off by 5px 2014-03-19 09:16:53 +01:00