Commit Graph

1938 Commits

Author SHA1 Message Date
Duncan Sommerville 3a1efa39eb Added instance description field 2014-09-19 12:55:02 -04:00
Duncan Sommerville 26d875ed66 Added confirmation prompt when deleting current logo 2014-09-19 12:54:03 -04:00
Duncan Sommerville 1d658867f7 Updated front-end validation to work in FireFox 2014-09-18 17:11:56 -04:00
Duncan Sommerville ee92f41a8d Updated look and feel and added front-end validation for image elements in add-show 2014-09-18 16:28:52 -04:00
Duncan Sommerville 096556fa74 Added show_logo_name field to data object to avoid deleting current logo when none is being uploaded 2014-09-18 10:32:56 -04:00
Duncan Sommerville b89a764442 Updated to include show image functionality 2014-09-17 19:41:17 -04:00
Duncan Sommerville f73432931c Updated js functionality for adding shows to POST show image to ShowController on success 2014-09-16 18:22:30 -04:00
Duncan Sommerville 1f52c6e093 Removed unnecessary test directory 2014-09-16 18:15:31 -04:00
Duncan Sommerville 5434311f7d More work on show image uploads 2014-09-16 18:03:14 -04:00
drigato 563fcf0342 Japanese Plupload i18n file 2014-09-16 16:54:20 -04:00
drigato afa9a27bb9 Japanese Plupload i18n file 2014-09-16 16:51:53 -04:00
Duncan Sommerville cb80423fdd Work on adding image upload to add-show form 2014-09-12 18:05:24 -04:00
drigato 9fe0830dfd Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 11:59:41 -04:00
drigato 20a5649dbe Removed unused code.
Changed linked show warning message in the edit show form.
2014-08-25 18:33:29 -04:00
drigato 10cb5484fe Removed unused function.
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
2014-08-25 18:33:15 -04:00
drigato bc63669853 Removed unused code.
Changed linked show warning message in the edit show form.
2014-08-21 17:12:54 -04:00
drigato 6249deb1ac Removed unused function.
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
2014-08-21 16:40:01 -04:00
drigato b38f3d7e03 CC-5895: Upgrade Propel to 1.7
Add vendor directory to include path
2014-07-23 16:13:55 -04:00
Albert Santoni db9d4e3327 htaccess changes to make the saas branch run locally 2014-07-07 15:13:27 -04:00
Albert Santoni 14113f7e60 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 2014-07-03 12:26:45 -04:00
Albert Santoni a5822aa07a CORS refactoring 2014-07-03 12:26:09 -04:00
Albert Santoni 2794ca1355 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
	airtime_mvc/application/models/Cache.php
2014-07-02 12:34:33 -04:00
Albert Santoni 9de92a87a4 Refactored the upgrade process for Airtime Pro 2014-07-01 13:36:09 -04:00
Albert Santoni f1610485c3 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
Conflicts:
	airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
2014-06-26 17:45:48 -04:00
Albert Santoni 18c828defd Finished up VAT validation for Plans page 2014-06-26 17:31:34 -04:00
Albert Santoni 51b7fe9adf Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 2014-06-25 20:33:10 -04:00
Albert Santoni b36967a690 Nicer auto-styling for the Billing Details form 2014-06-25 20:32:41 -04:00
Albert Santoni fce6116d60 Made the invoices view nice! 2014-06-25 20:01:14 -04:00
Albert Santoni 338fd06f81 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
Conflicts:
	airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
2014-06-25 19:03:13 -04:00
Albert Santoni d92e5197e1 Design and overhaul of Account Plans screen
* Basically working now except for VAT calculation
* Includes pricing grid, basic total calculation
* Revamped layout
* Implemented getting the service ID in BillingController.php
2014-06-25 18:58:54 -04:00
Albert Santoni 8c20592423 Start of form customization for billing 2014-06-24 15:52:43 -04:00
drigato f40cdbc8cd Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas 2014-06-23 10:59:07 -04:00
Albert Santoni 18e7707d8f Trying to fix my commit again 2014-06-20 18:10:59 -04:00
Albert Santoni faa12c8065 Super Admin edit page points to billing now
* Also prevent super admin from being deleted
2014-06-20 13:36:06 -04:00
Albert Santoni 7f6fc7770a Added Super Admin role and WHMCS login 2014-06-17 17:40:55 -04:00
Albert Santoni 51d930cd84 Make Live Chat not block the Add Media pagination buttons 2014-06-04 13:47:27 -04:00
Albert Santoni 397dfb6525 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-20 17:43:54 -04:00
Albert Santoni 08badfb421 SAAS-436: Fix widgets 2014-05-20 17:43:06 -04:00
Albert Santoni 1c33da948e Removed per-instance application.ini customizations 2014-05-02 16:14:06 -04:00
Albert Santoni 325310f681 CC-5818: Fix Live Chat on Airtime Pro (2.5.3) 2014-04-28 11:23:59 -04:00
Albert Santoni 446eca057c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
Conflicts:
	airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
	airtime_mvc/locale/template/airtime.po
	airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
