public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,525 Commits 655 Branches 650 Tags
95fcddcd952fa8c497c1bda703f706e5feba339e
Commit Graph
356 Commits
Author SHA1 Message Date
Torkel Ödegaard 0d3fbb8659 Added message alerts when login failed due to github team membership or email domain requirement, #1731, #1660 2015-04-29 10:08:01 +02:00
Torkel Ödegaard 884dc53f8a smalĺ refactorings 2015-04-29 09:49:33 +02:00
Torkel Ödegaard d812414621 Merge branch 'github-team-membership-requirement' of https://github.com/dewski/grafana into dewski-github-team-membership-requirement 2015-04-29 09:44:23 +02:00
Torkel Ödegaard e7c43bf614 expose org id to frontend, Closes #1907 2015-04-29 09:26:12 +02:00
Garrett Bjerkhoel 1d7f945268 Handle special error case if connect.UserInfo returns an error 2015-04-28 20:22:45 -07:00
Garrett Bjerkhoel eb37fc089b Check for active team membership when fetching s.UserInfo 2015-04-28 20:22:21 -07:00
Garrett Bjerkhoel 979d0ca70f Add new error type for team membership permissions 2015-04-28 20:21:44 -07:00
Garrett Bjerkhoel 7ea579bb71 Add team_ids configuration option 2015-04-28 20:19:48 -07:00
Torkel Ödegaard af277f560f Merge branch 'master' into editable_false 2015-04-27 08:53:57 +02:00
Torkel Ödegaard e410fbb558 Corrected SQL migration for snapshot table column type change, #1880 2015-04-25 20:28:50 +02:00
Anthony Woods f227002a80 fixes #1880 dashboard_snapshot table does not have a data column 2015-04-25 18:51:25 +08:00
Anthony Woods d84d92f73c fixes #1880 correct mysql statement for modifying column data type 2015-04-25 18:46:30 +08:00
Torkel Ödegaard 4fd2c0570c Replaced slug dependency with one that did not use gopkgs.com 2015-04-24 15:46:16 +02:00
Torkel Ödegaard b99ee2562e Restored sql integration tests to use in mem sqlite3 2015-04-23 16:21:49 +02:00
Torkel Ödegaard 8526025792 MySQL: Dashboard.data column type changed to mediumtext (sql migration added), Fixes #1863 2015-04-23 16:18:46 +02:00
Torkel Ödegaard 236c4e65f8 Began work on dashboard: editable flag, that actually stops users from changing anything, #1834 2015-04-23 15:26:48 +02:00
Torkel Odegaard 1edb13d715 Fixed gofmt formating 2015-04-19 09:29:08 +02:00
Torkel Ödegaard aa8beda4ec Merge pull request #1800 from alienth/allowsignup 
Add allow_sign_up setting for auth.google/github.
 2015-04-19 09:16:48 +02:00
Torkel Odegaard 7178dcad35 Windows: Fixed runtime issue with file logging config that casued errors on startup 2015-04-19 09:14:50 +02:00
Jason Harvey ddaac50a25 Add allow_sign_up override for auth.google/github. 2015-04-16 13:43:18 -08:00
Torkel Ödegaard c54f0fe58b Merge pull request #1783 from williamjoy/master 
oauth google: read api_url from config file
 2015-04-16 08:15:31 +02:00
Torkel Ödegaard fc47fb8f64 Backend auth: remember cookie is needed for oauth logins as well 2015-04-15 13:38:38 +02:00
Torkel Ödegaard 942e8fdba8 Support for unicode / international characters in dashboard title (improved slugify), Fixes #1734, Fixes #827 2015-04-15 12:36:02 +02:00
William Wei b7c0d99cdf get google api url from config file 
instead of using https://www.googleapis.com/oauth2/v1/userinfo in
code.
 2015-04-15 18:11:54 +08:00
