Torkel Ödegaard
7535677ed4
fix(build): fixed failing tslint test
2015-09-11 21:04:02 +02:00
woodsaj
6488324cf1
enhance quota support.
...
now includes:
- perOrg (users, dashboards, datasources, api_keys)
- perUser (orgs)
- global (users, orgs, dashboards, datasources, api_keys, sessions)
2015-09-11 23:17:10 +08:00
Torkel Ödegaard
812e4c7cd4
refactor: moved array join directive to typecrtipt
2015-09-11 10:54:56 +02:00
Torkel Ödegaard
85baae1ebd
feat(influxdb): added back fill option to editor, forgot to add it in the new updated query editor
2015-09-11 10:42:50 +02:00
Torkel Ödegaard
8174b9f041
fix(tests): fixed failling backend test
2015-09-11 08:58:45 +02:00
Torkel Ödegaard
fb9e91e486
Merge branch 'master' of github.com:grafana/grafana
2015-09-11 08:13:49 +02:00
Torkel Ödegaard
1429737a60
tech(typescript): added not about typescript to changelog
2015-09-11 08:11:17 +02:00
Torkel Ödegaard
286b4c0e46
Merge branch 'typescript'
2015-09-11 08:01:11 +02:00
Torkel Ödegaard
166a3c4d64
tech(typescript): added tslint to default task
2015-09-11 08:00:13 +02:00
Torkel Ödegaard
d4a701aad0
tech(typescript): more work on typescript
2015-09-11 07:47:00 +02:00
woodsaj
47bf1bd21a
return 404 when quotas not enabled.
2015-09-11 01:51:12 +08:00
woodsaj
852f9bd277
refactor quota settings
2015-09-11 01:47:33 +08:00
woodsaj
555cbeffa5
allow all users to retrieve org and quota data.
2015-09-11 01:18:36 +08:00
woodsaj
3d4d822528
implement updateQuota function
2015-09-11 01:04:29 +08:00
woodsaj
c238130842
quote table names passed by arguments
2015-09-11 01:04:22 +08:00
woodsaj
76e9ebde36
always return after errors.
2015-09-11 01:03:58 +08:00
woodsaj
0688050552
add quota middleware to enforce quotas. issue #321
...
Conflicts:
pkg/api/api.go
2015-09-11 01:03:47 +08:00
woodsaj
9023171940
inital backend suport for quotas. issue #321
...
Conflicts:
conf/defaults.ini
main.go
pkg/services/sqlstore/migrations/migrations.go
2015-09-11 01:01:36 +08:00
Torkel Ödegaard
84371f03b5
tech(typescript): more testing and migration
2015-09-10 16:47:38 +02:00
Torkel Ödegaard
20407bca89
tech(typescript): converted signup controller to typescript
2015-09-10 16:21:57 +02:00
Torkel Ödegaard
96af2debfc
Merge pull request #2717 from sileht/sileht/dataproxy_test-bug
...
Fix dataproxy_test.go tests
2015-09-10 15:51:02 +02:00
Mehdi Abaakouk
6e532231dc
Fix dataproxy_test.go tests
...
This change fix dataproxy_test.go tests that was failing with:
pkg/api/dataproxy_test.go:17: not enough arguments in call to NewReverseProxy
pkg/api/dataproxy_test.go:39: not enough arguments in call to NewReverseProxy
FAIL _/home/ubuntu/grafana/pkg/api [build failed]
2015-09-10 13:27:49 +00:00
Torkel Ödegaard
dceec44671
removed tsconfig
2015-09-10 14:36:05 +02:00
Torkel Ödegaard
0b5f40e66c
tech(): made config system check for generated css or javascript files and panic if there are none, also if there is a public_gen directory it will use that, even if static root is set to public
2015-09-10 13:34:32 +02:00
Torkel Ödegaard
da832368f0
dev building and optimized builds work
2015-09-10 12:42:24 +02:00
Torkel Ödegaard
abac8bccc6
tech(typescript): its looking good
2015-09-10 11:26:40 +02:00
Torkel Ödegaard
82061c7c3b
experiments
2015-09-09 20:37:27 +02:00
Torkel Ödegaard
ec3a684be2
Merge pull request #2711 from jsternberg/master
...
Update docstring for postgres session provider
2015-09-09 20:17:23 +02:00
Jonathan A. Sternberg
5572588c54
Update docstring for postgres session provider
...
The postgres provider is named postgres and not postgresql. For somebody
configuring the server from the config file example, it is very easy to
write an invalid value into the file and accidentally use the "memory"
provider instead because of a typo.
2015-09-09 14:06:14 -04:00
Torkel Ödegaard
a8197df1c1
more experiments for mixing javascript and typescript
2015-09-09 19:34:24 +02:00
Torkel Ödegaard
005e1e002b
more playing around with typescript
2015-09-09 17:40:52 +02:00
Torkel Ödegaard
9603dce469
feat(dataproxy): added whitelist setting and feature for data proxies, closes #2626
2015-09-09 17:21:25 +02:00
Torkel Ödegaard
13190f6f15
fixed version in changelog
2015-09-09 14:25:59 +02:00
Torkel Ödegaard
eaa061d90c
cleanup(): removed old influxdb editor partial
2015-09-09 14:18:56 +02:00
Torkel Ödegaard
1ab374008f
feat(influxdb): completed work on new influxdb query editor, now supports #2708 , #2647 , #2599
2015-09-09 14:17:55 +02:00
Torkel Ödegaard
8c9d551826
feat(influxdb): you can now change group by time iunterval on per query basis, #2647
2015-09-09 13:48:57 +02:00
Torkel Ödegaard
c4c3f9dc1f
feat(influxdb): more work on changing the influxdb editor to support better aliasing and interval options, #2647 , #2599
2015-09-09 13:39:45 +02:00
Torkel Ödegaard
5b722deb39
feat(influxdb): began work on changing the influxdb editor to support better aliasing and interval options, #2647 , #2599
2015-09-09 11:59:02 +02:00
Torkel Ödegaard
b61b7f0c3b
fix(influxdb): fixed editor bug introduced in recent commit
2015-09-09 11:05:49 +02:00
Torkel Ödegaard
3c40310e9b
tech(typescript): testing for how to migrate to typescript
2015-09-09 09:57:06 +02:00
Torkel Ödegaard
7a167742d0
Merge pull request #2701 from brunoqc/patch-1
...
Fix typo
2015-09-08 22:31:58 +02:00
Bruno Bigras
d2a798eb3d
Fix typo
2015-09-08 16:16:51 -04:00
Torkel Ödegaard
3e9e34afb8
feat(annotations): polished up the annotation editor tabs, similar to recent commits for templating editor
2015-09-08 16:59:39 +02:00
Torkel Ödegaard
26d8a041ef
fix(templating): updated templating UI and tab behavior, now edit tab is not visible when not actually editing an existing var, fixes #2679
2015-09-08 15:54:08 +02:00
Torkel Ödegaard
7c25edc7b2
docs(): fixed iframe snapshot links in docs, fixes #2682
2015-09-08 15:24:20 +02:00
Torkel Ödegaard
2725053c82
docs(): fixed iframe snapshot links in docs, fixes #2682
2015-09-08 15:19:59 +02:00
Torkel Ödegaard
e2cb66f8d7
fix(logging): removed temp dev logging code
2015-09-08 14:32:25 +02:00
Torkel Ödegaard
fad1d4cf98
feat(organization): added update org address to http api and to org details settings view, closes #2672
2015-09-08 14:22:44 +02:00
Torkel Ödegaard
daf64421f2
fix(api): Added error handling to create and update org http apis and sql update handlers, now checks for org name taken scenarios and returns correct http error code and message, fixes #2686
2015-09-08 13:06:18 +02:00
Torkel Ödegaard
fa3329271d
fix(email notifications): added error handling to email template parsing, fixes #2690
2015-09-08 10:57:47 +02:00
