fd3305bc4c
SAAS-289: Remove all isSaaS checks
...
-done
2012-11-06 17:10:47 -05:00
d467abe509
Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel
2012-11-05 11:27:34 -05: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
796274e4ef
CC-4642: Default Fade preference should be in seconds and tenths, rather than millionths
...
-fixed
2012-11-02 15:51:36 -04:00
1899d588ee
- CRLF fix
2012-10-30 18:03:03 -04:00
9d495ebc03
CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit.
...
- done
2012-10-30 17:57:58 -04:00
dc00528cd5
Merged baseUrl related conflicts
2012-10-29 11:56:20 -04:00
3a7700eaac
CC-4583: Use AJAX calls instead of refreshing entire page
...
-done
2012-10-26 18:09:30 -04:00
0ab1353564
CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on
...
-fixed
2012-10-26 18:00:48 -04:00
2527fa2e1a
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 14:42:01 -04:00
3ecde35b7c
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 14:28:14 -04:00
1146e1f269
CC-4215: Smart Playlist: Exception happens when generate with criteria Length is 2012-08-10 14:00:00
...
- fixed
2012-10-19 14:27:57 -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
a51c3174e0
SAAS-282: Overlap detection prevents creation of a repeating show
...
-fixed
2012-10-19 12:33:12 -04:00
d32495d100
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 11:09:34 -04:00
887a86c6a1
CC-4591: Calendar: Cannot change start time for repeating show
...
-fixed
2012-10-18 10:51:24 -04:00
45801e5dc4
- fix spelling of some function name
2012-10-17 15:16:03 -04:00
25c28da761
CC-4550: Track should not be a required field in metadata editor
...
-fixed
2012-10-16 15:29:05 -04:00
846af50543
CC-4567: Calendar: Exception in zendphp.log when setting a wrong rebroadcast time from repeating show
...
-fixed
2012-10-16 14:33:45 -04:00
5ff89eeba2
CC-4561: Can create overlapping shows when rebroadcasting a repeating show
...
-fixed
2012-10-15 14:19:52 -04:00
b79e190d3c
-small comment change
2012-10-12 15:42:51 -04:00
e60a23aab4
CC-4555: Can create overlapping shows with a repeating show if another show is on the last repeating day
...
-fixed
2012-10-12 15:34:42 -04:00
8f5830757f
CC-4553: Calendar: Can create overlapping show by repeat show's instances
...
-fixed
2012-10-12 14:26:54 -04:00
2fbd8e868b
CC-4547: Calendar: Create record & rebroadcast show will be blocked by "overlapping error"
...
-fixed
2012-10-10 14:22:09 -04:00
317bb7de69
CC-4479: Buttons in dialog windows are not styled
...
-done
2012-10-03 11:40:40 -04:00
0524e4e5d2
-implemented UI changes for playlist/block/webstream builder
2012-09-14 15:49:39 -04:00
e3c1a3ac0e
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
...
-initial commit
2012-09-14 12:09:40 -04:00
55993352bf
Removed unused variables.
2012-09-13 10:35:24 -04:00
9c8f4fe404
CC-4414: Unused local variables in forms
...
-done
2012-09-12 17:09:00 -04:00
54d18b7bcd
CC-4382: Editing the color of a repeating show gives error message
...
-fixed
2012-09-12 14:27:17 -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
7f8b5ab92e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 17:40:07 -04:00
859445c766
CC-3301: Add ability to switch stereo/mono stream in stream settings
...
-fixed
2012-08-29 17:39:24 -04:00
a7427645d5
CC-4273: Library: Open 'Edit Metadata' page and click 'Cancel' will cause an exception
...
-fixed
2012-08-29 17:01:55 -04:00
5e180f0ce2
sexified code
2012-08-29 12:57:56 -04:00
ca66073fb5
did some reformatting.
2012-08-29 12:31:59 -04:00
b2327472e8
CC-4090: Make code style PSR compliant - part 4
...
-forms directory
2012-08-28 23:04:55 -04:00
9d90e8c531
CC-4300: System -> Preference: Please add a option let user choose if the SMTP server requires User Authentication
...
-done
2012-08-28 16:17:37 -04:00
69b61c4cfe
CC-4285: Playlists-> Smart Block - displays that certain amount meets the criteria while no criteria is specified
...
-fixed
2012-08-28 12:13:58 -04:00
dc8e3da6db
CC-4283: Password Reset: Please let user input username they want to reset
...
-done
2012-08-24 12:40:30 -04:00
7e50a11195
CC-4225: Smart playlists: Sample and bit rate ranges should include entered values
...
-fixed
2012-08-22 16:01:50 -04:00
025656be1c
CC-4205: Smart Playlist Builder: Change text on button mouseovers
...
-changed generate success msg
2012-08-21 10:46:25 -04:00
a24da9e324
CC-4256: Smart Playlist: change name to smart block and etc
...
- done
2012-08-20 17:17:48 -04:00
76833344d6
CC-4250: Smart Playlists: Remove save button from form
...
-done
2012-08-17 16:24:11 -04:00
2d80131351
CC-4229: Smart Playlist: refactor code
...
- bug fixes
2012-08-15 16:22:56 -04:00
9fc5411895
CC-4229: Smart Playlist: refactor code
...
- done
2012-08-15 11:36:41 -04:00
c62d89d5da
CC-4220: Smart Playlists: Change indexing of criteria elements
...
-changed indexing on UI
2012-08-14 10:02:36 -04:00
1e36d77857
CC-4213: Smart Playlist -> Criteria Bpm: Cannot find track by 'is in the range'
...
- changed BPM to string type
2012-08-13 11:51:25 -04:00
5e1d8eabb3
Smart Playlists: moved Save button from right side to left side
2012-08-10 12:34:45 -04:00
7d73f0996c
CC-4205: Smart Playlist Builder: Change text on button mouseovers
...
-done
2012-08-10 10:54:13 -04:00
791989faf7
Smart Playlists: changed label 'block' to 'playlist' type
2012-08-08 15:35:28 -04:00
fd1628f971
CC-4117: Smart Playlist: radio_station_name criteria doesnot take effect
...
- removing radio_station_name from criteria list
2012-08-08 12:01:10 -04:00
9479aeb3dd
CC-84: Smart Playlists
...
- fixed db column mapping for radio station name and track title
2012-08-01 17:10:56 -04:00
27017c7903
CC-84: Smart Playlists
...
- fixed getCriteria() to non static function
2012-07-30 18:21:27 -04:00
f91be9468f
CC-84: Smart Playlists
...
-UI cleanup
2012-07-30 16:42:37 -04:00
e04273c335
CC-84: Smart Playlists
...
- created function that returns an array of block criteria
- fixed form so it displays modifier rows properly
2012-07-29 15:47:42 -04:00
d7cf50b2f4
CC-84: Smart Playlists
...
- changed error handling and criteria saving to handle same criteria rows
2012-07-27 14:32:31 -04:00
1f3cbd8aba
CC-84: Smart Playlists
...
- introducing smart-block
2012-07-25 12:44:37 -04:00
722e470f6f
CC-84: Smart Playlists
...
- changed playlist controller to also handle Blocks
- created new view for smart blocks
2012-07-25 11:00:46 -04:00
754187a2b7
CC-84: Smart Playlists
...
- remove subform and combined back into one form
2012-07-24 12:13:51 -04:00
c82ea30809
CC-84: Smart Playlists
...
- removed criteria subform and reverted back to original criteria options design
2012-07-24 12:12:47 -04:00
64185dac95
CC-84: Smart Playlists
...
- subforms now open and close on the click event
- fixed add and remove criteria to work with new subforms
2012-07-23 12:42:00 -04:00
952a584f10
CC-84: Smart Playlists
...
- form cleanup
2012-07-23 10:45:17 -04:00
c99e1b892c
CC-84: Smart Playlists
...
-divided criteria into sub form to handle multiple sets
2012-07-23 10:40:53 -04:00
a67b2fa300
CC-84: Smart Playlists
...
- removed soundcloud_id criteria
- added last_played criteria
2012-07-20 11:25:54 -04:00
9fcc851523
CC-84: Smart Playlists
...
-hides playlist content if dynamic instead of disabling
-show the user how many files match specified criteria
2012-07-19 14:52:39 -04:00
2d8a9188eb
CC-84: Smart Playlists
...
- qtip wasn't showing up on 'new' and 'edit' events
- changed 'Artist' to 'Creator' to be consistent with library
2012-07-18 15:48:15 -04:00
7c5291fe0c
CC-84: Smart Playlists
...
- ui cleanup
2012-07-18 11:55:29 -04:00
2a38527161
CC-84: Smart Playlists
...
- propel usage chage
- cleaning up code
- some js changes
2012-07-18 11:52:09 -04:00
0aae7c75ae
CC-84: Smart Playlists
...
- added shuffle button
- moved all callbacks into one function
2012-07-17 15:32:26 -04:00
7c07bf146c
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-17 11:07:38 -04:00
a4ba776b0f
CC-84: Smart Playlists
...
- save playlist type to db
- on edit type is loaded
2012-07-17 11:07:16 -04:00
e0a674a96c
CC-84: Smart Playlists
...
-added save button for static playlists
2012-07-16 18:24:46 -04:00
1bb97c8603
CC-84: Smart Playlists
...
- ui clean-up
2012-07-16 14:44:50 -04:00
2dae5f30f7
CC-84: Smart Playlists
...
- code cleanup
- adds 'Add' button to last row, always
2012-07-16 11:01:34 -04:00
ae9442d7f5
CC-84: Smart Playlists
...
- editing playlist
2012-07-13 15:58:23 -04:00
207582eb7e
CC-84: Smart Playlists
...
- temp commit
2012-07-13 14:23:30 -04:00
d81253cccc
CC-84: Smart Playlists
...
- send playlist id on generate/save action
- fixed some small UI bugs
2012-07-12 17:19:53 -04:00
31bb07b4f0
CC-84: Smart Playlists
...
- removed modifier array list from form and populate in javascript
- fixed remove functionality to handle the extra criteria value used
for 'is in the range' modifier
- moved 'add' button to last row
2012-07-12 13:02:02 -04:00
e8a2f23856
CC-84: Smart Playlists
...
- dynamically change modifier list depending on criteria type
- added extra text box for 'is in the range' modifier
2012-07-11 18:53:28 -04:00
c27b886817
CC-84: Smart Playlists
...
-0-indexed form elements
2012-07-11 16:15:44 -04:00
4842f1a5a1
CC-84: Smart Playlists
...
-removed limit checkbox
2012-07-11 15:52:46 -04:00
7358b00c81
CC-84: Smart Playlists
...
-disabled non-visible form elements
2012-07-11 15:18:47 -04:00
5fb0364f2d
CC-84: Smart Playlists
...
-switched action names for static/dynamic
2012-07-11 11:57:13 -04:00
fe75ba0e93
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-11 11:50:52 -04:00
1afe1e4d32
CC-84: Smart Playlists
...
-added in save/generate functionality in the UI
2012-07-11 11:50:40 -04:00
a1ceb4bfa0
CC-84: Smart Playlists
...
-added in 'Add' and 'Remove' form elements functionality on the UI
2012-07-11 10:42:51 -04:00
b7cd90bc28
CC-84: Smart Playlists
...
-created form and view script
2012-07-11 10:42:51 -04:00
7ce4934cdc
CC-4090: Make code style PSR compliant
...
-removed all trailing whitespace in forms directory
-replace all tabs with 4 spaces
2012-07-10 18:55:44 -04:00
ee3447f903
CC-4090: Make code style PSR compliant
...
-User.php
-removed all trailing whitespace
2012-07-10 18:51:32 -04:00
4301a221b7
CC-84: Smart Playlists
...
-added in 'Add' and 'Remove' form elements functionality on the UI
2012-07-10 18:20:23 -04:00
72dd48e33e
CC-84: Smart Playlists
...
-created form and view script
2012-07-10 15:25:29 -04:00
3d243468a7
CC-4090: Make code style PSR compliant
...
Subjects.php
2012-07-10 10:36:53 -04:00
dc2b4fed0a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-10 10:19:35 -04:00
e91c96b90e
CC-4090: Make code style PSR compliant
...
StreamSetting.php
2012-07-09 23:32:21 -04:00
c6c0a70152
CC-4075: Calendar -> Can create overlapping show by repeating show
...
-fixed
2012-07-09 14:50:35 -04:00
1cbb0345b3
improved error message for overlapping shows
2012-07-05 11:33:03 -04:00
1fa3da5bd0
CC-4069: Edit Show -> cannot edit show
...
-fixed
2012-07-04 18:58:22 -04:00
cbf026412c
CC-4056: Add Show -> Prevent shows from overlapping
...
-done
2012-07-04 11:34:18 -04:00
335dd1516b
Merge branch '2.1.x' into devel
...
Conflicts:
python_apps/pypo/liquidsoap_scripts/ls_script.liq
2012-06-29 10:57:14 -04:00
Martin Konecny
denise
James
Rudi Grinberg
denise