04ed640756
CC-3885: Deleted open playlist is not closed until a new item is added to it
...
-fixed
2013-02-13 15:44:52 -05:00
76cb04e296
CC-4538: Cannot edit title or change time of repeating show if first instance has ended
...
- fixed by populating the edit show form with the next repeating show that is not in the past
2013-02-13 11:55:27 -05:00
4ff1e8e78a
CC-4932: Library -> Update Scheduled column on 'Cancel current show' action
...
-fixed
2013-02-13 11:29:43 -05:00
8124d096d0
Removed log message
2013-02-07 15:56:35 -05:00
525b2dcb33
CC-4895: Remove all json die() statements from code
...
- removed json_encode
2013-02-07 15:41:47 -05:00
ba4cb16171
CC-4925: Changing User permissions to a higher level ends up with show editing problems
...
-typo
2013-02-06 14:35:39 -05:00
55970a4b20
CC-4925: Changing User permissions to a higher level ends up with show editing problems
...
- added check to ensure user is not an admin before assigning the 'dj-edit-show' action
2013-02-06 14:32:13 -05:00
909f2c95c4
XSS exploit prevention - audio preview
2013-02-05 17:24:39 -05:00
63439c276d
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-05 10:56:54 -05:00
74bc485b4b
XSS exploit prevention
...
- Calendar - Show Contents
- Playlist tooltip in Library page
- Adding track to a show
- Widgets
- Playlist/Webstream title and description
- Smart block expansion
2013-02-05 10:56:38 -05:00
c398ce930b
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
2013-02-04 16:22:35 -05:00
e2472f1f5d
CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<'
2013-02-04 16:21:56 -05:00
20a3f674b4
CC-4897: XSS exploit on library page
...
-fixed where this was happening on Calendar - show content
2013-02-04 12:12:57 -05:00
d63865625d
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-04 11:06:53 -05:00
1f0b9fa5dc
CC-4897: XSS exploit on library page
2013-02-04 11:06:46 -05:00
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
384298f680
CC-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist
2013-02-01 12:06:01 -05:00
d4e89df94e
CC-4895: Remove all json die() statements from code
2013-01-31 14:06:45 -05:00
0a198ae424
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/models/User.php
2013-01-30 18:31:45 -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
216b580395
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-30 14:40:47 -05:00
52d96241da
CC-4754: Replay gain modifier
...
-fix regression
2013-01-30 14:40:29 -05:00
595429e6e5
CC-4897: XSS exploit on library page
...
-fixed
2013-01-30 11:51:27 -05:00
b15c4569eb
CC-4894: Need to filter output for potential XSS exploits
...
-fixed few areas
2013-01-29 15:17:29 -05:00
22aafda2a8
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 14:17:23 -05:00
d0a4141ae4
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-25 12:44:37 -05:00
a6f4805e1a
CC-4879: Pop-up HTML Audio Player still seems to be changing spaces to %20 and so on...
...
-fixed
2013-01-25 12:44:20 -05:00
20d8bf3bc7
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 12:33:50 -05:00
a16e8d05aa
-don't push new schedule until end of request
2013-01-25 12:33:27 -05:00
9d6f2ebdf4
remove unecessary code
2013-01-25 12:32:37 -05:00
7c327e4c75
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 12:12:21 -05:00
1873022a13
CC-4876: Default interface language setting does not appear to affect text or drop-down menu on login page?
...
-fixed
2013-01-25 11:21:34 -05:00
6f5ffdc1e7
Merge branch '2.3.x' into 2.3.x-saas
2013-01-24 17:49:08 -05:00
c3f2bf57de
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
-further optimization by looking at the preferred time scale
2013-01-24 14:02:50 -05:00
2f3a30b580
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
-we know what month will be the initial view for the user.
-Provide this data ahead of time via ajax request
2013-01-24 12:52:24 -05:00
091f5ff49f
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
-we know what month will be the initial view for the user.
-Provide this data ahead of time.
2013-01-24 12:13:55 -05:00
548b73db42
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
-remove an unnecessary roundtrip to server
2013-01-23 18:31:45 -05:00
5d56341757
baseUrl is set incorrectly for previewing tracks
2013-01-21 19:32:00 -05:00
c0ca6b381f
merge conflict cleanup
2013-01-18 17:48:13 -05:00
909e290bd3
Merge branch 'devel' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
2013-01-18 17:38:48 -05:00
dfa392d914
CC-4868: Replay gain modifier is not setting the correct value
...
- fixed
2013-01-18 17:29:38 -05:00
210336d20a
Merge branch 'devel' into 2.3.x-saas
2013-01-18 17:14:11 -05:00
e0efaea0c9
CC-4867: Library -> Audio preview doesnt work with airtime in subdirectory
...
-fixed
2013-01-18 17:10:52 -05:00
f8208a355c
Merge branch 'devel' into 2.3.x-saas
2013-01-18 12:22:45 -05:00
ed7b22118c
Merge branch 'silan-script' into devel
2013-01-18 11:54:10 -05:00
f70ca93b53
CC-4841: Silan script
...
done
2013-01-18 11:53:26 -05:00
4a7b345649
fix exception on support settings page
2013-01-17 17:35:16 -05:00
94a87a0b2e
Smart block tooltip content breaks when language setting is not english
2013-01-17 16:19:35 -05:00
796099b413
CC-4860: Library -> Context Menu -> Can't download files
...
-fixed
2013-01-17 13:37:32 -05:00
784cb390d3
Merge branch 'devel' into 2.3.x-saas
2013-01-17 10:56:18 -05:00
6640c1ea4b
CC-4856: 2.3.x-saas: Overwriting metadata doesn't take effect
...
-fixed
2013-01-16 14:45:14 -05:00
f7e8fd33fd
CC-4848: Streaming server passwords should be hidden with dots, once entered
...
-fixed
2013-01-16 14:36:56 -05:00
8b12f692cd
CC-4854: Remove SaaS checking from codebase
...
-fixed
2013-01-16 14:31:43 -05:00
ab83029b2f
CC-4852: 2.3.x-saas: Exception happens when updating System -> Preferences
...
-fixed
2013-01-16 12:44:26 -05:00
8cd6bd9aa4
Merge branch 'devel' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/forms/SoundcloudPreferences.php
airtime_mvc/application/forms/SupportSettings.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
airtime_mvc/public/js/airtime/preferences/preferences.js
python_apps/api_clients/api_client.py
python_apps/pypo/listenerstat.py
2013-01-15 13:44:44 -05:00
a85b394d63
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 17:02:05 -05:00
692c1a1c9e
CC-4838: I18N: HTML contents of Print preview for Playout History need to be translated
...
-fixed
2013-01-14 17:01: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
0dfd8acf7a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 16:00:46 -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
8ea3aca3a0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 14:07:55 -05:00
cf09175ff1
CC-4796: Listener Stat: Authentication exception happens but no warning message on UI.
...
- done
2013-01-14 13:57:32 -05:00
891e993cd1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 13:56:24 -05:00
d4124f916d
CC-4796: Listener Stat: Authentication exception happens but no warning message on UI.
...
- done
2013-01-14 13:56:00 -05:00
2c3e79e842
CC-4832: I18N: Tool tip for show is partially filled in Calendar page is not translated
...
-fixed
2013-01-14 13:53:27 -05:00
1e6b0fe6ae
CC-4833: I18N: Alert message "Please select a cursor posion from timeline." in Now playing page is not translated
...
-fixed
2013-01-14 13:47:41 -05:00
83be01d0d0
CC-4835: I18N: "Copy of ..." from Duplicating playlist would better be translated
...
-fixed
2013-01-14 13:42:17 -05:00
1666a04451
CC-4826: Please re-push the liquidsoap queue if updating Replay Gain settings
...
- done
2013-01-14 11:28:48 -05:00
8362860904
Block expansion ajax url was missing baseUrl
2013-01-11 14:11:01 -05:00
dcf3526000
CC-4384: Remove annoying usage of $CC_CONFIG
...
- done
2013-01-10 18:09:00 -05:00
55fa8b8dc1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-10 14:52:45 -05:00
9f857433fa
CC-4817: I18N: "Playlist Shuffled" is not listed for translation
...
-fixed
2013-01-10 14:22:25 -05:00
a0be1c647e
CC-4786: Refresh page when language setting changes
...
-configure localization and reinitiliaze edit user form after the user locale is set
2013-01-10 14:01:03 -05:00
2797809c74
CC-4786: Refresh page when language setting changes
...
-done
2013-01-10 13:55:52 -05:00
048ee05030
CC-4821: Add option to disable ReplayGain
...
- done
2013-01-10 13:49:41 -05:00
0aeea61006
CC-4822: Cannot preview playlist
...
-fixed
2013-01-10 10:52:39 -05:00
1572955d07
CC-4810: Add language setting to login page
...
-done
2013-01-09 18:03:23 -05:00
db62b538dd
CC-4816: Timezones should be a user preference
...
-done
2013-01-09 13:38:38 -05:00
f887ca3d8d
CC-4813: Users -> Do not save username on User Management page
...
-fixed
2013-01-09 13:25:18 -05:00
6e7f45e615
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 17:32:39 -05:00
1263c04621
CC-4796: Listener Stat: Authentication exception happens but no warning message on UI
...
- done
2013-01-08 17:32:27 -05:00
9755ea6a20
CC-4814: System->Streams: Tool tips' content of output stream's admin user field is not listed in airtime.po file
...
-fixed
2013-01-08 16:47:00 -05:00
87bfc81ca0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 15:53:33 -05:00
6097196dd7
CC-4813: Users -> Do not save username on User Management page
...
-fixed
2013-01-08 15:52:56 -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
178abcfada
CC-4785: Zend errors on page not found
...
-partially fixed
2013-01-08 15:14:33 -05:00
f308305df8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-07 18:18:59 -05:00
a65e72941f
CC-4805: Localization -> Changing default language changes datatables and add media language setting
...
-fixed
2013-01-07 18:18:40 -05:00
6e241fd3ec
CC-4512: Allow changing stream "Offline" message via Web UI
...
- fixed
2013-01-07 18:14:57 -05:00
0542e713ed
CC-4794: Library: Please disable "Duplicate playlist" option for Smart Block's context menu
...
- fixed
2013-01-07 12:20:07 -05:00
32fd92c892
CC-4787: Edit User: Don't save username field
...
-fixed
2013-01-04 11:38:49 -05:00
e2c87ed8b6
CC-4781: Store localization settings on a per-user basis
...
-done
2013-01-03 16:19:02 -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
25df87d2e5
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-02 16:09:39 -05:00
d6eb043899
CC-4765: Webstream of AAC type can't be previewed
...
-fixed
2013-01-02 16:09:32 -05:00
88f2f1e4a7
CC-4773: L10N: Some strings is not listed in airtime.po
...
-fixed
2013-01-02 16:04:19 -05:00
dcdbc3160d
CC-4769: Duplicate Playlist: Fade in/out setting doesn't get copied correctly
...
- fixed
2013-01-02 11:41:33 -05:00
f26778ee72
CC-4757: Duplicate playlist
...
- done
- we still need a icon for context menu
2012-12-28 16:17:58 -05:00
cf38e2c596
CC-4754: Replay gain modifier
...
- done
2012-12-27 22:58:41 -05:00
c0665e4748
CC-4754: Replay gain modifier
...
- Initial commit
2012-12-27 00:36:11 -05:00
274b1f7562
CC-4743: Make user rights description localizable
2012-12-17 16:53:43 -05:00
dd5882984e
CC-4736: Let non-admin users update their user info
...
-done but needs design
2012-12-10 16:55:44 -05:00
062740ef81
CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page
...
-done
2012-12-05 13:16:25 -05:00
3086bde17e
-cleanup parsing for form elements that weren't provided by the client in our SaaS implementation
2012-12-04 16:22:03 -05:00
1846f17bbc
CC-4731: Cannot save support feedback settings
2012-12-04 16:21:45 -05:00
ee086fe43a
CC-4730: Support Feedback: Errors are displayed when they shouldn't be
2012-12-04 14:46:06 -05:00
89e0458500
CC-4728: Support Feedback save action does not use ajax
...
-done
2012-12-03 17:15:47 -05:00
b2699fa914
merge from devel
2012-12-03 11:06:56 -05:00
542434d9f0
CC-1960: Internationalize Airtime / Support translations
...
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
2012-11-28 16:16:39 -05:00
4983721565
Merge branch '2.2.x' into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/forms/LiveStreamingPreferences.php
2012-11-28 16:10:33 -05:00
9689c75bed
CC-1960: Internationalize Airtime / Support translations
...
-added i18n to serverbrowser.js
-fixed small typo in SmartBlockCriteria.php
2012-11-28 11:54:22 -05:00
c4062f7770
CC-1960: Internationalize Airtime / Support translations
...
-fixed javascript strings
2012-11-27 12:31:21 -05:00
c6a5db4a78
CC-1960: Internationalize Airtime / Support translations
...
-dashboard was missing a translation - fixed
2012-11-23 10:48:44 -05:00
dd0e71efcc
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
2012-11-22 17:32:24 -05:00
96b87d23e0
CC-1960: Internationalize Airtime / Support translations
...
-added i18n for plupload
2012-11-22 14:37:54 -05:00
3a1945a818
CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule
...
-fixed
2012-11-22 11:40:44 -05:00
25ddd083bc
CC-1960: Internationalize Airtime / Support translations
...
-added language option in preferences
2012-11-21 12:44:50 -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
10cd31fa56
CC-1960: Internationalize Airtime / Support translations
...
- channged all js strings with embedded variables to use sprintf
2012-11-20 17:42:26 -05:00
9762511693
Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LocaleController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/application/views/scripts/playlist/playlist.phtml
airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
2012-11-20 16:56:18 -05:00
f40d1f8dd4
CC-1960: Internationalize Airtime / Support translations
...
-enabled i18n for datatables, colVis, columnFilter, and fullCalendar
-fixed typos in full-calendar-functions.js
2012-11-20 16:40:02 -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
57fdab0ddf
CC-1960: Internationalize Airtime / Support translations
...
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
2012-11-20 11:33:37 -05:00
2ce530c5bd
CC-1960: Internationalize Airtime / Support translations
...
- fix to some controller strings
2012-11-20 11:33:37 -05:00
5adadc2e91
CC-1960: Internationalize Airtime / Support translations
...
- added gettext wrapper function to all strings in controllers
2012-11-20 11:33:37 -05:00
8c49540d3d
CC-1960: Internationalize Airtime / Support translations
...
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
2012-11-20 11:16:10 -05:00
d7495c6937
CC-1960: Internationalize Airtime / Support translations
...
- fix to some controller strings
2012-11-15 14:05:36 -05:00
105325994f
CC-1960: Internationalize Airtime / Support translations
...
- added gettext wrapper function to all strings in controllers
2012-11-15 12:55:45 -05:00
2b2a1db055
CC-2401: Shuffle option in playlists
...
- done
2012-11-13 17:32:10 -05:00
d8165cbf44
- haproxy support subdomain name with '.'
2012-11-13 16:32:36 -05:00
c0e54c64cd
CC-4685: System -> User: Unique username error
...
-fixed
2012-11-12 12:29:07 -05:00
ed7aba83bf
Merge branch 'cc-4661-listener-statistics' into 2.2.x-saas
2012-11-07 17:22:36 -05:00
7300b608cf
Merge branch 'cc-4661-listener-statistics' into devel
...
Conflicts:
python_apps/api_clients/api_client.py
2012-11-07 17:20:12 -05:00
9112a8d0b1
CC-4661: Listener Statistics
...
- enhancement on flot
- data point reduction
2012-11-07 16:26:31 -05:00
bd482a0a75
CC-4583: Use AJAX calls instead of refreshing entire page
...
-fixed
2012-11-07 15:17:47 -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
272e428fa7
Merge branch '2.2.x' into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/forms/EmailServerPreferences.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/forms/Preferences.php
airtime_mvc/application/forms/SupportSettings.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/menu.phtml
airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
2012-11-06 17:23:32 -05:00
fd3305bc4c
SAAS-289: Remove all isSaaS checks
...
-done
2012-11-06 17:10:47 -05:00
38d28d3346
SAAS-289: Remove all isSaaS checks
2012-11-06 16:48:34 -05:00
504d9968f1
CC-4639:
...
Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit
- fixed the bug where airtime hangs when repeat is checked but 0 files that
meet criteria
- fixed dynamic block bug where it didn't generate correct list
2012-11-06 16:32:00 -05:00
3f7d8a0c7f
Merge branch '2.2.x' into 2.2.x-saas
2012-11-06 16:11:51 -05:00
9712e64a69
CC-4661: Listener Statistics
...
- bug fix and removing unnecessary code
2012-11-06 14:52:35 -05:00
c605c97268
CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks
...
-disabled this option from context menu
2012-11-06 14:33:34 -05:00
d467abe509
Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel
2012-11-05 11:27:34 -05:00
e01a61208d
Merge remote-tracking branch 'sf/2.2.x' into cc-4585
2012-11-05 09:19:20 -05:00
5d3aa68c72
written method to unhide all files in a music dir
2012-11-03 01:09:36 -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
a93b588a09
Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics
2012-11-02 18:25:23 -04:00
74fe958cad
CC-4661: Listener Statistics
...
- changes for different mount names
2012-11-02 18:25:08 -04:00
6438b54a5f
CC-4661: Listener Statistics
...
-backend part working
2012-11-02 17:50:43 -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
3af3cd5870
CC-4661: Listener Statistics
...
- frontend part
2012-11-02 17:00:38 -04:00
2ae3c0ac03
Line wrapping
2012-11-02 16:06:12 -04:00
1111fd8163
align
2012-11-02 16:04:47 -04:00
ac9b47f5e2
made rescanWatchDirectoryAction more concise
2012-11-02 16:02:05 -04:00
270eb97128
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into cc-4585
2012-11-01 15:14:53 -04:00
226bdbf738
added todo
2012-10-31 17:41:50 -04:00
5b14c4fe88
CC-4656: Library -> No error message when a dj tries to delete smart blocks and webstreams they do not own
...
-fixed
2012-10-31 17:19:27 -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
9293a26738
CC-4639: Give an option to allow smart blocks to reuse tracks if not enough
...
tracks meet the time limit
- code optimazation
2012-10-31 12:05:17 -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
c1b2978fba
disable rabbitmq status on SaaS
2012-10-25 17:50:43 -04:00
b8d6132b52
- saas patch #1
2012-10-23 18:47:15 -04:00
3c61b39daa
Merge branch '2.2.x' into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2012-10-23 16:09:55 -04:00
58535bef88
CC-4580: No contents in rebroadcast show
...
- fixed
2012-10-19 16:40:32 -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
3b5ec6fbe0
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 11:46:18 -04:00
d32495d100
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 11:09:34 -04:00
4ad8ee2472
- removing a line for saas
2012-10-18 14:32:56 -04:00
45801e5dc4
- fix spelling of some function name
2012-10-17 15:16:03 -04:00
2b1db835dd
CC-4571: Now Playing delete action does not delete, should be labelled 'Remove from show'
...
-done
2012-10-16 16:01:05 -04:00
8a93717415
CC-4568: Show preview broken in Now Playing page
...
- fixed
2012-10-16 11:06:01 -04:00
9d3271c03d
CC-4562: Calendar: Add Show button is removed after editing a show from regular show to repeating show
...
-fixed
2012-10-15 15:36:38 -04:00
c95050c04c
CC-4546: Library->Context view for playlist: It only displays "..." instead of Static smart block's name
...
-fixed
2012-10-10 15:06:30 -04:00
89ed6925df
removed benchmarking
2012-09-19 16:36:04 -04:00
20b79374e2
Removed empty method
2012-09-19 10:25:29 -04:00
33be48e9e3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 18:21:00 -04:00
a9eefe21fa
cc-4304: Add call to save after each file reassignment
2012-09-18 18:20:33 -04:00
92b40bea0c
CC-4484: Some js files do not have the airtime version appended
...
-fixed
2012-09-18 17:43:13 -04:00
b69f3288d3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 17:22:22 -04:00
6420e6a830
remove trailing whitespace
2012-09-18 17:22:14 -04:00
be214ac126
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 15:47:48 -04:00
eecc90547d
CC-4461: Now Playing: Timeline does not reflect the changes on Show start time (which is changed from Calendar->Edit Show)
...
- fixed
2012-09-18 15:47:37 -04:00
72e6ee35fa
cc-4304: Temporarily fixed
2012-09-18 15:26:43 -04:00
09bc686d99
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 12:41:30 -04:00
b0f2176329
fix some TODO's in webstream.php
2012-09-18 12:40:44 -04:00
6fc0d50c9f
lined up
2012-09-18 11:46:35 -04:00
018b50d316
added better logging
2012-09-18 11:45:10 -04:00
0a83b33a5a
Removed extra logging statements
2012-09-18 11:10:54 -04:00
49e1b29bc9
Removed instances of getLine and getFile
2012-09-18 11:04:33 -04:00
2e0e0849c5
More clean up
2012-09-18 11:03:34 -04:00
d90559fdf8
Cleaned up ShowbuilderController
2012-09-18 11:02:41 -04:00
9c5ebdc4c0
Removed old commented code
2012-09-17 17:02:59 -04:00
0e82083ba1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 15:55:53 -04:00
1a29499bb8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 15:48:09 -04:00
54b6b12ec0
CC-4094: Dashboard -> Source Info panel: DJ assigned to current show can turn off the Master Resouce but cannot disconnect it.
...
- fixed
2012-09-17 15:41:27 -04:00
4f576afc00
cc-4396. Initial fix problem was a module was not being included in the soundcloud upload script.
2012-09-17 15:24:02 -04:00
54bb414500
CC-4318: Widgets: Weekly show cannot show the schedule
...
-fixed
2012-09-17 14:56:34 -04:00
92a5bf51a6
Added warning for uploading unknown file types
2012-09-17 12:45:33 -04:00
048da282fa
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 12:36:57 -04:00
2337078dd8
Cleaned up unused variables. Formatted some lines.
2012-09-17 12:35:12 -04:00
5d0592c729
CC-4454: Show deleting: if you do 'delete this instance and all following', it doesn't remove entries from cc_schedule table
...
-fixed
2012-09-17 12:32:39 -04:00
ab99e64e8a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 11:13:44 -04:00
f6967ac575
Added Martin's fix
2012-09-17 11:03:36 -04:00
7fed5bcd18
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 10:57:19 -04:00
a664e7f74a
Removed extra comments
2012-09-17 10:30:55 -04:00
1c2cebf5a8
Removed comment
2012-09-17 10:27:12 -04:00
f809a17c02
Formatting
2012-09-14 19:05:30 -04:00
be80eeb5fd
CC-4404: restart airtime-liquidsoap will interrupt the output stream and never resume until restart playout engine
...
-fixed
2012-09-14 18:20:46 -04:00
2faf299c73
Removed code duplication
2012-09-14 17:28:50 -04:00
092595eb9f
Removed profane logging message
2012-09-14 17:10:10 -04:00
f2b07e4a83
alignment
2012-09-14 17:02:38 -04:00
67483f8bb2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-14 17:01:45 -04:00
81dadb7f85
Removed annoying logging
2012-09-14 17:01:35 -04:00
39903be69a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-14 16:51:48 -04:00
3ced92db7a
CC-4415: Smart Block audio preview doesn't work
2012-09-14 16:51:14 -04:00
bf651a96aa
cc-4431: Fixed isUserType
2012-09-14 16:47:55 -04:00
ba08355c38
quick fix
2012-09-14 16:16:52 -04:00
76ba4bb6f0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-14 16:03:03 -04:00
05916a4d26
Code cleanup
2012-09-14 15:13:08 -04:00
198d15adc8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-14 14:53:32 -04:00
78460703a2
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
...
-done
2012-09-14 14:53:25 -04:00
79ce7b572c
cc-4202: Fixed
2012-09-14 14:51:50 -04:00
239a228175
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
...
-small fix
2012-09-14 14:36:31 -04:00
e3c1a3ac0e
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
...
-initial commit
2012-09-14 12:09:40 -04:00
d534f22ce4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 16:11:15 -04:00
505b53fa16
cc-1665: fix broken checkin for webstream
2012-09-13 16:11:06 -04:00
410a3406af
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 15:05:48 -04:00
8d08aa888b
cc-4421: Added special handling for files that mutagen returns None for.
2012-09-13 14:54:52 -04:00
b2d61f2402
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 14:22:27 -04:00
2293fcda01
CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
...
- fixed
2012-09-13 14:22:13 -04:00
4137602116
Cleaned up API controller
2012-09-13 14:21:15 -04:00
8a2703c50d
Made method static
2012-09-13 12:33:15 -04:00
2b9e6081a4
Added log for exception
2012-09-13 12:27:04 -04:00
e043816bf4
Removed superfluous logging
2012-09-13 12:23:48 -04:00
3fb7526fbb
Shortened logging
2012-09-13 12:15:51 -04:00
b28116f622
removed empty space
2012-09-13 11:34:00 -04:00
d564b85e7c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 11:12:32 -04:00
a779142a08
-fix commenting error
2012-09-13 11:12:39 -04:00
e2f8d8e0e7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 11:10:43 -04:00
d409af2876
shortened logging
2012-09-13 11:07:29 -04:00
dced49c425
Removed unused variable
2012-09-13 10:52:58 -04:00
55993352bf
Removed unused variables.
2012-09-13 10:35:24 -04:00
e1403d45bd
CC-4368: Unused local variables in Airtime Controllers. Should be removed.
...
-done
2012-09-13 10:32:33 -04:00
1f3bab2458
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-12 23:06:19 -04:00
cc88a9a8e3
Fixed a lot of unused variables
2012-09-12 18:36:27 -04:00
1c293839da
CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track
...
-disable preview icon
2012-09-12 17:32:19 -04:00
20f5fe6480
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/Block.php
airtime_mvc/public/css/styles.css
2012-09-12 15:55:43 -04:00
87fb9998dd
increase mem warning limit to 30MB
2012-09-12 15:44:26 -04:00
975830ff90
Removed wrong comments
2012-09-11 18:22:24 -04:00
e2d69df4a6
Removed unused code
2012-09-11 17:51:39 -04:00
dc91db1f46
formatting
2012-09-11 17:48:08 -04:00
bc5718ec09
logging removed
2012-09-11 17:39:28 -04:00
cc3ba90ec3
added debugging
2012-09-11 17:32:26 -04:00
b8db419717
All hands for America. Added robust debugging
2012-09-11 17:23:07 -04:00
fc8b2096af
Added debugging for Clifford
2012-09-11 17:21:20 -04:00
728a0dd736
Added todo documenting slight inefficiency
2012-09-11 16:24:59 -04:00
e664707076
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-11 16:03:01 -04:00
355b0ad35d
cc-4292: Initial fix of the MD5 issue. Now MD5's are only collected not really used for anything. Moves are handled completely
...
through paths.
2012-09-11 16:02:39 -04:00
bc355fe7a7
- webstream controller wasn't assigning webstream object properly
2012-09-11 15:10:30 -04:00
8af91f3901
-webstream controller wasn't setting webstream object properly
2012-09-11 15:02:12 -04:00
1635842b81
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-11 00:51:08 -04:00
8db4c94af1
CC-4389: Convert all PHP errors to throw exceptions instead
...
-echo to stdout as well
2012-09-11 00:50:56 -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
87ac1744f7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 16:54:51 -04:00
5292137430
-return json as data type for schedule action
2012-09-10 16:54:42 -04:00
43bef4939e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 16:30:38 -04:00
4fe8407659
Adde configurable value for list_all_files
2012-09-10 16:29:17 -04:00
c90ead9ef2
cc-4359: fixed at the cost of other issues that will be fixed later (restarting media monitor).
2012-09-10 16:08:08 -04:00
dfb1ffed79
CC-4319: Calendar: Remove all contents doesn't work
...
- fixed
2012-09-10 15:42:05 -04:00
33035a4212
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-07 17:38:35 -04:00
d20c450226
CC-4370: Transitioning between two webstreams a hiccup in the stream is audible
...
-some major refactoring before fixing this problem
2012-09-07 17:38:24 -04:00
a8e7cb392a
Sexification 2
2012-09-07 16:59:35 -04:00
3c0541f138
fix function camelcase
2012-09-07 16:50:33 -04:00
87787081ce
Removed unused optional argument.
2012-09-07 16:26:05 -04:00
089e896552
fix camelCase of function
2012-09-07 14:34:58 -04:00
33fe2f3467
CC-4351: Library->Deletion of Smart Block and saving it leads to "Processing" message being displayed for a while
...
-fixed
2012-09-06 14:10:50 -04:00
744577a8b5
Removed bad line break
2012-09-06 12:38:55 -04:00
3f898bfc3a
Fixed wrong function name
2012-09-06 12:33:04 -04:00
f4591f825f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 12:17:39 -04:00
56527e727c
extra debuggin
2012-09-06 12:17:18 -04:00
8d1003bbbe
CC-4303: Library Tab grays out after certain scenario with normal playlist
...
-fixed
2012-09-06 11:48:00 -04:00
bed360cd3e
Formatting
2012-09-06 11:15:01 -04:00
c1bc50c1db
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-05 16:56:14 -04:00
80fa090f13
Uncommented old line of code perhaps it's useful
2012-09-05 16:39:58 -04:00
8ec9ccedf3
CC-4358: Calendar: Show Content: Undefined Index
...
-fixed
2012-09-05 16:07:40 -04:00
f86fa8f945
gotten rid of annoying logging
2012-09-05 15:38:43 -04:00
579180301a
Removed stat caching to make sure is_file is accurate
2012-09-05 15:05:50 -04:00
a731fc147b
CC-4348: Prepared statements - part 4
...
-fixed Show.php
2012-09-04 13:34:05 -04:00
15f750eca5
CC-4248: Playlist Builder: 'Something went wrong' error message when dragging playlist into playlist
...
-included webstreams in the allowance type list in the error message
2012-09-04 11:29:23 -04:00
cad0a8fbd7
CC-1665: Scheduled stream rebroadcasting and recording
...
-make sure webstream length is properly updated in browser view after editing
2012-08-31 13:01:22 -04:00
a0a4094332
cc-4304: Small refactoring
2012-08-30 16:00:14 -04:00
417997e617
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-30 15:23:24 -04:00
a11ec08154
cc-4304: Implemented default behaviour to cascade delete all the files
2012-08-30 15:23:12 -04:00
010ba63d59
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-30 14:37:08 -04:00
7eefbf3e24
CC-4311: On Air button gets greyed out few seconds after show starts
...
-additional debug info
2012-08-30 14:36:55 -04:00
ea2595d70f
Documeneted funny quirk related to creating a password
2012-08-30 12:26:36 -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
b75f2ab9c7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 16:13:30 -04:00
80258f1fb7
CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
...
-fixed for dragging tracks into deleted blocks
2012-08-29 16:13:18 -04:00
7c79aad5f4
CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
...
-removed unnecessary exception catch
2012-08-29 16:04:40 -04:00
fe48780932
CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
...
-fixed
2012-08-29 16:00:58 -04:00
f483e271f6
formatting
2012-08-29 14:50:10 -04:00
af3cea464b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 12:58:06 -04:00
46a6a5fc30
CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save'
...
-added in saving behaviour for regular playlists
2012-08-29 12:05:41 -04:00
e796d4c03d
MM2: equal signs sexified
2012-08-29 11:39:42 -04:00
5effb253bf
CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save'
...
-done
2012-08-29 11:38:47 -04:00
8b5f94fa9f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 11:05:14 -04:00
699a49a103
CC-4090: Make code style PSR compliant - part 4
...
-controllers dir
2012-08-29 10:54:36 -04:00
3d20ded170
CC-4307: Add "Never show again" to the pop-up registration prompt
...
-done
2012-08-28 17:30:34 -04:00
c67ad44699
Merge branch 'cc-4274' into devel
2012-08-28 17:25:11 -04:00
481616a0d6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-28 17:22:57 -04:00
a0ad9a91ea
CC-1665: Scheduled stream rebroadcasting and recording
...
-Better error logging
-convert minutes > 59 into hours
2012-08-28 17:22:48 -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
7ee68c55e0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-28 16:17:46 -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
8249ea8816
CC-1665: Scheduled stream rebroadcasting and recording
...
-small optimization for user auth
2012-08-28 12:38:13 -04:00
219fba9bee
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-28 12:30:45 -04:00
fc67d7f08d
CC-1665: Scheduled stream rebroadcasting and recording
...
-allow user more flexibility for entering length interval (require hours OR minutes)
2012-08-28 12:30:33 -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
7f66bdbb66
cc-4301: Fixed bug where owner_id would be null whenever show is recorded.
2012-08-27 17:58:09 -04:00
583d3837be
cc-3936: formattingk
2012-08-27 17:15:38 -04:00
57020b6e3b
cc-3936: Added warning whenever files that don't exist in db are requested to be deleted.
2012-08-27 16:50:22 -04:00
3fb0fbd73f
CC-4291: Adding webstreams: Need ability to parse webstreams from .m3u and .xspf urls
...
-fixed
2012-08-24 19:25:19 -04:00
54db68bb26
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-24 12:40:39 -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
dcc9c58577
cc-3936: Sexified equal signs.
2012-08-24 10:20:59 -04:00
36b344a910
cc-3936: remove unneeded garbage.
2012-08-24 10:20:59 -04:00
a9cf597f14
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-23 15:04:38 -04:00
ea58ae9cc8
-remove unecessary logging
2012-08-23 15:03:59 -04:00
a4c579f36e
CC-4254: Library: advanced search on library
...
- bug fix
2012-08-23 10:59:34 -04:00
38173bd3a2
- small fix
2012-08-23 10:19:00 -04:00
442c156458
CC-1665: Scheduled stream rebroadcasting and recording
...
-fixed context menu for webstreams
2012-08-22 16:08:51 -04:00
fe1aa7a169
CC-1665: Scheduled stream rebroadcasting and recording
...
-fixed syntax error
2012-08-22 15:56:18 -04:00
8573dcb870
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-22 15:35:09 -04:00
91f13a6279
CC-1665: Scheduled stream rebroadcasting and recording
...
-current Library session object should not be stored as a property of the Controller class.
-fixed
2012-08-22 15:34:59 -04:00
e9bc0074c0
cleaned up ApiController.php a little bit.
2012-08-22 14:38:48 -04:00
c8c257a330
CC-1665: Scheduled stream rebroadcasting and recording
...
-change behaviour so that the webstream is not saved as soon as it it created.
2012-08-22 14:04:01 -04:00
24988616b3
CC-1665: Scheduled stream rebroadcasting and recording
...
-current Library session object should not be stored as a property of the Controller class.
-fixed
2012-08-22 14:03:11 -04:00
cef3ffb07b
CC-4265: Keep track of how much memory each request is taking and log if over a threshold
...
-fixed
2012-08-22 14:01:44 -04:00
ea4567f373
Make user functions work more consistently
...
isHost didn't work similar to isPM or isAdmin
2012-08-22 13:59:37 -04:00
9885374d34
CC-1665: Scheduled stream rebroadcasting and recording
...
-more work to make webstreams behave like playlist creator
2012-08-21 18:55:38 -04:00
462542bf68
change Logging::log to Logging::info
2012-08-21 18:41:56 -04:00
15eae0698b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-21 16:55:17 -04:00
ecfc27431a
CC-1665: Scheduled stream rebroadcasting and recording
...
-verify user that is deleting has current permissions
2012-08-21 16:54:41 -04:00
a1b91aebbd
CC-1665: Scheduled stream rebroadcasting and recording
...
-use sessions to determine currently open object in Library
2012-08-21 16:54:14 -04:00
2cdaa186e3
CC-4257: Smart Block: Admin cannot delete DJ user's block
...
-fixed
2012-08-21 15:42:44 -04:00
51ebae3de9
Make sure we are using the Library controller for the Library page
2012-08-21 11:12:33 -04:00
47852bce2a
indentation fixes
2012-08-21 10:50:24 -04:00
179aa3d739
CC-1665: Scheduled stream rebroadcasting and recording
...
-Show meaningful page after webstream is deleted
2012-08-21 10:50:18 -04:00
337e5fec8a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-20 18:36:32 -04:00
3230f14231
CC-1665: Scheduled stream rebroadcasting and recording
...
-Fixed delete button on right side of library screen not working
2012-08-20 18:35:10 -04:00
d517bf6e19
fix indentation and remove \r characters
2012-08-20 18:29:57 -04:00
a24da9e324
CC-4256: Smart Playlist: change name to smart block and etc
...
- done
2012-08-20 17:17:48 -04:00
398fbb04db
CC-1665: Scheduled stream rebroadcasting and recording
...
-don't show delete button until a stream has been saved
2012-08-17 17:29:17 -04:00
4216440670
CC-1665: Scheduled stream rebroadcasting and recording
...
-previewing streams have NaN:NaN:NaN as length
2012-08-17 16:51:23 -04:00
817fe13533
CC-4248: Playlist Builder: 'Something went wrong' error message when dragging playlist into playlist
...
-fixed
2012-08-17 15:56:16 -04:00
99437147dc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-17 15:08:10 -04:00
2a1ea33362
CC-1665: Scheduled stream rebroadcasting and recording
...
-store Liquidsoap metadata in cc_schedule instead of cc_webstream
2012-08-17 15:07:58 -04:00
5b134d0055
cc-4228: fixed this ticket by stomping out bugs in eventcontractor and tweaking ApiController
2012-08-17 12:37:58 -04:00
e511f7cd37
CC-1665: Scheduled stream rebroadcasting and recording
...
-fixed clicking save multiple times creates multiple smart playlists
2012-08-16 17:49:07 -04:00
9930ffae35
CC-4178: Smart Playlist: Cannot update the block's title
...
-fixed
2012-08-16 16:00:59 -04:00
b17cd2b3c9
CC-4178: Smart Playlist: Cannot update the block's title
...
-fixed
2012-08-16 15:58:03 -04:00
0d21d9a9af
Smart Playlists: code cleanup
2012-08-16 15:40:36 -04:00
d773dcd112
CC-1665: Scheduled stream rebroadcasting and recording
...
-send stream name back to Airtime: [("url","http://idobiradio.com/ "), ("title","Good Charlotte - Like It's Her Birthday")]
2012-08-15 15:12:44 -04:00
4d9a31b3c1
CC-4219: Smart Playlist: Cannot preview static block
...
-fixed
2012-08-15 12:10:56 -04:00
9fc5411895
CC-4229: Smart Playlist: refactor code
...
- done
2012-08-15 11:36:41 -04:00
e98eda144a
cc-4105: removed naive replaygain again. added micro optimization to Insert into cc_files
2012-08-14 14:50:41 -04:00
6981a5cb49
cc-4105: added truncation of BPM to prevent crashes
2012-08-14 14:50:40 -04:00
ba03447946
cc-4105: added handling for pyinotify events and create more logical events
2012-08-14 14:50:39 -04:00
688d22e995
cc-4105: fixed metadata formatting bug
2012-08-14 14:50:39 -04:00
6e9db647c1
cc-4105: Fixed metadata handling. Added more error reporting to rmq requests
2012-08-14 14:50:39 -04:00
5f1024bb7d
cc-4105: Tweaked config params. Fixed error checking. Fixed unicode stuff. Removed redundant php
2012-08-14 14:50:39 -04:00
7abe882455
cc-4105-2: added retries on failed requests. added ignored files set like in the old media monitor
2012-08-14 14:50:39 -04:00
3422eb3cc0
cc-4105: added event packing to event objects
2012-08-14 14:50:39 -04:00
9964c826ab
cc-4105: Added problem dir moving. Also locale config from old media monitor
2012-08-14 14:50:37 -04:00
7a5d9a0f91
CC-1665: Scheduled stream rebroadcasting and recording
...
-don't require 2 digits for minutes or hours
2012-08-13 15:26:32 -04:00
c3862d69e5
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-13 14:58:20 -04:00
51e242ec7f
CC-1665: Scheduled stream rebroadcasting and recording
...
-remove edit menu from show builder
2012-08-13 14:58:11 -04:00
b8ea08c065
CC-1665: Scheduled stream rebroadcasting and recording
...
-analyze stream mime type and report error as needed.
2012-08-13 12:59:26 -04:00
dad8762f4f
CC-4209: Smart Playlist: 'Processing' wont disappear after clicking Generate during 'File import in progress'
...
- fixed
2012-08-13 12:31:49 -04:00
028f6636dd
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix right clicking in playlist builder to view metadata causing exception
2012-08-10 14:37:32 -04:00
fa749c58f0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-10 12:40:45 -04:00
35e3b3bc02
CC-1665: Scheduled stream rebroadcasting and recording
...
-use mime type so that webstreams can play with invalid filenames
2012-08-10 12:40:28 -04:00
4009ae741f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-10 12:39:45 -04:00
8b13af2e04
fix bug on widget
2012-08-10 12:14:15 -04:00
bd966915ee
CC-4207: Smart Playlists: Criteria is lost on 'Shuffle' click
...
-fixed
2012-08-10 11:56:01 -04:00
fe3f4ea678
CC-1665: Scheduled stream rebroadcasting and recording
...
-capture stream mime type and store in db.
2012-08-10 00:57:03 -04:00
5a63a284c8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 18:24:32 -04:00
10ea825536
CC-4201: Playlist Builder -> Smart Playlist: DJ user can edit SP created by others in particular situation
...
-fixed
2012-08-09 18:24:22 -04:00
65cb34db4a
CC-1665: Scheduled stream rebroadcasting and recording
...
-webstream preview on show builder working
2012-08-09 18:14:53 -04:00
63a51081c1
CC-4182: Media Library -> Smart Playlist: Empty box appears after left clicking a Dynamic Smart Playlist created by other users, when login as DJ
...
- fixed
2012-08-09 17:50:43 -04:00
bc72a6743b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 17:42:32 -04:00
4129900858
CC-1665: Scheduled stream rebroadcasting and recording
...
-step 1 of getting stream preview on show builder working
2012-08-09 17:42:25 -04:00
f75cf5ffe2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 17:24:00 -04:00
e674654cb1
CC-4192: Smart Playlist Builder: make save button save title, description, and criteria
...
-done
2012-08-09 17:23:52 -04:00
618813ebc1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 16:59:33 -04:00
6c721cd68d
CC-4184: Playlist Builder : Error alert for trying to add Web Stream to Smart Playlist
...
- fixed
- extra fix: context menu for webstream
2012-08-09 16:59:18 -04:00
c73328e297
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to preview webstreams inside of playlists
2012-08-09 16:49:20 -04:00
952f18dc3c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 14:39:42 -04:00
b53bc36f4f
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to preview webstreams
2012-08-09 14:39:31 -04:00
ae5b6e58d7
CC-4144: Playlist Builder: Adding smart playlist into regular playlist will reset the Fade in/out settings to default value
...
- fixed
2012-08-09 11:03:57 -04:00
c69dac7ab6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-08 23:02:39 -04:00
d0d70db391
remove useless debugging
2012-08-08 23:02:16 -04:00
d1e6f8178b
CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error
...
- fixed. Not displaying fade setting button if the playst/smartplaylist
is empty.
2012-08-08 15:29:09 -04:00
48a1bf3f02
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/Show.php
2012-08-06 17:10:46 -04:00
40023d9086
CC-4152: Widget does not display current show in some modes
...
-fixed
2012-08-06 17:07:18 -04:00
f901e13a84
CC-1665: Scheduled stream rebroadcasting and recording
...
-Make playlist builder show creator name instead of creator id
2012-08-03 18:06:47 -04:00
0ea66fc33f
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to edit playlists
2012-08-03 15:59:34 -04:00
361e681a59
CC-84: Smart Playlists
...
- remove 'add to playlist' option on showbuilder screen
2012-08-02 16:50:35 -04:00
028e089c82
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/Block.php
2012-08-02 16:37:12 -04:00
0d2d8218bf
CC-84: Smart Playlists
...
- audio preview on playlist
- cleaning up some code
2012-08-02 16:36:12 -04:00
a146fdcd37
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-02 16:27:00 -04:00
9cc152c0ae
CC-1665: Scheduled stream rebroadcasting and recording
...
-validate form fields of new webstream
2012-08-02 15:45:15 -04:00
997b5c31c3
CC-84: Smart Playlists
...
- fixed dragging tracks into playlists (smart and dumb)
- display alert when dragging into dynamic block
- display alert when dragging playlist into block
2012-08-02 11:52:11 -04:00
b9bb87f69d
CC-1665: Scheduled stream rebroadcasting and recording
...
-clicking save now show's webstream save was successful
2012-08-01 15:37:50 -04:00
c9afac239a
CC-84: Smart Playlists
...
- add qtip for smart playlists
- modified qtip content for regular playlists that contain smart playlists
2012-08-01 12:04:48 -04:00
9d51222dae
CC-84: Smart Playlists
...
- Length calculation for dynamic blocks and playlist that contains
dynamic blocks
2012-07-31 17:46:37 -04:00
ab85ab59d9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-30 21:48:25 -04:00
7e433b61fb
CC-1665: Scheduled stream rebroadcasting and recording
...
-improve working with "webstreams"
2012-07-30 21:48:04 -04:00
27017c7903
CC-84: Smart Playlists
...
- fixed getCriteria() to non static function
2012-07-30 18:21:27 -04:00
019d13b4c9
CC-84: Smart Playlists
...
- backend implementation
- UI for blocks within playlist
2012-07-30 17:55:22 -04:00
5becd70ab1
CC-84: Smart Playlists
...
- drag and drop playlist that contains block
- audio preview of playlist that contains static block
2012-07-27 11:51:50 -04:00
7cde4ba2ba
CC-84: Smart Playlists
...
- merging code
2012-07-26 16:16:07 -04:00
8755500d30
CC-84: Smart Playlists
...
- some minor fix
2012-07-26 15:30:49 -04:00
eb4c23b0b6
CC-1665: Scheduled stream rebroadcasting and recording
...
-Fix scheduled streams mixed with scheduled files
2012-07-26 14:49:32 -04:00
3735579378
-remove cc_access table and gunid usage
2012-07-26 14:49:32 -04:00
8b2facaa96
CC-1665: Scheduled stream rebroadcasting and recording
...
-playlists load contents now correctly identify tracks vs streams
2012-07-26 14:49:32 -04:00
a16a1f5033
CC-1665: Scheduled stream rebroadcasting and recording
...
-Webstreams now appearing in the library
2012-07-26 14:49:31 -04:00
31176f525e
CC-1665: Scheduled stream rebroadcasting and recording
...
-started working on UI
2012-07-26 14:41:40 -04:00
ed54e882a3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-26 14:41:22 -04:00
3f41835e12
re-add getCurrentShowAction
2012-07-26 14:36:21 -04:00
a828c46d32
CC-84: Smart Playlists
...
- changed name of 'block' to 'smart playlist' on UI only
2012-07-26 13:16:29 -04:00
3df0f2d26e
CC-84: Smart Playlists
...
- added 'add' option to smart playlist context menu
2012-07-26 12:45:31 -04:00
bef9ba1eea
CC-84: Smart Playlists
...
- added 'Smart Block' filter in datatable
- added block files to library datatable
2012-07-25 17:08:22 -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
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
30b64f81fd
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-23 10:41:09 -04:00
c99e1b892c
CC-84: Smart Playlists
...
-divided criteria into sub form to handle multiple sets
2012-07-23 10:40:53 -04:00
255866d240
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Show.php
2012-07-22 19:18:53 -04:00
aaa0c01e01
CC-4120: memory optimizations for calendar page.
...
-can now fetch over a year of data at a time
2012-07-22 19:14:29 -04:00
647de9ed39
CC-84: Smart Playlists
...
- started storing last played time in cc_files
- db column (lptime) already existed but was not being used before this
- will use this as a criteria for smart playlists
2012-07-19 18:07:39 -04:00
1f603bb75b
cc-4105 : merge devel into my branch
2012-07-19 10:51:04 -04:00
9516771099
Merge branch 'cc-84-smart-playlist' into devel
...
Conflicts:
airtime_mvc/application/controllers/PlaylistController.php
airtime_mvc/application/models/Scheduler.php
2012-07-18 12:23:57 -04:00
2a38527161
CC-84: Smart Playlists
...
- propel usage chage
- cleaning up code
- some js changes
2012-07-18 11:52:09 -04:00
c23023bcd9
Removed irrelevant comment
2012-07-17 16:43:04 -04:00
25d3028fb1
cc-4105: added testing support for api client and ApiController
2012-07-17 16:43:04 -04:00
531dfe2b5e
cc-4105: fixed up python media monitor request parameter for recorded shows\n.Added more input validation in php controller
2012-07-17 16:43:04 -04:00
0ddc8497c3
cc-4105: small improvement in reloadMetadataGroupAction. We give more detailed responses and log bad requests in a little more detail as well
2012-07-17 16:43:04 -04:00
f348652f0e
cc-4105: reloadMetadataGroupAction seems to be ready for production.\nSet the parameter correctly after finishing the debugging from the python side
2012-07-17 16:43:04 -04:00
fdf921bbaf
cc-4105: Made reloadMetadataGroupAction safer by validating input
2012-07-17 16:43:04 -04:00
01448d42df
cc-4105: added some comments to describe development
2012-07-17 16:43:04 -04:00
b0f5b722db
cc-4105: fixed typo.\nadded some error checking in case bad parameters are given to dispatchMetadataAction
2012-07-17 16:43:04 -04:00
98b4e3c47b
cc-4105: Tweaked php method to have more consistent return values
2012-07-17 16:43:04 -04:00
aa298453b7
cc-4105: removed useless comments
2012-07-17 16:43:04 -04:00
eb00b5cbb3
cc-4105: renamed controller action and method to correct name
2012-07-17 16:43:04 -04:00
1bd07eeaca
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/models/ServiceRegister.php
2012-07-17 15:00:53 -04:00
eba4b688c4
User Patch: If a callback is not given, then just provide the raw JSON.
...
Submitted by Ross Masters <ross@rossmasters.com>
2012-07-17 14:47:13 -04:00
1e76845e9c
more sophisticated remote_addr determining
2012-07-17 13:34:48 -04:00
20e32b98ba
Merge branch 'devel' into mediamonitor2
...
Conflicts:
python_apps/api_clients/api_client.py
2012-07-16 17:41:36 -04:00
1804531e84
removed comment
2012-07-16 17:19:11 -04:00
fc09baacd7
CC-84: Smart Playlists
...
- static playlist is done.
2012-07-16 17:18:37 -04:00
a1c205edff
cc-4105: Removed wrong error handling from api_client. Split up controller action to make it reusable through other actions
2012-07-16 16:43:48 -04:00
1c084a3101
moved misplaced docstring
2012-07-16 15:47:44 -04:00
d08b62dd39
cc-4105: removed dead code path
2012-07-16 15:25:45 -04:00
723e6356bc
Merge branch 'mediamonitor2' of dev.sourcefabric.org:airtime into mediamonitor2
2012-07-16 14:58:34 -04:00
a9f6bb3b5c
cc-4105: changed error handling from returning none to throwing exception
2012-07-16 14:58:23 -04:00
4ebcb1b1f9
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/PlaylistController.php
airtime_mvc/application/models/Playlist.php
python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-07-16 14:31:03 -04:00
312f35ae48
CC-430: Audio normalization (Replaygain Support)
...
-change default database value to null
2012-07-16 12:10:42 -04:00
3e24b71436
removed wrong comments
2012-07-16 10:31:00 -04:00
ce1a63f47d
CC-430: Audio normalization (Replaygain Support)
...
-small bug fixes
2012-07-15 22:55:52 -04:00
583695f98c
CC-430: Audio normalization (Replaygain Support)
...
-values are now written through to database
2012-07-15 22:22:42 -04:00
39760f8494
CC-4090: Make code style PSR compliant
2012-07-15 22:22:07 -04:00
632f039977
CC-430: Audio normalization (Replaygain Support)
...
-values are now written through to database
2012-07-15 22:19:55 -04:00
b4f1cc13c0
CC-430: Audio normalization (Replaygain Support)
...
make code simpler (don't download database to file)
2012-07-15 22:19:16 -04:00
71dc7d99b4
cc-4105: added a method in API client corresponding to chunked requests.\nAlso add prepared corresponding apicontroller method
2012-07-15 22:17:36 -04:00
44d91f7798
cc-4105: clean up url construction in api client
2012-07-15 22:17:36 -04:00
0fd6c4adbf
fixed typo
2012-07-15 22:17:36 -04:00
9f1ec3c05c
created a new controller action for chunked requests from media monitor
2012-07-15 22:16:58 -04:00
794cf2c845
CC-4090: Make code style PSR compliant
...
-run psr-cs-fixer
2012-07-15 21:17:13 -04:00
5661872034
checkAuth in init() function
2012-07-15 21:07:34 -04:00
8340079b95
cc-4105: added a method in API client corresponding to chunked requests.\nAlso add prepared corresponding apicontroller method
2012-07-13 17:57:18 -04:00
47893865cc
cc-4105: clean up url construction in api client
2012-07-13 16:32:17 -04:00
ae9442d7f5
CC-84: Smart Playlists
...
- editing playlist
2012-07-13 15:58:23 -04:00
3b708fae6a
fixed typo
2012-07-13 14:54:04 -04:00
a6d51bea8d
created a new controller action for chunked requests from media monitor
2012-07-13 14:51:43 -04:00
bf46605ea1
CC-84: Smart Playlists
...
- changing field name in backend
- diabled loading criteria on edit temporarly
2012-07-13 14:32:05 -04:00
207582eb7e
CC-84: Smart Playlists
...
- temp commit
2012-07-13 14:23:30 -04:00
3bce6b4999
CC-84: Smart Playlists
...
- db inserting into cc_playlistcriteria
- error validations
2012-07-12 17:58:44 -04:00
f0f033b4fb
CC-430: Audio normalization (Replaygain Support)
2012-07-12 17:58:29 -04:00
f0134ba3fa
CC-84: Smart Playlists
...
- validation on server side
- getting list of files from db which satisfies criteria
2012-07-12 15:27:51 -04:00
8f6d6058a2
CC-4100: Make number of shows displayed in widget customizable
...
-removed Logging message
2012-07-11 19:33:19 -04:00
bd51b4db02
CC-4100: Make number of shows displayed in widget customizable
...
-fixed
2012-07-11 19:31:24 -04:00
93b34bb079
CC-84: Smart Playlists
...
- controller skeleton
- playlist model dummy functions
2012-07-11 16:14:11 -04:00
646e028037
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-11 10:47:14 -04:00
4bed5e647e
CC-84: Smart Playlists
...
-moved smart_playlistbuilder.js into playlist folder
2012-07-11 10:45:24 -04:00
b7cd90bc28
CC-84: Smart Playlists
...
-created form and view script
2012-07-11 10:42:51 -04:00
d9cde230cd
CC-4090: Make code style PSR compliant
...
-removed all trailing whitespace
2012-07-10 18:53:06 -04:00
ee3447f903
CC-4090: Make code style PSR compliant
...
-User.php
-removed all trailing whitespace
2012-07-10 18:51:32 -04:00
24a90700a1
CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
...
others on some situation.
2012-07-10 17:24:57 -04:00
f174a2bcf3
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-07-10 17:09:46 -04:00
39506740eb
CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
...
others on some situation.
- fixed
2012-07-10 17:09:21 -04:00
f072be5d0e
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-07-10 16:41:48 -04:00
6d98cca9c3
SAAS-270: Apache2 errors on SaaS
...
-no reason to pass $pl since it is not even used. Fixed
2012-07-10 16:41:30 -04:00
72dd48e33e
CC-84: Smart Playlists
...
-created form and view script
2012-07-10 15:25:29 -04:00
62b0fec595
CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
...
others on some situation.
- fixed
2012-07-10 15:11:59 -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
e4fb42cbd0
CC-4027: In the Calendar view, please have a little play icon indicating the currently playing show.
...
-done
2012-07-06 15:26:51 -04:00
9bc1c66fe3
CC-2747: If the file contains '\' in its meta title, airtime doesn't
...
detect duplicate
- fixed
- extra fix: there was also problem with web UI upload and it's fixed
see the comment on the ticket for more detail.
2012-07-05 15:27:49 -04:00
1fa3da5bd0
CC-4069: Edit Show -> cannot edit show
...
-fixed
2012-07-04 18:58:22 -04:00
598bf8942c
Merge branch '2.1.x' into devel
2012-07-03 14:57:16 -04:00
7342ea4d4b
CC-4053: Widget not showing correct day on Sunday
...
- fixed weekly widget
- also fixed today's show widget
2012-07-03 13:17:48 -04:00
3e75b28c9d
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
2012-07-03 10:42:29 -04:00
7ea106e0d3
CC-4051: Library -> First character gets cut off of file name when downloading a track from a watched folder
...
-fixed
2012-06-29 16:02:27 -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
6c83633933
CC-4008: Inconsistent button labels for Play/Preview in Now Playing page
...
- changed everyting to "Preview"
2012-06-28 13:33:01 -04:00
8141dec3b5
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-added comment
2012-06-27 15:13:03 -04:00
d5a5bdd310
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-added comment
2012-06-27 14:57:47 -04:00
bdaa64d4d1
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-fixed (originally scheduled for 2.2 - adding for 2.1.3)
2012-06-27 13:13:07 -04:00
1300593e8b
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-fixed
2012-06-27 13:03:22 -04:00
c669d3cb47
CC-3969: Reset Password: specifying wrong e-mail keeps you on the same page
...
without possibility to navigate back gracefully
- done
2012-06-20 18:02:46 -04:00
186b8ef1c2
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-fixed
2012-06-15 16:48:51 -04:00
b0e93005e5
Merge branch '2.1.x' into devel
2012-06-15 15:04:18 -04:00
87faf47c94
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-15 14:42:37 -04:00
d02607ed94
CC-3561: Add button to automatically rescan watched folders.
...
-done
2012-06-15 12:16:19 -04:00
73a7a76078
Merge branch 'CC-3963' into 2.1.x
...
Conflicts:
airtime_mvc/public/js/airtime/preferences/streamsetting.js
2012-06-14 16:06:53 -04:00
70bfe031ef
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/models/Email.php
2012-06-14 15:30:33 -04:00
295a8ea5fe
CC-3561: Add button to automatically rescan watched folders.
...
-done
2012-06-14 13:44:56 -04:00
f433fd89fe
CC-3970: Password Reset: No UI error msg for no mail server founded
...
-done
2012-06-13 16:04:57 -04:00
b07b83f740
CC-3981: Record Show: Change streams settings during recording will
...
cause record fail
- added warning message
2012-06-13 14:44:38 -04:00
9cabd4d32c
CC-3921: Add mobile phone number field to user record
...
-done
2012-06-13 13:39:54 -04:00
8b2353ede0
Merge branch '2.1.x' into devel
2012-06-12 15:49:18 -04:00
57397312f2
CC-3963: If DJ is scheduled to broadcast for show, then automatically
...
enable source when DJ connects.
- done
2012-06-12 15:38:03 -04:00
22453f3820
CC-3968: Cannot preview file as * .MP3
...
-fixed
2012-06-12 11:31:10 -04:00
d66ba4074c
Merge branch '2.1.x' into devel
2012-06-11 18:11:09 -04:00
81c7eb7763
CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked
...
-fixed
2012-06-11 18:08:36 -04:00
1b057c8954
Merge branch '2.1.x' into devel
2012-06-11 16:49:03 -04:00
06d90c53aa
CC-3957: Make Schedule Widgets show future Sunday instead of past Sunday
...
- fixed
2012-06-11 16:42:12 -04:00
d498c51814
Merge branch '2.1.x' into devel
2012-06-11 15:10:33 -04:00
ca8187c9c2
CC-3718: Please enable user to input the mail server settings
...
-done
2012-06-11 12:53:09 -04:00
1625cc6a25
CC-3948: Dashboard -> Source Info panel: Cannot turn off source if
...
source is disconnect.
- fixed
2012-06-08 15:14:30 -04:00
7d4851573f
CC-3951: Password Reset: You can still reset password even after system email for Password Reset disabled
...
-fixed
2012-06-08 13:09:14 -04:00
7228dc9eb0
CC-3869: Source Streams: Please give Guest and DJ user clear error message
...
when they try to shut off Scheduled Play stream
- fixed
2012-06-07 14:27:12 -04:00
2bf6408d90
CC-3864: Calendar -> Edit show: Can edit the start time of current playing show
...
- fixed
2012-06-06 18:23:27 -04:00
ec6ff4c9e6
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-06 17:32:10 -04:00
e5d5f44813
CC-3905: Playlist Library -> the delete tracks button is enabled for DJ
...
users and PM's
- done
- PM should have full control on the library
- DJ is only allowed to edit/delete playlist that they created.
no action on files except play or add to their own playlist
2012-06-06 17:31:51 -04:00
d8a75cf5c6
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-06 17:06:54 -04:00
fda04295a6
CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked
...
-fixed
2012-06-06 17:06:46 -04:00
fb533bed07
CC-3855: System -> Support Feedback: Cannot uncheck 'Promote my station
...
on Sourcefabric.org' if it's checked then saved.
- fixed
2012-06-06 14:26:23 -04:00
0ca45e343b
CC-3878: Recorded media file's track number is changed after restarting media-monitor
...
- fixed
2012-06-06 14:18:54 -04:00
b23e3d0a54
CC-3927: Should automatically switch back to Master/Show stream if there is a
...
connection interruption
- done
2012-06-05 16:41:41 -04:00
990dea12a4
CC-3895: Sometimes Media Monitor will not update the length of tracks with the same title but different contents.
...
-fixed
2012-06-05 11:20:00 -04:00
c1976162cb
CC-3793: "Star time" check will block updating shows when error found in colour settings
...
-fixed
2012-06-05 11:19:59 -04:00
f23582612a
SAAS-247: Stream settings wipes out master/show source settings if is a SAAS instance
...
-fixed
2012-05-28 15:41:59 -04:00
d91850b1ca
CC-3877 : Now Playing-> Show manipulation buttons should be disabled for guest user and DJ's who are not assigned to the show
2012-05-24 18:10:36 +02:00
428b13f3d7
CC-3803 : Don't allow editing of a current Record show
2012-05-22 17:51:53 +02:00
95003c3571
CC-3712 : Trial end date overlaps with Airtime Clock
2012-05-22 12:45:42 +02:00
f485b9b601
CC-3804: The title of the record show's media will be changed after Media Monitor restart
...
-removed re-setting the track_title. It was causing problems, and it seems to no
longer have a reason to be here (you cannot rename a recorded show after it
has started)
2012-05-21 02:23:34 -04:00
466e30895c
CC-3845 : General UI cleanup
2012-05-18 16:00:36 +02:00
ff1327881a
CC-3845 : General UI cleanup
2012-05-18 15:40:22 +02:00
5d3382a3d9
CC-3845 : General UI cleanup
...
changing eye icon to play for the preview option in a context menu.
2012-05-18 12:29:37 +02:00
ccbe4f1998
CC-3420 : Custom UI for jplayer from CC-3395
...
creating new stylesheet for our audio previews based from jplayer blue monday.
2012-05-17 16:20:40 +02:00
025ef0ed27
CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE
...
-fixed
2012-05-15 12:35:02 -04:00
803c44611a
CC-3819 : Add View on Soundcloud context menu option on calendar page
2012-05-14 15:48:09 +02:00
f8900d4b05
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2012-05-14 15:13:08 +02:00
cc71c61fce
CC-3816 : Automatic uploading of recorded shows, View on Soundcloud choice in menu doesn't work
2012-05-14 13:01:44 +02:00
97ce006130
CC-3816 : Automatic uploading of recorded shows, View on Soundcloud choice in menu doesn't work
2012-05-14 12:36:57 +02:00
de3e5a6e3c
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-fixed inserts into cc_live_log
2012-05-11 16:09:36 -04:00
99738fad30
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-added cc_live_log inserts
2012-05-11 16:09:35 -04:00
e347819c77
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-created cc_live_log table
2012-05-11 16:06:28 -04:00
df4cdfb07e
CC-3687 : Remove context menus from recorded shows since they are blank.
2012-05-07 17:48:56 +02:00
edaec54a5d
CC-3724 : Now Playing -> Timeline view: to drag and drop single file very fast will block adding the same file
...
using jquery.blockUI.js on timeline/playlist builder pages.
2012-05-04 15:00:18 +02:00
81d7e0c80f
CC-3747: Metadata popup should also show the filepath of the track
...
-fixed filepath join
2012-05-03 09:59:31 -04:00
ff6e2a2e5a
CC-3747: Metadata popup should also show the filepath of the track
...
-fixed
2012-05-02 16:52:49 -04:00
8a2b9e7221
CC-3746: Calendar: Duration of 24hrs show is 00h 00m
...
- fixed
2012-05-01 17:05:18 -04:00
0fe4478bb5
CC-3478: Calendar->Show has some inconsistencies on special Days (e.g.
...
switching to Daylight Saving Time)
- added exception handling
2012-04-26 10:56:08 -04:00
2c84420424
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-26 12:15:31 +02:00
b5863d3d7a
CC-3522 : Now Playing Screen-> Periodical message pops up
2012-04-26 12:14:41 +02:00
28d27b8932
CC-3719: "Start time" check will block editing ON AIR show
...
- fixed
2012-04-25 18:01:37 -04:00
b5a65ae7e4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 17:22:05 -04:00
fe71487fa2
CC-3478: Calendar->Show has some inconsistencies on special Days (e.g.
...
switching to Daylight Saving Time)
- fixed
2012-04-25 17:21:25 -04:00
e12bd35ee2
CC-3671: add show on week/day view doesn't get start time/end time filled in
...
-use str formatter for padding
2012-04-25 16:39:58 -04:00
b6bed6ce7a
CC-3667 : Preferences pages should have an option to enable/disable password recovery option
2012-04-25 15:22:38 +02:00
63a5f45e9b
CC-3690: Able to create repeat show in the past, by editing an already ON AIR show
...
-fixed
2012-04-24 18:22:39 -04:00
3c4d01aa93
CC-3675: Playlist -> the files from Disconnected Mediafolder can still
...
be previewed (played)
- done
2012-04-24 12:59:07 -04:00
b9ab11ce28
CC-3702: System -> Status: No difference between a service is failed vs a service is not monitor
...
-fixed
2012-04-23 17:18:34 -04:00
6e9b179afc
CC-3603: Calendar->Once you update the rebroadcasted show it disappears
...
-fixed
2012-04-20 16:57:32 -04:00
d5a416be43
CC-3416 : Create password reset form
2012-04-20 16:10:27 +02:00
e242972a78
Merge branch 'CC-3174' into devel
2012-04-20 13:04:38 +02:00
6b4fd7d3bb
CC-3686 : Improve differentiation of a record/rebroadcast show in the timeline
2012-04-20 13:03:50 +02:00
96b010e7f0
CC-1927 Remove PEAR DB
...
* Removed all traces of PEAR functions.
* Fixed AirtimeInstall::GetVersionInstalled() to return the correct answer
even when it cant connect to the database. Also fixed return value to
be consistent on failure.
* Fixed phone_home_stat.php and soundcloud-uploader.php
2012-04-19 16:35:19 -04:00
7f78a7f663
CC-1927: Remove PEAR DB
...
First pass through the model classes to remove use of $CC_DBC.
Web application is working.
There are still other parts of the app that use PEAR DB.
2012-04-19 16:33:05 -04:00
f69a172ee1
Commented out a bunch of Logging debug lines. There was a lot of output
...
being logged in the Zend log file.
2012-04-19 16:16:56 -04:00
92f2027fc4
-missing CC_CONFIG global..
2012-04-19 15:06:15 -04:00
1e111f176e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-19 15:03:28 -04:00
458aae33a1
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
-Removed use of filemtime
-audiopreview is now in correct directory
2012-04-19 15:03:17 -04:00
ee7829d920
CC-3663: Cannot edit rebroadcast show
...
-fixed
2012-04-19 12:57:13 -04:00
a7fc31012f
CC-3689: Remove Edit Show Instance ability
...
- done
2012-04-19 11:29:19 -04:00
5bea867bec
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
-fixed
2012-04-18 19:02:29 -04:00
70a51f1aca
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-18 15:45:15 -04:00
dacdc4e432
CC-3672: Source switch stays connected if current show is cancelled
...
- fixed
2012-04-18 15:38:47 -04:00
479e112317
CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source
...
-fixed
2012-04-18 12:30:37 -04:00
64a7a13f79
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-17 16:25:57 -04:00
d258e39b2e
CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage.
...
-Remove unecessary "continue;" statements
2012-04-17 16:25:10 -04:00
5df1fede9f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-17 15:43:39 -04:00
a91785ff42
CC-3652: Can't edit current show if it's a single instance
...
when the timezone is in CEST(prague timezone)
- The bug was that it was using local timestamp for the current time.
- removed some unnecessary code
- changed a variable name to more understandable name.
2012-04-17 15:43:18 -04:00
29e24d1847
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-17 12:24:05 -04:00
cdf92b016f
CC-3655: Context menu for current show missing add/remove content and remove all content options.
...
-undone
2012-04-17 12:23:56 -04:00
102bcb1d46
CC-3416 : Create password reset form
2012-04-17 18:16:10 +02:00
4527da6cdf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 18:22:03 -04:00
1d91d1b11b
CC-3659: Override on Master/Show Source connection needs to have
...
better description about what the override field actually does.
- fixed description
- extra fix:
- using variable instead of hard coded text
- removed unnecessary code
2012-04-16 18:21:28 -04:00
27e5a6db5e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 17:36:19 -04:00
e786514f27
CC-3655: Context menu for current show missing add/remove content and remove all content options.
...
-fixed
2012-04-16 17:31:16 -04:00
c08800468f
CC-3658: DJ assigned to the Show can't switch/kick streams
...
- fixed
2012-04-16 17:29:02 -04:00
2f4861db26
CC-3444: Ability to edit currently playing show (end time and permissions)
...
- added comment
2012-04-16 17:06:06 -04:00
d11fca8ac8
CC-3444: Ability to edit currently playing show (end time and permissions
...
- fixed
2012-04-16 16:48:04 -04:00
2e811dfef8
CC-3642: System->Streams->DJ URL changes are not reflected in Calendar
...
->LiveStream
- fixed
2012-04-16 15:23:37 -04:00
a0fb607d30
Merge branch 'CC-3174' into devel
2012-04-16 16:40:02 +02:00
c96c60dc5a
CC-3620 : Calendar -> Unresponsive script warning when trying to add 300 ogg files
...
improving speed of js rendering,
datatables config is loaded from localstorage,
removed aggregate propel behaviour on cc_show_instances time_filled.
2012-04-16 16:33:32 +02:00
ffc17ba705
CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format
...
- DateHelper.php is moved from model to common folder
- created OsPath.php file which contains normpath()
- normpath() is used instead of realpath()
2012-04-13 17:45:28 -04:00
9cafc91785
CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage. Attempt to
...
play unavailable track leads to platform hanging
- in cast of mount/unmoun drive has some nested folder that were already in the
cc_music_dirs table, airtime was only setting true/false flag on only one of
the entry.
2012-04-13 17:18:31 -04:00
f522c7a7af
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 16:17:36 -04:00
53e37ee826
CC-3634: Media Folder: if file was deleted from file system, and the file was
...
scheduled in the future, it wasn't getting deleted from AIrtime
- fixed
2012-04-12 16:17:19 -04:00
04718a88ae
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-done
2012-04-12 13:29:49 -04:00
8303eb728e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 11:54:58 -04:00
5a8df0321e
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-in progress
2012-04-12 11:54:51 -04:00
18391604b5
CC-3424: UI Design for new drop down menu
...
- html integration
2012-04-12 10:26:11 -04:00
0ec58f0bc3
CC-3250: UI design for mount monitor for media monitor
...
( Manage Media Folder and Playlist Builder screen)
- adding tooltip and fixed a minor bug
2012-04-11 17:24:26 -04:00
bdd3444acf
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-in progress
2012-04-11 16:45:03 -04:00
148fdfb8f9
Merge branch 'CC-3603' into devel
2012-04-10 15:28:38 -04:00
b998a04c2e
Merge branch 'devel' into CC-3174
2012-04-10 15:57:13 +02:00
32548de639
CC-3486: Text Fields in Stream settings behave in unorthodox way. Highlighting
...
entire text and typing does not erase the highlighted text.
- removed all the masking
- meioMask is very outdated so it's removed from the project.
2012-04-09 16:35:39 -04:00
7fc575e750
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-09 15:51:37 -04:00
ee0a08be15
CC-3487: Improved restart warning message for stream settings page
...
-fixed
2012-04-09 15:51:17 -04:00
5bc1fe84ad
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-09 12:43:46 -04:00
54ec6445c6
CC-3606: System->Media Folders-> system seems to search
...
-fixed. Need to check if directory actually exists.
2012-04-09 12:43:40 -04:00
b32e463350
CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
...
- fixed
2012-04-09 12:19:22 -04:00
064490a2fd
CC-3603: Calendar->Once you update the rebroadcasted show it disappears
...
- temp commit
2012-04-09 10:37:44 -04:00
d562a26f4b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-07 22:33:47 -04:00
548c4ffb8d
-change it so that user can access API actions if logged in.
2012-04-07 22:28:10 -04:00
954fa2bceb
CC-3444: Ability to edit currently playing show (end time and permissions)
...
- handling in better way. we created separate action for this.
2012-04-05 16:01:27 -04:00
ef6c496ba3
CC-3541: Missing show title from "Show Content" pop-up
...
-fixed
2012-04-05 15:49:58 -04:00
8050a1ce29
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-in progress
2012-04-05 14:45:16 -04:00
0b3809c379
CC-3110 : Password reset
...
added sender email to preferences form, created db upgrade script.
2012-04-05 14:18:42 +02:00
35d2ded26b
CC-3597 : Playlist->Library->Edit Metadata: Throw exception after click "Cancel" at "Edit Metadata" page
2012-04-05 10:47:35 +02:00
ab7da1ce90
CC-3581: Calendar->It should not be possible to change the duration for
...
the recorded show
- "When" section is disabled when editting rebroadcasting show
2012-04-04 15:44:52 -04:00
5da7d42290
CC-3548: Schedule: Separate repeate show template and single instance on
...
'When' section
- UI portion of the feature
2012-04-04 14:53:26 -04:00
3be1944fa4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-03 18:29:44 -04:00
366ea78fce
CC-3532: Now Playing GUI-> Progress bar is still playing after end of show
...
-fixed
2012-04-03 18:29:36 -04:00
bcdd27863f
CC-3513: Playlist Builder->Download makes user be redirected to a blank page
...
- fixed
2012-04-03 16:30:54 -04:00
6c25423f4e
CC-3545 : Calendar->AddRemove (Now Playing Tab->Add Files to Show) -> changing order of tracks is not correct
...
removing table tools.
replacing with something simpler that will preserve order on screen.
2012-04-02 19:03:11 +02:00
eeb7273909
CC-3542 : When you delete the current show it takes all songs from that show out of the playout history
2012-04-02 15:20:13 +02:00
ebf530a97c
CC-3558 : Playlist->EditMetadata->Save Changes -> 404 page not found page appears
2012-04-02 11:02:03 +02:00
286c240012
CC-3444: Ability to edit currently playing show (end time and permissions)
...
- done
2012-03-30 15:11:24 -04:00
cea37774ca
CC-3551 : Change Cue Out for currently deleted track
2012-03-29 19:20:02 +02:00
5a24331ef6
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 17:37:18 +02:00
12b23443db
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 16:27:08 +02:00
f48c5ff575
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 15:34:58 +02:00
d12ef1c7a2
CC-3536 : Work out ACL with library on NowPlaying when it's a guest User
2012-03-28 18:43:44 +02:00
aca6e995dd
CC-3503 : Preserve the state of "Now Playing" screen - whether Library section is open or not
2012-03-28 17:29:34 +02:00
fe21abf16d
CC-3503 : Preserve the state of "Now Playing" screen - whether Library section is open or not
2012-03-28 16:14:02 +02:00
4904a16ebb
CC-3534 : Check Scheduling Edge Cases
...
extracting out error checking in scheduling, added created column to cc_showinstances
2012-03-28 14:23:25 +02:00
9dbe8a5e5e
CC-3463 : Usability improvements for timeline
2012-03-27 18:40:17 +02:00
c1bdc6ff0f
CC-3463 : Usability improvements for timeline
...
working on timeline context menu.
cursor/play functions.
2012-03-27 18:27:58 +02:00
9c52b2ee1f
CC-3174 : showbuilder
...
fixing jplayer preview
2012-03-27 16:27:43 +02:00
dfc6ae6273
CC-3463 : Usability improvements for timeline
...
started to add cursor options to context menu.
2012-03-27 15:46:25 +02:00
451b573c52
Merge branch 'CC-3174' into devel
2012-03-27 14:14:58 +02:00
10e4ae781f
CC-3451 : Ability to delete the currently playing clip
2012-03-27 12:44:48 +02:00
3f713ca8dc
CC-3426: apache log errors from plupload
...
-fixed
2012-03-26 19:00:40 -04:00
e76f4baf18
CC-3489: Live Stream: When Custom Auth check box is checked, Custom Username and Custom Password field must be required
...
- done
2012-03-26 15:09:27 -04:00
0525f182ef
CC-3516: Creating a show has a long execution time
...
-grey out add-show form while busy
2012-03-25 22:56:51 -04:00
b4e9f9699c
CC-3483: Live Stream: default fade in/out for live stream transition
...
- take care of bootstrap of pypo
2012-03-20 22:29:52 -04:00
6b768c2f99
CC-3483: Live Stream: default fade in/out for live stream transition
...
- done. changing fade value doesn't require LS to restart
2012-03-20 22:16:17 -04:00
4bb0421cf7
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
- removed useless logging in AudiopreviewController.php.
- updated if statement syntax in audio-preview.phtml according to review comments.
2012-03-20 18:46:48 -04:00
d4142f8b8b
CC-3484: Pypo: On bootup, it should grab station name and stream
...
label for liquidsoap
- fixed
- created new function set_bootstrap_variables()
2012-03-20 16:41:15 -04:00
e194ff0dc8
CC-3469: Stream settings: Connection URLs are not generated correctly
...
- done
2012-03-19 16:08:23 -04:00
9509c70595
CC-3453 : Playlist
...
reworking inital playlist events to all use the new "on" delegation in jQuery.
fixing some out of date errors.
2012-03-19 14:09:05 +01:00
22cc362f1c
CC-3448: Cancel show shouldn't send "cancel show" msg to pypo anymore
...
-done
2012-03-17 23:51:58 -04:00
5a7a502d45
CC-3436: Warn the user that the stream will be interrupted when pypo is restarted
...
-Done
2012-03-17 15:24:19 -04:00
7914b30233
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
- after reading about the trick foudn in Mark Panaghiston's posting from this link https://groups.google.com/forum/#!topic/jplayer/gTJrSCjwftw
- the current imperfect solution for firefox sould be to show a video jplayer that can play all the audio types.
2012-03-16 18:03:35 -04:00
5b953443c6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/public/js/airtime/showbuilder/builder.js
2012-03-15 18:12:15 -04:00
ae0d3c560c
CC-3394: Add play button to timeline table.
...
- added image information to row in ShowBuilder.php to enable audio preview of shows.
- moved around code so the audio preview functionaly is standalone
- fixed the firefox bug for issue CC-3429
2012-03-15 17:56:51 -04:00
04c2c2f920
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-15 14:29:48 -04:00
4595da9087
CC-3452: Live Stream: DJs assigned to the show and Program Managers should
...
be able to control switches and able to kick out connection
- kickout buttons and switch buttons are now visible to everyone.
- clicking buttons without correct permission will return proper error msg.
2012-03-15 14:29:31 -04:00
7a8398bd32
CC-3174 : showbuilder
...
including context menu to delete items from timeline.
2012-03-15 16:11:29 +01:00
2beadc9301
CC-3174 : showbuilder
2012-03-15 14:14:02 +01:00
c5c9fd7ba8
CC-3430: Live Stream: Admin should be able to kick out the source connection
...
- Clicking a button on UI triggers sending msg to pypo, which will lead running
'kick' command in liquidsoap.
2012-03-14 14:43:11 -04:00
06e810c35d
CC-3437: Live Stream: Liquidsoap(Pypo) should preserve the last switch
...
status when it restarts
- missed one file from previous commit
2012-03-14 14:43:10 -04:00
4eefc05366
CC-3427: Live Stream: Ability to switch off Scheduled Play
...
- done
2012-03-14 14:43:10 -04:00
79f8eabe2b
CC-3405: Display to users how to connect a live stream to Airtime
...
- Done
2012-03-14 14:43:10 -04:00
540f262a77
CC-3224: "On-the-fly" stream rebroadcasting
...
- removed "Allow override" checkbox from show live stream section.
- removed "auto enable live stream" checkbox from stream setting page.
- implemented authentication functionality of live dj source connection.
2012-03-14 14:43:10 -04:00
efee025691
CC-3406: Live Stream: Switch off live sources on disconnection
...
- done
2012-03-14 14:43:10 -04:00
f193047a1c
CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream
...
are connected and give user the ability to block those streams
- added stream source switch interface
- backend code
2012-03-14 14:43:10 -04:00
128a497059
CC-3224: "On-the-fly" stream rebroadcasting
...
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
2012-03-14 14:41:00 -04:00
1ebe3d1812
CC-3224: "On-the-fly" stream rebroadcasting
...
- Live source is created when only both port and mount point are specified
2012-03-14 14:41:00 -04:00
30901aa0d6
CC-3224: "On-the-fly" stream rebroadcasting
...
- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file
2012-03-14 14:41:00 -04:00
48bb19d758
CC-3224: "On-the-fly" stream rebroadcasting
...
- web interface
- auth script for liquidsoap
- DB changes
2012-03-14 14:41:00 -04:00
701ed82f40
CC-3224: "On-the-fly" stream rebroadcasting
...
- interface implementation. subform within the show form.
2012-03-14 14:41:00 -04:00
f399c7adab
CC-3426: apache log errors from plupload
...
- Updated code so the errors in the log are fixed.
- Performed sanity test on large file size that exceed disk space
and normal uploads that are small enough to be copied
2012-03-14 11:14:22 -04:00
927e5033c8
CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
- Updated detection of ogg or mp3 files
2012-03-13 14:12:14 -04:00
9e850838ca
CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table
...
- Updated ApiController to use Schedule's GetPlayOrderRange which has better performance.
2012-03-13 10:36:11 -04:00
6830af574a
CC-3174 : showbuilder
...
fixing some merge stuff.
2012-03-13 12:52:41 +01:00
c0b0e8079b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-12 11:33:28 -04:00
3145c24ba2
CC-3174 : showbuilder
...
changing queries for datatables to use the Datatables model class.
2012-03-12 15:32:24 +01:00
d713f830cd
CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/public/js/airtime/library/library.js
2012-03-12 10:23:50 -04:00
f28f6659dc
CC-3403 : Replace Now Playing with the new Timeline screen
2012-03-12 14:23:03 +01:00
20db8d6fdf
CC-733 : broadcast logs
...
adding time range selection for the log history.
2012-03-12 11:47:25 +01:00
470cf0dbf8
CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
- Updated jplayer so it now shows a list view under the player which shows details of the track being played, and for playlists the entire playlist list.
- Also enabled playing playlists from the library.
2012-03-09 18:47:08 -05:00
7c63387dd5
CC-733 : broadcast logs
...
adding the export table tools.
2012-03-09 13:39:12 +01:00
53b8eb2724
CC-733 : export broadcast logs
...
exporting stats based on czech law
2012-03-08 18:30:56 +01:00
e9627bca07
CC-3174 : showbuilder
...
only updating the timeline view if it is needed.
2012-03-07 12:20:30 +01:00
a4d07b3060
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2012-03-07 10:33:00 +01:00
709e117f41
CC-3391: Audio Preview cannot play tracks with commas in their filename
...
- The content distribution header filename attribute, wasn't properly quoted for inline content. This causes a bug for files with comma names.
- changed the play button in library back to the speaker icon
- removed some dead code preview_player.js
- removed the file name attribute, will need better approch to presenting the user with audio information.
2012-03-06 13:50:07 -05:00
157078b963
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2012-03-06 13:51:37 +01:00
6c5f710329
CC-3174 : showbuilder
...
making each separate widget scrollable (playlist, library, timeline)
2012-03-06 13:19:20 +01:00
a09b63b8d0
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- removed javascript from php files
- removed preview.js
- fixed small problems with editor
2012-03-05 19:00:14 -05:00
a246f85a5b
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- Merged with devel, removed js from StoredFile.php
2012-03-05 19:00:14 -05:00
2de81c6027
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updated logic removed when doing a rebase with devel
2012-03-05 19:00:14 -05:00
aacbac4757
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- Updated functionality so user can play a track and in jplayer and jump around it.
2012-03-05 19:00:14 -05:00
7d95e4ffa7
CC-2430 : Preview tracks in the library + better preview (ability to jump around in clip)
...
- added accept ranges header to the response to enable seek ahead in the music file.
2012-03-05 19:00:14 -05:00
b8452928da
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updated player ui so it matches demo code
- can play any song from the library or playlist builder, but not very usable
2012-03-05 19:00:14 -05:00
1aab682104
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updates to audio preview on library and playlist
2012-03-05 19:00:14 -05:00
dd3b7afff2
Updated library so I can play a song.
2012-03-05 19:00:14 -05:00
a832a40c75
CC-3174 : showbuilder
...
making the library a separate scrollable from playlist
2012-03-05 18:14:10 +01:00
d250e2a297
CC-3380 Better names for items in the System menu
2012-03-02 17:50:52 -05:00
508c623850
-remove comments that should not have been committed
2012-03-01 18:00:46 -05:00
92f19139b9
CC-3336: Refactor schedule API used by pypo
...
-done
2012-02-29 21:27:42 -05:00
99b490129c
CC-3174 : showbuilder
...
making a dialog on the calendar page.
2012-03-01 00:19:59 +01:00
0f91f91c41
CC-3174 : showbuilder
...
adding checks to enable/disable buttons for playlist & timeline.
2012-02-29 15:47:11 +01:00
057e377c5f
Merge branch 'cc-3336-refactor-pypo' into devel
2012-02-28 19:49:48 -05:00
5257711866
CC-3174 : showbuilder
...
fixing order of scheduled/playlist data when added via group dragging.
2012-02-28 23:52:20 +01:00
b572b26b68
CC-3336: Refactor schedule API used by pypo
...
-make sure that empty arrays are objects and not arrays
-clean up some comments
2012-02-28 15:32:18 -05:00
322d1bfa99
CC-3336: Refactor schedule API used by pypo
...
-initial commit
2012-02-28 14:43:39 -05:00
564575d657
CC-3174 : showbuilder
...
fixing timezone calculations if browser/server is different.
2012-02-27 20:14:12 +01:00
denise
Martin Konecny
James
james
Martin Konecny
Rudi Grinberg
Rudi Grinberg
James
Martin Konecny
denise
Vladimir
Naomi Aro
paul.baranowski
Denise Rigato
Daniel