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

9892 Commits

Author SHA1 Message Date
Guido Schwab 07d3ec2cde Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-21 11:14:28 +01:00
Guido Schwab 2aa3f49bb1 moved 'user management' to 'tools' dropdown 2014-02-21 11:14:23 +01:00
Jan Steemann 35c00ce592 jslint ist unser freund 2014-02-21 09:07:22 +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
Guido Schwab 779b3aaddb ignore .sass-cache/ 2014-02-21 08:36:52 +01:00
Guido Schwab 48d23be18f ignore .sass-cache 2014-02-21 08:34:13 +01:00
Heiko Kernbach 3e559d9afd cleanup old source view 2014-02-20 23:23:13 +01:00
Heiko Kernbach ba14989b22 jslint 2014-02-20 23:19:46 +01:00
Heiko Kernbach a189b8136d cleanup 2014-02-20 23:07:15 +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 b427bad63a do not allow reset 2014-02-20 20:51:00 +01:00
Frank Celler 38f1e55f99 ignore cache 2014-02-20 20:35:18 +01:00
Guido Schwab 1f8bf8da2d changed default avatar image size 2014-02-20 20:30:27 +01:00
Frank Celler 730da7623a added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
Guido Schwab b7d1eebfd3 fixed dropdown item selection and dropdown hide event of user dropdown 2014-02-20 20:03:26 +01:00
Frank Celler 00490ef26d removed unnessary files 2014-02-20 20:02:00 +01:00
Guido Schwab 291011a12b img size fixed 2014-02-20 19:49:33 +01:00
Guido Schwab d109f61e32 somone put the letter 'F' in there O.o 2014-02-20 19:16:26 +01:00
Guido Schwab 45513567d7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 19:09:49 +01:00
Guido Schwab 63c722ab0c some layout changes 2014-02-20 19:09:28 +01:00
Jan Steemann affd2eff14 added derived file 2014-02-20 18:06:48 +01:00
Jan Steemann 68707cabad better error message if keyfile cannot be found 2014-02-20 18:06:25 +01:00
Michael Hackstein bd5eecff85 Fixed a bug in collection settings 2014-02-20 18:00:42 +01:00
Michael Hackstein d20b758a77 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-20 17:43:41 +01:00
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