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

3046 Commits

Author SHA1 Message Date
Michael Hackstein 168b256acb fixed a css bug, it was possible to scroll far to the right on the collections view 2014-02-20 17:43:23 +01:00
Guido Schwab 459b6dc7d7 dbdropdown refresh fixed 2014-02-20 17:23:15 +01:00
Heiko Kernbach c5f7bb4d34 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 17:22:16 +01:00
Heiko Kernbach b865bccb26 new jqconsole lib 2014-02-20 17:21:42 +01:00
Michael Hackstein f58fb5c310 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/templates/userProfileView.ejs
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-20 17:11:18 +01:00
Michael Hackstein fa6d5e72ba Removed unused logo 2014-02-20 16:58:34 +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
Heiko Kernbach 4672e6403c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 16:49:20 +01:00
Heiko Kernbach 3e87072669 ie plugin fix 2014-02-20 16:49:12 +01:00
Guido Schwab 5def66027a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 16:33:10 +01:00
Guido Schwab cb415c7652 added user profile management 2014-02-20 16:32:53 +01:00
Heiko Kernbach 808e2deae5 spelling errors 2014-02-20 16:32:52 +01:00
Heiko Kernbach e3bb5a585a removed unused libs 2014-02-20 13:30:51 +01:00
Heiko Kernbach 77a76da9b0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 13:12:29 +01:00
Heiko Kernbach e00c398ab8 jquery update + cleanup, swagger-fix 2014-02-20 13:12:15 +01:00
Guido Schwab 6b39964f02 delete user fixed 2014-02-20 12:40:45 +01:00
Guido Schwab 4b5babd813 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 12:34:29 +01:00
Guido Schwab 2657fd9063 fixed userModel and notifications 2014-02-20 12:34:20 +01:00
Michael Hackstein d3805eceb8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-20 11:18:30 +01:00
Michael Hackstein e7b796173f Unified badges and buttons on tiles 2014-02-20 11:17:12 +01:00
Jan Steemann a0c3a7fe56 improved users API 2014-02-20 10:04:13 +01:00
Jan Steemann c6f865c55f fixed jslint warnings 2014-02-20 09:56:06 +01:00
Jan Steemann 9577923c7a fixed jslint warnings 2014-02-20 09:55:51 +01:00
Jan Steemann 75b4447191 removed debug stuff 2014-02-20 09:55:38 +01:00
Heiko Kernbach 064e609217 fixed document pagination after using filter method 2014-02-19 18:37:54 +01:00
Heiko Kernbach dafbe9f025 gritter cleanup 2014-02-19 16:00:55 +01:00
Heiko Kernbach d04a34e720 cleanup 2014-02-19 15:51:13 +01:00
Heiko Kernbach 4e3edc679e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-19 15:38:00 +01:00
Heiko Kernbach 7d64371ff0 ejs: karma + manifest 2014-02-19 15:37:52 +01:00
Michael Hackstein 1b1ba44dd0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-19 15:34:16 +01:00
Michael Hackstein cfbb499cfc Fixed jslint line to long crying 2014-02-19 15:34:12 +01:00
Heiko Kernbach 65bdad7617 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-19 15:33:10 +01:00
Heiko Kernbach c2e7d34669 1.0 ejs 2014-02-19 15:33:05 +01:00
Heiko Kernbach fe779c627d ejs update 0.9 -> 1.0 2014-02-19 15:32:48 +01:00
gschwab e7dc7aa3bb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-19 15:31:22 +01:00
Heiko Kernbach 2398ec0fa0 bugfix 2014-02-19 15:30:49 +01:00
gschwab b376b3a803 added logout and restricted images to gravatars 2014-02-19 15:30:31 +01:00
Heiko Kernbach 500f5283bc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-19 14:51:02 +01:00
Heiko Kernbach 7943824c80 user model update 2014-02-19 14:49:18 +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 991bcf0171 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-19 14:29:00 +01:00
Frank Celler c779325b5d added frontend-development switch 2014-02-19 14:28:51 +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
Michael Hackstein 5bd7dce8d5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_colors.scss
 2014-02-19 08:40:21 +01:00
