Commits · f9cd942363ab57bd6f544e9aa3c2ea530ff82b31 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

16 Sep, 2015 3 commits
- Merge branch 'master' of github.com:grafana/grafana · f9cd9423
  Torkel Ödegaard committed Sep 16, 2015
  
  f9cd9423 Browse Files
- Merge pull request #2750 from elliot/patch-1 · 1282da52
```
Fixed 404 error for robots.txt
```
  Torkel Ödegaard committed Sep 16, 2015
  1282da52 Browse Files
- Fixed 404 error for robots.txt · 10c099a5
  Elliot Anderson committed Sep 16, 2015
  
  10c099a5 Browse Files
15 Sep, 2015 10 commits
- Merge branch 'quotas' of https://github.com/raintank/grafana into raintank-quotas · fa0542ca
  Torkel Ödegaard committed Sep 15, 2015
  
  fa0542ca Browse Files
- fix getting default quota as map[string]int64 · 39262264
  woodsaj committed Sep 15, 2015
  
  39262264 Browse Files
- Merge branch 'quotas' of https://github.com/raintank/grafana into raintank-quotas · 6a30511f
  Torkel Ödegaard committed Sep 15, 2015
  
  6a30511f Browse Files
- add quota middleware unittests · 1ad10914
  woodsaj committed Sep 15, 2015
  
  1ad10914 Browse Files
- move toMap function to be a method on the quota structs · 86ed85aa
  woodsaj committed Sep 15, 2015
  
  86ed85aa Browse Files
- add unittests for quota sqltore methods. · b7de8472
  woodsaj committed Sep 15, 2015
  
  b7de8472 Browse Files
- be sure to pass result obj by reference to xorm. · 3cf2cd46
  woodsaj committed Sep 15, 2015
  
  3cf2cd46 Browse Files
- refactor: moving routes into core, improved bundle loader · 2b95cd50
  Torkel Ödegaard committed Sep 15, 2015
  
  2b95cd50 Browse Files
- fix(): fixed requirejs build · 8f45324b
  Torkel Ödegaard committed Sep 15, 2015
  
  8f45324b Browse Files
- refactor: improving structure, moving things into a core module · 5545cdbf
  Torkel Ödegaard committed Sep 15, 2015
  
  5545cdbf Browse Files
14 Sep, 2015 5 commits
- refactor: refactoring app boot up and core structure · 9dec5083
  Torkel Ödegaard committed Sep 14, 2015
  
  9dec5083 Browse Files
- fix(settings): another attempt at fixing, #2736 · 64973f1d
  Torkel Ödegaard committed Sep 14, 2015
  
  64973f1d Browse Files
- fix(settings): reverted prev settings fix for detecting public_gen folder in… · d7bfb727
```
fix(settings): reverted prev settings fix for detecting public_gen folder in dev, caused issue for prod build
```
  Torkel Ödegaard committed Sep 14, 2015
  d7bfb727 Browse Files
- fix(gofmt): somehow api.go did not pass gofmt test · 37ad58c6
  Torkel Ödegaard committed Sep 14, 2015
  
  37ad58c6 Browse Files
- fix(build): fixed issue with ngAnnotate not including files in core/*, fixes #2733 · de753bf3
  Torkel Ödegaard committed Sep 14, 2015
  
  de753bf3 Browse Files
13 Sep, 2015 2 commits
- fix(backend): made public_gen detection more bullet proof, #2731 · d17f8538
  Torkel Ödegaard committed Sep 13, 2015
  
  d17f8538 Browse Files
- tech(nodejs upgrade): upgraded to nodejs 4.0 for grunt build · 1900c81d
  Torkel Ödegaard committed Sep 13, 2015
  
  1900c81d Browse Files
12 Sep, 2015 2 commits
- refactor: finished timepicker to typescript and directive refactor · 9db6f826
  Torkel Ödegaard committed Sep 12, 2015
  
  9db6f826 Browse Files
- refactor: moved timepicker from a simple panel to component, removed simple panel directive · d96a6a59
  Torkel Ödegaard committed Sep 12, 2015
  
  d96a6a59 Browse Files
11 Sep, 2015 10 commits
- fix(build): fixed failing tslint test · 7535677e
  Torkel Ödegaard committed Sep 11, 2015
  
  7535677e Browse Files
- enhance quota support. · 6488324c
```
now includes:
- perOrg (users, dashboards, datasources, api_keys)
- perUser (orgs)
- global (users, orgs, dashboards, datasources, api_keys, sessions)
```
  woodsaj committed Sep 11, 2015
  6488324c Browse Files
- refactor: moved array join directive to typecrtipt · 812e4c7c
  Torkel Ödegaard committed Sep 11, 2015
  
  812e4c7c Browse Files
- feat(influxdb): added back fill option to editor, forgot to add it in the new updated query editor · 85baae1e
  Torkel Ödegaard committed Sep 11, 2015
  
  85baae1e Browse Files
- fix(tests): fixed failling backend test · 8174b9f0
  Torkel Ödegaard committed Sep 11, 2015
  
  8174b9f0 Browse Files
- Merge branch 'master' of github.com:grafana/grafana · fb9e91e4
  Torkel Ödegaard committed Sep 11, 2015
  
  fb9e91e4 Browse Files
- tech(typescript): added not about typescript to changelog · 1429737a
  Torkel Ödegaard committed Sep 11, 2015
  
  1429737a Browse Files
- Merge branch 'typescript' · 286b4c0e
  Torkel Ödegaard committed Sep 11, 2015
  
  286b4c0e Browse Files
- tech(typescript): added tslint to default task · 166a3c4d
  Torkel Ödegaard committed Sep 11, 2015
  
  166a3c4d Browse Files
- tech(typescript): more work on typescript · d4a701aa
  Torkel Ödegaard committed Sep 11, 2015
  
  d4a701aa Browse Files
10 Sep, 2015 8 commits
- return 404 when quotas not enabled. · 47bf1bd2
  woodsaj committed Sep 11, 2015
  
  47bf1bd2 Browse Files
- refactor quota settings · 852f9bd2
  woodsaj committed Sep 11, 2015
  
  852f9bd2 Browse Files
- allow all users to retrieve org and quota data. · 555cbeff
  woodsaj committed Sep 11, 2015
  
  555cbeff Browse Files
- implement updateQuota function · 3d4d8225
  woodsaj committed Sep 11, 2015
  
  3d4d8225 Browse Files
- quote table names passed by arguments · c2381308
  woodsaj committed Sep 11, 2015
  
  c2381308 Browse Files
- always return after errors. · 76e9ebde
  woodsaj committed Sep 11, 2015
  
  76e9ebde Browse Files
- add quota middleware to enforce quotas. issue #321 · 06880505
```
Conflicts:
	pkg/api/api.go
```
  woodsaj committed Sep 11, 2015
  06880505 Browse Files
- inital backend suport for quotas. issue #321 · 90231719
```
Conflicts:
	conf/defaults.ini
	main.go
	pkg/services/sqlstore/migrations/migrations.go
```
  woodsaj committed Sep 11, 2015
  90231719 Browse Files