Torkel Ödegaard
d38c891fac
merge with master
2017-10-02 14:14:45 +02:00
Torkel Ödegaard
0c86241c5b
Webpack ( #9391 )
...
* webpack poc, this is not going to work for plugins, dam
* tech: webpack and systemjs for plugins starting to work
* tech: webpack and systemjs combo starting to work
* tech: webpack + karma tests progress
* tech: webpack + karma progress
* tech: working on tests
* tech: webpack
* tech: webpack + karma, all tests pass
* tech: webpack + karma, all tests pass
* tech: webpack all tests pass
* webpack: getting closer
* tech: webpack progress
* webpack: further build refinements
* webpack: ng annotate fixes
* webpack: optimized build fix
* tech: minor fix for elasticsearch
* tech: webpack + ace editor
* tech: restored lodash move mixin compatability
* tech: added enzyme react test and upgraded to react v16
* tech: package version fix
* tech: added testdata to built in bundle
* webpack: sass progress
* tech: prod & dev build is working for the sass
* tech: clean up unused grunt stuff and moved to scripts folder
* tech: added vendor and manifest chunks, updated readme and docs
* tech: webpack finishing touches
2017-10-01 20:02:25 +02:00
Torkel Ödegaard
18337f610d
Merge branch 'master' into develop
2017-09-22 08:42:07 +02:00
Patrick O'Carroll
d6725d4fbe
updated error page html+css, added ds_store to ignore ( #9285 )
2017-09-18 14:04:55 +02:00
Matt
f68dc5ca23
Starting to play with new form styles
2017-08-15 09:48:35 +02:00
Torkel Ödegaard
ecfe28d7ac
packaging: added strech to publish script, closes #8737
2017-08-01 09:49:26 +02:00
Daniel Lee
8973b48f96
setting: add tests for windows
2017-06-28 09:35:33 +02:00
Louis Law
8c8b1dde8a
[fix] fix minor issue in gitignore file. ( #8694 )
2017-06-25 11:34:23 -04:00
Torkel Ödegaard
2b029912aa
mysql: query editor fix
2017-04-24 10:58:53 +02:00
bergquist
015423b233
tech(gitignore): ignore vscode folder
2016-09-05 21:35:24 +02:00
bergquist
e3e0b72b43
fix(examples): ignore dist folder
2016-03-02 10:45:17 +01:00
Daniel Lee
be92c8bde1
chore(docker): rename fig.yml to docker-compose.yml
...
Support for the old fig.yml file standard has been removed
in newer versions of docker-compose.
2016-02-24 09:56:57 +01:00
bergquist
36f4f1d0f3
fix(cli): add new executables to gitignore
2016-02-16 08:47:26 +01:00
Torkel Ödegaard
a00231a1c2
updated gitignore
2016-01-28 14:38:55 -05:00
Torkel Ödegaard
a87b5f757d
fix(datasources): minor fix to data sources after apps branch merge
2016-01-12 20:05:40 +01:00
carl bergquist
d7c7f27207
add npm-debug.log to gitignore
2015-12-03 15:29:28 +01:00
Torkel Ödegaard
0bcda4a2eb
minor elasticsearch fix
2015-10-05 11:17:53 +02:00
Torkel Ödegaard
81a660eae4
fix(phantomjs binary): fixed PR #2832 so that it works on linux, now phantomjs based server side rendershould work on mac and linux, maybe even windows
2015-09-29 15:36:13 +02:00
Torkel Ödegaard
4ffa26cf2c
feat() started work on more feature rich time picker
2015-09-15 13:23:36 +02:00
Torkel Ödegaard
20407bca89
tech(typescript): converted signup controller to typescript
2015-09-10 16:21:57 +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
a8197df1c1
more experiments for mixing javascript and typescript
2015-09-09 19:34:24 +02:00
Torkel Ödegaard
99bb9d4fcf
feat(signup): added back the welcome on signup completed email
2015-08-31 11:42:12 +02:00
Torkel Ödegaard
4439545428
feat(invite): lots of work completing the new email template system and css inlineing, converted new_user_invite.html to new system, #2353
2015-08-10 21:24:47 +02:00
Torkel Ödegaard
697529d0e8
Worked on golang code coverage via coveralls
2015-05-02 17:24:03 +02:00
Torkel Ödegaard
e86bedddb2
Updated gitignore file
2015-04-02 15:37:22 +02:00
Torkel Ödegaard
ce99e7b294
Updated gitignore and added config.js
2015-03-29 13:41:01 +02:00
Torkel Ödegaard
6336edbc18
Merge branch 'docs-1.x' into develop
2015-03-11 10:47:09 +01:00
Torkel Ödegaard
5f5bb8541b
Updated docs
2015-03-11 10:32:12 +01:00
Torkel Ödegaard
f32c34c726
Merge branch 'master' into develop
...
Conflicts:
.gitignore
2015-03-10 08:57:14 +01:00
Torkel Ödegaard
15cb1d8980
Added grafana 1.x docs to main repo
2015-03-10 08:56:03 +01:00
Torkel Ödegaard
5ab64987eb
Switching to mkdocs for documentation, and docs that are inside the main repo, adding existing docs, #1571
2015-03-09 17:12:59 +01:00
Torkel Ödegaard
d043ee9407
Fixed js concat issue
2015-03-04 10:04:59 +01:00
Torkel Ödegaard
563d5e3ad8
All migrations work in sqlite3, mysql and postgres
2015-02-25 07:57:51 +01:00
Ryan Williams
c29bf31f2b
add intellij files to gitignore
2015-02-20 19:51:21 +00:00
Jason Wilder
9cc0be0fc2
Add grafana binary to .gitignore
...
Running "go build" defaults to building a binary named
grafana in the root dir.
2015-02-11 14:55:26 -07:00
Torkel Ödegaard
397dfc54cd
Fixed bug in png rendering when having changed public url
2015-02-06 14:17:40 +01:00
Torkel Ödegaard
861e45aedf
Merge remote-tracking branch 'origin/pro'
2015-02-05 10:37:41 +01:00
Torkel Ödegaard
3ab7b5c3f7
Merge branch 'master' of /home/torkel/dev/go/src/github.com/torkelo/backend
...
Conflicts:
.gitignore
LICENSE.md
README.md
2015-02-05 10:10:39 +01:00
Torkel Ödegaard
4cc8a9bd18
More work on getting grafana pro to work in sub url
2015-01-05 07:59:18 +01:00
Torkel Ödegaard
318338f967
Updated zip release task
2015-01-01 22:26:57 +01:00
Torkel Ödegaard
c4a48b35c0
Updated libs
2014-12-30 11:27:36 +01:00
Torkel Ödegaard
26ec858903
Moved grafana bin file to bin folder
2014-12-15 17:36:42 +01:00
Torkel Ödegaard
d7ee4b4573
Added missing files
2014-11-26 09:58:36 +01:00
Torkel Ödegaard
f5b1b192a0
Macaron and sqllite
2014-11-14 17:13:33 +01:00
Torkel Ödegaard
d7cd2b970e
OAuth remake
2014-10-07 17:56:37 -04:00
Torkel Ödegaard
450d242d5f
working on oauth
2014-10-07 15:54:38 -04:00
Torkel Ödegaard
4cd53ce119
Merge branch 'cleanup-generated-files' of github.com:clkao/grafana into clkao-cleanup-generated-files
2014-08-10 09:23:44 +02:00
Chia-liang Kao
8819d559b7
move vendor css intor appropriate places and remove generated files from version control
2014-08-10 02:21:05 +08:00
Torkel Ödegaard
380f707285
workin on png rendering
2014-08-09 11:57:54 +02:00
Torkel Ödegaard
8154b4f60d
search and save are 'working', barely
2014-08-08 12:35:15 +02:00
Torkel Ödegaard
02fb2baf62
Added code coverage, and sending reports to coveralls
2014-08-07 14:58:57 +02:00
Jordan Rinke
f958924b79
added saving and showing temp searches also trailing comman in default.json was causing the default to fail to load for me, #633
2014-07-31 12:37:35 -07:00
Harald Kraemer
f70bf61ff6
Added vim swp files to gitignore
2014-05-15 15:07:03 +02:00
Torkel Ödegaard
f2f435b4cb
Changed name off config.js to config.sample.js to make it easier to upgrade with having to worry about config being overwwritten, if there is no config.js file config.sample.js will be read instead (requirejs fallback). Closes #65
2014-02-06 17:10:25 +01:00
Torkel Odegaard
9d2ce9874a
removed histogram panel
2014-01-06 14:50:56 +01:00
Torkel Ödegaard
54eae2e34a
addded graphiteUrl to config.js
2013-12-07 14:40:14 +01:00
Torkel Ödegaard
50e42c8bdd
started removing kibana stuff I do not need, thinking of doing a custom dashboard based on kibana
2013-12-05 16:45:52 +01:00
Rashid Khan
d21e1c35e1
remove execute bit re: @shatlovsky
2013-10-25 07:47:54 -07:00
Spencer Alger
259562136f
- Removed the "dist" directory
...
- Created a grunt task to build, compress, and upload the build to s3
- Updated the README to point users to downloads.elasticsearch.org
2013-09-16 15:14:20 -07:00
Spencer Alger
5d9cb85ccf
Merged Pull Request #484
2013-09-13 13:52:13 -07:00
Spencer Alger
d778873ba5
Moved JSHint config into the standard .jshintrc file, so that it can be shared with the command line version as well as version that run within IDEs
2013-08-26 17:44:02 -07:00