2014-04-25 00:43:22 -04:00
Naomi fe20cc7f63 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
2014-04-23 15:58:39 -04:00
drigato edcf8844e3 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-14 11:25:02 -04:00
drigato 4add0f0b7b CC-5786: Quota Enforcement in the File Upload API 2014-04-14 11:24:39 -04:00
drigato 47215eb541 CC-5781: Upgrade script for new storage quota implementation
Removing scripts from public folder (was only there for testing)
2014-04-09 15:04:15 -04:00
drigato 661ab7f647 CC-5781: Upgrade script for new storage quota implementation
Copied upgrade files to public folder.
Seeing if we can execute the scripts with a URL
2014-04-09 12:32:20 -04:00
Albert Santoni afc7df8469 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-01 16:41:25 -04:00
Albert Santoni 19f231bd11 CC-5709: Airtime Analyzer
* Add Media page CSS file that I forgot to commit ages ago
2014-04-01 16:40:54 -04:00
Albert Santoni 6e6d20d3fc Merge branch '2.5.x-serbian-croatian' of https://github.com/danielhjames/Airtime into 2.5.x
Conflicts:
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
2014-04-01 10:30:00 -04:00
Albert Santoni 1c5e2d6205 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
Conflicts:
	airtime_mvc/public/index.php

* Reverted some SaaS-only thing Martin did a year ago. Looks benign but
  only one way to find out...
2014-03-27 16:38:03 -04:00
Albert Santoni 9e9e676b54 CC-5709: Airtime Analyzer
* Make the Recent Uplods file actions a bit clearer
2014-03-25 15:35:50 -04:00
Albert Santoni db2b52a1bf CC-5709: Airtime Analyzer
* Some cleanup and refactoring for file deletion in the Media REST API
* Fix the refresh timer on the Add Media page when there's pending
  imports.
2014-03-24 17:14:04 -04:00
Albert Santoni 61c2c90b7e CC-5709: Airtime Analyzer
* Remove the "hidden" field from the REST blacklist, the analyzer needs to set it.
* Added import_status column messages in the recent uploads table
* Auto-refresh the recent uploads table while imports are pending
* Moved the file moving stuff to its own analyzer in airtime_analyzer
* Basic error reporting to the REST API in airtime_analyzer, needs
  hardeneing though
