93ec4c001b
Merge branch '2.3.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/models/StoredFile.php
2013-02-02 21:07:34 -05:00
8309593a0f
CC-4904: Library -> Sort by status doesn't work
...
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
2013-02-01 17:47:07 -05:00
cf2ed25bfb
CC-4900: Indicate in the library if a webstream is scheduled in the future or belongs to a playlist
...
-done
2013-01-30 16:53:59 -05:00
4f5d7869d8
Removed html from Library/contents-feed and StoredFile model
...
Added new Library column to indicate if a file is scheduled in the future or belongs to a playlist/smart block
2013-01-30 15:38:25 -05:00
043fbd1dfb
CC-4886: Warn if track is part of a playlist when deleting from library.
...
-done
2013-01-30 10:55:24 -05:00
c45440482a
CC-4887: Show whether track is scheduled in the future on Library page
2013-01-30 08:57:59 -05:00
f1215c10fd
CC-4882: Scheduled item does not take into account cue_out - cue_in time
...
-fixed
2013-01-28 14:21:11 -05:00
f70ca93b53
CC-4841: Silan script
...
done
2013-01-18 11:53:26 -05:00
bb2f9316af
CC-4841: Silan script
...
- temp commit
2013-01-15 11:16:50 -05:00
9ae3559305
Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2013-01-14 16:19:51 -05:00
5a97fb69f2
CC-4384: Remove annoying usage of $CC_CONFIG
...
- done
2013-01-14 16:16:14 -05:00
fae3f3a03f
CC-2184: Hardcoded CSS path should be relative path instead
...
-Make '/' the default root
2013-01-14 16:00:38 -05:00
4bf9ab60d9
CC-4819: Tracks length in Scheduler is 0.0 all the time
...
- fixed in better way
2013-01-10 11:49:02 -05:00
1ee90ed9b9
CC-4790: Media Monitor: Re-added files won't show up in Library
...
-fixed
2013-01-08 15:42:35 -05:00
a1837366be
Merge branch 'cc-3018-silence-detection' into devel
2013-01-03 14:08:21 -05:00
b8f80866cf
CC-3018: Automatically strip out silence from audio tracks
...
- done
2013-01-03 14:02:06 -05:00
d6eb043899
CC-4765: Webstream of AAC type can't be previewed
...
-fixed
2013-01-02 16:09:32 -05:00
10b6dd202e
Merge branch 'devel' into cc-1960-internationalize-airtime
...
Conflicts:
airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
2012-11-21 11:44:40 -05:00
7124cbe04d
fixed bug where hidden files would be shown in library
2012-11-20 15:18:41 -05:00
20855c73b5
refactoring + fix typo
2012-11-20 15:10:38 -05:00
a76b9b305f
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper to all strings in models
2012-11-20 11:33:37 -05:00
ccd6447696
- install failed due to wrong metadata key
...
- wrong controller action called
2012-11-07 12:05:20 -05:00
b817684972
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/public/js/bootstrap/bootstrap.js
2012-11-07 11:21:36 -05:00
6ef646124e
CC-4668: Blocks/Playlists: Length includes deleted tracks
...
-fixed
2012-11-06 10:58:25 -05:00
d467abe509
Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel
2012-11-05 11:27:34 -05:00
bd3cf543bf
made param useless in listAllFiles since its now safe to pass all files to MM
2012-11-05 11:11:05 -05:00
a62e64969d
Removed commented method
2012-11-05 09:49:49 -05:00
e01a61208d
Merge remote-tracking branch 'sf/2.2.x' into cc-4585
2012-11-05 09:19:20 -05:00
7e03333496
changed deletion by the user to be setting the file to be hidden instead
2012-11-03 01:33:13 -04:00
9609a4e220
Merge branch 'cc-4652' of https://github.com/rgrinberg/Airtime into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 20:16:54 -04:00
106b18bf30
CC-4637: Media Library: Item will be removed from Playlist if it's removed from Library
...
-fixed
2012-11-02 17:49:32 -04:00
2507e0f8a4
CC-4655: DJ's can delete files that they do not own
...
-fixed
2012-10-31 16:51:29 -04:00
fc613aa597
CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files
...
-fixed
2012-10-31 16:01:17 -04:00
2527fa2e1a
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 14:42:01 -04:00
7d8079f770
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ShowbuilderController.php
airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
airtime_mvc/public/js/airtime/common/common.js
2012-10-19 12:50:36 -04:00
d32495d100
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 11:09:34 -04:00
819dcf70fd
CC-4579: Edit Metadata: Track number defaults to 0 if it is deleted
...
-fixed
2012-10-16 15:56:03 -04:00
5a0df2b6d5
Adde TODO's
2012-10-03 12:01:24 -04:00
1ae7784331
Added TODO
2012-10-03 11:59:02 -04:00
2deceaa5fb
comment formatting
2012-10-03 11:58:21 -04:00
4ff267ee8a
removed z
2012-09-19 17:45:03 -04:00
7bb1eadf03
formatting
2012-09-19 17:39:30 -04:00
36d454184d
formatted
2012-09-19 17:37:49 -04:00
f801fcb81e
empty space
2012-09-19 11:20:26 -04:00
014da73eed
heredoc sql
2012-09-19 11:17:32 -04:00
ecb5c93ddf
Removed methods again...
2012-09-19 11:14:59 -04:00
7dac1c6561
Added them back because not sure
2012-09-19 11:14:26 -04:00
99b28cca82
Removed unused methods
2012-09-19 11:11:50 -04:00
2cfb0c85d5
Formatted sql
2012-09-18 15:04:22 -04:00
3a60d729fd
added todo
2012-09-18 15:02:07 -04:00
b069b1254e
Aligned
2012-09-18 12:56:01 -04:00
6ac241b1fc
Added todo
2012-09-18 12:48:45 -04:00
a22ba39de1
formatting
2012-09-18 12:26:07 -04:00
d2f43058c2
fixed comment
2012-09-18 12:09:28 -04:00
f9319b869a
Corrected comments
2012-09-18 12:08:30 -04:00
bc873a3ece
Added extension handling for file path
2012-09-18 12:04:54 -04:00
8657a80459
removed return ''
2012-09-18 11:51:13 -04:00
c310cecf40
CC-4463: do we need getFileExtension()?
2012-09-17 16:40:27 -04:00
2337078dd8
Cleaned up unused variables. Formatted some lines.
2012-09-17 12:35:12 -04:00
6e239d08e9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-14 14:43:15 -04:00
e3c1a3ac0e
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
...
-initial commit
2012-09-14 12:09:40 -04:00
c7f4ede766
-implemented UI changes for library page
2012-09-14 12:08:51 -04:00
e0286b112f
cc-4292: Removed unnecessary code related to md5.
2012-09-12 11:10:25 -04:00
faa04a2f5c
Refactored RecallByX
2012-09-11 18:22:46 -04:00
c6ab540120
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-11 17:19:12 -04:00
58d39d74d4
CC-4355: Smart block criteria do not match library columns or metadata editor
...
-fixed
2012-09-11 17:18:17 -04:00
72a424bb7e
Added todo to fix crust
2012-09-11 16:25:45 -04:00
0dd38920a3
Cosmetic changes.
2012-09-11 16:20:59 -04:00
51d4f35c55
Removed unused global variable
2012-09-11 16:15:15 -04:00
d95731f2f3
Reformatted sql to use heredoc
2012-09-11 16:13:39 -04:00
0fec175681
CC-1710: FLAC, BWF, AAC support
...
-context menu for mp4's having a problem
2012-09-11 14:04:45 -04:00
585ee579d6
CC-4005: Tag files with Last Played date and number of times played
...
- fixed CRLF
2012-09-10 18:07:12 -04:00
645593f954
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/Webstream.php
2012-09-10 18:04:35 -04:00
ba37bb4327
CC-4005: Tag files with Last Played date and number of times played
...
- done for files and webstreams
2012-09-10 18:01:36 -04:00
af225418c4
Removed empty constructor.
2012-09-10 16:08:21 -04:00
0ab08af48f
CC-4380: Show ReplayGain value in the Library page
...
- done
2012-09-10 14:37:38 -04:00
4d3c624607
CC-4380: Show ReplayGain value in the Library page
...
- temp commit
2012-09-10 12:35:32 -04:00
a479a11c8f
Removed crazy handling of flac.
2012-09-07 18:23:14 -04:00
8125d6b553
CC-4344: Conductor column not available in library view
...
-done
2012-09-06 14:30:09 -04:00
ab6ae1ce8e
cc-4336: Fixed the issue. But this whole chunk of code could probably be removed.
2012-09-05 14:33:49 -04:00
982dd1e2a7
CC-4348: Prepared statements - part 4
...
-StoredFile.php
2012-09-04 17:21:59 -04:00
d7aad93e4f
cc-4288. Added owner to query.
2012-08-31 13:34:21 -04:00
8b5f94fa9f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 11:05:14 -04:00
4848717d4d
CC-4090: Make code style PSR compliant - part 4
...
-models dir
2012-08-29 10:58:03 -04:00
05908d121f
cc-4274: Fixed bad table name.
2012-08-28 16:23:16 -04:00
33bb4e600c
cc-4274: implemented james' hack to fix this issue.
2012-08-28 16:23:16 -04:00
7f66bdbb66
cc-4301: Fixed bug where owner_id would be null whenever show is recorded.
2012-08-27 17:58:09 -04:00
c28025ecfb
hotfix for bad class name
2012-08-27 16:49:45 -04:00
8d7f3817ec
cc-3936: Fixed bug where setDbColMetadata to use airtime metadata key names.
2012-08-27 15:11:28 -04:00
7aba1dcebd
Added warning method. Changed some code to use it.
2012-08-27 14:51:35 -04:00
cab7a6c930
cc-3936: added comment documenting metadata translation
2012-08-27 14:07:05 -04:00
dea764b8fd
cc-3936: added warning for metadata attributes that are not defined in constants.php
2012-08-27 14:03:22 -04:00
687a6d3c5a
cc-3936: removed intrusive logging
2012-08-27 11:49:36 -04:00
fcc853b732
cc-3936: Renamed metadata key for owner id.
2012-08-27 11:06:06 -04:00
7284770226
cc-3936: Changed setting of owner when modifying/inserting metadata.
2012-08-24 12:38:33 -04:00
5841cb7066
cc-3936:
...
Made it so that identifer file is written before the file itself so that media monitor always
has the identifier file before the song itself.
2012-08-24 12:37:16 -04:00
857be6b702
cc-3936: Removed manual path concatenation. Fixed setting owner of file.
2012-08-24 11:09:38 -04:00
19a5a8f992
cc-3936: fixed wrong argument order bug.
2012-08-24 10:20:59 -04:00
4ad983f63c
cc-3936: applied schema changes
2012-08-24 10:20:59 -04:00
c83fad2546
cc-3936: added owner to every file insert
2012-08-24 10:20:59 -04:00
Martin Konecny
denise
drigato
James
Rudi Grinberg
Rudi Grinberg