Torkel Ödegaard
1f959272c5
feat(migration): added back support to import old dashboard from from Elasticsearch
2015-09-16 16:28:41 +02:00
Torkel Ödegaard
f9cd942363
Merge branch 'master' of github.com:grafana/grafana
2015-09-16 15:17:57 +02:00
Torkel Ödegaard
1282da52eb
Merge pull request #2750 from elliot/patch-1
...
Fixed 404 error for robots.txt
2015-09-16 12:09:56 +02:00
Elliot Anderson
10c099a52d
Fixed 404 error for robots.txt
2015-09-16 11:02:50 +10:00
Torkel Ödegaard
fa0542ca8b
Merge branch 'quotas' of https://github.com/raintank/grafana into raintank-quotas
2015-09-15 14:33:21 +02:00
woodsaj
3926226417
fix getting default quota as map[string]int64
2015-09-15 20:31:58 +08:00
Torkel Ödegaard
6a30511fc4
Merge branch 'quotas' of https://github.com/raintank/grafana into raintank-quotas
2015-09-15 14:23:13 +02:00
woodsaj
1ad10914ce
add quota middleware unittests
2015-09-15 18:19:47 +08:00
woodsaj
86ed85aa6e
move toMap function to be a method on the quota structs
2015-09-15 17:18:26 +08:00
woodsaj
b7de847236
add unittests for quota sqltore methods.
2015-09-15 17:10:46 +08:00
woodsaj
3cf2cd4684
be sure to pass result obj by reference to xorm.
2015-09-15 17:10:16 +08:00
Torkel Ödegaard
2b95cd5081
refactor: moving routes into core, improved bundle loader
2015-09-15 08:53:06 +02:00
Torkel Ödegaard
8f45324bce
fix(): fixed requirejs build
2015-09-15 08:20:26 +02:00
Torkel Ödegaard
5545cdbf4d
refactor: improving structure, moving things into a core module
2015-09-15 08:17:40 +02:00
Torkel Ödegaard
9dec50832d
refactor: refactoring app boot up and core structure
2015-09-14 22:54:00 +02:00
Torkel Ödegaard
64973f1d57
fix(settings): another attempt at fixing, #2736
2015-09-14 15:54:35 +02:00
Torkel Ödegaard
d7bfb727b0
fix(settings): reverted prev settings fix for detecting public_gen folder in dev, caused issue for prod build
2015-09-14 13:42:23 +02:00
Torkel Ödegaard
37ad58c69e
fix(gofmt): somehow api.go did not pass gofmt test
2015-09-14 12:30:30 +02:00
Torkel Ödegaard
de753bf330
fix(build): fixed issue with ngAnnotate not including files in core/*, fixes #2733
2015-09-14 09:33:26 +02:00
Torkel Ödegaard
d17f8538b2
fix(backend): made public_gen detection more bullet proof, #2731
2015-09-13 15:23:23 +02:00
Torkel Ödegaard
1900c81d9f
tech(nodejs upgrade): upgraded to nodejs 4.0 for grunt build
2015-09-13 12:13:47 +02:00
Torkel Ödegaard
9db6f82628
refactor: finished timepicker to typescript and directive refactor
2015-09-12 12:52:50 +02:00
Torkel Ödegaard
d96a6a59ee
refactor: moved timepicker from a simple panel to component, removed simple panel directive
2015-09-12 11:49:27 +02:00
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
