Martin Konecny
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
Martin Konecny
4e0d644d8b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 17:16:01 -05:00
Martin Konecny
e22a573d8a
CC-2184: Hardcoded CSS path should be relative path instead
...
-missed some paths
2013-01-14 17:15:53 -05:00
denise
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
Martin Konecny
0dfd8acf7a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 16:00:46 -05:00
Martin Konecny
fae3f3a03f
CC-2184: Hardcoded CSS path should be relative path instead
...
-Make '/' the default root
2013-01-14 16:00:38 -05:00
James
ed2e25fb29
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 14:49:22 -05:00
James
0eb5fb51b6
CC-4836: Playlist length is wrong because wrong cue out setting.
...
- fixed
2013-01-14 14:49:06 -05:00
Martin Konecny
ba66746a00
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 14:07:55 -05:00
Martin Konecny
3a70a371be
CC-4751: Calendar: Add/Remove contents won't trig status update of shows
...
-fix problem when baseurl changed
2013-01-14 14:07:32 -05:00
denise
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
Martin Konecny
97eeafb142
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-11 15:38:06 -05:00
Martin Konecny
2bbdb01495
CC-4751: Calendar: Add/Remove contents won't trig status update of shows
...
-fixed
2013-01-11 15:37:58 -05:00
denise
224bcf0c2b
CC-4793: System -> User: Sometimes the user type's tips turns out "undefined"
...
-fixed
2013-01-11 15:12:41 -05:00
denise
8362860904
Block expansion ajax url was missing baseUrl
2013-01-11 14:11:01 -05:00
denise
f80f0dddd7
Listenerstat ajax call was missing baseUrl
2013-01-11 13:18:57 -05:00
Martin Konecny
c11edea253
CC-4802: Preferences -> Soundcloud settings: Sub-options can be checked before major one
...
-fixed
2013-01-11 13:13:36 -05:00
denise
a129b0b081
CC-4472: User password verify or clear text display.
...
-done with password verify
2013-01-10 17:51:25 -05:00
denise
86f57cb953
CC-4820: I18N: Date and Time picker of Record/rebroadcast show is not translated
...
-fixed
2013-01-10 16:30:04 -05:00
denise
4673f11d76
Default language to english when cookie is not set
2013-01-10 15:06:45 -05:00
denise
6fe8006612
Jquery cookie plugin
2013-01-10 14:57:47 -05:00
denise
9f857433fa
CC-4817: I18N: "Playlist Shuffled" is not listed for translation
...
-fixed
2013-01-10 14:22:25 -05:00
denise
dffe932223
Added missing base directory to urls
2013-01-10 13:58:11 -05:00
denise
2797809c74
CC-4786: Refresh page when language setting changes
...
-done
2013-01-10 13:55:52 -05:00
denise
1100baefbc
CC-4823: Locale cookie doesn't get set after user logs in
...
-fixed
2013-01-10 10:37:30 -05:00
denise
20f7544552
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-09 18:03:39 -05:00
denise
1572955d07
CC-4810: Add language setting to login page
...
-done
2013-01-09 18:03:23 -05:00
Martin Konecny
a5e7c0197f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-09 15:52:45 -05:00
Martin Konecny
58fc8ecee7
CC-4766: Invalid date appears during setting show's time and date
2013-01-09 15:52:35 -05:00
denise
26ab0fb468
CC-4809: Listen popup UI breaks with localization
...
-added comment
2013-01-08 17:56:05 -05:00
denise
3b2b275c30
CC-4809: Listen popup UI breaks with localization
...
-fixed
2013-01-08 17:51:42 -05:00
denise
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
denise
a7992c291e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 15:09:55 -05:00
denise
3de33bc3e3
CC-4811: Move the edit user form to its own page
...
-done
2013-01-08 15:09:35 -05:00
Martin Konecny
c632ad00f9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 12:37:53 -05:00
Martin Konecny
add51bd735
-update plupload from 1.5beta to 1.5.4
2013-01-08 12:37:37 -05:00
denise
bf2e5c6f32
Fixed Typo in user rights
2013-01-08 11:57:05 -05:00
denise
e9a86b7bcf
CC-4799: Calendar -> Show empty and show partially filled icons need qtips
...
-fixed
2013-01-07 17:26:40 -05:00
denise
1f1b408c6e
CC-4803: Calendar -> Soundcloud id is always null
...
-fixed
2013-01-07 17:21:35 -05:00
denise
cffad91840
CC-4800: Soundcloud icon qtips do not work and have wrong colour scheme
...
-fixed
2013-01-07 15:23:51 -05:00
denise
251e1a52d6
Removed a function no longer in use
2013-01-07 14:12:31 -05:00
denise
82da4dcfe8
CC-4599: Calendar: Add an icon to indicate show is not fully booked
...
-done but a new icon is needed
2013-01-07 12:41:28 -05:00
denise
8142427668
Small formatting fix
2013-01-04 18:18:58 -05:00
denise
3c969b0aef
Removed useless code
2013-01-04 18:16:47 -05:00
denise
495fd7da1a
CC-4734: French - UI breaks in several places
...
-fixed
2013-01-04 17:19:09 -05:00
denise
7e1efe5d96
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-04 11:00:36 -05:00
denise
596e103d96
CC-4763: Alignment error for User settings UI in Firefox
...
-fixed
2013-01-04 11:00:21 -05:00
James
5d76bb2d17
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-03 18:00:33 -05:00
James
ae7b6fe092
CC-4732: Ask for admin username + password in Stream Settings page
...
- done
2013-01-03 17:58:50 -05:00
denise
c11032111e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-03 16:19:20 -05:00
denise
e2c87ed8b6
CC-4781: Store localization settings on a per-user basis
...
-done
2013-01-03 16:19:02 -05:00
James
0f4ddc904f
CC-4756: System -> Streams: "Addtional Options" is not expandable when connection error happens
...
- fixed
2013-01-03 14:54:07 -05:00
Martin Konecny
d41c248435
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-02 16:24:12 -05:00
Martin Konecny
f7bcc8a4ed
Merge branch 'patch-2' of https://github.com/havban/Airtime into devel
2013-01-02 16:24:04 -05:00
Martin Konecny
25df87d2e5
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-02 16:09:39 -05:00
Martin Konecny
d6eb043899
CC-4765: Webstream of AAC type can't be previewed
...
-fixed
2013-01-02 16:09:32 -05:00
denise
3f7a1189f4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-02 16:08:58 -05:00
denise
44ab27ad7d
CC-4773: L10N: Some strings is not listed in airtime.po
...
-added missing file extension error message to plupload language files
2013-01-02 16:08:38 -05:00
denise
05eee37f20
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-02 16:04:37 -05:00
denise
88f2f1e4a7
CC-4773: L10N: Some strings is not listed in airtime.po
...
-fixed
2013-01-02 16:04:19 -05:00
cliff.wang
cdb3ec468a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-02 12:15:05 -05:00
cliff.wang
306282521a
Add Chinese pulp upload translation file
2013-01-02 12:14:22 -05:00
denise
a725148832
CC-4775: Add option for Italian language in preferences
...
-done
2013-01-02 12:10:16 -05:00
denise
93ea912d54
CC-4774: Add option for Chinese in preferences
...
-done
2013-01-02 11:50:10 -05:00
James
f26778ee72
CC-4757: Duplicate playlist
...
- done
- we still need a icon for context menu
2012-12-28 16:17:58 -05:00
james
cf38e2c596
CC-4754: Replay gain modifier
...
- done
2012-12-27 22:58:41 -05:00
james
c0665e4748
CC-4754: Replay gain modifier
...
- Initial commit
2012-12-27 00:36:11 -05:00
denise
a4008aaef3
CC-4721: Library -> Context Menu -> 'Add to smart block' option only takes affect once the open smart block has been saved
2012-12-19 15:01:53 -05:00
denise
854537f387
CC-4745: Add Russian language option to preferences
2012-12-17 14:33:14 -05:00
denise
bd18039785
CC-4744: Edit user form needs styling
...
-done
2012-12-17 14:12:27 -05:00
denise
8b76bd0373
CC-2258: Describe rights for each user type on the user page
...
Modified user rights descriptions
2012-12-13 15:29:29 -05:00
denise
8125337c4a
Changed the opacity of user rights tipsy tooltip
2012-12-13 12:58:26 -05:00
denise
076a1c56cb
CC-2258: Describe rights for each user type on the user page
2012-12-13 12:29:02 -05:00
denise
854eccfb76
CC-4736: Let non-admin users update their user info
...
Adding jquery tipsy plugin
2012-12-11 11:30:59 -05:00
denise
dd5882984e
CC-4736: Let non-admin users update their user info
...
-done but needs design
2012-12-10 16:55:44 -05:00
Febiansyah Hidayat
5e9d5bd71a
Update airtime_mvc/public/js/airtime/preferences/streamsetting.js
...
Update statement to remove "disabled" attribute to be compatible with chrome and firefox browser.
Perform commit in devel branc as requested in: https://github.com/sourcefabric/Airtime/pull/21#issuecomment-11144375
2012-12-08 09:25:19 +09:00
James
efa5f6ff6c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-12-05 13:29:48 -05:00
James
e1e8160e53
CC-4737: Listener stats should take up the full screen
...
- fixed
2012-12-05 13:29:29 -05:00
denise
402950211a
CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page
...
-removed redundant 'Ok' button
2012-12-05 13:23:58 -05:00
denise
adb966a734
CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page
...
-cancel button does not reload the page anymore
2012-12-05 13:21:18 -05:00
denise
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
Martin Konecny
b1985e2bdf
SAAS-290: Hosted SaaS widgets + javascript code generation
...
-fix code box not automatically expanding on page refresh
2012-12-04 17:42:28 -05:00
denise
1846f17bbc
CC-4731: Cannot save support feedback settings
2012-12-04 16:21:45 -05:00
denise
e69bd74d6e
-adding german translation files for datatables and plupload plugins
2012-12-04 12:14:35 -05:00
denise
7c046bd0cc
-adding spanish translation file for plupload plugin
2012-12-04 12:14:01 -05:00
denise
a10f8276db
-added spanish .po, and.mo files
...
-added spanish translation files for datatables and plupload
2012-12-04 12:08:23 -05:00
denise
4515ac2aef
- added french .po file
...
- added french translations for datatables and plupload plugins
2012-12-03 18:15:08 -05:00
denise
89e0458500
CC-4728: Support Feedback save action does not use ajax
...
-done
2012-12-03 17:15:47 -05:00
denise
b2699fa914
merge from devel
2012-12-03 11:06:56 -05:00
denise
260c6aea59
Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime
2012-11-29 10:50:01 -05:00
denise
7a4e871495
Merge branch 'devel' into cc-1960-internationalize-airtime
2012-11-29 10:47:17 -05:00
James
4ad9e28e14
CC-1960: Internationalize Airtime / Support translations
...
- korean lang pack
2012-11-29 10:31:13 -05:00
denise
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
Martin Konecny
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
denise
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
denise
22bfc45497
CC-1960: Internationalize Airtime / Support translations
...
-defined translations for show builder datatable
2012-11-27 15:51:50 -05:00
denise
0a642fc717
CC-1960: Internationalize Airtime / Support translations
2012-11-27 12:23:16 -05:00
denise
d2ed927e65
CC-1960: Internationalize Airtime / Support translations
...
-playout history datatable was missing translation table
2012-11-27 12:17:59 -05:00
denise
b9b387fcd0
CC-1960: Internationalize Airtime / Support translations
...
-fixed typos
2012-11-27 11:59:55 -05:00
denise
ddb6289c87
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-23 16:54:39 -05:00
denise
04f6ae5c1a
CC-4607: Library: Please make the 'Add x items' following mouse's point
...
-fixed
2012-11-23 16:53:51 -05:00
denise
b677130a3f
CC-1960Internationalize Airtime / Support translations
...
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
2012-11-23 16:39:41 -05:00
denise
c6a5db4a78
CC-1960: Internationalize Airtime / Support translations
...
-dashboard was missing a translation - fixed
2012-11-23 10:48:44 -05:00
denise
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
James
da6013b523
CC-4717: Lintian warnings from devel branch
...
- fixed
2012-11-22 15:14:55 -05:00
denise
96b87d23e0
CC-1960: Internationalize Airtime / Support translations
...
-added i18n for plupload
2012-11-22 14:37:54 -05:00
James
acf2ffc9d5
CC-4707: Webstream: Preview for Webstream in Scheduler is forbidden
...
- fixed
2012-11-22 11:18:42 -05:00
Daniel James
a819b20f55
Moved Flot license information into LICENSE_3RD_PARTY and debian/copyright files
2012-11-22 15:37:08 +00:00
denise
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
James
4242fecd34
CC-4615: Now Playing page: Fail to get soundcloud file id in Schedule
...
- fixed
2012-11-20 18:03:13 -05:00
denise
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
denise
06c3dcb69e
CC-1960: Internationalize Airtime / Support translations
...
-added jquery.i18n library
2012-11-20 16:43:42 -05:00
denise
e9b9f63630
CC-1960: Internationalize Airtime / Support translations
...
-added english translation file for datatables
2012-11-20 16:42:06 -05:00
denise
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
James
d69faef560
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-11-20 15:05:20 -05:00
James
4737232b21
CC-2401: Shuffle option in playlists
...
- add delayed removing of success message
2012-11-20 15:05:09 -05:00
denise
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
Martin Konecny
fed39077c0
Merge branch '2.2.x' into devel
2012-11-20 11:21:29 -05:00
Martin Konecny
d1a22fe7ca
CC-4677: Improve Smart block repeat description
...
-fixed
2012-11-15 11:30:56 -05:00
James
2b2a1db055
CC-2401: Shuffle option in playlists
...
- done
2012-11-13 17:32:10 -05:00
denise
0a0cf70046
CC-4687: System -> Stream: Cannot expand/shrink Stream 1/2/3 settings after clicking Save
...
-fixed
2012-11-12 12:06:22 -05:00
denise
ef8f8dfa75
CC-4688: System -> Preferences: Please expand the Soundcloud settings if warning for wrong settings exists
...
-fixed
2012-11-12 11:45:26 -05:00
Martin Konecny
ed7aba83bf
Merge branch 'cc-4661-listener-statistics' into 2.2.x-saas
2012-11-07 17:22:36 -05:00
James
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
James
9112a8d0b1
CC-4661: Listener Statistics
...
- enhancement on flot
- data point reduction
2012-11-07 16:26:31 -05:00
Martin Konecny
4b09b289ce
SAAS-290: Hosted SaaS widgets + javascript code generation
...
Slight improvements to description as well as element
positioning
2012-11-07 15:44:22 -05:00
Martin Konecny
1b0b124247
SAAS-290: Hosted SaaS widgets + javascript code generation
...
-working code
2012-11-07 12:49:17 -05:00
denise
ccd6447696
- install failed due to wrong metadata key
...
- wrong controller action called
2012-11-07 12:05:20 -05:00
denise
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
denise
bf4f5fd699
CC-4607: Library: Please make the 'Add x items' following mouse's point
...
-fixed
2012-11-06 16:34:06 -05:00
James
9712e64a69
CC-4661: Listener Statistics
...
- bug fix and removing unnecessary code
2012-11-06 14:52:35 -05:00
denise
a1a7396ec9
CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks
...
-disabled this button in the library toolbar if dynamic blocks are open
2012-11-06 14:29:26 -05:00
James
2e79e8421c
CC-4661: Listener Statistics
...
- better legend for multiple series of data
- consistant number of ticks on x-axis
2012-11-06 10:54:52 -05:00
denise
78e731f717
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-11-05 12:03:59 -05:00
denise
8fda0ba610
CC-4625: On tablet you cannot create a playlist, smart block or webstream
...
-attempt #2
2012-11-05 12:03:46 -05:00
denise
c051e0671d
CC-4625: On tablet you cannot create a playlist, smart block or webstream
...
-attempt #2
2012-11-05 12:00:37 -05:00
Martin Konecny
d467abe509
Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel
2012-11-05 11:27:34 -05:00
denise
a201d6f2da
CC-4666: Showbuilder page is dead
...
-fixed. result of a bad merge
2012-11-05 11:15:26 -05:00
James
74fe958cad
CC-4661: Listener Statistics
...
- changes for different mount names
2012-11-02 18:25:08 -04:00
James
3af3cd5870
CC-4661: Listener Statistics
...
- frontend part
2012-11-02 17:00:38 -04:00
denise
2854dd40e0
CC-4663: Smart Blocks -> Deleting a track in smart block from library gives error
...
-fixed
-tracks with undefined mime type were not handled properly
2012-11-02 16:54:49 -04:00
denise
135aadf16b
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/public/js/airtime/showbuilder/builder.js
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 12:28:21 -04:00
denise
715a21acb2
CC-4625: On tablet you cannot create a playlist, smart block or webstream
...
-upgraded bootstrap-dropdown.js to v2.2.1
2012-11-02 11:59:36 -04:00
denise
a937df30ad
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-02 10:48:16 -04:00
denise
cc208da2fb
CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference
...
-added labels
2012-11-02 10:48:08 -04:00
James
575400b4c2
CC-4623: Library: Preview button for Flac does not work
...
- fixed
2012-11-01 16:44:37 -04:00
James
d7a5ab4d94
CC-4622: Library: AAC file can be preview but is blocked from playlist and content menu
...
- fixed
2012-11-01 15:21:56 -04:00
denise
dfd52eedf1
CC-4654: Library -> Simple search still has effects even if you are doing an advanced search
...
-fixed
2012-10-31 15:24:50 -04:00
james
2e4d5ec142
CC-4539: Advanced search: Sample rate searched on Hz, but search results
...
shown in kHz
- fixed
2012-10-31 12:32:40 -04:00
James
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
denise
00947f9d7e
CC-4640: Automatically jump to current song when loading the Now Playing page.
...
-small fix
2012-10-30 15:34:38 -04:00
denise
cabe583a3b
CC-4649: Library -> Disable simple search if advanced search fields are open
...
-done
2012-10-30 15:01:46 -04:00
denise
695c0fa926
CC-4607: Library: Please make the 'Add x items' following mouse's point
...
-fixed
2012-10-30 11:45:53 -04:00
denise
b08f5091b5
CC-4609: Calendar -> Add/Remove contents: Please remove useless buttons: 'Jump to current playing song' and 'Cancel current show'
...
-done
2012-10-30 11:18:11 -04:00
denise
d97afabaea
CC-4640: Automatically jump to current song when loading the Now Playing page.
...
-added check to see if a show is currently playing
2012-10-29 15:40:58 -04:00
denise
332f9993c0
CC-4640: Automatically jump to current song when loading the Now Playing page.
...
-done
2012-10-29 15:20:16 -04:00
denise
fdd889d7a8
- fixed formatting
2012-10-29 12:09:11 -04:00
Rudi Grinberg
dc00528cd5
Merged baseUrl related conflicts
2012-10-29 11:56:20 -04:00
denise
3a7700eaac
CC-4583: Use AJAX calls instead of refreshing entire page
...
-done
2012-10-26 18:09:30 -04:00
James
e667a721ad
- comment for some code
2012-10-26 16:26:48 -04:00
James
1ee228558a
CC-4574: Audio preview fails with certain characters in metadata
...
- fixed
2012-10-26 16:24:17 -04:00
denise
c51fb8a040
CC-4549: Tooltip for source username cannot be shared between input and output settings
...
-fixed
2012-10-22 16:37:06 -04:00
denise
f30d636b17
CC-4581: Confirmation dialog for removing an item from a show refers to deletion
2012-10-19 16:19:32 -04:00
denise
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
Martin Konecny
f5051cff3a
CC-4605: Some AJAX calls are cached
...
-fixed
2012-10-19 11:22:44 -04:00
Martin Konecny
d5c2c37a3e
Revert "CC-4605: Some AJAX calls are cached"
...
This reverts commit ffca5b42a8
.
2012-10-19 11:16:42 -04:00
denise
d32495d100
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 11:09:34 -04:00
Martin Konecny
ffca5b42a8
CC-4605: Some AJAX calls are cached
2012-10-19 11:07:37 -04:00
denise
e9815b617b
- added comment
2012-10-18 15:21:38 -04:00
denise
67ac4340c4
CC-4596: Too many ajax calls in Calendar page
...
-fixed
2012-10-18 14:47:19 -04:00
Daniel James
7c799cd3af
Fixed formatting of tooltip for smart blocks
2012-10-18 13:01:55 +01:00
James
96da822bc7
CC-4574: Audio preview fails with Zend errors on file with question mark in the title
...
- fixed
2012-10-16 14:38:24 -04:00
James
67ca0db4c8
CC-4542: Playlists containing dynamic smart blocks cannot be previewed
...
- fixed
2012-10-16 14:09:34 -04:00
James
7796b23a58
CC-4506: Audio Preview in Playlist doesn't work
...
- fixed
2012-10-16 12:06:47 -04:00
James
03b32ea986
CC-4563
...
Library: Exception is found when remove a block by context menu
- fixed
2012-10-16 10:37:42 -04:00
Daniel James
a103c76378
CC-4558: Make button in Now Playing consistent with same action in Calendar
2012-10-15 12:27:16 +01:00
denise
5f35336fd0
CC-2295 Improvements to playlist builder beha...CC-2303 Cue-in Cue-out inconsistency with time values:
...
-fixed
2012-10-11 11:49:04 -04:00
Daniel James
395d25158f
CC-4545: Fix tooltip for Auto Switch On feature
2012-10-10 16:26:32 +01:00
denise
c9ac675a10
CC-4529: Playlist Builder: The panel of 'Adding n items' will be bigger than usual if there is a item in Playlist has expanded cue in/out setting
...
-fixed
2012-10-09 14:39:29 -04:00
Daniel James
b4fee4321c
CC-4537: Bit rate hint should be in kbps to match actual search
2012-10-09 16:46:51 +01:00
denise
0d35056cd4
CC-4486: Library -> Advanced Search: Alignment is off sometimes
...
-added placeholders to input tags for format examples
2012-10-04 12:16:57 -04:00
denise
eadde1c498
CC-4519: Advanced Search Option: Please use text search instead of scope search from Mime's type
...
-fixed
2012-10-03 11:29:16 -04:00
denise
3dd7e9767b
CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes
...
-validation was missing for Encoded By filter
2012-10-02 13:57:36 -04:00
Martin Konecny
9df90414fc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 17:22:13 -04:00
Martin Konecny
5a8510b909
remove gap on right side of show builder: part 3
2012-09-19 17:22:04 -04:00
denise
e926b62915
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 17:00:15 -04:00
denise
f909ab9da2
CC-4490: Calendar: Empty show icon should have a tooltip
...
-done
2012-09-19 16:59:45 -04:00
Martin Konecny
40c122fafa
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 16:56:04 -04:00
Martin Konecny
84ed03ffac
remove gap on right side of show builder: part 2
2012-09-19 16:55:44 -04:00
denise
f2e495cbd8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 16:40:05 -04:00
denise
2afc4183bb
CC-4496: Library -> Contents-feed does not work if advanced search data is invalid
...
-fixed
2012-09-19 16:39:56 -04:00
Martin Konecny
a3b53ee3d3
remove gap on right side of show builder
2012-09-19 16:19:02 -04:00
denise
b4277f1f17
CC-4495: Library -> Advanced Search: Some fields with ranges do not get validated
...
-fixed
2012-09-19 15:46:03 -04:00
denise
4b2d6caf0e
CC-4485: Library -> Advanced Search -> Tooltip needed for invalid input
...
-done
2012-09-19 15:35:45 -04:00
Martin Konecny
f717efd7fb
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 13:23:14 -04:00
Martin Konecny
ca0fb969b7
fix jplayer errors for mp3 and firefox (flash)
2012-09-19 13:23:06 -04:00
denise
81620d4f94
CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes
...
-fixed
2012-09-19 12:41:54 -04:00
denise
dc95ab1d00
CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
...
-changed null values to empty strings
2012-09-19 11:05:17 -04:00
Martin Konecny
ddc0e8d2ba
remove console.log from javascript library :/
2012-09-19 11:04:01 -04:00
denise
281e7d1092
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 10:49:52 -04:00
denise
0c823af660
CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
...
-done
2012-09-19 10:49:17 -04:00
Martin Konecny
7036036a86
CC-4476: Make all green notification boxes fade out after 5 seconds
...
-fixed
2012-09-18 21:29:02 -04:00
denise
5003e86eac
- changed smart block qtip text
2012-09-18 17:37:38 -04:00
denise
f9778f2da4
-removed windows CRLF
2012-09-18 17:26:34 -04:00
denise
1d699fe0b8
CC-4479: Buttons in dialog windows are not styled
...
-done
2012-09-18 17:22:24 -04:00
denise
b77429164b
CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
...
-removed setInterval function
2012-09-18 16:55:46 -04:00
denise
54ab58a9c7
CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
...
-removed (commented out) code for this ticket
-postponing for now
2012-09-18 16:49:45 -04:00
denise
8cae11d588
CC-4478: Library: audio preview check should be skipped if file does not exist
...
-fixed
2012-09-18 15:52:11 -04:00
denise
09b117999e
CC-4475: Register form button doesn't have any styling
...
-fixed
2012-09-18 15:28:38 -04:00
denise
e676cf856f
-remove console.log
2012-09-18 15:16:54 -04:00
denise
0386f8a9cb
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 15:14:57 -04:00
denise
7bbd10556b
CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
...
-done
2012-09-18 15:14:46 -04:00
James
98f0692b8d
CC-4457: Media Library: The background of 'Adding items' is minimize to a point
...
- fixed
2012-09-18 14:40:18 -04:00
denise
e00ff6367d
CC-4458: Now Playing -> "+ Add to current playlist text" might be replaced by something more appropriate
...
-fixed
2012-09-18 11:22:37 -04:00
denise
9c721f202f
-small UI improvement
2012-09-18 11:05:13 -04:00
denise
1698aae251
CC-4466: Buttons on Now Playing page are clickable even though they are disabled
...
-fixed
2012-09-18 10:53:19 -04:00
Naomi Aro
bb3ffce071
CC-3944 : Now Playing -> Time Line view: Cannot cancel record show, cancel button is disabled
2012-09-17 16:28:28 -07:00
denise
9b39ff93b4
-removed console.log
2012-09-17 15:49:22 -04:00
denise
43c336eb6d
CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
...
-implemented css changes
-formatted playlist_builder.css
2012-09-17 15:41:22 -04:00
James
5d60a599a6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 12:42:11 -04:00
James
5e514b3b60
-UI alignment of input text element
2012-09-17 12:41:58 -04:00
denise
f840a9b24a
CC-4451: (Firefox) Now Playing -> Can't cancel Current Show
...
-fixed
2012-09-17 12:30:43 -04:00
denise
f02bf04a25
CC-4449: (Firefox) Now Playing -> Cancel currently playing track does not work
...
-fixed
2012-09-17 12:27:17 -04:00
denise
b8b3bfb495
CC-4450: Now Playing -> Can't remove overbooked tracks
...
-fixed
2012-09-17 12:23:49 -04:00
denise
e30d3b770c
-removed unused code
2012-09-17 12:19:02 -04:00
denise
3c3b39796d
CC-4445: Timeline: 'Select' dropdown menu should be disabled if the button is disabled
...
-fixed
2012-09-17 12:10:23 -04:00
Rudi Grinberg
990bcebfe8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 11:58:18 -04:00
Rudi Grinberg
b913b067c2
Added setColumnFilter(oTable)
2012-09-17 11:58:08 -04:00
denise
99969ff19d
CC-4445: Timeline: 'Select' dropdown menu should be disabled if the button is disabled
...
-fixed
2012-09-17 11:58:05 -04:00
James
b3420984e2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 11:27:52 -04:00
James
396b529162
- UI interation of advanced search
2012-09-17 11:23:38 -04:00
Rudi Grinberg
fab7042ce6
cc-4419: Added quick hack for now -- actual fix
2012-09-17 11:18:18 -04:00
Rudi Grinberg
d4443da626
Removed debugging statement
2012-09-17 11:12:52 -04:00
Rudi Grinberg
6118cd63d7
cc-4419: Added quick hack for now
2012-09-17 10:52:37 -04:00
Rudi Grinberg
1c2cebf5a8
Removed comment
2012-09-17 10:27:12 -04:00
Rudi Grinberg
f809a17c02
Formatting
2012-09-14 19:05:30 -04:00
denise
84deda99c5
CC-4440: System -> Streams: Update and Save 'Stream 1/2/3' will make it invisible
...
-fixed
2012-09-14 17:35:14 -04:00
Martin Konecny
39903be69a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-14 16:51:48 -04:00
Martin Konecny
3ced92db7a
CC-4415: Smart Block audio preview doesn't work
2012-09-14 16:51:14 -04:00
denise
8ffaaaef25
-skip playable test if item is a smart block
2012-09-14 16:38:26 -04:00
denise
0524e4e5d2
-implemented UI changes for playlist/block/webstream builder
2012-09-14 15:49:39 -04:00
denise
c7f4ede766
-implemented UI changes for library page
2012-09-14 12:08:51 -04:00
denise
f581b0536e
-fixed formatting
2012-09-14 11:18:13 -04:00
denise
bb38512bae
-fixed formatting
2012-09-14 10:52:50 -04:00
denise
97a0a82dc3
-renamed AIRTIME_DEV_README to AIRTIME_DEV_README_COLUMN_FILTER
...
-added new diff file for dataTables.ColVis.js
2012-09-13 17:19:08 -04:00
denise
c35c76351b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 17:11:10 -04:00
denise
8f48544bb7
-implemented UI changes for Now Playing page
2012-09-13 17:10:38 -04:00
James
d93fcec490
CC-4424: Clicking "edit" on playlist allows you to preview tracks that should be disabled
...
- fixed
2012-09-13 17:09:10 -04:00
Martin Konecny
14db5053b1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 14:56:10 -04:00
Martin Konecny
b04afaec2c
CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
...
-detect flash fallback
2012-09-13 14:55:17 -04:00
James
b2d61f2402
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 14:22:27 -04:00
James
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
Martin Konecny
4fd9993108
CC-1710FLAC, BWF, AAC support
...
-Enable browser preview for new filetypes
2012-09-13 12:30:26 -04:00
Martin Konecny
09d587e262
CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
...
-better file type detection
2012-09-13 12:28:10 -04:00
Martin Konecny
e95933525b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 12:25:03 -04:00
Martin Konecny
983bbc5fc5
CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
...
-better file type detection
2012-09-13 12:24:53 -04:00
Rudi Grinberg
e2f8d8e0e7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 11:10:43 -04:00
James
5067a304d9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 10:49:33 -04:00
James
b6b93618e6
CC-4353: Numeric search fields in Library would benefit from format labels
...
- bug fix
2012-09-13 10:49:24 -04:00
Rudi Grinberg
52882ef938
Added mp4 removed aac.
2012-09-13 10:35:13 -04:00
Martin Konecny
4998a63a6a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-12 17:34:32 -04:00
Martin Konecny
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
denise
32b1ee95b7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-12 16:29:35 -04:00
denise
5ac6877e60
CC-4362: Smart Block: error for multiple criteria
...
-fixed
2012-09-12 16:29:26 -04:00
Martin Konecny
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
Martin Konecny
a418f5777c
CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track
...
-initial commit
2012-09-12 15:43:50 -04:00
Vladimir
77824afdd3
Added Bootstrap CSS, images and JS for new buttons and dropdown menues
2012-09-12 21:23:25 +02:00
Rudi Grinberg
d1b4ce3de6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-12 15:19:57 -04:00
denise
07ac651f71
- move title and creator to top of library column view
2012-09-12 15:09:07 -04:00
Rudi Grinberg
92532cb708
cc-4394: Added m4a
2012-09-12 14:54:11 -04:00
denise
ceccb547c2
CC-4355: Smart block criteria do not match library columns or metadata editor
...
-put library column filter in alphabetical order to match smart block criteria order
2012-09-11 17:39:47 -04:00
denise
f1b8ada1e6
- removed logging
2012-09-11 17:19:02 -04:00
denise
58d39d74d4
CC-4355: Smart block criteria do not match library columns or metadata editor
...
-fixed
2012-09-11 17:18:17 -04:00
James
b692abb9ae
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-11 15:10:17 -04:00
James
1ba24a8d0b
CC-4353: Numeric search fields in Library would benefit from format labels
...
- done
2012-09-11 15:09:57 -04:00
denise
49f2a31be1
- added advanced search validation for owner and last played time
2012-09-11 11:22:12 -04:00
denise
ba89982b17
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 18:09:19 -04:00
denise
4239a49d58
- advanced search validation UI cleanup
2012-09-10 18:09:13 -04:00
James
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
James
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
denise
c536169fb3
-original dataTables.columnFilter.js
2012-09-10 17:58:31 -04:00
denise
2474d50e9f
CC-4379: Playlist Builder: Click Save will cause playlist disappear from right side
...
-fixed
2012-09-10 17:53:55 -04:00
denise
bba001c0db
-diff between original dataTables.columnFilter.js and our modified version
2012-09-10 17:41:54 -04:00
denise
def513d200
-fixed commit problem
2012-09-10 17:38:05 -04:00
denise
fe0b6cd32b
-changed windows line endings to unix
2012-09-10 17:36:51 -04:00
denise
bca7fbf50e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 17:17:19 -04:00
denise
8520141240
CC-4282: Library ->"Uploaded From" -> Submitting data in wrong format causes "Processing ..." message pop up for a while
...
-implemented advanced search validation
-data only gets sent to server if all fields are valid
2012-09-10 17:17:09 -04:00
James
67b295a553
CC-4367: Media Library -> Search: Please enable searching Bit Rate by Kbps
...
- done
2012-09-10 15:37:22 -04:00
James
4d3c624607
CC-4380: Show ReplayGain value in the Library page
...
- temp commit
2012-09-10 12:35:32 -04:00
James
0f1cb61a13
CC-4330: Media Library - > Search: Please change the way to search by owner
...
- fixed
2012-09-06 17:46:45 -04:00
denise
8125d6b553
CC-4344: Conductor column not available in library view
...
-done
2012-09-06 14:30:09 -04:00
denise
8d1003bbbe
CC-4303: Library Tab grays out after certain scenario with normal playlist
...
-fixed
2012-09-06 11:48:00 -04:00
denise
d9baddeba0
CC-4349: Encoded search in library should be labelled 'Encoded by'
...
-fixed
2012-09-05 16:38:55 -04:00
denise
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
Martin Konecny
886888a958
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-31 17:21:48 -04:00
Rudi Grinberg
59f527c14c
cc-4288: added owner column.
2012-08-31 13:31:14 -04:00
Martin Konecny
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
Rudi Grinberg
3571e2c691
cc-1710: switched bwf to wav
2012-08-30 16:50:10 -04:00
Rudi Grinberg
3911662cff
Remove unused function
2012-08-30 16:30:49 -04:00
Rudi Grinberg
c09ebce1f0
cc-1710: Removed verbosity
2012-08-30 11:43:11 -04:00
Rudi Grinberg
bed9989d2a
cc-1710: Added more supported extensions to the allowed upload list
2012-08-30 11:40:05 -04:00
Rudi Grinberg
2b8bd2ffe9
cc-1710 removed ^M
2012-08-30 11:37:22 -04:00
denise
3ff80fae14
CC-4314: Library: Add playlist to playlist shows wrong error message
...
-fixed
2012-08-29 16:47:20 -04:00
denise
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
denise
3d20ded170
CC-4307: Add "Never show again" to the pop-up registration prompt
...
-done
2012-08-28 17:30:34 -04:00
denise
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
denise
7c5765ccb9
CC-4298: Smart Block: Sometimes criteria value text box doesn't resize properly
...
-fixed
2012-08-27 16:46:05 -04:00
denise
d4dbca5de3
CC-4296: Media Library: Dragging Smart Block gives wrong item number
...
-fixed
2012-08-27 12:33:57 -04:00
denise
53418e475d
CC-4286: Library: Alert pops up when double clicking any item in Library when nothing is opened in right side
...
-fixed
2012-08-24 17:37:13 -04:00
denise
ffa4c131ee
CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
...
-code refactor
2012-08-24 11:50:02 -04:00
denise
2e505ee970
CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
...
-small code fix
2012-08-24 11:47:32 -04:00
denise
b8571be827
CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
...
- small code fix
2012-08-24 11:45:56 -04:00
denise
5f1c6453a5
CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
...
-fixed
-disabled shuffle button
2012-08-24 11:44:18 -04:00
James
a4c579f36e
CC-4254: Library: advanced search on library
...
- bug fix
2012-08-23 10:59:34 -04:00
James
c2d475e6d8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/controllers/PlaylistController.php
2012-08-23 10:43:28 -04:00
James
de0aeee594
CC-4254: Library: advanced search on library
...
- initial commit
2012-08-23 10:41:40 -04:00
denise
462e73d93b
CC-4245: Playlists: Can only rearrange, by dragging and dropping, tracks once
...
-fixed
2012-08-22 13:58:13 -04:00
denise
025656be1c
CC-4205: Smart Playlist Builder: Change text on button mouseovers
...
-changed generate success msg
2012-08-21 10:46:25 -04:00
Martin Konecny
cba717dc4b
CC-1665: Scheduled stream rebroadcasting and recording
...
-Fixed regressions introduced by changing HTML element id
2012-08-21 10:33:36 -04:00
Martin Konecny
337e5fec8a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-20 18:36:32 -04:00
Martin Konecny
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
James
734be21269
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-20 17:18:00 -04:00
James
a24da9e324
CC-4256: Smart Playlist: change name to smart block and etc
...
- done
2012-08-20 17:17:48 -04:00
Martin Konecny
4d8dc01638
don't crash js if a backend service is not running
2012-08-20 17:09:59 -04:00
Martin Konecny
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
Martin Konecny
4216440670
CC-1665: Scheduled stream rebroadcasting and recording
...
-previewing streams have NaN:NaN:NaN as length
2012-08-17 16:51:23 -04:00
denise
764316a36c
CC-4247: Smart Playlist: Lost modifier when delete one from multiple modifiers
...
-fixed
2012-08-17 15:30:30 -04:00
denise
92408612f6
CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
...
-fixed
2012-08-17 15:11:43 -04:00
denise
36a080ac13
CC-4243: Playlist Builder: Remove main fade block if there are no fades to set
...
-fixed
2012-08-17 14:30:46 -04:00
denise
3e879f390a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-17 12:56:52 -04:00
denise
e2fe6d4284
CC-4243: Playlist Builder: Remove main fade block if there are no fades to set
...
-fixed
2012-08-17 12:56:45 -04:00
James
c1cc1c8fba
CC-4184: Playlist Builder : Error alert for trying to add Web Stream to Smart Playlist
...
- fixed
2012-08-17 10:55:42 -04:00
Martin Konecny
0cbd6165c4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-16 17:49:23 -04:00
Martin Konecny
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
denise
6b841a0fc4
CC-4239: Playlist: need to improve error msg "Something went wrong"
...
-fixed
2012-08-16 17:11:48 -04:00
Martin Konecny
12ddf30049
CC-1665: Scheduled stream rebroadcasting and recording
...
-fixed preview icon in context menu doesn't work
2012-08-16 16:52:38 -04:00
denise
45f08e41d1
Smart playlists: fixed shuffle button activation clause
2012-08-16 15:47:31 -04:00
denise
73ec580316
Playlists: set cue/fade in/out were not saving when editing a playlist
2012-08-16 13:02:48 -04:00
denise
4ca290320d
CC-4236: Smart Playlists: Deactivate shuffle button when playlist contents is empty
...
-done
-refactor code
2012-08-16 11:26:04 -04:00
James
4783bf121a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-15 16:23:15 -04:00
James
2d80131351
CC-4229: Smart Playlist: refactor code
...
- bug fixes
2012-08-15 16:22:56 -04:00
denise
3e80781308
Smart playlist:
...
- fixed modifier selection onchange function
2012-08-15 15:36:06 -04:00
denise
7225345541
CC-4231: Library: Prevent audio preview popup for dynamic blocks
...
- done
2012-08-15 12:51:53 -04:00
denise
4d9a31b3c1
CC-4219: Smart Playlist: Cannot preview static block
...
-fixed
2012-08-15 12:10:56 -04:00
James
9fc5411895
CC-4229: Smart Playlist: refactor code
...
- done
2012-08-15 11:36:41 -04:00
James
5ece15c1e8
CC-4206: Smart Playlist: Edit cue in/out setting will lost all contents
...
- fixed
2012-08-14 17:10:31 -04:00
denise
09f1fe6775
CC-4220: Smart Playlists: Change indexing of criteria elements
...
-code refactoring
2012-08-14 10:05:13 -04:00
denise
c62d89d5da
CC-4220: Smart Playlists: Change indexing of criteria elements
...
-changed indexing on UI
2012-08-14 10:02:36 -04:00
denise
cfc5587043
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-13 14:41:59 -04:00
denise
0203c3f0c5
CC-4206: Smart Playlist: Edit cue in/out setting will lost all contents
...
-fixed event bubbling
2012-08-13 12:46:17 -04:00
James
1e36d77857
CC-4213: Smart Playlist -> Criteria Bpm: Cannot find track by 'is in the range'
...
- changed BPM to string type
2012-08-13 11:51:25 -04:00
Martin Konecny
fa749c58f0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-10 12:40:45 -04:00
Martin Konecny
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
denise
7911761017
CC-4208: Smart Playlists: Cannot see error messages sometimes after clicking 'Save'
...
-fixed
2012-08-10 12:22:59 -04:00
denise
00a484d595
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 17:43:22 -04:00
denise
23683ccccb
Smart Playlists: changed positioning of error message on click 'Save'
2012-08-09 17:43:12 -04:00
Martin Konecny
bc72a6743b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 17:42:32 -04:00
Martin Konecny
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
denise
ac295243d4
Smart Playlists: changed success message for 'Save' button
2012-08-09 17:34:47 -04:00
denise
f75cf5ffe2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 17:24:00 -04:00
denise
e674654cb1
CC-4192: Smart Playlist Builder: make save button save title, description, and criteria
...
-done
2012-08-09 17:23:52 -04:00
Martin Konecny
c73328e297
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to preview webstreams inside of playlists
2012-08-09 16:49:20 -04:00
Martin Konecny
952f18dc3c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 14:39:42 -04:00
Martin Konecny
b53bc36f4f
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to preview webstreams
2012-08-09 14:39:31 -04:00
James
ef0e800c92
CC-4186: Playlist Builder -> Smart Playlist : The static Smart Playlist's length value will be empty if no file meet the criteria.
...
- fixed
2012-08-09 14:12:30 -04:00
James
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
denise
90ec046854
CC-4188: Playlist Builder -> Smart Playlist : sometimes elements do not index properly when add a new criteria row
...
-fixed
2012-08-08 16:27:03 -04:00
James
ab19d6f511
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-08 15:29:28 -04:00
James
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
denise
3a4a827f1f
CC-4180: Smart Playlist Builder: modifier select boxes do not change when criteria changes
...
-fixed
2012-08-08 15:24:47 -04:00
denise
67a8457889
Smart Playlists: modifier buttons appear incorrectly when editing
2012-08-08 13:16:02 -04:00
denise
5c3701c064
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-08 13:07:12 -04:00
denise
85259e5bba
CC-4170: Smart Playlist Builder: elements don't organize properly after deleting a row
...
-fixed
2012-08-08 13:07:00 -04:00
James
fd1628f971
CC-4117: Smart Playlist: radio_station_name criteria doesnot take effect
...
- removing radio_station_name from criteria list
2012-08-08 12:01:10 -04:00
Martin Konecny
f33485f8ea
Merge branch '2.1.x' into devel
2012-08-08 00:09:13 -04:00
Martin Konecny
230c3399ef
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix newlines appearing in playlist/webstream title
-disable autosave of playlist/webstream title
2012-08-07 20:48:58 -04:00
Martin Konecny
1dddaa0ba2
CC-1665: Scheduled stream rebroadcasting and recording
...
-refresh library to show new stream after save
2012-08-07 19:49:26 -04:00
denise
9b805f0a01
CC-4159: Playlist Builder -> Smart Playlist : "+" for modifier disappears if 3 or more Criteria
...
-fixed
2012-08-07 17:40:47 -04:00
James
171825e19a
CC-4148: Playlist Builder: Please add a 'Processing' for generating Smart playlist
...
- added processing box
2012-08-07 15:54:16 -04:00
denise
550c97a2dc
CC-4154L: Indicate whether a show has scheduled content on the calendar page
...
-done
2012-08-07 14:57:04 -04:00
denise
d05661afff
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-07 11:08:34 -04:00
denise
2c0f7bf03b
CC-4145: Playlist Builder: Alert pops up when clicking 'Add to playlist' in context menu of Smart Playlist to add it into regular playlist
...
-fixed
2012-08-07 11:08:00 -04:00
Martin Konecny
b23b9a0cbd
CC-1665: Scheduled stream rebroadcasting and recording
...
-allow to filter by webstream only
2012-08-03 16:33:58 -04:00
Martin Konecny
0ea66fc33f
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to edit playlists
2012-08-03 15:59:34 -04:00
James
82970c6e73
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-02 17:04:49 -04:00
James
af939469d3
CC-84: Smart Playlists
...
- fixed bug on expanding block
- fixed text bug
2012-08-02 17:03:54 -04:00
denise
ef994aa449
CC-84: Smart Playlists
...
- block options scroll for small screens
2012-08-02 16:40:32 -04:00
James
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
James
0d2d8218bf
CC-84: Smart Playlists
...
- audio preview on playlist
- cleaning up some code
2012-08-02 16:36:12 -04:00
Martin Konecny
a146fdcd37
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-02 16:27:00 -04:00
Martin Konecny
9cc152c0ae
CC-1665: Scheduled stream rebroadcasting and recording
...
-validate form fields of new webstream
2012-08-02 15:45:15 -04:00
denise
4fca33c5fc
CC-84: Smart Playlists
...
- removed block from right side if it gets deleted from context menu
2012-08-02 12:59:00 -04:00
denise
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
Martin Konecny
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
denise
7d788c51b2
CC-84: Smart Playlists
...
- added scrolling on qtip
2012-08-01 14:43:52 -04:00
denise
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
James
9d51222dae
CC-84: Smart Playlists
...
- Length calculation for dynamic blocks and playlist that contains
dynamic blocks
2012-07-31 17:46:37 -04:00
Martin Konecny
45a77e90a8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-31 11:00:26 -04:00
Martin Konecny
92e34b12f7
CC-1665: Scheduled stream rebroadcasting and recording
...
-cancel button has effect now :)
2012-07-31 11:00:15 -04:00
denise
eb2a8c1009
CC-84: Smart Playlists
...
- renamed Smart Blocks to Smart Playlists in library filter
2012-07-31 10:17:48 -04:00
Martin Konecny
ab85ab59d9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-30 21:48:25 -04:00
Martin Konecny
7e433b61fb
CC-1665: Scheduled stream rebroadcasting and recording
...
-improve working with "webstreams"
2012-07-30 21:48:04 -04:00
denise
ecd926ae90
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-30 18:53:57 -04:00
denise
ff62769d6c
CC-84: Smart Playlists
...
-UI cleanup
2012-07-30 18:53:50 -04:00
James
b9739b022d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-30 17:55:39 -04:00
James
019d13b4c9
CC-84: Smart Playlists
...
- backend implementation
- UI for blocks within playlist
2012-07-30 17:55:22 -04:00
denise
f91be9468f
CC-84: Smart Playlists
...
-UI cleanup
2012-07-30 16:42:37 -04:00
denise
2083d04107
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-27 14:32:39 -04:00
denise
d7cf50b2f4
CC-84: Smart Playlists
...
- changed error handling and criteria saving to handle same criteria rows
2012-07-27 14:32:31 -04:00
Martin Konecny
ebed110429
CC-1665: Scheduled stream rebroadcasting and recording
...
-code cleanup
2012-07-26 17:51:47 -04:00
James
7cde4ba2ba
CC-84: Smart Playlists
...
- merging code
2012-07-26 16:16:07 -04:00
Martin Konecny
eb4c23b0b6
CC-1665: Scheduled stream rebroadcasting and recording
...
-Fix scheduled streams mixed with scheduled files
2012-07-26 14:49:32 -04:00
Martin Konecny
c90495d2d3
CC-1665: Scheduled stream rebroadcasting and recording
...
-getting closer to being able to schedule a webstream
2012-07-26 14:49:32 -04:00
Martin Konecny
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
Martin Konecny
a16a1f5033
CC-1665: Scheduled stream rebroadcasting and recording
...
-Webstreams now appearing in the library
2012-07-26 14:49:31 -04:00
Martin Konecny
31176f525e
CC-1665: Scheduled stream rebroadcasting and recording
...
-started working on UI
2012-07-26 14:41:40 -04:00
denise
a828c46d32
CC-84: Smart Playlists
...
- changed name of 'block' to 'smart playlist' on UI only
2012-07-26 13:16:29 -04:00
denise
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
James
1f3cbd8aba
CC-84: Smart Playlists
...
- introducing smart-block
2012-07-25 12:44:37 -04:00
denise
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
denise
c82ea30809
CC-84: Smart Playlists
...
- removed criteria subform and reverted back to original criteria options design
2012-07-24 12:12:47 -04:00
denise
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
denise
a67b2fa300
CC-84: Smart Playlists
...
- removed soundcloud_id criteria
- added last_played criteria
2012-07-20 11:25:54 -04:00
denise
9fcc851523
CC-84: Smart Playlists
...
-hides playlist content if dynamic instead of disabling
-show the user how many files match specified criteria
2012-07-19 14:52:39 -04:00
denise
2d8a9188eb
CC-84: Smart Playlists
...
- qtip wasn't showing up on 'new' and 'edit' events
- changed 'Artist' to 'Creator' to be consistent with library
2012-07-18 15:48:15 -04:00
James
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
denise
7c5291fe0c
CC-84: Smart Playlists
...
- ui cleanup
2012-07-18 11:55:29 -04:00
James
2a38527161
CC-84: Smart Playlists
...
- propel usage chage
- cleaning up code
- some js changes
2012-07-18 11:52:09 -04:00
denise
0aae7c75ae
CC-84: Smart Playlists
...
- added shuffle button
- moved all callbacks into one function
2012-07-17 15:32:26 -04:00
denise
a8ca9accdb
CC-84: Smart Playlists
...
- added remove button to all rows unless only one row is enabled
- disabled playlist contents if type switches from static to dynamic
and vice versa
2012-07-17 14:40:52 -04:00
James
7c07bf146c
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-17 11:07:38 -04:00
James
a4ba776b0f
CC-84: Smart Playlists
...
- save playlist type to db
- on edit type is loaded
2012-07-17 11:07:16 -04:00
denise
e0a674a96c
CC-84: Smart Playlists
...
-added save button for static playlists
2012-07-16 18:24:46 -04:00
James
fc09baacd7
CC-84: Smart Playlists
...
- static playlist is done.
2012-07-16 17:18:37 -04:00
denise
1bb97c8603
CC-84: Smart Playlists
...
- ui clean-up
2012-07-16 14:44:50 -04:00
Martin Konecny
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
denise
2dae5f30f7
CC-84: Smart Playlists
...
- code cleanup
- adds 'Add' button to last row, always
2012-07-16 11:01:34 -04:00
James
46294c3f40
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
...
Conflicts:
airtime_mvc/application/forms/SmartPlaylistCriteria.php
2012-07-13 16:00:02 -04:00
James
ae9442d7f5
CC-84: Smart Playlists
...
- editing playlist
2012-07-13 15:58:23 -04:00
denise
b48fb49947
CC-84: Smart Playlists
...
-fixed add/remove behaviour
2012-07-13 15:15:11 -04:00
James
207582eb7e
CC-84: Smart Playlists
...
- temp commit
2012-07-13 14:23:30 -04:00
Martin Konecny
8dcb1f8f3d
CC-4101Calendar displays white on white for certain show names, making shows invisible
2012-07-13 10:28:50 -04:00
denise
7dc0229770
CC-84: Smart Playlists
...
- error msgs were not deleting from a removed row
- fixed
2012-07-12 17:33:40 -04:00
denise
d81253cccc
CC-84: Smart Playlists
...
- send playlist id on generate/save action
- fixed some small UI bugs
2012-07-12 17:19:53 -04:00
denise
31bb07b4f0
CC-84: Smart Playlists
...
- removed modifier array list from form and populate in javascript
- fixed remove functionality to handle the extra criteria value used
for 'is in the range' modifier
- moved 'add' button to last row
2012-07-12 13:02:02 -04:00
denise
e8a2f23856
CC-84: Smart Playlists
...
- dynamically change modifier list depending on criteria type
- added extra text box for 'is in the range' modifier
2012-07-11 18:53:28 -04:00
denise
c27b886817
CC-84: Smart Playlists
...
-0-indexed form elements
2012-07-11 16:15:44 -04:00
denise
7358b00c81
CC-84: Smart Playlists
...
-disabled non-visible form elements
2012-07-11 15:18:47 -04:00
denise
5fb0364f2d
CC-84: Smart Playlists
...
-switched action names for static/dynamic
2012-07-11 11:57:13 -04:00
denise
1afe1e4d32
CC-84: Smart Playlists
...
-added in save/generate functionality in the UI
2012-07-11 11:50:40 -04:00
denise
4bed5e647e
CC-84: Smart Playlists
...
-moved smart_playlistbuilder.js into playlist folder
2012-07-11 10:45:24 -04:00
denise
4301a221b7
CC-84: Smart Playlists
...
-added in 'Add' and 'Remove' form elements functionality on the UI
2012-07-10 18:20:23 -04:00
denise
72dd48e33e
CC-84: Smart Playlists
...
-created form and view script
2012-07-10 15:25:29 -04:00
denise
0171212e9b
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-07-10 13:19:19 -04:00
denise
81eb751c9f
- shortened height on Add/Remove content dialog window
2012-07-10 13:19:03 -04:00
James
78acd4f805
CC-4093: Timeline -> Alert for deleting track(s) appears twice by clicking
...
context menu
- fixed
2012-07-10 13:08:36 -04:00
denise
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
James
31f1d5879e
CC-4076: Library: make doubleclick trigger adding files to playlist/timeline
...
- done
2012-07-05 18:24:07 -04:00
James
f3fbaf89f5
CC-4076: Library: make doubleclick trigger adding files to playlist/timeline
...
- done
2012-07-05 18:23:34 -04:00
denise
bc93119adc
Merge branch '2.1.x' into devel
2012-07-04 09:46:30 -04:00
denise
87afea63bf
CC-4065: Timeline -> Cursor will disappear after a track is finished sometimes
...
-fixed
2012-07-03 18:22:48 -04:00
denise
598bf8942c
Merge branch '2.1.x' into devel
2012-07-03 14:57:16 -04:00
denise
f6d79b1f54
CC-4063: Timeline -> Add a track to a show will cause another show's cursor to be selected
...
-fixed
2012-07-03 14:52:27 -04:00
denise
2bf6d0e54e
Merge branch '2.1.x' into devel
2012-07-03 12:57:25 -04:00
denise
e11fe8a2b8
CC-4058: Timeline -> Cannot add song twice if last cursor is selected
...
-fixed
2012-07-03 12:42:53 -04:00
denise
bc569462ee
CC-4057: Calendar -> Add/Remove contents: Lost cursor after add contents to a show
...
-fixed
2012-07-03 11:48:57 -04:00
denise
3e75b28c9d
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
2012-07-03 10:42:29 -04:00
denise
46604fdf59
CC-4046: Timeline -> cannot drag and drog song into the posion between song's name and "show empty"
...
-fixed
2012-06-29 16:59:03 -04:00
denise
68420a898f
CC-4044: Timeline -> Cursor keeps highlight even if the song is played
...
-fixed
2012-06-29 15:49:22 -04:00
denise
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
denise
38cb439f53
CC-4036: Timeline -> A new Cursor will be selected when there are 2 shows and we add/delete items in timeline view
...
-fixed
2012-06-28 17:55:17 -04:00
denise
79513de1ba
CC-4035: Timeline -> Filter by show: please let the setting automatically takes effect without clicking the button out of the 'box'
...
-also added this functionality for the 'All my shows' checkbox
2012-06-28 17:07:01 -04:00
denise
61fc269b13
CC-4035: Timeline -> Filter by show: please let the setting automatically takes effect without clicking the button out of the 'box'
...
-done
2012-06-28 16:55:43 -04:00
denise
a603d67397
fixed indentation on schedule.js
2012-06-28 15:44:55 -04:00
denise
69eb80c5ac
CC-4000: Calendar -> Add/remove content -> Show / hide columns: the selector window will pop up at background sometimes
...
-fixed
2012-06-28 15:43:48 -04:00
denise
5427fbc083
CC-4033: Record show icon gets covered with soundcloud icons (soundcloud, progress, and error)
...
-done
2012-06-28 15:23:21 -04:00
denise
abc5b04045
fixed indentation
2012-06-28 14:02:57 -04:00
denise
0bc825947e
CC-3995: Media Library -> it takes too long time to switch page or select all from this page if set as displaying 100 item in Media Library.
...
-done
2012-06-28 11:44:30 -04:00
james
c4480a46b1
CC-4025: Suggest show colour in calendar automatically, based on show name
...
- done
2012-06-27 23:03:50 -04:00
denise
9fb9fb3219
CC-4021: Media Library -> "+" button wont take effect if uncheck one and check another
...
-fixed
2012-06-27 17:19:55 -04:00
denise
12bf42d2f1
CC-4031: Timeline cursor vanishes when every once in a while
...
-fixed
2012-06-27 15:50:56 -04:00
Martin Konecny
0a0e873ef9
CC-4019: Library: When "Add content" is clicked, "Proccessing" image …
...
-fix small comment typo
2012-06-27 11:50:31 -04:00
James
31d643cee1
CC-3997: Now Playing -> Time Line: different behaviour between 'delete'
...
button and 'delete' menu items
- added confirm box on clicking delete button on now playing table
- also added confirm box on library delete button as well
2012-06-26 17:43:15 -04:00
James
576c13963d
CC-3998: Now Playing -> Time Line: confirm message for user 'delete'
...
track by context menu is misleading
- fixed
2012-06-26 17:35:07 -04:00
James
c2cc4253b3
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-26 16:56:01 -04:00
James
9a14051f0b
CC-4019: Library: When "Add content" is clicked, "Proccessing" image is keep
...
flickering
- fixed
2012-06-26 16:55:43 -04:00
denise
d892a4b5ae
CC-4009: Calendar icon cannot be clicked twice without clicking another icon first
...
-fixed
2012-06-26 16:43:36 -04:00
denise
ca3d554c07
CC-3983: Timeline cursor in Now Playing vanishes after adding a file to a show
...
-empty cursorId array after every callback
2012-06-26 15:49:17 -04:00
denise
05fa673e42
CC-3983: Timeline cursor in Now Playing vanishes after adding a file to a show
...
-done
2012-06-26 15:36:45 -04:00
James
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
James
2480639e58
CC-3980: Excel export button in Playout History does not really export
...
Excel format
- removed xls option
2012-06-20 17:42:49 -04:00
James
5c43fa5a7b
CC-3978: Playout History table says Artist when it should say Creator
...
- fixed
2012-06-20 16:51:34 -04:00
James
3a32e7240a
CC-3984: Now Playing scissor and trashcan buttons are incorrectly labelled in
...
tooltips
- fixed
2012-06-20 16:49:41 -04:00
James
e40d9731a2
CC-3979: Playout History export should include date range in file and/or
...
filename
- fix
2012-06-20 16:47:11 -04:00
James
6a75fd6c76
CC-3979: Playout History export should include date range in file and/or
...
filename
- done
2012-06-20 16:35:34 -04:00
denise
b0e93005e5
Merge branch '2.1.x' into devel
2012-06-15 15:04:18 -04:00
denise
d02607ed94
CC-3561: Add button to automatically rescan watched folders.
...
-done
2012-06-15 12:16:19 -04:00
James
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
denise
6b990f8712
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into devel
2012-06-14 13:45:14 -04:00
denise
295a8ea5fe
CC-3561: Add button to automatically rescan watched folders.
...
-done
2012-06-14 13:44:56 -04:00
denise
9cabd4d32c
CC-3921: Add mobile phone number field to user record
...
-done
2012-06-13 13:39:54 -04:00
James
4077858c8e
CC-3927: Should automatically switch back to Master/Show stream if there
...
is a connection interruption
- chaning label and description text
2012-06-13 12:46:26 -04:00
James
032637049d
CC-3952: Calendar: Create/Edit Show's End time manually and keep date picker
...
open, the change will not take effect
- fixed
2012-06-12 17:07:24 -04:00
denise
8b2353ede0
Merge branch '2.1.x' into devel
2012-06-12 15:49:18 -04:00
James
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
denise
df518fb03f
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-12 14:58:51 -04:00
denise
8a63478c73
CC-3972: it is not possible to select tracks in Now Playing tab
...
-fixed
2012-06-12 14:58:33 -04:00
Martin Konecny
22453f3820
CC-3968: Cannot preview file as * .MP3
...
-fixed
2012-06-12 11:31:10 -04:00
denise
d66ba4074c
Merge branch '2.1.x' into devel
2012-06-11 18:11:09 -04:00
denise
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
denise
1b057c8954
Merge branch '2.1.x' into devel
2012-06-11 16:49:03 -04:00
denise
ebaff793be
CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings
...
-fixed (had to apply custom changes to new version of fullcalendar.js)
2012-06-11 16:43:24 -04:00
denise
5b9add360c
CC-3718: Please enable user to input the mail server settings
...
-fixed soundcloud settings from collapsing if there are form input errors
2012-06-11 15:18:12 -04:00
denise
d498c51814
Merge branch '2.1.x' into devel
2012-06-11 15:10:33 -04:00
denise
d348d21c10
CC-3960: Day of week text is missing from monthly Calendar view
...
-fixed
2012-06-11 15:08:02 -04:00
denise
16b6f09420
CC-3959: Make default username "source" for master and show inputs
...
-done (just added tooltip)
2012-06-11 14:55:26 -04:00
denise
ca8187c9c2
CC-3718: Please enable user to input the mail server settings
...
-done
2012-06-11 12:53:09 -04:00
denise
cf32096d9c
CC-3942: Canceling a storage folder change does not blank the Import Folder field
...
-fixed
2012-06-08 12:14:16 -04:00
denise
33f77c8c28
CC-3923: Show Timefilter - Even If the time filter is scheduled for yesterday it displays the Show played today
...
-fixed
2012-06-08 12:03:23 -04:00
denise
76c598c05b
CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings
...
-committing diff between original fullcalendar.js and changes made to it
2012-06-08 10:55:13 -04:00
denise
8fae454db6
CC-3901: DJ not assigned to Show, Guest: selection dialog populated upon clicking on "Select All" button in Now Playing
...
-fixed
2012-06-07 17:04:31 -04:00
denise
24f4e589a4
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-07 16:10:04 -04:00
denise
da7e44a78c
CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings
...
-fixed
2012-06-07 16:09:51 -04:00
James
dc4597e526
CC-3910: NowPlaying-> preview dialog is greyed for files uploaded to Soundcloud
...
- fixed
2012-06-07 11:26:35 -04:00
denise
a0a078db2b
CC-3925: Media Library: Please keep staying current page after editing or searching items instead of switching to first page.
...
-fixed to keep current page after deleting an item
2012-06-07 10:33:00 -04:00
denise
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
denise
532b2710f0
CC-3932: Master/Source Source Connection URL should be in non-editable box
...
-done
2012-06-06 13:10:57 -04:00
denise
8e0c886350
CC-3896: Playlist Builder: Using "select this page" to add songs to playlist, those songs will be added in by opposite order, like a stack
...
-fixed whitespace in library.js
2012-06-06 10:45:27 -04:00
James
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
denise
af71a03982
CC-3925: Media Library: Please keep staying current page after editing or searching items instead of switching to first page.
...
-maintains current page after edit metadata
2012-06-05 11:27:17 -04:00
denise
a3754be31a
CC-3850: Use qTip instead of custom tooltips
...
-done
2012-06-05 11:24:40 -04:00
denise
9c89d263db
CC-3880: NowPlaying-> there is no tooltip for the removed files available
...
-done
2012-06-05 11:20:00 -04:00
denise
c554190faf
-fixed indentation
2012-06-05 11:20:00 -04:00
denise
c18704aa4d
CC-3900: Show Builder boxes remain checked even when the item is no longer visible
...
-fixed playlist builder "Dragging <x> items" message so <x> is amount of visible items only
2012-06-05 11:20:00 -04:00
denise
1b540626ed
CC-3900: Show Builder boxes remain checked even when the item is no longer visible
...
-only visible tracks can be added/deleted
2012-06-05 11:20:00 -04:00
denise
5e894f7351
CC-3893: Add Media: Red underline appears on the bottom
...
-fixed
2012-06-05 11:19:59 -04:00
denise
05378f52d3
CC-3896: Playlist Builder: Using "select this page" to add songs to playlist, those songs will be added in by opposite order, like a stack
...
-fixed
2012-06-05 11:19:59 -04:00
denise
3566480999
CC-3888: Record Show: ON AIR light and scheduled Play will ON for several seconds when a record show starts
...
-fixed
2012-06-05 11:19:59 -04:00
Martin Konecny
54d741972a
CC-3903: Help -> Getting Started: the link "user manual" is different from the menu item "Help -> User Manual"
...
-fixed
2012-06-03 22:51:23 -04:00
James
e1a86d50f6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-30 12:46:30 -04:00
James
e48b2f2a84
CC-3913: Live Stream: When master switch is turned on, it turns off show switch
...
- fixed
2012-05-30 12:46:05 -04:00
Naomi Aro
1a49173d2f
CC-3860 : Timeline: Can knock a current playing song out of place with drag and drop if current playing song has checkbox selected
2012-05-30 17:46:24 +02:00
denise
3277a81221
- moved calcAdditionalShowData call before currentShow and nextShow get assigned
2012-05-29 14:19:31 -04:00
Naomi Aro
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
Naomi Aro
1b115178d3
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 15:50:29 +02:00
James
a6dc2adb78
CC-3874: after 3 unsuccessful attempts to login no RE-CAPTCHA is shown and
...
you can't even login as admin user
- fixed
2012-05-23 17:14:59 -04:00
Naomi Aro
bf614dd729
CC-3870 : Now playing -> "Add n items" displays wrong "n" when drag and drop tracks to Time Line
2012-05-23 17:40:56 +02:00
Naomi Aro
0c233c3346
CC-3860 : Timeline: Can knock a current playing song out of place with drag and drop if current playing song has checkbox selected
2012-05-23 17:06:04 +02:00
Naomi Aro
0b84dec86f
CC-3862 : Now playing -> Time Line: Left clicking and "Select cursor" won't enable to add current selected track from Media Library
2012-05-23 12:18:51 +02:00
denise
773693f636
- fixed spelling mistake on variable 'songElapsedTime' in dashboard.js
2012-05-22 17:47:46 -04:00
Martin Konecny
8720aabc27
CC-3857: Chmod fixes for files which should not be executable
...
-fixed
2012-05-22 11:22:43 -04:00
Naomi Aro
438bc93133
CC-3851 : Preview Player: does not expand on Chrome, too big on Firefox
2012-05-22 15:03:34 +02:00
Naomi Aro
4fe80194b6
CC-3845 : General UI cleanup
2012-05-21 17:07:34 +02:00
Naomi Aro
466e30895c
CC-3845 : General UI cleanup
2012-05-18 16:00:36 +02:00
Naomi Aro
ff1327881a
CC-3845 : General UI cleanup
2012-05-18 15:40:22 +02:00
denise
3ba4551ed3
- increased amount of time is allowed to pass before ON-AIR light is turned off
2012-05-17 18:49:06 -04:00
denise
9967f5451c
CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
...
- fixed
- added a 'type' key to distinguish between tracks and shows
2012-05-17 18:21:58 -04:00
Naomi Aro
fd0d82a873
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-17 17:53:23 +02:00
Naomi Aro
45ef2af142
CC-3420 : Custom UI for jplayer from CC-3395
2012-05-17 17:53:01 +02:00
denise
8abb57c402
CC-3842: Next scheduled show gets registered as next scheduled song
...
- removed case where light stays on for first 5 seconds of track
- also removed function calls no longer in use (notifySongStart(), and notifyShowStart())
- removed nowplayingdatagrid.js since it is no longer in use
2012-05-17 11:23:24 -04:00
Naomi Aro
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
denise
1629f41a8d
CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
...
-fixed
2012-05-16 12:54:02 -04:00
Paul Baranowski
c5b1e23486
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-15 17:13:20 -04:00
Paul Baranowski
2856d379b5
Fixed bug with upgrade notifications - it was always saying that your version
...
is obsolete if the version was greater than 1 minor version.
2012-05-15 17:13:01 -04:00
Naomi Aro
07d029b8cc
CC-3777 : Decide on what should happen with canceling recorded show
2012-05-15 14:56:31 +02:00
denise
ea5c5c8586
CC-3795: Schedule Play's line is all OFF after Master source is ON
...
-fixed
2012-05-14 12:16:11 -04:00
Naomi Aro
71c279a2f9
CC-3820 : when using reupload to soundcloud on calendar, progress icon never goes away unless you refresh the page
2012-05-14 16:30:18 +02:00
Naomi Aro
803c44611a
CC-3819 : Add View on Soundcloud context menu option on calendar page
2012-05-14 15:48:09 +02:00
Naomi Aro
ff5aebfd6b
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2012-05-14 15:06:56 +02:00
Naomi Aro
2b55002532
CC-3809 : Metadata popup keeps loading by right clicking the preview button of a playlist, only in Firefox
2012-05-11 11:27:53 +02:00
Naomi Aro
4e2aee83fd
CC-3806 : "n" of Add n items increases unexpectly
2012-05-11 11:04:16 +02:00
Naomi Aro
e61924de37
CC-3799 : Dragging and dropping a track from the library causes the track in the library to be selected
2012-05-10 14:19:36 +02:00
Martin Konecny
6c4bb1ef9e
-rename playlists.js to dashboard.js
2012-05-08 20:41:09 -04:00
Martin Konecny
55312e9538
-add missing semicolons
2012-05-08 20:37:45 -04:00
denise
9203e8c5d6
CC-3768: Reduce number of columns selected by default on the Playlist Builder screen
...
-fixed
2012-05-07 16:24:59 -04:00
denise
b4d8c72869
CC-3765: When master resource and schedule source are all ON, the current playing area only shows scheduled resource's name
...
-fixed
2012-05-07 16:08:26 -04:00
Naomi Aro
df4cdfb07e
CC-3687 : Remove context menus from recorded shows since they are blank.
2012-05-07 17:48:56 +02:00
Naomi Aro
a79514c8ee
CC-3687 : Remove context menus from recorded shows since they are blank.
2012-05-07 15:24:06 +02:00
Naomi Aro
a4b949cc2f
CC-3753 : Cannot cancel record show on Timeline view
2012-05-07 14:28:21 +02:00
Naomi Aro
f78e6eaeca
CC-3763 : Don't call window.resize callbacks multiple time during continuous events
2012-05-04 18:16:10 +02:00
Naomi Aro
025822ce35
CC-3763 : Don't call window.resize callbacks multiple time during continuous events
2012-05-04 18:13:01 +02:00
Naomi Aro
96d2f657f7
CC-3741 : Timeline's cursors looks a little bit far from timeline
2012-05-04 15:49:05 +02:00
Naomi Aro
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
Naomi Aro
12a5f17ff5
CC-3724 : Now Playing -> Timeline view: to drag and drop single file very fast will block adding the same file
2012-05-04 11:50:51 +02:00
Naomi Aro
0a17b34885
CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours
2012-05-03 18:00:10 +02:00
Naomi Aro
9b52115abc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-03 15:04:56 +02:00
Naomi Aro
c2c6e1b114
CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours
...
updating datatables to stable 1.9.1 release.
optimizing javascript, using jquery to add/remove nodes to avoid JQuery.cache issues.
2012-05-03 15:04:23 +02:00
denise
37190c25c6
CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
...
-reverting previous commit
2012-05-02 17:02:05 -04:00
denise
0d5b9ebada
CC-3734: Library/Timeline: Use horizontal scrollbar when there isnt enough room for column data
...
-fixed
2012-05-02 11:26:39 -04:00
Naomi Aro
08d939d736
CC-3742 : Library: could be confused by carrying over selected state betwee pages
2012-05-02 14:40:27 +02:00
Naomi Aro
c5f9288aab
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-02 11:15:20 +02:00
Naomi Aro
b5b24ae8f1
CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours
2012-05-02 11:14:53 +02:00
denise
3c53d5c7e6
CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
...
-fixed
2012-05-01 10:51:28 -04:00
denise
4477ac02e7
CC-3677: Tooltips improvements
...
-done
2012-04-30 16:20:23 -04:00
Naomi Aro
f6ff289506
CC-3677 : Tooltips improvements
2012-04-27 15:53:37 +02:00
Naomi Aro
e6b724c45a
CC-3729 : Create same UI for timeline to select checkboxes.
2012-04-27 15:44:40 +02:00
Naomi Aro
d7dcd03de5
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-27 14:42:21 +02:00
Naomi Aro
c42aebe5e9
CC-3715 : Library- carry over selected state between pages, be like gmail include select all/none
2012-04-27 14:41:52 +02:00
Naomi Aro
b9e13d3b08
CC-3715 : Library- carry over selected state between pages, be like gmail include select all/none
2012-04-27 11:22:44 +02:00
Martin Konecny
88100e79ad
CC-3725: Make it so that ON-AIR light never goes off between tracks.
...
-fixed
2012-04-26 15:26:07 -04:00
James
c9df8e8b15
CC-3722: Create loading indicator for AJAX call when calculating Show length
...
- done
2012-04-26 11:56:14 -04:00
Martin Konecny
a9d125bc4d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-26 10:15:40 -04:00
Martin Konecny
9c9abfab8d
CC-3704: No default checked day when creating repeat show
...
better validation of user input
2012-04-26 10:15:30 -04:00
Naomi Aro
2c84420424
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-26 12:15:31 +02:00
Naomi Aro
b5863d3d7a
CC-3522 : Now Playing Screen-> Periodical message pops up
2012-04-26 12:14:41 +02:00
James
b5a65ae7e4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 17:22:05 -04:00
James
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
Martin Konecny
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
Martin Konecny
517013ffc3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 16:21:15 -04:00
Martin Konecny
d04e053814
CC-3704: No default checked day when creating repeat show
...
-fixed
2012-04-25 16:21:03 -04:00
James
5c401cb472
CC-3671: add show on week/day view doesn't get start time/end time filled in
...
- fixed
- moved pad function into common.js
2012-04-25 16:04:36 -04:00
Naomi Aro
7e0e631740
CC-3616 : ShowBuilder-> A tooltip remains in the Showbuilder frame permanently
2012-04-25 15:52:11 +02:00
James
957b750d6a
CC-3711: Verify Propel hasn't broken anything with its different handling
...
of boolean columns compared to Pear
- fixed
2012-04-24 16:49:14 -04:00
James
3c4d01aa93
CC-3675: Playlist -> the files from Disconnected Mediafolder can still
...
be previewed (played)
- done
2012-04-24 12:59:07 -04:00
James
a41f100545
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-24 11:26:39 -04:00
James
2cb17a3b08
CC-3660: Cannot click Airtime Manual link on override info popup
...
- replaced the popup with qtip
2012-04-24 11:26:22 -04:00
Naomi Aro
8020ae0a29
CC-3688 : Make sure timeline knows to refresh itself when a rebroadcast file has been scheduled
...
forgot I commented out the check when fixing something in the past....
2012-04-24 17:21:59 +02:00
Martin Konecny
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
denise
558d2e5d9a
CC-3330: Regression in library behavior: left click anywhere in a row should bring up menu, right click anywhere in row should bring up metadata
2012-04-20 13:01:47 -04:00
Martin Konecny
7d6e251adf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-20 11:31:37 -04:00
Martin Konecny
da8a5296b0
CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
...
-add user type into javascript as a variable so we can check permissions on js side
2012-04-20 11:31:24 -04:00
denise
4fcb4a530f
CC-3330: Regression in library behavior: left click anywhere in a row should bring up menu, right click anywhere in row should bring up metadata
...
-added README for jquery.contextMenu.js bug fix
2012-04-20 10:21:14 -04:00
denise
9afdbe2fbc
CC-3330: Regression in library behavior: left click anywhere in a row should bring up menu, right click anywhere in row should bring up metadata
...
-consider it wrapped
2012-04-20 10:03:12 -04:00
Naomi Aro
e242972a78
Merge branch 'CC-3174' into devel
2012-04-20 13:04:38 +02:00
Naomi Aro
6b4fd7d3bb
CC-3686 : Improve differentiation of a record/rebroadcast show in the timeline
2012-04-20 13:03:50 +02:00
denise
636c40eb11
CC-3330: Regression in library behavior: left click anywhere in a row should bring up menu, right click anywhere in row should bring up metadata
...
-fixed
2012-04-19 18:23:30 -04:00
denise
710389a416
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-19 18:21:45 -04:00
James
a482a8fe07
CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
...
- done
2012-04-19 15:55:55 -04:00
James
295eab430a
CC-3671: add show on week/day view doesn't get start time/end time filled in
...
- fixed in both day and week view
2012-04-19 15:45:13 -04:00
denise
0f6a72f6f8
CC-3668: Live stream player - volume control needs improved usability
...
-fixed centered volume control
2012-04-19 12:51:36 -04:00
denise
64e8640795
CC-3668: Live stream player - volume control needs improved usability
...
-new layout done, mute/un-mute image blurry (need new one)
2012-04-19 12:34:51 -04:00
denise
1b92f82c1f
CC-3668: Live stream player - volume control needs improved usability
...
-un-minified jplayer.blue.monday.css
2012-04-19 10:00:30 -04:00
Martin Konecny
c6222849df
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
-comment out questionable css modification
2012-04-18 19:10:14 -04:00
Martin Konecny
bd8ce4b0a7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-18 19:02:53 -04:00
Martin Konecny
5bea867bec
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
-fixed
2012-04-18 19:02:29 -04:00
denise
de89db7c36
CC-3668: Live stream player - volume control needs improved usability
...
-in progress
2012-04-18 18:24:50 -04:00
denise
3ddabf5cf7
CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source
...
-fixed
2012-04-18 12:30:37 -04:00
denise
479e112317
CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source
...
-fixed
2012-04-18 12:30:37 -04:00
denise
a7fb8ea3f2
CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source
...
-semi-fixed
2012-04-18 12:30:37 -04:00
denise
ddf1a6d027
CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source
...
-fixed
2012-04-18 12:30:37 -04:00
denise
1c9871a6ed
fixed whitespace
2012-04-18 12:30:37 -04:00
denise
a58dc95f07
changed "current" label - not perfect
2012-04-18 12:30:37 -04:00
denise
fffaac726c
CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source
...
-semi-fixed
2012-04-18 12:26:10 -04:00
denise
a7ac80e785
CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source
...
-fixed
2012-04-18 12:26:10 -04:00
denise
ef22a33258
fixed whitespace
2012-04-18 12:26:10 -04:00
denise
91cc633139
changed "current" label - not perfect
2012-04-18 12:26:10 -04:00
James
90edd9d1b0
CC-3643: System->Streams - Master URL GUI is broken after overriding URL
...
setting
- fixed
2012-04-16 15:10:01 -04:00
Naomi Aro
a0fb607d30
Merge branch 'CC-3174' into devel
2012-04-16 16:40:02 +02:00
Naomi Aro
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
denise
82130560f5
CC-3640: Refresh Datatable after "Importing in Progress" label disappears on the Playlist Builder screen.
...
-fixed
2012-04-13 18:05:31 -04:00
denise
eff9ca85be
CC-3640: Refresh Datatable after "Importing in Progress" label disappears on the Playlist Builder screen.
...
-fixed
2012-04-13 16:52:22 -04:00
denise
fe68d0fc87
CC-3498: Calendar -> Show Content better representation of duration needed
...
-fixed
2012-04-12 16:25:01 -04:00
Martin Konecny
fbef6aa3c4
-remove reference to deleted meio mask jquery library
2012-04-12 13:11:45 -04:00
James
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
James
8f197115ae
CC-3618: Current playing Text Field in Dashboard alternates between "Nothing
...
Scheduled" and "current playing song"
- fixed
2012-04-11 15:54:03 -04:00
James
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
James
a57f8e2554
CC-3488: Update pop up window for jplayer so the size is exactly the same
...
size as the player.
- done
2012-04-09 15:28:38 -04:00
James
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
Martin Konecny
d562a26f4b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-07 22:33:47 -04:00
James
332c1d91b5
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/public/js/airtime/schedule/add-show.js
2012-04-05 16:03:15 -04:00
James
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
Martin Konecny
ef6c496ba3
CC-3541: Missing show title from "Show Content" pop-up
...
-fixed
2012-04-05 15:49:58 -04:00
Martin Konecny
176e5fdbd7
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-in progress
2012-04-05 15:30:21 -04:00
Martin Konecny
8050a1ce29
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-in progress
2012-04-05 14:45:16 -04:00
James
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
James
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
James
bcdd27863f
CC-3513: Playlist Builder->Download makes user be redirected to a blank page
...
- fixed
2012-04-03 16:30:54 -04:00
James
a49a3a1d2e
CC-3482: Live Stream: UI Design for Source Stream panel on dashboard
...
- master panel UI integration
2012-04-03 11:58:48 -04:00
Naomi Aro
f2a05adf49
CC-3481 : Calendar->AddRemoveShow->Content management dialog can't be moved
2012-04-03 16:23:37 +02:00
Naomi Aro
079862d2f2
CC-3505 : Timeline: Remove repeating date if "end date" is the same as the "Start date"
2012-04-03 16:11:53 +02:00
Naomi Aro
db1287d6ec
CC-3508 : Double Scrollbar in Show Builder menu
2012-04-03 15:19:38 +02:00
Naomi Aro
6c5eb384a5
CC-3508 : Double Scrollbar in Show Builder menu
2012-04-03 14:58:10 +02:00
Naomi Aro
cf4704ad89
CC-3174 : timeline
2012-04-03 12:30:53 +02:00
Naomi Aro
0c2066a90e
CC-3550 : Playlist Library -> Ctrl or Shift selection is not possible
2012-04-03 12:12:50 +02:00
Naomi Aro
09bebaa68b
CC-3550 : Playlist Library -> Ctrl or Shift selection is not possible
2012-04-03 12:07:51 +02:00
Naomi Aro
2f712535ad
CC-3550 : Playlist Library -> Ctrl or Shift selection is not possible
2012-04-03 11:57:53 +02:00
Naomi Aro
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
Naomi Aro
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
Naomi Aro
9f0741a684
CC-3174 : timeline
...
don't highlight empty timeline.
2012-04-02 11:07:28 +02:00
Naomi Aro
b5a8db6720
CC-3174 : timeline
2012-03-30 18:15:27 +02:00
Naomi Aro
fcbf547456
CC-3174 : timeline
2012-03-30 18:03:45 +02:00
Naomi Aro
cfb5fbc0c9
CC-3518 : Airtime requires internet access to run
2012-03-30 17:37:21 +02:00
Naomi Aro
6dc9193682
CC-3553 : Now Playing screen-> Tooltip change for "jump to current item" button
2012-03-30 17:26:20 +02:00
Naomi Aro
5242ac45a9
CC-3496 : PlaylistBuilder, NowPlaying -> GUI representation gets broken while being resized
2012-03-30 17:13:17 +02:00
Naomi Aro
2ab6ea98a6
CC-3496 : PlaylistBuilder, NowPlaying -> GUI representation gets broken while being resized
2012-03-30 16:33:43 +02:00
Naomi Aro
6ddc8288be
CC-3496 : PlaylistBuilder, NowPlaying -> GUI representation gets broken while being resized
2012-03-30 16:04:00 +02:00
Naomi Aro
bb1f94c796
CC-3496 : PlaylistBuilder, NowPlaying -> GUI representation gets broken while being resized
...
fixing now playing screen.
2012-03-30 15:33:52 +02:00
Naomi Aro
b39db57d0c
CC-3501 : Calendar->Show->Add media files from Library better usability may be proposed
2012-03-30 14:45:30 +02:00
Naomi Aro
f48c5ff575
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 15:34:58 +02:00
Naomi Aro
1b8a967cc0
CC-3174 : timeline
...
register js getting in way of toggling.
2012-03-29 11:32:27 +02:00
Martin Konecny
8cb5ccbe41
CC-3516: Creating a show has a long execution time
...
-cool effect now works under firefox
2012-03-28 23:52:17 -04:00
Martin Konecny
bc629bf441
CC-3537: When you try to navigate away while uploading you get a "false" message
...
-fixed
2012-03-28 23:27:31 -04:00
Naomi Aro
1e9348f27f
CC-3509: "Add Files" button (make it look better)
2012-03-28 17:50:14 +02:00
Naomi Aro
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
Naomi Aro
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
Naomi Aro
03c5daa9e7
CC-3534 : Check Scheduling Edge Cases
2012-03-28 14:26:38 +02:00
Naomi Aro
c1bdc6ff0f
CC-3463 : Usability improvements for timeline
...
working on timeline context menu.
cursor/play functions.
2012-03-27 18:27:58 +02:00
Naomi Aro
d9a42c4e40
CC-3463 : Usability improvements for timeline
2012-03-27 17:47:21 +02:00
Naomi Aro
9c52b2ee1f
CC-3174 : showbuilder
...
fixing jplayer preview
2012-03-27 16:27:43 +02:00
Naomi Aro
dfc6ae6273
CC-3463 : Usability improvements for timeline
...
started to add cursor options to context menu.
2012-03-27 15:46:25 +02:00
Naomi Aro
296a5c583a
CC-3407 : Timeline: Display if tracks are missing on disk
2012-03-27 15:16:07 +02:00
Naomi Aro
451b573c52
Merge branch 'CC-3174' into devel
2012-03-27 14:14:58 +02:00
Naomi Aro
10e4ae781f
CC-3451 : Ability to delete the currently playing clip
2012-03-27 12:44:48 +02:00
James
d7819b6dd2
CC-3489: Live Stream: When Custom Auth check box is checked, Custom
...
Username and Custom Password field must be required
- fixed spacing
2012-03-26 17:21:13 -04:00
James
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
Naomi Aro
275faa1881
CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time
2012-03-26 19:08:52 +02:00
Naomi Aro
7a6cdeaf10
CC-3174 : timeline
2012-03-26 12:36:06 +02:00
Naomi Aro
5facac4cd6
CC-3174 : timeline
2012-03-26 12:31:35 +02:00
Naomi Aro
91d44847cb
CC-3506 : Timeline: smaller columns for time values
2012-03-26 12:24:16 +02:00
Martin Konecny
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
Naomi Aro
ac9fc9f665
CC-3436 : timeline usability
2012-03-23 18:54:03 +01:00
Naomi Aro
2f287274f6
CC-3463 : timeline usability
2012-03-23 18:33:40 +01:00
Naomi Aro
95f97ccc55
CC-3463 : Usability improvements for timeline
2012-03-23 18:27:47 +01:00
Naomi Aro
a77ac56621
CC-3463 : timeline usability
...
removing auto scrolling to now playing item, bad idea.
2012-03-23 16:46:08 +01:00
Naomi Aro
711d1f202a
CC-3463 : Usability of timeline
...
changing buttons to be jquery ui icons.
adding button to trim overbooked
adding button toscroll current item to top.
2012-03-23 16:42:08 +01:00
Naomi Aro
13bbdc327e
CC-3360 : timeline css
...
mistyped selector.
2012-03-23 01:56:56 +01:00
Naomi Aro
8af4f052e0
CC-3360 : timeline css
2012-03-23 01:46:45 +01:00
Naomi Aro
f1d76443ab
CC-3360 : timeline css
2012-03-23 00:11:49 +01:00
Naomi Aro
7ab0289d12
CC-3360 : timeline css
...
changed library search width calculation to be in library.js
2012-03-22 23:31:18 +01:00
Naomi Aro
da02bb7076
CC-3360 : Timeline Css
2012-03-22 19:15:39 +01:00
Naomi Aro
1fdb3cf163
CC-3360 : Timeline Css
...
adding Css to timeline.
2012-03-22 18:04:22 +01:00
Naomi Aro
e76cffd8b0
CC-3463 : timeline usability
...
moving multiple files within the timeline.
2012-03-20 17:55:35 +01:00
Naomi Aro
ff2907823b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-20 11:14:26 +01:00
Naomi Aro
642270998c
CC-3174 : showbuilder
...
adding semi colon.
2012-03-20 11:14:00 +01:00
Daniel
064f7cf591
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-19 16:14:16 -04:00
Daniel
acf0eb4eb2
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
- updated the logic in jplayer to include supplied m4v, but hide the video viewer through the size option.
2012-03-19 16:09:59 -04:00
James
e194ff0dc8
CC-3469: Stream settings: Connection URLs are not generated correctly
...
- done
2012-03-19 16:08:23 -04:00
Naomi Aro
8105c6571c
CC-3355 : Timeline/Library: Select all in the library, drag to empty show --> nothing is added
...
if something is added after a footer, it will be added to the end of whatever is before the footer.
2012-03-19 14:48:11 +01:00
Naomi Aro
970c2fc47a
CC-3453 : Playlist
...
fixing description
2012-03-19 14:21:34 +01:00
Naomi Aro
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
Naomi Aro
b5f92dfa93
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-19 10:18:52 +01:00
Daniel
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
Naomi Aro
8925d44252
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-16 11:26:08 +01:00
Naomi Aro
d03e565861
CC-3174 : showbuilder
...
adding more length options to library, these ones should still fit without scrolling the page.
2012-03-16 11:26:03 +01:00
Daniel
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
Daniel
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
james
04c2c2f920
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-15 14:29:48 -04:00
james
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
Naomi Aro
6409003b3f
CC-3174 : showbuilder
...
putting qtip on missing file alert.
2012-03-15 16:29:52 +01:00
Naomi Aro
7a8398bd32
CC-3174 : showbuilder
...
including context menu to delete items from timeline.
2012-03-15 16:11:29 +01:00
Naomi Aro
3019cb9c42
CC-3434 : playlist
...
changing image to be smaller.
2012-03-15 11:37:20 +01:00
Naomi Aro
94e5a3d423
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-14 20:10:22 +01:00
Naomi Aro
68a4443c36
CC-3174 : showbuilder
...
changing get to post.
2012-03-14 20:10:10 +01:00
James
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
James
2ee4b227fc
CC-3439: Live Stream: Only admin should be able to turn on/of switch and
...
able to see kick out button
- done
2012-03-14 14:43:11 -04:00
James
4eefc05366
CC-3427: Live Stream: Ability to switch off Scheduled Play
...
- done
2012-03-14 14:43:10 -04:00
James
e31ac81e74
CC-3418: Live Stream: Merge current "On-Air" indicator and "Listen"
...
button with new stream source indicator
- Initial commit
2012-03-14 14:43:10 -04:00
James
79f8eabe2b
CC-3405: Display to users how to connect a live stream to Airtime
...
- Done
2012-03-14 14:43:10 -04:00
James
efee025691
CC-3406: Live Stream: Switch off live sources on disconnection
...
- done
2012-03-14 14:43:10 -04:00
James
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
james
701ed82f40
CC-3224: "On-the-fly" stream rebroadcasting
...
- interface implementation. subform within the show form.
2012-03-14 14:41:00 -04:00
Naomi Aro
eb389d99d2
CC-3434 : Playlist Builder fast deleting
2012-03-14 17:50:48 +01:00
Daniel
0b82107d28
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-13 14:12:36 -04:00
Daniel
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
Naomi Aro
7e7820d366
CC-733 : broadcast logs
...
adding table scroll height.
2012-03-13 16:41:06 +01:00
Naomi Aro
a8d61ff19c
CC-3328 : Scrolling behaviour in Chrome on OSX makes Airtime unusable
2012-03-13 14:19:25 +01:00
Naomi Aro
6830af574a
CC-3174 : showbuilder
...
fixing some merge stuff.
2012-03-13 12:52:41 +01:00
Martin Konecny
6f270bfb3d
Merge branch '2.0.x' into devel
...
Conflicts:
VERSION
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/Show.php
airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
install_minimal/include/airtime-constants.php
python_apps/api_clients/api_client.py
python_apps/pypo/pypocli.py
python_apps/pypo/pypofetch.py
2012-03-12 17:52:17 -04:00
Martin Konecny
926231513e
-remove unused function
2012-03-12 12:24:54 -04:00
Daniel
09b5d9003b
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 library.js because I lost my changes during merge
2012-03-12 11:57:30 -04:00
Daniel
c0b0e8079b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-12 11:33:28 -04:00
Naomi Aro
3145c24ba2
CC-3174 : showbuilder
...
changing queries for datatables to use the Datatables model class.
2012-03-12 15:32:24 +01:00
Daniel
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
Daniel
48aeaaf05a
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.
...
- merging with devel
2012-03-12 10:20:58 -04:00
Naomi Aro
f28f6659dc
CC-3403 : Replace Now Playing with the new Timeline screen
2012-03-12 14:23:03 +01:00
Naomi Aro
3b32a16813
CC-3174 : showbuilder
...
setting a timeout to refresh when the first item on the timeline starts incse there is no "current" item.
2012-03-12 13:25:03 +01:00
Naomi Aro
20db8d6fdf
CC-733 : broadcast logs
...
adding time range selection for the log history.
2012-03-12 11:47:25 +01:00
Daniel
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
Naomi Aro
7c63387dd5
CC-733 : broadcast logs
...
adding the export table tools.
2012-03-09 13:39:12 +01:00
Naomi Aro
c66b55ec17
CC-733 : playout history
...
translating mDataProp values to be able to search table on backend
2012-03-09 11:13:32 +01:00
Naomi Aro
53b8eb2724
CC-733 : export broadcast logs
...
exporting stats based on czech law
2012-03-08 18:30:56 +01:00
Naomi Aro
7a5054655e
CC-3174 : showbuilder
...
change max-height slightly for the library dialog.
2012-03-08 11:14:09 +01:00
Naomi Aro
fe3c340a90
CC-3174 : showbuilder
...
making library table only scroll on the table part.
2012-03-07 18:27:32 +01:00
Naomi Aro
e9627bca07
CC-3174 : showbuilder
...
only updating the timeline view if it is needed.
2012-03-07 12:20:30 +01:00
Naomi Aro
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
Daniel
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
Naomi Aro
157078b963
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2012-03-06 13:51:37 +01:00
Naomi Aro
64fe303b20
CC-3174 : showbuilder
...
fixing indentation.
2012-03-06 13:35:21 +01:00
Naomi Aro
6c5f710329
CC-3174 : showbuilder
...
making each separate widget scrollable (playlist, library, timeline)
2012-03-06 13:19:20 +01:00
Daniel
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
Daniel
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
Daniel
51f004933b
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updated icon in library
2012-03-05 19:00:14 -05:00
Daniel
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
Daniel
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
Daniel
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
Daniel
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
Daniel
0b9ed43e50
Updated library functionality and started with playlist work.
2012-03-05 19:00:14 -05:00
Daniel
dd3b7afff2
Updated library so I can play a song.
2012-03-05 19:00:14 -05:00
Daniel
6ff24bd1fd
Updated Library logic so I can play a song in the library.
...
Still need to be able to get the song file from the element and
update the playlist builder so its player respects cuein/cueout and fadein/fadeout
2012-03-05 19:00:14 -05:00
Martin Konecny
463fc1ff08
CC-3382: Include jPlayer sources in release tarball for GPL compliance
...
-Done
2012-03-05 16:17:00 -05:00
Naomi Aro
a832a40c75
CC-3174 : showbuilder
...
making the library a separate scrollable from playlist
2012-03-05 18:14:10 +01:00
Naomi Aro
b8ca0ef740
CC-3174 : showbuidler
...
fixing width of search input so it will work on smaller screens.
2012-03-05 15:39:18 +01:00
Naomi Aro
62c07107c1
CC-3174 : showbuilder
...
dialog improvements, can scroll library, builder independently.
2012-03-05 14:43:34 +01:00
Naomi Aro
59b7f4ab56
CC-3174 : showbuilder
...
adding timeout for the now playing song, as well as polling every 20 seconds.
2012-03-02 18:16:44 +01:00
Naomi Aro
f4fac98221
CC-3174 : showbuilder
...
adding back polling.
2012-03-02 17:25:44 +01:00
Naomi Aro
29b03c1181
CC-3174 : showbuilder
...
creating smart refresh timeout for now playing.
2012-03-02 16:27:14 +01:00
Naomi Aro
3ab375a23c
CC-3174 : showbuilder
...
chaning text on edit button.
2012-03-02 15:29:19 +01:00
Naomi Aro
b358c90cfb
CC-3174 : showbuilder
...
making the library toggle in when pressing the edit button
2012-03-02 15:28:04 +01:00
Naomi Aro
9e1b3e7e6e
CC-3174 : showbuilder
...
edge checking on empty datatables.
2012-03-02 14:16:11 +01:00
Naomi Aro
f61afb0216
CC-3373 : Timeline: only lock the currently playing track and the one after
2012-03-02 14:01:02 +01:00
Naomi Aro
b68204751e
CC-3174 : showbuilder
...
making sure recorded shows aren't editable.
2012-03-01 17:49:11 +01:00
Naomi Aro
1c43edb40b
CC-3174 : showbuilder
2012-03-01 17:05:50 +01:00
Naomi Aro
3bfbe036c7
CC-3174 : showbuilder
...
using the new status column in cc_schedule to colour boundary/overbooked tracks.
2012-03-01 15:09:13 +01:00
Naomi Aro
99b490129c
CC-3174 : showbuilder
...
making a dialog on the calendar page.
2012-03-01 00:19:59 +01:00
Naomi Aro
a8f53d169b
CC-3174 : showbuilder
...
sizing bit rate/sample rate in library, text right aligned.
2012-02-29 17:47:26 +01:00
Naomi Aro
bc1d519408
CC-3174 : showbuilder
...
showing message if some files could not be deleted since they were scheduled.
2012-02-29 16:02:41 +01:00
Naomi Aro
0f91f91c41
CC-3174 : showbuilder
...
adding checks to enable/disable buttons for playlist & timeline.
2012-02-29 15:47:11 +01:00
Naomi Aro
5257711866
CC-3174 : showbuilder
...
fixing order of scheduled/playlist data when added via group dragging.
2012-02-28 23:52:20 +01:00
Naomi Aro
4386690b54
CC-3174 : showbuilder
...
prevents scheduling outside a show.
2012-02-28 20:58:06 +01:00
Naomi Aro
b5f510de85
CC-3174 : showbuilder
...
making sure an item is not added outside of a show.
2012-02-28 16:57:53 +01:00
Naomi Aro
9b639a9b6d
CC-3356 : Library & Timeline : remove zero prefixes from numbers
2012-02-28 15:38:57 +01:00
Naomi Aro
997782c73c
CC-3354 : playlist drag and drop
...
improving apperance of playlist drag and drop.
2012-02-28 13:13:40 +01:00
Naomi Aro
5972aba46e
CC-3174 : showbuilder
...
changing playlist placeholder to be a li item thanks
to a hack on stack overflow.
2012-02-27 23:58:08 +01:00
Naomi Aro
43d67c921d
CC-3174 : showbuilder
...
adding cue/fade columns to table
fixing schedule fade out
putting default fade between files not in a playlist.
2012-02-27 21:29:02 +01:00
Naomi Aro
564575d657
CC-3174 : showbuilder
...
fixing timezone calculations if browser/server is different.
2012-02-27 20:14:12 +01:00
Naomi Aro
28759a2d34
CC-3354 : timeline drag and drop
...
changing helper to say just the number of items being moved like gtalk.
2012-02-27 16:01:05 +01:00
Naomi Aro
66ff3c61c3
CC-3330 : library behaviour.
2012-02-24 21:21:53 +01:00
Naomi Aro
1864447d7e
CC-3355 : Timeline/Library: Select all in the library, drag to empty show --> nothing is added
2012-02-24 19:58:06 +01:00
Naomi Aro
c6edfc3208
CC-3174 : showbuilder
...
removing columns that no longer should be in cc_schedule.
changing cc_files length column to be of type interval.
adding length formatter to showbuilder.
2012-02-24 16:05:01 +01:00
Naomi Aro
19d13889af
CC-3351 : Track length should only show to tenths of a second in the library
...
created a length formatter to use in multiple places.
2012-02-24 15:07:04 +01:00
Naomi Aro
28bb97acfa
CC-3174 : showbuilder
...
allow user to filter library by
files/playlists or all.
2012-02-24 00:55:20 +01:00
Naomi Aro
5364894833
CC-3174 : showbuilder
...
don't want to select empty rows anymore.
2012-02-23 23:12:30 +01:00
Naomi Aro
c665a3fa03
CC-3333 : showbuilder track colouring
...
tracks coloured if boundry/over.
needs better colour selection.
2012-02-23 22:23:21 +01:00
Naomi Aro
753c05ce5b
CC-3335 : Timeline: Drag and drop usability improvements
...
cursor must be used to add tracks to timeline, not check boxes.
2012-02-23 17:46:07 +01:00
Naomi Aro
b357b80054
CC-3174 : showbuilder
...
created controller Usersettings, noticed hosts couldn't
save datatables setting through pref controller.
starting to use new cursor arrows.
2012-02-23 12:13:00 +01:00
Naomi Aro
c89451f880
CC-3340 : Remove "Search" tab from library view
2012-02-22 21:56:55 +01:00
Naomi Aro
bb49914294
CC-3174 : showbuilder
...
bug fixed in datatables - thanks Allan!
2012-02-22 21:09:24 +01:00
Naomi Aro
d4c7b832c9
CC-3174 : showbuilder
...
fixing up library table to include all interesting columns if a user would like to choose to see them.
query is done with propel.
2012-02-22 18:38:33 +01:00
Naomi Aro
2ac4940fd5
CC-3339 : showbuilder column names
2012-02-22 15:57:21 +01:00
Naomi Aro
0ba3049528
CC-3174 : showbuilder
...
removing old scheduling method code to avoid confusion.
2012-02-22 13:19:49 +01:00
Naomi Aro
2aae318a5a
CC-3174 : showbuilder
...
remembering state for the timeline datatable.
2012-02-22 12:42:24 +01:00
Naomi Aro
5703508beb
CC-3174 : showbuilder
...
col reorder resize isn't new enough to work with the new save/load callbacks.
switched to just the col reorder plugin written by Allan( datatables author)
2012-02-22 11:43:37 +01:00
Naomi Aro
5f89975c64
CC-3174 : showbuilder
...
datatables state restore needs real booleans not strings.
2012-02-22 00:02:35 +01:00
Naomi Aro
9b5a0fc565
CC-3174 : showbuilder
...
working on trying to save/load state serialized into the db for datatables.
2012-02-21 17:31:54 +01:00
Naomi Aro
378d3d3ef4
CC-3174 : showbuilder
...
group drag and drop for playlist.
2012-02-20 20:44:35 +01:00
Naomi Aro
c0f16fac3c
CC-3174 : showbuilder
...
improving playlist functionality/error checking like the showbuilder.
will send last modified ts to make sure user has a current copy of the open playlist.
2012-02-20 18:24:04 +01:00
Naomi Aro
17c3cdcfb2
CC-3174 : showbuilder
...
fix ordering problem with track column.
2012-02-20 11:41:44 +01:00
Naomi Aro
44dccf15ce
CC-3335 : Timeline - Drag and drop usability improvements
...
dragging and dropping multiple files is working.
2012-02-17 15:53:10 +01:00
Naomi Aro
ac11d8bcf6
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
2012-02-17 11:50:49 +01:00
Naomi Aro
b2d0565ec4
CC-3174 : showbuilder
...
checking to make sure UI is up to date with db
2012-02-16 19:46:14 +01:00
Naomi Aro
e1d5d6de73
CC-3174 : showbuilder
...
checking modification time before deleting items.
Throws a ScheduleOutdatedException
2012-02-16 16:29:11 +01:00
Naomi Aro
f14ebce239
CC-3174 : showbuilder
...
adding new column last_scheduled to cc_show_instance
changing column time_filled to be of type interval.
2012-02-15 18:27:59 +01:00
Daniel
190490d6f4
CC-3329: Library: Add "track number" to the list of available columns to show (was in 1.9, disappeared in 2.0)
...
- updated the view columns to include track_number from db as track
- updated sql query to include track_number from db
2012-02-15 11:21:21 -05:00
Naomi Aro
b1fbeeb448
CC-3174 : showbuilder
...
adding a showbuilder form, can filter by show,
or if you're a host user by all shows you can schedule in a range.
2012-02-15 00:39:27 +01:00
Martin Konecny
54cbc86a0a
Merge branch '2.0.x' into devel
...
Conflicts:
VERSION
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Nowplaying.php
airtime_mvc/application/models/Show.php
airtime_mvc/application/models/airtime/CcShowInstances.php
2012-02-14 14:47:07 -05:00
Naomi Aro
b7b1c401f6
CC-3174 : showbuilder
...
fixing classes on show footer, selector for the select all.
only adding a checkbox on a row if a user is allowed to schedule there.
2012-02-14 13:33:25 +01:00
Naomi Aro
4f5b5d8562
CC-3174 : Show Content Builder
...
adding time filled/empty row data.
2012-02-13 18:29:39 +01:00
Martin Konecny
238abd6f87
CC-3324: Uncaught TypeError: Cannot read property 'length' of undefined - if watched dir not defined
2012-02-13 12:24:55 -05:00
Naomi Aro
941da1fe44
CC-3174 : showbuilder
...
adding add/remove to the context menu.
airtimeline now has default set start/end times in the inputs.
2012-02-09 23:41:12 +01:00
Naomi Aro
fdd962f5ce
CC-3174 : showbuilder
...
replacing context menus on calendar screen.
2012-02-09 21:19:21 +01:00