* Fixed a bug with the number of recent uploads
* Prevent airtime_analyzer from running if media_monitor is running
2014-03-22 02:12:03 -04:00
Albert Santoni 8f7ecafcf6 CC-5709: Airtime Analyzer
* A bunch of changes that somehow didn't make it into my last commit...
* confused
2014-03-21 14:03:17 -04:00
Albert Santoni 878dd11ccc CC-5709: Airtime Analyzer
* Overhauled Add Media screen, now shows state of recent uploads
* Dropped old unused "state" column, added new file_import column to cc_files
* New PluploadController methods
* Save the filename as the track title for unprocessed uploads
* Hide pending files from the library until they've been processed.
* Don't overwrite files with duplicate names, we rename them instead.
2014-03-21 13:22:00 -04:00
Albert Santoni 2a783f3825 Merge branch '2.5.x' into 2.5.x-saas 2014-03-17 15:41:14 -04:00
drigato 13a664207f CC-5742: Airtime isn't handling caught exceptions properly 2014-03-17 11:19:06 -04:00
Naomi b209108604 CC-5732 : History -> Playout History: live chat banner blocks navigator buttons
avoid livechat problems
2014-03-13 12:37:56 -04:00
Albert Santoni e6cbbdff33 CC-5709: Airtime Analyzer
* Added session auth to the Media API (if you're logged in)
* Started reworking our Plupload interaction with the server to be less
  awkward.
* Basic uploading works with the Add Media page again, but messages
  aren't dispatched to airtime_analyzer yet (coming next...)
2014-03-13 11:14:30 -04:00
Naomi 7078180da0 CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats)
removing flawed functions.
2014-03-11 13:26:05 -04:00
Naomi f8935a312f CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats)
fixing listener stat search
2014-03-11 13:24:22 -04:00
Naomi cd55ed5ee4 CC-5727 : History search range using incorrect timezone offset
fixing show fetching times.
2014-03-10 18:48:40 -04:00
Naomi 8d2926aeed CC-5727 : History search range using incorrect timezone offset (also Nowplaying)
sending the timestamp string back for nowplaying as well.
added error class to history page if end is < start.
2014-03-10 18:33:07 -04:00
Naomi 5f3199b4bb CC-5727 : History search range using incorrect timezone offset 2014-03-10 17:39:17 -04:00
Daniel James eb35dcac5f Added Serbian Cyrillic, Serbian Latin and Croatian, thanks Zsolt! 2014-01-29 17:54:28 +00:00
Naomi Aro 49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas
Conflicts:
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.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
2013-12-17 17:20:38 -05:00
Albert Santoni 653f0e02a4 CC-5648: Events are shifted down in the month view
* Fixed it.
2013-12-17 15:25:43 -05:00
Naomi 424de61a11 CC-5619 : Browser caching can produce unexpected behaviour in the 'Listen Now' window.
upgrading to jPlayer 2.5.0
2013-12-16 17:14:00 -05:00
Albert Santoni 0afaeadb15 CC-5641: Can Create Zero or Negative Length Shows
* Fixed two underlying causes of zero or negative length shows
  that could be created over DST time changes:
    - Fixed incorrect end time arithmetic which did not preserve the
      show duration.
    - Fixed a desynchronization issue due to FullCalendar handling
      events over DST differently from Airtime.
2013-12-14 22:38:33 -05:00
Albert Santoni f16d8ca2ea Fixed a bunch of annoying/major graphical issues with the calendar
* Fixed a bug where the calendar would keep shrinking smaller and
  smaller as you resized the window.
* Fixed the size and alignment of the time span combobox in the corner,
  which fixes a bug where the text was cut off.
* Fixed a bug where the schedule header would grow as you flipped
  to the next or previous week.
* Dropped javascript from the resizing of the calendar (for the most
  part).