Torkel Ödegaard 836e4b4911 Dashboard snapshot: Should not require login to view snapshot, Fixes #1780 2015-04-15 10:39:03 +02:00
Torkel Ödegaard e9afd30b47 Updated changelog with, Github OAuth: Now works with Github for Enterprise, thanks @williamjoy 2015-04-15 10:31:56 +02:00
William Wei 4fd2622e55 grafana/grafana#1781 add oauth api url as config 
read github api from config file instead of using public github:
http://api.github.com/user

this would be useful when you are using github enterprise edition
 2015-04-15 14:18:10 +08:00
William Wei d048e39cde grafana/grafana#1781 add oauth api url as config 2015-04-15 14:03:28 +08:00
Torkel Ödegaard 6de584aafc Updated to config file finding, and added homepath command line option 2015-04-12 09:15:49 +02:00
Torkel Ödegaard d32c03ed11 Rpm working again, systemd working on centos 7 2015-04-10 16:20:01 +02:00
Torkel Ödegaard 2020fedfdb Fixed issue with overriding default config values via command line 2015-04-10 10:58:32 +02:00
Torkel Ödegaard d1767144a8 Reworking configuration loading and overriding 2015-04-09 12:16:59 +02:00
Torkel Ödegaard a991cda233 Began work on refactoring reading config values 2015-04-08 20:31:42 +02:00
Torkel Ödegaard 96ee1c17a3 Worked on new deb & rpm packaging and init.d scripts 2015-04-08 14:10:04 +02:00
Torkel Ödegaard 6911572fa1 Panel image rendering: now works under self-signed https cert, Fixes #1726 2015-04-08 09:06:01 +02:00
Torkel Ödegaard 059db533d5 HTTP API: grafana /render calls nows with api keys, Fixes #1649 2015-04-08 08:59:12 +02:00
Torkel Ödegaard c07d48d930 A big refactoring for how sessions are handled, Api calls that authenticate with api key will no longer create a new session 2015-04-07 19:21:14 +02:00
Torkel Ödegaard 646298f5c5 Handle errors when loading dashboard with template variables that query data sources that cannot be found 2015-04-07 13:48:26 +02:00
Torkel Ödegaard 22adf0d06e Datasource proxy & session timeout fix (casued 401 Unauthorized error after a while), Fixes #1667 2015-04-07 09:25:00 +02:00
Torkel Ödegaard eb575685aa OAuth: Specify allowed email address domains for google or and github oauth logins, Closes #1660 2015-04-06 14:16:22 +02:00
Torkel Ödegaard b8c378f2f0 Updated golang/x/oauth2 dependency, #1710 2015-04-04 09:50:25 +02:00
Torkel Ödegaard e6492f7db9 Share modal: Override UI theme via URL param for Share link, rendered panel, or embedded panel, Closes #1701 2015-04-02 09:21:38 +02:00
Torkel Ödegaard a96e4a343c Only create admin user specified in config file when there are no users in the database, Fixes #1680 2015-04-01 16:05:42 +02:00
Torkel Ödegaard 1f330d7753 Basic auth: Fixed issue when using basic auth proxy infront of Grafana, Fixes #1673 2015-04-01 15:23:26 +02:00
Torkel Ödegaard cf877e6567 added postgres and redis session options 2015-04-01 09:45:42 +02:00
Torkel Ödegaard c3fa68ade8 Data source proxy: Fixed issue with Gzip enabled and data source proxy, Fixes #1675 2015-04-01 09:00:17 +02:00
Torkel Ödegaard 5422d13607 Postgres fix update 2015-04-01 08:26:02 +02:00
Torkel Ödegaard d8f614ed98 Merge pull request #1665 from mattrobenolt/bool 
Let xorm convert `False` into the right type
 2015-04-01 08:25:20 +02:00
Torkel Ödegaard 3c2bfbfc1c Search: Dashboard results should be sorted alphabetically, Fixes #1685 2015-03-31 22:06:19 +02:00
Torkel Ödegaard b83367063e Small improvement to dashboard loading error handling 2015-03-31 14:03:01 +02:00