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

Master #52

Open
wants to merge 208 commits into
base: dev
Choose a base branch
from
Open

Master #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
208 commits
Select commit Hold shift + click to select a range
3414cfa
Add note to README.md about The Great Rewrite
Darep Jul 11, 2013
5732263
Remove .powrc (you don't belong here)
Darep Feb 24, 2014
485cefd
Update thin and trinidad
Darep Jul 6, 2014
b99683d
Update Rails to 3.2.19
Darep Jul 6, 2014
fbcbc15
Remove rtaglib (unused)
Darep Jul 6, 2014
0067e64
Set specific version in Gemfile for all gems
Darep Jul 6, 2014
e6b93a3
Add changelog file
Darep Jul 6, 2014
96c522e
Version 1.0.1
Darep Jul 6, 2014
0971e3d
Rename Rails app from BeatStream => Beatstream
Darep Jul 6, 2014
a651c02
Update changelog
Darep Jul 6, 2014
3fcd434
Fix indendation in controllers, models and .gitmodules
Darep Jul 6, 2014
113dee6
Remove unused helpers
Darep Jul 6, 2014
7ea154b
Add a base controller for API controllers
Darep Jul 6, 2014
0f90dbc
Routes: Move login/logout routes to the bottom
Darep Jul 6, 2014
d4f36e1
Fix users fixtures
Darep Jul 6, 2014
e65a0fd
Remove unusde playlists fixture
Darep Jul 6, 2014
60c0dfd
Always authorized on test env
Darep Jul 6, 2014
01d2ca8
Set SONGS_JSON_FILE to a String instead of Pathname
Darep Jul 6, 2014
76c034f
Song: Avoid double MUSIC_PATH declarations
Darep Jul 6, 2014
62a38fc
Add tests for /songs and /songs/play API endpoints
Darep Jul 6, 2014
a8af409
Add tests for /songs/now_playing and /songs/scrobble
Darep Jul 6, 2014
0ffe3c1
Move SongsController under ApiV1 namespace
Darep Jul 7, 2014
ad37f0d
Add travis.yml for Travis CI
Darep Jul 7, 2014
a2632e2
Add tests for songs index creation and refresh
Darep Jul 7, 2014
d8831ad
Remove "rake test" from travis.yml
Darep Jul 7, 2014
17ddf45
Add "rake db:migrate" and "rake test" as scripts for Travis CI
Darep Jul 7, 2014
2029d37
Create config/initializers/music_paths.rb file in Travis CI
Darep Jul 7, 2014
dedd92c
Don't test Ruby 2.x on Travis CI, they're not supported yet
Darep Jul 7, 2014
c4ae4bc
Remove controller tests (relics of the past)
Darep Jul 7, 2014
ebcfe53
Test if simple "cp" for music_paths.rb works better in Travis CI
Darep Jul 7, 2014
3428e47
Require "webmock/test_unit" on Ruby 1.8.x
Darep Jul 7, 2014
2b8f099
Use rocket syntax in api_test_helper.rb
Darep Jul 7, 2014
7d23009
Use shorter and Ruby 1.8.7 compatible .each in songs integration tests
Darep Jul 8, 2014
0d0c159
Trying a Ruby 1.8.7 compatible binary string check
Darep Jul 8, 2014
f4eafac
Remove Ruby 1.8.7 from Travis CI; cannot reliably test that anymore
Darep Jul 8, 2014
1112496
Remove Playlist and User unit test files; no tests there...
Darep Jul 8, 2014
0ef185a
Move Song-related constants into models/song.rb
Darep Jul 8, 2014
92135b6
Song: Set @id before @filename so it's first item in the object
Darep Jul 8, 2014
989ff29
Move mp3 mocking into test_helper.rb and add support for unit tests
Darep Jul 8, 2014
5877fce
Move refresh() from SongsController to Song
Darep Jul 8, 2014
b3b7fc0
Add unit test file for Song
Darep Jul 8, 2014
0108c5b
Song: Add .all and .all_as_json
Darep Jul 8, 2014
4738ea0
Song: Add .find
Darep Jul 8, 2014
2fd26ec
Arrange SongTest tests alphabetically
Darep Jul 8, 2014
707b7f9
SongsController: Use Song model's .refresh and .all_as_json
Darep Jul 8, 2014
0292a40
SongsController: Remove obsolete "require 'logger'"
Darep Jul 8, 2014
2fef702
Deactivate FakeFS by default before every integration test
Darep Jul 8, 2014
b12154d
Move scrobbling stuff into its own controller
Darep Jul 8, 2014
a6b0d52
Use Song.refresh in SongsTest to populate the Songs
Darep Jul 8, 2014
b96d257
ApiV1Controller: Fix missing : in render_404
Darep Jul 8, 2014
a000790
ApiV1Controller: Add missing "code" field in render_error and render_…
Darep Jul 8, 2014
f820e77
Change ScrobblesTest to actually assert the requests
Darep Jul 8, 2014
de72f3a
Test that scrobbling returns 404 if user is not found
Darep Jul 8, 2014
41fef78
ScrobblesController: Remove needless "respond_to" blocks
Darep Jul 8, 2014
92fe14f
ScrobblesController: Move user fetching into a private method and mem…
Darep Jul 8, 2014
cfbbd0b
ScrobblesController: Move "track" fetching into a memoizing getter
Darep Jul 8, 2014
0632770
Remove unused request mocks from SongsTest
Darep Jul 8, 2014
706eb9b
Song: Use songs_file in refresh method
Darep Jul 8, 2014
a92565d
Clean the FakeFS before every single integration test
Darep Jul 8, 2014
b66f8dc
ScrobblesTest: Do "get '/songs'" with FakeFS active
Darep Jul 8, 2014
a7a1d5d
Scrobbles: Check that the user has lastfm_session_key
Darep Jul 8, 2014
29b42ad
Scrobbles: Remove unnecessary user and user.lastfm_session_key checks…
Darep Jul 8, 2014
5ff82c3
ScrobblesController: Check that artist and title parameters exist
Darep Jul 8, 2014
98724b3
ScrobblesController: Add artist and title getter methods and use those
Darep Jul 8, 2014
6b9a3a0
SessionsController: Define layout in root
Darep Jul 8, 2014
c75124b
MainController: Remove whitespace :-]
Darep Jul 8, 2014
7a5ced8
Move PlaylistController skeleton under ApiV1
Darep Jul 8, 2014
64f3029
Fix whitespace in views/layouts/login.html.erb
Darep Jul 8, 2014
fa800b5
Remove testing stuff from application layout
Darep Jul 8, 2014
171b133
Update changelog
Darep Jul 8, 2014
fa00d42
Version 1.0.2
Darep Jul 8, 2014
fadb5d7
Update readme
Darep Jul 8, 2014
c897db5
Update rockstar to 0.8.0
Darep Jul 8, 2014
0e32aaa
Replace mp3info gem with ruby-mp3info
Darep Jul 8, 2014
5ad6321
Update changelog
Darep Jul 8, 2014
587656e
Song: Add ID3 parsing test
Darep Jul 8, 2014
0cd7944
Song: Add test for MP3 files without title in ID3
Darep Jul 8, 2014
efc94a7
Song: Add absolute_path
Darep Jul 9, 2014
1f145f4
Move song play logic from controller to model
Darep Jul 9, 2014
979405e
Clean-up ApiV1::SongsController
Darep Jul 10, 2014
e03bed3
Require 'find' in Song
Darep Jul 10, 2014
2819333
Start Song ids from 1 instead of 0
Darep Jul 10, 2014
6a6f869
Song: Refactor "to_natural_sort_string"
Darep Jul 10, 2014
a41b772
Song: Refactor "refresh"
Darep Jul 10, 2014
d87e361
Song: Separate model initialization and mp3 file parsing
Darep Jul 10, 2014
d003841
Song: Use to_utf8 when reading ID3 tag, because that's where the prob…
Darep Jul 10, 2014
8f367c9
Add MediaReader service for refreshing and reading the media files
Darep Jul 10, 2014
f560ec9
Move refresh and JSON song file reading into MediaReader
Darep Jul 10, 2014
e6eb2ef
MediaReader: Chop refresh into multiple methods
Darep Jul 10, 2014
049b190
Remove utf8 conversion thingie, we'll handle this stuff some otherway...
Darep Jul 10, 2014
3529df6
Remove Song.absolute_path
Darep Jul 10, 2014
d635798
Song: Sort methods alphabetically
Darep Jul 10, 2014
771a043
Song: Rename create_from_mp3_file => new_from_mp3_file
Darep Jul 10, 2014
3c50e2b
Remove forced redirect to https when request is not local
Darep Jul 10, 2014
2ee43f2
Remove protect_from_forgery, because its effects are unknown
Darep Jul 10, 2014
bc59e31
Update changelog
Darep Jul 10, 2014
d7beadf
Move "user" method to ApplicationController
Darep Jul 10, 2014
5b30043
DRY in SettingsController
Darep Jul 10, 2014
2b92451
Add route name for /songs route
Darep Jul 10, 2014
fce3a9d
More DRY in SettingsController
Darep Jul 10, 2014
48f37a5
Add Ruby 2.x to Travis CI
Darep Jul 10, 2014
a4dd29a
Update changelog
Darep Jul 10, 2014
cb333f3
Version 1.0.3
Darep Jul 10, 2014
ae7e2d2
Fix crash when user is not logged in. Fixes #43
Darep Aug 16, 2014
0b30101
Version 1.0.4
Darep Aug 16, 2014
f44e8ee
Update README.md
Darep Sep 4, 2014
88419f2
Update README.md
Darep Sep 20, 2014
3ab7156
Add Code Climate and TravisCI badge to README
Darep Sep 20, 2014
e1d98d5
Tweak CHANGELOG.md markup style
Darep Sep 20, 2014
d2e101b
Update list of known issues to README.md
Darep Sep 20, 2014
0944fd6
issue-30 fix
stefkin Oct 15, 2014
946eb51
Merge pull request #45 from bublik42/issue-30
Darep Oct 15, 2014
c6da071
commit-issue#37
stefkin Oct 16, 2014
bab84fd
added playing status and time to cookies, history updated
stefkin Oct 17, 2014
c80c8c3
issue-#22-select-all
stefkin Oct 19, 2014
22ff6f1
Merge branch 'bublik42-issue#37-shuffle-back'
Darep Oct 22, 2014
2aef955
Clean-up after merging 'bublik42-issue#37-shuffle-back'
Darep Oct 22, 2014
1a4ce79
Fix previous-button not working if history empty and shuffle off
Darep Oct 22, 2014
ac0c662
Merge branch 'save-state' of https://github.com/bublik42/Beatstream i…
Darep Oct 22, 2014
f84fb34
Remove duplicate "time" cookie set
Darep Oct 22, 2014
af15951
Whoops
Darep Oct 22, 2014
9738d03
Refactor save-state feature
Darep Oct 22, 2014
8b8e1fc
Fix play resuming
Darep Oct 22, 2014
e595a5b
Merge branch 'select-all-items-ctrl-a' of https://github.com/bublik42…
Darep Oct 22, 2014
3550efb
Merge branch 'bublik42-select-all-items-ctrl-a'
Darep Oct 22, 2014
14d62ea
Clean-up after merging 'bublik-42-select-all-items-ctrl-a'
Darep Oct 22, 2014
62951bd
Add support for cmd+a for select all on Mac
Darep Oct 22, 2014
60726f8
Version 1.1.0
Darep Dec 21, 2014
70f83d3
Update README.md
Darep Dec 21, 2014
c4a4005
Add failing test for MediaReader.refresh with a broken MP3 file
Darep Dec 30, 2014
4fd86e1
Fix MediaReader.refresh crashing with a broken MP3 file
Darep Dec 30, 2014
601c88e
Version 1.1.1
Darep Dec 30, 2014
e7dd08a
Remove cruft from application.js
Darep Feb 14, 2015
73ea39f
Require jquery.cookie in the modules that require it
Darep Feb 14, 2015
2b318d4
Remove jquery_ujs require (not used)
Darep Feb 14, 2015
17f9fae
Clean-up login.css
Darep Feb 14, 2015
2e0cbc0
Clean-up CSS file and directory structure
Darep Feb 14, 2015
dcc3816
Variablize some things in SCSS
Darep Feb 14, 2015
b867ff7
Change @clear_float => %clearfix
Darep Feb 14, 2015
11de0c6
Add a few CSS3 mixins
Darep Feb 14, 2015
7016bc2
Disable text selection in player
Darep Feb 14, 2015
eefc11f
Simplify selectors in _player.scss
Darep Feb 14, 2015
d2aeaba
Add $color-orange
Darep Feb 14, 2015
4ffb6fc
Add %no-select and use it to disable text-selection in #player
Darep Feb 14, 2015
6a8cbe4
Fix indendation in _mixins.scss
Darep Feb 14, 2015
69371f2
Update CHANGELOG
Darep Feb 14, 2015
4f8f5da
Re-structure file, directory and require structure of JS helpers & utils
Darep Feb 14, 2015
2f4ed21
Welcome to 2015
Darep Feb 16, 2015
9f772d9
Attempt to make README prettier
Darep Feb 16, 2015
2199d2c
Load application.js just before </body>
Darep Feb 14, 2015
fc79764
Store #sidebar element in $sidebar in sidebar.js
Darep Feb 14, 2015
a518cf1
Fix CSS and markup dumbness in header
Darep Feb 14, 2015
a2aa61a
Initialize a global "App" module in main.js
Darep Feb 21, 2015
7b4513f
Add API module
Darep Feb 14, 2015
98b19c7
Use API in lastfm module
Darep Feb 14, 2015
b9cc290
Use API to get song URI
Darep Feb 14, 2015
97384c1
Add mediator as a simple pub-sub system
Darep Feb 14, 2015
c8f6c5f
Add MediatorEvents global to hold contants for different mediator queues
Darep Feb 21, 2015
82d1e75
Subscribe songlist module to "show current song" event
Darep Feb 21, 2015
c4826d7
Add App.Audio and make it publish events
Darep Feb 14, 2015
f3855e5
Subscribe to audio events for player, seekbar and songlist
Darep Feb 14, 2015
54e1e83
Update CHANGELOG
Darep Feb 21, 2015
b06013c
Initialize window.App in application.js instead of main.js
Darep Feb 21, 2015
33ac6cd
Move lastfm.js => lib/lastfm.js
Darep Feb 21, 2015
55ff938
lastfm: Use mediator, and namespace under App
Darep Feb 21, 2015
4c2265c
Update CHANGELOG
Darep Feb 21, 2015
387a202
main.js: Remove stop(), it's not used anywhere
Darep Feb 21, 2015
522aa9f
Player: Set z-index so it's under preloader
Darep Feb 22, 2015
97fd101
Do initial fetching of songs in main.js, instead of songlist.js
Darep Feb 22, 2015
a5af921
Songlist: Remove loadPlaylist()
Darep Feb 22, 2015
9787869
Update song counts in main.js, instead of songlist.js
Darep Feb 22, 2015
ae14d63
Prefix API request with /api/v1
Darep Feb 22, 2015
4ec146a
Fix tests to use /api/v1 as well
Darep Feb 22, 2015
5a4715c
Use POST for scrobbling, and PUT for updating "now playing" status
Darep Feb 22, 2015
feb8040
Remove redundant endpoint /api/v1/songs/index
Darep Feb 22, 2015
c69d513
Add /api/v1/songs/refresh endpoint for refreshing the media library
Darep Feb 22, 2015
6314cf7
Remove support for /api/v1/songs?refresh=1
Darep Feb 22, 2015
4fd37eb
Add route comment for songs#play in controller
Darep Feb 22, 2015
65adc08
Settings: Fix "Search for new MP3s" button
Darep Feb 22, 2015
ded71f0
Redirect from refresh route to root, temporarily
Darep Feb 22, 2015
d87f40e
Update CHANGELOG
Darep Feb 22, 2015
8a184c0
README: Put code climate and build status badges inline with header
Darep Mar 21, 2015
7f79996
README: Fix typo
Darep Feb 14, 2015
1eb60ae
Remove unused gems
Darep Jun 23, 2015
027e611
Set exact versions for fakefs & webmock in Gemfile
Darep Jun 23, 2015
dde213a
Update CHANGELOG
Darep Jun 23, 2015
6173138
Update version.rb
Darep Jun 23, 2015
940d206
Add API endpoint for hopping into Last.fm's connect dialog
Darep Jun 23, 2015
72445cb
Add $color-red, $color-gray-light and border-radius mixin for Sass
Darep Jun 23, 2015
72aa735
Reimplement the frontend using React
Darep Jun 23, 2015
66f43b6
Add missing semicolons
Darep Jun 23, 2015
5905fe8
Add first draft of a rubocop config
Darep Jun 23, 2015
2e4bd42
Remove obsolete routing module
Darep Jun 23, 2015
9bdae20
Tweak JS style in main.js
Darep Jun 23, 2015
90b5560
Add scss-lint config
Darep Jun 23, 2015
7d03803
Bringing some fresh beats to the CSS, BEMming up the place!
Darep Jun 23, 2015
526c2ef
Update CHANGELOG
Darep Jun 23, 2015
b7a6df3
Add preloader
Darep Jun 23, 2015
872021e
Disable debug alert for SoundManager2 not being ready
Darep Jun 23, 2015
9fb318c
Songlist: Remove "if (shuffle)" check when starting to play a song
Darep Jun 23, 2015
06b5861
Update CHANGELOG
Darep Jun 23, 2015
5a794fd
CHANGELOG: Typo fix
Darep Aug 9, 2015
56d438d
Fix indentation in main.js.jsx
Darep Nov 5, 2016
e3144cc
Fix typo in Gemfile
Darep Jan 4, 2016
5880875
Reindent main.js to use 2 spaces
Darep Jan 4, 2016
a8f413c
Update rails & sqlite3; remove thin
Darep Nov 6, 2016
1e9a50d
Add test-unit due to locking ruby to a version without it
Darep Nov 6, 2016
e2a56dd
Update ruby-mp3info gem to fix some id3 tag issues
Darep Nov 6, 2016
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "public"]
path = public
url=git://github.com/Darep/Beatstream-client.git
url=git://github.com/Darep/Beatstream-client.git
4 changes: 0 additions & 4 deletions .powrc
View file
Open in desktop

This file was deleted.

Loading