Torkel Ödegaard
a6a5f393cc
feat(annotations): updated flot events lib and refactored it to use tether-drop lib
2016-02-23 08:09:56 +01:00
Torkel Ödegaard
fa5cf602f5
removed old popover and unused boostrap components
2016-02-22 18:56:35 +01:00
Torkel Ödegaard
cc4fdd6d0c
ux(): fixed issue with cach buster for temlpates, and updated on hover style for sidemenu to look better
2016-02-21 12:47:57 +01:00
bergquist
d769f6c084
ux(timepicker): fix css for the timepicker
2016-02-19 09:13:22 +01:00
Torkel Ödegaard
4ab3542c88
ux(): fixes
2016-02-16 15:12:20 +01:00
Torkel Ödegaard
c961d6218d
ux(less): removed normalize
2016-02-15 14:43:33 +01:00
Torkel Ödegaard
5274f93db7
ux(less): began less / bootstrap less cleanup and restructuring
2016-02-14 18:02:53 +01:00
Torkel Ödegaard
caa765ec32
ux(forms): major simplification of norm-form markup and css
2016-02-13 19:42:05 +01:00
Torkel Ödegaard
7d75e0e53c
ux(): minor fixes and cleanup, fixes for white theme
2016-02-13 16:45:07 +01:00
Trent White
f98dbd249e
update navbar and elements on playlist snapshots and change apps to plugins
2016-02-12 17:20:58 -05:00
Torkel Ödegaard
2ea548850e
Merge branch 'master' into style-changes-bulletfactory
...
Conflicts:
pkg/api/index.go
public/less/sidemenu.less
2016-02-11 21:23:54 +01:00
Trent White
d8b43a3d76
button size tweaks, user form tweaks
2016-02-11 14:41:21 -05:00
Trent White
6189208fa5
org and user form tweaks
2016-02-11 14:18:55 -05:00
Trent White
daf8db71a8
button spacing tweak. Dropdown hover color tweak, sexy pattern added
2016-02-11 13:00:36 -05:00
Trent White
0fa0b3b256
style changes to forms, icons updates and new buttons
2016-02-10 18:14:26 -05:00
Torkel Ödegaard
dfe0e258cd
feat(text and css): html partials and css can be loaded via systemjs
2016-02-10 11:54:17 +01:00
Torkel Ödegaard
509b37eb91
dependency(): upgraded angularjs to 1.5.1
2016-02-10 10:15:11 +01:00
Torkel Ödegaard
ff4dbea19d
ux(navbar): worked on responsive breakpoints for navbar
2016-02-07 12:28:06 +01:00
Torkel Ödegaard
9914714eeb
removed npm frontend assets from repo, installed using npm install postinstall script
2016-01-28 14:37:24 -05:00
Torkel Ödegaard
e95170e9fd
tech(angularjs): upgrade to angularjs 1.5
2015-12-22 12:24:36 +01:00
Torkel Ödegaard
4522b02925
tech(systemjs): almost all tests are passing
2015-12-21 16:00:58 +01:00
Torkel Ödegaard
f7888886e9
tech(systemjs): working on getting tests to work
2015-12-21 11:10:16 +01:00
Torkel Ödegaard
545c39356a
tech(systemjs): starting work on systemjs bundling
2015-12-17 19:18:30 +01:00
Torkel Ödegaard
df1e52e394
tech(systemjs): more stuff is starting to work
2015-12-17 16:30:53 +01:00
Torkel Ödegaard
7c06b5cc22
tech(systemjs): minor change
2015-12-17 13:18:32 +01:00
Torkel Ödegaard
c24935b519
minor progress
2015-12-16 17:01:34 +01:00
Torkel Ödegaard
ca84ef38f8
angular2 test
2015-12-16 12:21:13 +01:00
Torkel Ödegaard
7ee290cc57
tech(systemjs): systemjs and jspm work
2015-12-15 17:56:16 +01:00
Torkel Ödegaard
201f50b121
Merge branch 'master' into external-plugins
...
Conflicts:
pkg/api/login.go
public/app/core/routes/all.js
public/app/core/table_model.ts
public/app/panels/table/table_model.ts
public/app/plugins/panels/table/editor.ts
public/app/plugins/panels/table/table_model.ts
2015-12-14 17:28:57 +01:00
Eric Smekens
58093941c0
Cleaned up jquery.flot.events.js
...
_lastRange was confused with lastRange. This declared '_lastRange' somewhere globally.
Was also not used, so removed both.
(I know this is a library, but it was heavily adjusted anyway.)
2015-12-07 20:16:52 +01:00
Torkel Ödegaard
ee0e4d2b69
Merge branch 'master' into external-plugins
...
Conflicts:
public/app/plugins/panels/table/editor.ts
public/views/index.html
2015-12-02 18:30:48 +01:00
Torkel Ödegaard
4a69de1f30
feat(plugins): made panels work as plugins
2015-11-21 13:46:43 +01:00
Torkel Ödegaard
b25b31e4a0
Merge branch 'master' into develop
2015-11-09 11:25:22 +01:00
utkarshcmu
8448e3970b
Removed unnecessary components.
2015-11-01 09:48:27 -08:00
Torkel Ödegaard
97de8c1cc2
refactoring: move moving stuff around
2015-10-30 15:04:27 +01:00
Torkel Ödegaard
205d4232b9
feat(cloudwatch): only support proxy mode, can remove frontend aws-sdk lib
2015-10-01 17:38:55 +02:00
Torkel Ödegaard
f93215f4ec
feat(timepicker2): more progress
2015-09-18 10:36:47 +02:00
Torkel Ödegaard
5eefa36111
feat(timepickerv2): big progress on new design of new timepicker, #2761
2015-09-17 22:44:59 +02:00
Torkel Ödegaard
4ffa26cf2c
feat() started work on more feature rich time picker
2015-09-15 13:23:36 +02:00
Torkel Ödegaard
ffbf70af25
Merge branch 'cloudwatch' of https://github.com/mtanda/grafana into cloudwatch
2015-08-31 15:45:49 +02:00
Torkel Ödegaard
c876aa537a
feat(panel resize): Resize handles in panel bottom right corners for easy width and height change, closes #2577
...
Conflicts:
public/app/features/panel/panelDirective.js
2015-08-21 14:59:15 +02:00
Torkel Ödegaard
5b9ea96dc5
Merge branch 'v2.1.x'
...
Conflicts:
CHANGELOG.md
package.json
2015-08-20 11:16:05 +02:00
Torkel Ödegaard
e5794ed1c1
fix(dragdrop): Fix for broken drag drop behavior, fixes #2558
2015-08-20 11:12:06 +02:00
Torkel Ödegaard
bf5081ec8c
fix(type ahead): fixed highlight, and made the highlight more distinct, also rolled back #2436 due to its issues on linux and windows, fixes #2527
2015-08-18 10:09:12 +02:00
Torkel Ödegaard
6ee0f2c6a7
feat(mixed data source queries): lots of minor polish to new mixed data source and all the changes it has required, #436
2015-08-17 17:07:33 +02:00
Torkel Ödegaard
56d5b0b12a
feat(mixed datasource): minor progress
2015-08-17 10:31:54 +02:00
Torkel Ödegaard
234d1291f9
Merge branch 'invite'
...
Conflicts:
public/css/less/gfbox.less
public/emails/reset_password.html
public/emails/welcome_on_signup.html
2015-08-11 11:22:43 +02:00
Torkel Ödegaard
775e044e69
feat(invite): progress on invite feature, #2353
2015-08-10 13:47:06 +02:00
Torkel Ödegaard
81790aed13
tech(lib upgrade): updated angularjs to 1.4.3
2015-08-08 12:31:37 +02:00
Mitsuhiro Tanda
88ce05976e
add CloudWatch datasource
2015-08-05 23:10:32 +09:00