2013-12-14 00:05:13 -05:00
drigato d841f11de3 CC-5638: Shows become unlinked when moving the end time back
Disabled linked checkbox field in show form while the show is playing
Added a warning message if the user attempts to change this value
Update .po and .mo files with the warning message string
2013-12-13 13:06:14 -05:00
Naomi e6d28b250e CC-5629 : Smart Block timestamps aren't saved in UTC time 2013-12-11 17:35:31 -05:00
Naomi a1a9ec34cc CC-5594 : Remove all date_default_timezone_get()
moving var serverTimezoneOffset to bootstrap,
also creating a var for userTimezoneOffset.
Utilities.js uses the userTimezoneOffset to calculate time in forms.
2013-12-06 18:17:30 -05:00
Naomi 39063aaadb CC-5594 : Remove all date_default_timezone_get()
using the user selected timezone in the form to calculate duration.
2013-12-05 15:12:01 -05:00
drigato a465b5a770 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
Create a new cc_show_day rule instead of a new cc_show
2013-12-04 09:00:43 -05:00
Naomi ecf363ccfe CC-5430 : sorting settings not saved on library datatable
default sorting set in incorrect place, overriding saved settings.
2013-10-16 18:14:07 -04:00
Albert Santoni 0d74d744da Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x 2013-10-16 16:49:15 -04:00
denise bc30e13b44 Changed calendar js to only start fetching events after all files have been loaded 2013-10-15 12:53:43 -04:00
Naomi 73e5fa8a90 CC-5410 : Now playing icon should not lag to show up on calendar 2013-10-11 18:15:12 -04:00
Naomi c765438b95 CRLF 2013-10-11 15:13:49 -04:00
Naomi 7f5e2bdefa CC-5404 : colorpickers littering DOM 2013-10-11 15:12:58 -04:00
Naomi 22d5df866c CC-5404 : colorpickers littering DOM 2013-10-11 13:13:30 -04:00
Naomi 5defb12430 CC-5398 : "Add Show" does not update calender "orange" progress bar immediately showing content is added until refresh page or different view. 2013-10-11 11:53:53 -04:00
Naomi 916d85ca57 CRLF 2013-10-10 17:41:05 -04:00
Naomi 2ef95db747 CC-5371 : Fail to extend/shrink show by drag
window rezie event was triggered when resizing the show, caused problem.
Using the windowResize callback provided by fullcalendar now.
2013-10-10 17:38:49 -04:00
denise 533fbeb5f6 CC-5385: Shows with negative duration time are created with inverted time 2013-10-10 11:16:39 -04:00
Daniel James 036df34f06 These files should not be chmod executable 2013-10-10 10:37:42 +01:00
denise b923a45ac6 Addming minified FullCalendar-1.5.4 2013-10-09 15:45:42 -04:00
denise 0f2848be22 Delete old full calendar files not in use
Update fullcalendar from 1.5.3 to 1.5.4
Apply custom timezone changes to fullcalendar 1.5.4
2013-10-08 17:09:19 -04:00
denise 9be2ec2e99 Fixed small typo 2013-10-08 11:24:42 -04:00
denise 56db6e9386 Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x 2013-10-08 11:19:05 -04:00
denise d248f0ca14 Merge branch '2.5.x' 2013-10-08 11:13:39 -04:00
denise 11e4f5a124 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-10-08 11:13:15 -04:00
Daniel James 3fdadf5b66 SAAS-351 Only hide day checkboxes when show repeat type is 2 or 3 2013-10-08 15:55:49 +01:00
denise 55254e88a5 UI text improvements for setting the station/user timezones
Added info icon in the add-show form for timezone setting
2013-10-07 14:49:52 -04:00
Naomi 4ca2554999 CC-5362 : In Calendar Week/Day view crappy JS for now playing show makes everything a record show
fc-show-instance is now a class since agenda day/week are prerendered, thought only 1 was rendered at a time.
better handling of adding the now playing icon.
2013-10-04 11:05:35 -04:00
denise 632b11c0ab CC-5331: Now Playing keeps refreshing sometimes
- typo in GET request parameters causing overriding of data
2013-10-01 16:49:08 -04:00
denise 3d9bc85fa0 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-01 08:49:10 -04:00
Albert Santoni 52b7dbb226 Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x 2013-09-26 08:36:11 -04:00
denise a8a02704f3 Merge branch '2.5.x' into cc-5232-show-timezone 2013-09-25 17:24:44 -04:00
Albert Santoni a1f3309cf7 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-09-25 16:41:35 -04:00
Albert Santoni 99669c78a0 Fixed CC-5045 and Now Playing time remaining style improvements 2013-09-25 16:40:20 -04:00
denise 8ddb2974f1 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
denise 107263ae20 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
denise 2ab5e6b26a CC-5344: Edit Recorded Show -> Rebroadcasts get deleted
When editing a show the record option was getting posted with a false value
even if the value was true. This was caused because on show-edit action the
record form field is disabled
2013-09-25 16:17:20 -04:00
Daniel James 8dc100126a Alert icon for missing file in Now Playing should be orange, to match Media Builder 2013-09-25 17:36:50 +01:00
Naomi Aro e47b446804 CC-5338 : Uncaught SyntaxError: audio resources unavailable for AudioContext construction
creating a single global audio context to avoid resource problems.
2013-09-24 18:50:41 +02:00
Naomi Aro 7e96828cdd CC-5317 : Guest user can't see Now playing page
removed the library module completely from page if the user does not have permission to view it.
2013-09-24 12:21:04 +02:00
Naomi Aro 71001480d2 CC-5335 : I18N: Calendar picker strings are not translated.
loading the same strings as the jquery calendar.
2013-09-24 11:47:20 +02:00
Naomi Aro ee45f10aeb CC-5334 : Localize Ryerson History Feature 2013-09-23 14:42:35 +02:00
Naomi Aro 0e20e5b50b Merge branch '2.4.x' into ryerson-history 2013-09-07 16:51:22 +02:00
denise 0b66f62045 Removed old jquery syntax 2013-09-06 11:08:01 -04:00
Naomi Aro 682a37894b Merge branch 'ryerson-history' into 2.5.x-saas
Conflicts:
	airtime_mvc/application/views/scripts/menu.phtml