Michael Hackstein 599e5b3759 Added background transparent color to colors 2014-02-19 08:39:18 +01:00
gschwab dfb352a23c added some userManagement functionality 2014-02-19 08:38:04 +01:00
gschwab e17c4c870a merged 2014-02-18 16:40:33 +01:00
gschwab 26e95aa140 updated 2014-02-18 16:37:09 +01:00
gschwab ca6d852621 fixed some minor bugs 2014-02-18 16:35:49 +01:00
Heiko Kernbach 1e964b18d0 removed old/unnecessary notifications 2014-02-18 16:31:46 +01:00
Heiko Kernbach a2e1425b87 karma fix for navigationviewspec 2014-02-18 16:00:00 +01:00
Heiko Kernbach ce450dd994 removed console log 2014-02-18 15:07:14 +01:00
Heiko Kernbach 736ae9ec62 cleanup 2014-02-18 14:55:36 +01:00
Heiko Kernbach fe8d22cdd7 finished new notification system 2014-02-18 14:54:38 +01:00
Heiko Kernbach 140a8f125b notifications 2014-02-18 12:27:39 +01:00
Jan Steemann 39584f0735 adjusted user result structure 2014-02-18 12:05:05 +01:00
Michael Hackstein 46cdc95c6d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-18 10:40:28 +01:00
Michael Hackstein 10c380602a Added a foxx route for authentication. It is now possible to request the logged in user 2014-02-18 10:40:23 +01:00
gschwab 107748a228 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-18 09:27:56 +01:00
gschwab 5408e4b845 added usermanagement view 2014-02-18 09:27:45 +01:00
Heiko Kernbach e8aaac38e2 css fix 2014-02-18 08:26:17 +01:00
Heiko Kernbach fce3cd2879 removed notification view 2014-02-18 08:23:57 +01:00
Michael Hackstein c4b14fcfac Added strong transparency to colors, used by tiles. Also added some more attributes to tile, still some overwrites found there 2014-02-17 22:16:09 +01:00
Michael Hackstein 36affeb5d7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-17 21:32:27 +01:00
Heiko Kernbach 286bcc658a notification prep. + karma fix 2014-02-17 16:46:15 +01:00
gschwab cecb40147d path fixed 2014-02-17 16:43:13 +01:00
Heiko Kernbach 899fa52876 added api-cmd for getting a complete user list 2014-02-17 16:37:50 +01:00
Heiko Kernbach c9193d153f removed obsolesce test 2014-02-17 11:55:22 +01:00
Heiko Kernbach 238396e3c4 prep for new notifications, cleanup 2014-02-17 11:47:58 +01:00
Jan Steemann c40d930fa6 issue #765: added SLICE AQL function 2014-02-17 11:09:03 +01:00
gschwab 067a202104 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-17 08:57:27 +01:00
gschwab 5e90b2fe04 added user and statistic view (fakey and inactive) 2014-02-17 08:57:17 +01:00
Heiko Kernbach 2f96ac70ad new model for notification 2014-02-14 20:45:00 +01:00
Heiko Kernbach 04ab98b133 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-14 20:43:25 +01:00
Heiko Kernbach bcf587847a karma 2014-02-14 20:43:01 +01:00
Frank Celler 38cffe5401 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-14 16:52:13 +01:00
Heiko Kernbach 5a2a5508ef added new collection/model for notifications 2014-02-14 16:51:57 +01:00
Frank Celler 6d51527fb5 check for drive letter 2014-02-14 16:51:40 +01:00
gschwab 2111c7a98e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-13 16:35:28 +01:00
gschwab 8d8476834e tests fixed 2014-02-13 16:35:18 +01:00
Frank Celler 6e588b468a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-13 16:26:07 +01:00
gschwab df7932f7ca tools dropdown fixed 2014-02-13 16:15:53 +01:00
gschwab 2bb45f052c resized page margins 2014-02-13 15:37:39 +01:00
Frank Celler 16f7d558ba added node modules semver, numeral, moment, marked 2014-02-13 15:31:48 +01:00
Michael Hackstein 0474d47a1e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-13 15:12:56 +01:00
gschwab 485958a2a2 tests fixed 2014-02-13 13:10:54 +01:00
gschwab 4fefdeba7f dropdown menues fixed 2014-02-13 12:55:01 +01:00
gschwab 30b9f20250 Highlighting for dropdown item fixed 2014-02-13 09:29:05 +01:00
gschwab ee1ec1b08a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-13 08:45:19 +01:00
gschwab c58342f08a changed 'blubber' to 'Tools' 2014-02-13 08:43:19 +01:00
Frank Celler 89b6ca0ba3 fixed test setup 2014-02-12 22:04:19 +01:00
gschwab 0d2f3b945f karma configuration fixed 2014-02-12 14:44:53 +01:00
gschwab ae3fa2ec77 more tests fixed 2014-02-12 14:36:27 +01:00
gschwab a21d499e51 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-12 14:12:40 +01:00
gschwab 6d55f35058 fixed test 2014-02-12 14:12:18 +01:00
Frank Celler 25878be3d4 added fix for absolute path 2014-02-12 13:54:32 +01:00
Heiko Kernbach 9cb13ca7c0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-12 10:40:31 +01:00
Heiko Kernbach f215495c0f karma&jslint 2014-02-12 10:40:23 +01:00