Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream changes #1

Merged
merged 80 commits into from
Jan 22, 2014
Merged

Upstream changes #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
caaf6a8
Use protocol agnostic google font url.
Apr 18, 2013
a1b14ec
Added suffix option for number widget
jfriedlaender Apr 29, 2013
4bb30e4
Merge pull request #115 from jfriedlaender/patch-1
pushmatrix Apr 29, 2013
aadfbf1
Merge pull request #107 from neopoly/protocol-agnostic
pushmatrix Apr 30, 2013
31bdc6d
Properly hyphenate css class names for widgets.
Mar 25, 2013
1a974c7
Test that the Sinatra app redirects to the default dashboard; saves d…
apeckham May 7, 2013
50c8638
add test for redirecting to first dashboard, and returning a 404 if d…
apeckham May 8, 2013
8ad8097
allow send_event to be called from within modules
zsalzbank Apr 29, 2013
627504c
updated version of gridster
Apr 14, 2013
56b3ac9
Bump coffee script version.
pushmatrix May 9, 2013
8795505
use any Tilt-supported view engine for dashboards, including Haml
apeckham May 10, 2013
b1b0b3c
Persist history at exit and load on start, so that server restarts do…
ndbroadbent May 17, 2013
a6eea61
allow widget views to be written in any Tilt-supported template language
apeckham May 20, 2013
f91c1b8
Added dependency to the twitter gem so that the twitter widget can wo…
pushmatrix Jun 14, 2013
2e1c714
Version 1.0.6.
pushmatrix Jun 14, 2013
a0f4d31
Merge pull request #123 from apeckham/haml
davefp Jun 21, 2013
6f2b575
Version 1.0.7
Jun 21, 2013
7d7a07e
Merge pull request #142 from ndbroadbent/persist_history
davefp Jun 21, 2013
f609a40
Changes history file location to avoid failing tests
Jun 21, 2013
062a84c
Update License
pushmatrix Jun 24, 2013
32edb87
render titles correctly
Jun 25, 2013
6e19ec4
Merge pull request #153 from davefp/title_fix
pushmatrix Jun 26, 2013
86d8c29
Updates gitignore to exclude compiled gem
Jun 27, 2013
8dfe7c7
Merge branch 'master' of github.com:Shopify/dashing
Jun 27, 2013
7b2a1e7
bump minor gem version for release of history file
Jun 27, 2013
86aac07
Yo dawg, I heard you liked jobs so we added recursive loading to your…
Jun 28, 2013
326c5b9
Merge pull request #156 from davefp/recursive_job_loading
pushmatrix Jul 8, 2013
3f58bbd
Adding application messaging.
pvande Nov 5, 2012
5f8cbcb
dashboard events - use SSE event names
cjolly Jul 15, 2013
630269f
use tmp dir for history file when running tests
cjolly Jul 15, 2013
c2fad09
Merge pull request #165 from cjolly/tests-tmp-history-file
davefp Jul 16, 2013
04f9678
add stop command to dashing
mcritchlow Jul 24, 2013
98a6195
Merge pull request #171 from mcritchlow/master
davefp Jul 24, 2013
60dcd73
only fire dashboard events when target is current dashboard
cjolly Jul 20, 2013
ff467e2
Merge remote-tracking branch 'cjolly/cjolly-application-messages'
Jul 29, 2013
bf0315f
add stop command to dashing
mcritchlow Jul 24, 2013
c327f6e
Merge branch 'master' of github.com:Shopify/dashing
Jul 29, 2013
60a3ddf
update gemspec to 1.2.0
Jul 29, 2013
06ba2ea
Authenticate / route as to not leak private dashboard url
Jul 31, 2013
e672d84
Merge pull request #174 from drubin/auth-for-index
davefp Jul 31, 2013
8e14229
Handle widgets with multiple capital letters
drubin Aug 8, 2013
7f20315
The default dashboard is picked simply as the first one alphabeticall…
pushmatrix Aug 9, 2013
2b715ac
Allow the graph type to be specified when using the graph widget
Aug 17, 2013
9f93895
Strip html by default in widgets. Users can disable this with the 'ra…
pushmatrix Aug 20, 2013
9496b31
Updates rickshaw and d3, and puts version numbers in the filenames
Aug 20, 2013
de40223
Merge pull request #181 from drubin/patch-2
pushmatrix Aug 20, 2013
3af326d
Updates fontawesome to 3.2.1
Aug 21, 2013
81b3cbf
Merge branch 'master' of github.com:Shopify/dashing
Aug 21, 2013
99c64d5
Make relative to allow running on sub-path
Aug 28, 2013
69afd2f
Merge pull request #209 from micpango/master
davefp Aug 30, 2013
e11d3c2
Fixes event connection close error never re-establishes connection.
Aug 30, 2013
833d995
Remove silly label
pushmatrix Sep 2, 2013
7b4cc3e
change reload to 5 minutes
Sep 3, 2013
2671d38
Merge pull request #211 from redronin/fix-connection-closed
davefp Sep 3, 2013
eb331a2
add firebase gems
Sep 9, 2013
a4cdeb8
Merge pull request #226 from jordanwheeler/use-firebase
Sep 9, 2013
b812737
Revert "Merge pull request #226 from jordanwheeler/use-firebase"
pushmatrix Sep 9, 2013
68836c6
gitignore history.yml
Sep 11, 2013
f827263
Merge pull request #229 from mpavlov/gitignore_history
pushmatrix Sep 11, 2013
a05fb1b
Add Travis CI support.
pushmatrix Sep 19, 2013
c973499
Update Readme to include travis CI build status.
pushmatrix Sep 19, 2013
795eb52
Fix travisCI config to not use a bundled version of rake.
pushmatrix Sep 19, 2013
2c81931
Locks rufus to version 2.x
Oct 2, 2013
540aefd
bump minor version number for release
Oct 2, 2013
a9edc7e
fix url for fontawesome
sangmank Oct 6, 2013
96b72b5
Merge pull request #239 from sangmank/patch-2
davefp Oct 6, 2013
4028045
bumps patch version
Oct 6, 2013
7ca9e82
Define a KEYS constant
Oct 30, 2013
4177623
require config/settings.rb if exists
Oct 30, 2013
5b04572
Update to use the new Twitter 5.0.0 gem.
pushmatrix Nov 21, 2013
4a042c5
adding pessimistic versioning for gem dependencies
pseudomuto Dec 18, 2013
69ed82e
adding haml to dev dependencies so all tests run
pseudomuto Dec 18, 2013
c3a7279
switching from test unit to minitest
pseudomuto Dec 18, 2013
d0eef2d
moving cli to lib and updating bin file
pseudomuto Dec 19, 2013
0c1adbd
adding simplecov for verifying test coverage
pseudomuto Dec 19, 2013
fbc9497
moving app to it's own file under lib/dashing
pseudomuto Dec 19, 2013
e975ce7
light refactoring for better test coverage
pseudomuto Dec 19, 2013
333f5b2
updating javascripts path
pseudomuto Dec 19, 2013
c49b9bc
removing and ignoring .ruby-version
pseudomuto Jan 6, 2014
9e8dfe7
Merge pull request #296 from Shopify/updating_gems_and_refactoring
pushmatrix Jan 13, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
removing and ignoring .ruby-version
  • Loading branch information
@pseudomuto
pseudomuto committed Jan 6, 2014
commit c49b9bc5d47fe02d26836dee5034fe28490f0ebd
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
/Gemfile.lock
*.gem
coverage/
.ruby-version
1 change: 0 additions & 1 deletion .ruby-version
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: ruby
rvm:
- 2.1.0
- 2.0.0
- 1.9.3

script: "rake test"
script: "rake test"