2013-09-02 15:52:43 -04:00
Naomi Aro 60bf334aeb Merge branch '2.4.x' into 2.4.x-saas 2013-09-02 15:46:25 -04:00
Naomi Aro 614a8174d5 put "no show" at the end of the select by default. 2013-08-31 22:56:22 -04:00
Naomi 4fd37a4fa0 Merge branch '2.4.x' into ryerson-history 2013-08-30 16:07:41 -04:00
Naomi d790dc63c2 taking the modified calendar from 2.4.1 2013-08-30 16:03:17 -04:00
Naomi 98412e59ff underscore templates updated 2013-08-30 15:25:57 -04:00
Naomi 8c66c5bb18 default no show option 2013-08-30 15:06:59 -04:00
Naomi 0c379ef840 a working show instance select. 2013-08-30 15:03:43 -04:00
Naomi Aro ab8cf60fe3 refreshing view on navigation. 2013-08-30 02:39:14 -04:00
Naomi Aro de225c589f restricting search properly for select all/none. 2013-08-30 02:31:23 -04:00
Naomi Aro ad531f9512 clearing internal selected items array. 2013-08-30 02:24:16 -04:00
Naomi Aro 846c90bc8f fixing select all/none button 2013-08-30 02:11:26 -04:00
Naomi Aro a4e9cd1add can research times in show summary now. 2013-08-30 01:51:33 -04:00
Naomi Aro 8971e6330a removing animation for smoother effect. 2013-08-30 01:39:51 -04:00
Naomi Aro 53c326b320 pagination buttons look better if they can fit on the same line. 2013-08-30 01:23:35 -04:00
Naomi Aro 7b54d3b6ce fixing colour to go back to default theme 2013-08-30 01:08:49 -04:00
Naomi Aro 2c88d1e0a0 formating the date start/end of each show in the accordian. 2013-08-30 01:06:59 -04:00
Naomi Aro 15e27f8166 history records for a show have times validated within show range. 2013-08-30 00:43:43 -04:00
Naomi Aro 5a8957273f removing choice for show instance if in shows tab. 2013-08-29 18:52:40 -04:00
Naomi d50cdd16c2 starting association of a show instance. 2013-08-29 17:40:08 -04:00
Naomi 91d4d1224e redoing accordian properly. 2013-08-29 15:52:24 -04:00
Naomi ec31fd50c9 deleteing items from the show table. 2013-08-29 15:34:34 -04:00
Naomi 5780eb5bbe show tables filtering by instance id. 2013-08-29 15:17:24 -04:00
Naomi Aro 803409f151 creating a show table beginning 2013-08-29 11:01:03 -04:00
Naomi Aro a4c97479b6 using an accordian to display per show logs. 2013-08-28 23:30:15 -04:00
Naomi 429cdeeffb filtering by a host's show so they can edit their own playout history. 2013-08-28 19:37:46 -04:00
Naomi 653a6384b9 creating a separate controller for playouthistory templates. 2013-08-28 18:25:46 -04:00
Naomi 5fbc3867f8 removing default button after pressing. 2013-08-28 15:57:29 -04:00
Naomi e6b09308a5 IM-932 : File Metadata Distinction/Template Design 2013-08-28 15:40:10 -04:00
Naomi 3769f5e5db IM-933 : datepicker switch/design 2013-08-28 14:54:44 -04:00
Naomi 05054fa823 IM-931 : Icon Overlap 2013-08-28 14:48:35 -04:00
Naomi f08a732c11 reinitialize form after error check. 2013-08-28 13:42:33 -04:00
Naomi dbe160c5d9 beginning of displaying form errors, need to keep working on this. 2013-08-23 15:52:49 -04:00
cliff.wang 12a62a3827 CC-5309:Calendar-> Recording Show: Fail to open context menu
Better error msg, also add more information in show-record.log
2013-08-23 14:23:47 -04:00
Naomi b2828d466d need delegation with delayed initialization. 2013-08-23 13:38:20 -04:00
Naomi f1b1352077 matching selected row colours to the library table. 2013-08-23 13:31:37 -04:00
Naomi 59ba938334 implementing select all/none etc 2013-08-23 13:18:17 -04:00
Naomi 63ce35b38d initializing only when viewed. fixes flash buttons, saves load time. 2013-08-23 12:28:37 -04:00
Naomi dd0115f573 proper showTimeFirst file 2013-08-23 11:53:31 -04:00
Naomi 5ec8665aec adding datetimepicker with showTimeFirst option 2013-08-23 11:48:26 -04:00
Naomi Aro fb37f371e2 changing enddate at all times now, problem with setting time otherwise. 2013-08-22 22:21:08 -04:00
Naomi Aro 3e8f49c00d only automatically set the end date if it is blank. 2013-08-22 21:46:17 -04:00
Naomi Aro af822bb5b9 showing time first for endtime box. 2013-08-22 21:39:46 -04:00
Naomi Aro 48e6ddbb04 set the end time to be the starttime on change. 2013-08-22 20:48:00 -04:00
Naomi Aro 01370c2124 reverting back to the bootstrap datetime picker since it's nicer to use. 2013-08-22 20:23:17 -04:00
Naomi ec7f4fa1ef default display length is 25. 2013-08-22 15:45:09 -04:00
Naomi 8ed3e23195 output columns are only the sortable columns (everything except checkbox pretty much)
pdf output is default landscape now.
2013-08-22 15:19:38 -04:00
Naomi f7531d5da2 remove sizing of history content div in JS. CSS to fix width and containing box problems. 2013-08-22 14:50:58 -04:00
Naomi 5c0ba2e79b clearing custom Label name after adding 2013-08-22 14:23:07 -04:00
Naomi fa6de28bcf not allowing double file metadata to be added to avoid query problems. 2013-08-22 14:15:40 -04:00
Naomi Aro 17abb4ad9a need a better random field name generator to avoid problems 2013-08-21 21:44:52 -04:00
Naomi 007a7ee7ef casting non mandatory types from "", to avoid database query problems. 2013-08-20 17:23:15 -04:00
Naomi 2e572c652c creating a random string for field names to work for all languages. 2013-08-20 15:31:13 -04:00
Naomi 6d5febe4f7 getting rid of characters from a field name that may cause problems. 2013-08-20 15:18:05 -04:00
Naomi 10ef55b083 context menu just in the client now. works for both tables. 2013-08-20 14:58:22 -04:00
Naomi Aro 3ea2b920a6 crlf 2013-08-19 23:20:26 -04:00
Naomi Aro 09693ef174 changing to context menu single edit/delete. 2013-08-19 23:19:13 -04:00
Naomi Aro 9b45b9dc72 converting to a jquery UI based datepicker. 2013-08-16 15:12:00 -04:00
Naomi 673c422015 replacing booleans in table with checkbox + column title 2013-08-14 16:38:59 -04:00
Naomi fdf18ec3ce upgrading table tools to version 2.1.5 2013-08-12 18:18:33 -04:00
Naomi d83c004fb9 subclassing the template types, files summary table is now fully configurable form wise. 2013-08-12 15:06:26 -04:00
Naomi 5676decd2d Using local copy of jquery UI 1.8.24 2013-08-09 17:11:34 -04:00
Naomi d201efbe49 crlf 2013-08-09 15:52:50 -04:00
Naomi 333ee7453e downgrading full calendar (too much to do the necessary updates at the moment) but still an upgrade from 2.4.x 2013-08-09 15:52:22 -04:00
denise 5bdc1a1e4b Update jplayer to 2.4.0 2013-08-09 13:04:33 -04:00
Naomi 27b079ace9 adding a label to the form fields (Datatables column headers) 2013-08-07 17:55:18 -04:00
Naomi aaf2e5c2f6 better casting on form checkbox, setting populate flag properly based on if id is set (for create/update) 2013-08-05 15:05:26 -04:00
Naomi c110b4b4df file summary table now starting to work with templates.need to change query around to be configurable still. 2013-08-02 15:29:39 -04:00
Naomi a5a99da21e Editing templates, strictly typing metadata for datatables (for unions) 2013-08-01 16:36:18 -04:00
Naomi 7ca28fe81d history item datatable is set up with configurable columns now.
should add a field when configuring template field for "display name"
2013-07-31 17:38:48 -04:00
Naomi 7ca3048f36 can add a new list item using the template.
set a default item template

