Guido Schwab
|
1f8bf8da2d
|
changed default avatar image size
|
2014-02-20 20:30:27 +01:00 |
Guido Schwab
|
b7d1eebfd3
|
fixed dropdown item selection and dropdown hide event of user dropdown
|
2014-02-20 20:03:26 +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 |
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 |
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 |