 Torkel Ödegaard
|
dba7062fbc
|
Some more polish to confirm dialogs
|
2015-03-05 21:02:25 +01:00 |
|
|
Torkel Ödegaard
|
6786ffffac
|
Small update to submenu (annotation/templating) css, #1554
|
2015-03-05 20:45:14 +01:00 |
|
|
Torkel Ödegaard
|
16320d66f2
|
Updated build file
|
2015-03-05 20:11:34 +01:00 |
|
|
Torkel Ödegaard
|
ec6dd35098
|
Fixed path to ZeroClipboard flash file
|
2015-03-05 20:10:05 +01:00 |
|
|
Torkel Ödegaard
|
f5f4689e7c
|
Worked on styling for confirm dialogs, #1554
|
2015-03-05 20:04:54 +01:00 |
|
|
Torkel Ödegaard
|
259d330822
|
Began work on modal css polish, #1554
|
2015-03-05 18:01:41 +01:00 |
|
|
Torkel Ödegaard
|
79be106711
|
Fixed javascript style check error
|
2015-03-05 16:53:08 +01:00 |
|
|
Torkel Ödegaard
|
5ccd3e2f84
|
Updated share panel/dash look, added copy to clipboard button (using ZeroClipboard lib), #1554
|
2015-03-05 16:52:32 +01:00 |
|
|
Torkel Ödegaard
|
4f8d22796a
|
Merge remote-tracking branch 'origin/master' into develop
|
2015-03-05 12:26:08 +01:00 |
|
|
Torkel Ödegaard
|
5be5ee9b1b
|
Fixed panel error handling issue
|
2015-03-05 12:25:48 +01:00 |
|
|
Torkel Ödegaard
|
679f2aa262
|
removed console logging, left by mistake in last commit
|
2015-03-05 12:19:52 +01:00 |
|
|
Torkel Ödegaard
|
58034c24ce
|
Merge remote-tracking branch 'origin/master' into develop
|
2015-03-05 11:17:39 +01:00 |
|
|
Torkel Ödegaard
|
1ac9b50f21
|
Increased limit before graph date axis switches to showing date and hour, Fixes #1558
|
2015-03-05 11:16:48 +01:00 |
|
|
Torkel Ödegaard
|
af9dc4c277
|
Fixed issue with OpenTSDB editor and checkboxes, Fixes #1559
|
2015-03-05 11:00:47 +01:00 |
|
|
Torkel Ödegaard
|
f817a8ca3c
|
Merge remote-tracking branch 'origin/master' into develop
Conflicts:
src/app/directives/grafanaPanel.js
src/app/features/dashboard/dashboardCtrl.js
|
2015-03-05 10:45:27 +01:00 |
|
|
Torkel Ödegaard
|
97e5a04621
|
Fixed memory leak in bootstrap Typeahead code, Fixes #1497
|
2015-03-05 10:42:46 +01:00 |
|
|
Torkel Ödegaard
|
30294740bd
|
Updated build script, changed deb and rpm config path to /etc/grafana, #1476
|
2015-03-04 16:23:30 +01:00 |
|
|
Torkel Ödegaard
|
6bf4edade1
|
Updated build.go to get better version/build names
|
2015-03-04 14:48:21 +01:00 |
|
|
Torkel Ödegaard
|
de1e762528
|
Fixed issue using mysql as session store, Closes #1557
|
2015-03-04 10:34:26 +01:00 |
|
|
Torkel Ödegaard
|
d043ee9407
|
Fixed js concat issue
|
2015-03-04 10:04:59 +01:00 |
|
|
Torkel Ödegaard
|
14766ad38e
|
Updated wercker, moved s3sync to deploy step
|
2015-03-04 09:12:32 +01:00 |
|
|
Torkel Ödegaard
|
dfcf68f21d
|
Moved npm install before test
|
2015-03-04 07:20:36 +01:00 |
|
|
Torkel Ödegaard
|
d89c77af54
|
Small changes to build scripts
|
2015-03-04 07:09:59 +01:00 |
|
|
Torkel Ödegaard
|
2d7d70b90f
|
removed old todo file
|
2015-03-03 21:36:51 +01:00 |
|
|
Torkel Ödegaard
|
5dc905e35d
|
Updated wercker file
|
2015-03-03 21:11:37 +01:00 |
|
|
Torkel Ödegaard
|
660d44b6ad
|
Fixed form issue with firefox and IE, Closes #1551
|
2015-03-03 20:47:35 +01:00 |
|
|
Torkel Ödegaard
|
d3d39b3e17
|
s3 sync working finally
|
2015-03-03 20:35:42 +01:00 |
|
|
Torkel Ödegaard
|
3fd2f87b15
|
another wercker failure, trying this
|
2015-03-03 20:32:37 +01:00 |
|
|
Torkel Ödegaard
|
9e7a0f8d83
|
Updated wercker again
|
2015-03-03 20:26:39 +01:00 |
|
|
Torkel Ödegaard
|
6703f0514d
|
Another attemp at s3 sync
|
2015-03-03 20:17:13 +01:00 |
|
|
Torkel Ödegaard
|
02f4eb53dd
|
Updated wercker s3 step
|
2015-03-03 20:12:11 +01:00 |
|
|
Torkel Ödegaard
|
04597b3f54
|
Updated wercker test step
|
2015-03-03 20:08:20 +01:00 |
|
|
Torkel Ödegaard
|
4379f58213
|
Fixed intendation in wercker file
|
2015-03-03 19:59:53 +01:00 |
|
|
Torkel Ödegaard
|
2906d643a5
|
Testing s3sync from wercker build
|
2015-03-03 19:58:57 +01:00 |
|
|
Torkel Ödegaard
|
bec9504cd8
|
Updated wercker file again
|
2015-03-03 19:17:24 +01:00 |
|
|
Torkel Ödegaard
|
7a8889e7f5
|
Added rpm tools to wercker pre build step
|
2015-03-03 19:00:22 +01:00 |
|
|
Torkel Ödegaard
|
8054f6a2d1
|
Updated build and wercker, again
|
2015-03-03 18:11:16 +01:00 |
|
|
Torkel Ödegaard
|
f2595917c6
|
updated wercker build, trying to install ruby and fpm in wercker step
|
2015-03-03 18:00:58 +01:00 |
|
|
Torkel Ödegaard
|
55b40aeb65
|
updated build.go
|
2015-03-03 17:58:13 +01:00 |
|
|
Torkel Ödegaard
|
4f2bca08f1
|
Updated wercker file again...
|
2015-03-03 17:56:55 +01:00 |
|
|
Torkel Ödegaard
|
48d83a4dc4
|
Updated wercker file
|
2015-03-03 17:56:08 +01:00 |
|
|
Torkel Ödegaard
|
2362f9574e
|
Updated wercker file
|
2015-03-03 17:50:33 +01:00 |
|
|
Torkel Ödegaard
|
8ba9b8d7bd
|
added custom wercker box
|
2015-03-03 17:47:26 +01:00 |
|
|
Torkel Ödegaard
|
c6d4b5cc86
|
Working on build steps
|
2015-03-03 17:42:50 +01:00 |
|
|
Torkel Ödegaard
|
0db55b6194
|
Work on deb and rpm packages, both seem to work now, #1476
|
2015-03-03 17:14:58 +01:00 |
|
|
Torkel Ödegaard
|
59da4a0b3b
|
Updates to build and wercker file
|
2015-03-03 12:09:15 +01:00 |
|
|
Torkel Ödegaard
|
9192acf250
|
Fixed js style errors
|
2015-03-03 10:20:52 +01:00 |
|
|
Torkel Ödegaard
|
7e0f1a57af
|
Progress on deb and rpm packaging, renamed config files, added file logging, #1476
|
2015-03-03 10:18:37 +01:00 |
|
|
Torkel Ödegaard
|
f5cd3d853d
|
Small update to confirm dialog
|
2015-03-03 08:03:21 +01:00 |
|
|
Torkel Ödegaard
|
04d25dc58a
|
Dashboard: When saving a dashboard and another user has made changes inbetween, the user is promted with a warning if he really wants to overwrite the other's changes, Closes #718
|
2015-03-02 22:24:01 +01:00 |
|