working on sql to get a table with unified columns for file md and manually entered metadata without a file.
2013-07-30 19:24:05 -04:00
Naomi 8eecbb18c0 propel rename done for template fields, template name input. 2013-07-29 17:21:46 -04:00
Naomi 16581088d9 working on configuring an item template UI.
modified db to have fields concept for templates.
2013-07-29 16:31:01 -04:00
Naomi Aro c0206ff8f4 CRLF 2013-07-29 08:59:04 -04:00
Naomi Aro 7183396da5 needed to update jquery, fullcalendar needed updating for the new JS.
working on configuring a template.
2013-07-29 08:57:31 -04:00
Naomi 46ecdf393d dynamic form rendering for template
bootstrap datetime widget.

jquery update is needed, testing with hosted jquery first.
2013-07-26 17:33:17 -04:00
Naomi Aro c7b5592fa9 starting to populate with the template. 2013-07-26 11:36:58 -04:00
drigato b77b12c508 Merge branch '2.4.x' into 2.4.x-saas 2013-07-24 15:32:16 -04:00
Naomi ecb2f81211 creating an new row for edit/delete links in the datatable
working on creating/editing records.
2013-07-23 18:01:43 -04:00
Naomi 69afc715d1 creating templates for validation. 2013-07-22 18:11:44 -04:00
drigato f76bb5209e CC-5222: Calendar: Ends time of show is missed in Weekly view 2013-07-19 12:46:04 -04:00
Naomi Aro 29c8570ade editing in progress 2013-07-18 01:31:20 -04:00
Naomi c744d88f23 IM-784 : Create Editing Abilities For History 2013-07-08 18:00:02 -04:00
Naomi Aro f2d5fa96da Merge branch '2.4.x' into 2.4.x-saas
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
	utils/phone_home_stat.php
2013-06-26 01:25:26 -04:00
drigato 3f9e756912 CC-5245: It's able to edit contents for current ON AIR linked show 2013-06-20 12:56:05 -04:00
Martin Konecny 3391aa90c5 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-06-10 15:57:21 -04:00
Martin Konecny 93192853d5 CC-5221
Don't refresh Calendar after closing add/remove popup
2013-06-10 15:57:08 -04:00
Martin Konecny deecc9db7b CC-5220
Cancelled show still appears on Dashboard
2013-06-10 15:55:57 -04:00
Naomi fe0b0b9a65 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-06-10 15:54:32 -04:00
Naomi ee1cf64515 CC-4504 : Double scrollbars in Library view 2013-06-10 15:52:46 -04:00
Naomi 01f835c4c4 CC-4504 : Double scrollbars in Library view 2013-06-10 15:50:33 -04:00
Martin Konecny af595e0c8a CC-5217
Calendar: "NaN..." appears at date field sometimes

fixed
2013-06-10 14:52:43 -04:00
Martin Konecny b18495a79e CC-5210: "Linked" Icon is missing after adding contents into linked show
-fixed
2013-06-07 15:15:52 -04:00
denise 311e0c103d small fix 2013-06-07 14:44:21 -04:00
denise 8bc93fcba7 CC-5218: Provide show id and linked flag to calendar events
Prefixed attribute names with "data"
2013-06-07 14:36:52 -04:00
denise ede618b3ad Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-06-07 13:58:00 -04:00
denise ee41e13fe1 CC-5218: Provide show id and linked flag to calendar events 2013-06-07 13:57:48 -04:00
Martin Konecny ade1890acd CC-5210:
"Linked" Icon is missing after adding contents into linked show

-fixed
2013-06-07 13:52:13 -04:00
Martin Konecny 86f3985c03 CC-5206:
Calender: "Empty show" icon doesn't change after filling contents unless manually refresh page

fixed
2013-06-04 14:52:26 -04:00
denise afda0c140b CC-5196: L10N: Smartblock only generate 1 file even multiple files are qualified, no matter which limitation is set. 2013-05-30 15:50:35 -04:00
denise 527b1eaf1d CC-5191: I18N: "items" is not translated when expanding dynamic Smartblock in playlist 2013-05-30 15:05:57 -04:00
denise 6520211b4d Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-28 16:19:30 -04:00
denise 9545d8aacb Removed dropping and recreating cc_schedule table index before inserting into this table.
We thought it would be a significant performance booster but it isn't
2013-05-28 16:19:17 -04:00
Naomi Aro c5550d31fd Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-28 14:28:28 -04:00
Naomi Aro 4d1a15b7ca CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-28 14:27:59 -04:00
denise 8f418fb34c Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-28 14:18:38 -04:00
denise 950cc6d6b7 CC-5177: Create "?" icon beside linked show check box 2013-05-28 14:18:26 -04:00
Naomi Aro 51573d36c9 CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-28 13:30:47 -04:00
Naomi Aro 96eefee407 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-28 13:12:15 -04:00
Naomi Aro 5a2b9796ec CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-28 13:11:47 -04:00
Martin Konecny 951eeb0bbe CC-5178:
Dashboard: Error happens after creating a show

-fixed
2013-05-28 11:07:45 -04:00
Naomi 408ecc530d CC-3822 : NowPlaying-> Time filter is allowing Start_Time be greater than the End_Time 2013-05-27 14:37:16 -04:00
Naomi 4c791e573b Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-27 11:57:00 -04:00
Naomi 9ce3b0c043 small modifications to make the waveform enabled in firefox 21 (playout does not work though) 2013-05-27 11:55:57 -04:00
Naomi Aro 69f6295553 CC-5108 : Waveform Editor UI
error check for if both tracks cannot be decoded.
2013-05-24 11:27:56 -04:00
Naomi Aro f5e03db9fe CC-5108 : Waveform Editor UI
making sure the correct li is activated when a track has a decoding error.
2013-05-24 11:23:08 -04:00
drigato 46cc2d00b8 Removed CRLF 2013-05-24 10:30:37 -04:00
drigato 0e9c9e3946 Updating de_DE datatables and plupload language files. Thanks to Silvio Mende 2013-05-24 10:29:07 -04:00
Naomi 75e6f21ce0 CC-5108 : Waveform Editor UI
putting on the timescale for time reference.

fade editor now has cursor playback info.
2013-05-23 18:33:40 -04:00
Naomi c57de650e8 CC-5172 : errors from setting cues in waveform editor not handled properly
Conflicts:
	airtime_mvc/application/models/Playlist.php
2013-05-23 13:01:38 -04:00
Martin Konecny 5c11f5fc72 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
2013-05-22 18:08:14 -04:00
Naomi d51139b615 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-22 17:50:59 -04:00
Naomi 0bfcd32554 CC-5172 : errors from setting cues in waveform editor not handled properly 2013-05-22 17:50:34 -04:00
Martin Konecny 254d3b8950 Merge branch '2.4.x' into 2.4.x-saas 2013-05-22 16:09:02 -04:00
Martin Konecny 8e990e2bf9 CC-5170:
Sometimes the dashboard does not show the current playing file

-fixed
2013-05-22 16:03:24 -04:00
Daniel James 7ec664823d Fixes whitespace to the left of 'Open Media Builder' button (CC-5166) 2013-05-22 10:23:42 +01:00
Daniel James 717cda984a Fixed 'steam' typo in stream settings tooltip 2013-05-22 10:21:27 +01:00
Naomi 3ad7c868e2 Merge branch 'SAAS-317-datatables-reorder' into 2.4.x 2013-05-21 17:44:25 -04:00
Naomi b720086a4b SAAS-317 : http://ryerson.airtime.pro/ is having issues with show/hide column in their library
missing single quote problem, updating column visible plugin.
2013-05-21 17:40:52 -04:00
Martin Konecny 3b9b23a7dd Merge branch '2.3.x-saas' into 2.4.x-saas
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/airtime-playout
2013-05-21 16:40:10 -04:00
denise fb605ccb71 Renamed 'Open Playlist Editor' button to 'Open Media Builder' on Library page 2013-05-21 09:30:35 -04:00
denise 0f1a94532e CC-5157: [Beta user reported]Linked Show: Multiple warnings after multiple check/uncheck action
Fixed. Also had to prepare the warning message for localization.
2013-05-17 14:47:34 -04:00
Martin Konecny 01d16348db Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-17 13:20:40 -04:00
Martin Konecny ae41a4f9ff more persistent links (won't be invalid if title changes) 2013-05-17 13:20:28 -04:00
denise 5bf91d513d CC-5127: Library -> Scheduled and Playlist columns needs better icon
Changed icon
Renamed Playlist to Playlist / Block
2013-05-17 11:42:48 -04:00
denise 3010d014b4 Hungarian translation 2013-05-16 12:47:40 -04:00
Martin Konecny ca6442f7f0 ensure we are parsing in base 10 2013-05-15 17:18:52 -04:00
Martin Konecny 05dc0b7dbc added comments, remove deprecated code, better var names... 2013-05-15 16:44:36 -04:00