Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,696 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

4104 Commits

Author SHA1 Message Date
drigato 63e2eda64b CC-5786: Quota Enforcement in the File Upload API 
Tweaked this so it will work on self-hosted instances
 2014-04-14 12:09:15 -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 4afccfe225 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-10 15:55:49 -04:00
drigato 7fbd285dd0 Fix typo 2014-04-10 15:55:21 -04:00
drigato 51c80bc033 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-10 15:50:58 -04:00
drigato 819862c37b CC-5781: Upgrade script for new storage quota implementation 
cleaned up upgrade controller
 2014-04-10 10:55:47 -04:00
drigato b9b3e95caa CC-5781: Upgrade script for new storage quota implementation 
Returns error if API key is incorrect
Set the upgrade controller to skip login authentication
 2014-04-10 09:28:23 -04:00
drigato bae0c564d0 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-10 07:12:52 -04:00
drigato 5971f51b53 CC-5781: Upgrade script for new storage quota implementation 
First draft of an upgrade controller
 2014-04-10 07:12:31 -04:00
Albert Santoni 8fb95316f2 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
 2014-04-09 15:01:11 -04:00
Albert Santoni 4fe9fc189a CC-5709: Airtime Analyzer 
* CC-5772: Recent Upload table times should be shown in local time
 2014-04-09 14:57:30 -04:00
Albert Santoni 1e62908e66 CC-5709: Airtime Analyzer 
* Bounce files with file extensions we don't support in MediaController
* Added translation stuff for Recent Uploads
 2014-04-09 11:28:41 -04:00
Albert Santoni e4af3a5a0e CC-5709: Airtime Analyzer 
* Better SIGTERM handling for airtime_analyzer
* Nuke the .identifier files saved by Airtime
 2014-04-08 17:28:50 -04:00
Albert Santoni e044187aed Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	python_apps/airtime_analyzer/setup.py
 2014-04-04 19:48:22 -04:00
drigato cdcdf7d912 SAAS-382: Reimplement Storage Quota 
Changed status page to use new disk_usage value from cc_pref table.
 2014-04-04 13:30:46 -04:00
Albert Santoni cf492045cc CC-5709: Airtime Analyzer 
* A bunch of cleanup and fix for metadata extraction on files mutagen can't read
 2014-04-04 12:35:50 -04:00
Albert Santoni 64a95c7c59 CC-5709: Airtime Analyzer 
* Nuked another unused function
 2014-04-03 16:36:42 -04:00
Albert Santoni 95b369c54d CC-5709: Airtime Analyzer 
* Remove awful StoredFile::uploadFile() function
* Massive airtime_analyzer commenting and cleanup
* Cleaned up the upload code
* Temporarily disabled the liquidsoap playability test.
 2014-04-03 16:13:26 -04:00
Albert Santoni 0398072d45 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-03 11:35:37 -04:00
drigato 2ca911616f Setting hidden flag to true on post request 2014-04-03 10:12:20 -04:00
Albert Santoni e3757d892b CC-5709: Airtime Analyzer 
* Fix hack for Airtime Pro
 2014-04-02 17:27:10 -04:00
Albert Santoni aabb8ec01f Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-02 16:48:04 -04:00
drigato 3c5b7b5853 CC-5733: RESTful API data sanitization and validation 
small fix - was setting the hidden flag twice
 2014-04-02 11:33:47 -04:00
drigato 5ddbb4ddd1 CC-5733: RESTful API data sanitization and validation 
Validate field types on post/put requests using the EditAudioMD form
 2014-04-02 11:22:56 -04:00
Albert Santoni a6e80e2789 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-01 12:29:20 -04:00
Albert Santoni 7ea2eef233 CC-5709: Airtime Analyzer 
* Use system-wide config for Airtime PHP->airtime_analzyer RabbitMQ
  communication on Airtime Pro
 2014-04-01 12:07:29 -04:00
drigato 70228a675e Changed default import_status value on cc_files table to 1 (pending) 2014-04-01 11:28:33 -04:00
drigato 9eda78f8f9 CC-5733: RESTful API data sanitization and validation 
Added more fields to the black list
Using the "Edit Metadata" form for field validation on put requests
 2014-03-31 17:57:32 -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 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 6952902b22 CC-5709: Airtime Analyzer 
* Unbreak stuff
 2014-03-24 16:05:53 -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 e5e4d5bb01 SAAS-417: quick fix for typo 2014-03-21 16:27:32 -04:00
Albert Santoni efca227388 SAAS-417: Disable Live Chat for Starter Plans 
* Disable Live Chat for Starter Plans
 2014-03-21 14:30:41 -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 f120caa093 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-03-21 13:26:47 -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
drigato 7800cb1e15 SAAS-382: Reimplement Storage Quota 
Storing disk usage in cc_pref
Add/subtract filesize to/from disk usage total when a file is uploaded or deleted
TODO: Hook this into the ftp server
 2014-03-21 09:50:03 -04:00
drigato 2b696dbee5 CC-5741: Create a download action for the File API 2014-03-18 13:04:06 -04:00
Albert Santoni 2a783f3825 Merge branch '2.5.x' into 2.5.x-saas 2014-03-17 15:41:14 -04:00
Albert Santoni 16c56e6aff CC-5709: Airtime Analyzer 
* Fixed error in media API authentication
* Improved documentation
 2014-03-17 14:43:50 -04:00
drigato 86a34635bb CC-5701: Airtime File API 
Fixed saving filepath and directory
 2014-03-17 10:56:49 -04:00
Albert Santoni f7cb923ceb CC-5709: Airtime Analyzer 
* Fixed breakage
 2014-03-17 10:25:26 -04:00
Albert Santoni e1f69b26af Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2014-03-17 10:22:54 -04:00
Albert Santoni 50a42f12bb CC-5709: Airtime Analyzer 
* File import via the Add Media page now works!
* Reworked StoredFile::copyFileToStor() because it's still needed.
* Reworked the way file paths are reported in airtime_analyzer
  and in the RESTful media API
 2014-03-17 10:19:39 -04:00
drigato 65ab49baee CC-5733: RESTful API data sanitization and validation 
Renamed sanitize function to sanitizeResponse
 2014-03-14 17:53:03 -04:00
drigato 820f7f257a CC-5733: RESTful API data sanitization and validation 
Stripped out fields that are readonly to the RESTful API from the request data for POST and PUT.
Stripped out fields that should never be visible outside of Airtime in response data.
Set uploaded and modified timestamp on POST request.
Set modified timestamp on PUT request.
 2014-03-14 17:34:56 -04:00
drigato 6a68967f81 CC-5734: RESTful API media ownership 2014-03-13 17:00:15 -04:00
Albert Santoni 9b390518b7 CC-5709: Airtime Analyzer 
* Fix the callback URL
* Imports files successfully now!
 2014-03-13 14:59:48 -04:00
Albert Santoni 451b19150b CC-5709: Airtime Analyzer 
* Notify airtime_analyzer of new uploads with RabbitMQ
* Use a durable exchange for airtime-uploads
 2014-03-13 13:35:48 -04:00
Albert Santoni f4ea417b83 CC-5709: Airtime Analyzer 
* Renamed a function in MediaController for clarity
* Updated airtime_analyzer README
 2014-03-13 12:12:12 -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 97989953c8 CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats) 
need to modify these to user timezone strings to match the new changes.
 2014-03-12 18:00:01 -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 c668d91e08 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-03-10 18:33:15 -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
drigato 725b5da154 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-03-10 17:42:12 -04:00
drigato 14c670aa20 CC-5728: Problem when removing repeat option and changing start date 2014-03-10 17:41:57 -04:00
Naomi 1854d76f03 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-03-10 17:39:36 -04:00
Naomi 5f3199b4bb CC-5727 : History search range using incorrect timezone offset 2014-03-10 17:39:17 -04:00
drigato 8ad866c2a2 Fixed changing the start date on a non-repeating show 2014-03-10 17:32:54 -04:00
Albert Santoni 6d7117f670 CC-5709: Airtime Analyzer 
* Added MetadataAnalyzer unit tests and test data
* Improved debug logging and squashed pika logging
* Implemented file moving
* Extract the track number/total
* Fixed mapping of mutagen to Airtime fields in a few spots. The mapping
  matches the DB column names now.
* Fixed the bin/airtime_analyzer binary
* Started work on PluploadController to make it work with the new File
  API
 2014-03-10 16:32:23 -04:00
drigato 6b91d2daf8 CC-5725: Changing a show's repeat type removes first instance from repeating series 2014-03-07 14:52:32 -05:00
Albert Santoni c0818682af CC-5709: Airtime Analyzer 
* Fixed the /rest/media endpoint
 2014-03-06 17:38:57 -05:00
Albert Santoni 4e39fce701 CC-5709: Airtime Analyzer 
* Basic HTTP reporting back to the File API works (PUT)
* Use the database table names as JSON field names.
* Fixed result returning bug in message_listener.py
* Fixed API key verification to adhere with the HTTP Basic Auth spec
 2014-03-06 16:55:20 -05:00
drigato 35fd639c1c CC-5725: Changing a show's repeat type removes first instance from repeating series 2014-03-06 11:18:13 -05:00
drigato 51b5cc2052 CC-5725: Changing a show's repeat type removes first instance from repeating series 2014-03-06 10:54:40 -05:00
drigato bcda9ea5e6 Broke unit test for adding content to single show 2014-03-05 14:50:35 -05:00
drigato 426b75b635 CC-5724: Changing start date of a repeating show will update content incorrectly 2014-03-05 14:37:07 -05:00
drigato ebc68b980c CC-5718: Show content can get scheduled in instances that are in the past 
Disabled scheduled content into instances that have already played out
Removed setting the show's start date to the first repeating instance's start date
because we already fixed that in CC-5697
 2014-03-05 13:12:27 -05:00
drigato 7660e0cd84 CC-5719: Incorrect show content start time 
The show content was getting recalculated twice sometimes.
So if the difference between the original and now show start
date-time and was 2 hours, the scheduled content would have
a difference of 4 hours
 2014-03-04 11:29:49 -05:00
drigato b433a529ab CC-5696: Two shows or even three shows playing at once. Unstopable even after reboot 2014-03-03 16:42:52 -05:00
drigato b6dd2e3152 CC-5701: Airtime File API 2014-03-03 16:04:34 -05:00
drigato f33f49259d CC-5701: Airtime File API 
Fixed http response code for delete
 2014-03-03 11:28:18 -05:00
drigato aba2fb44d1 CC-5701: Airtime File API 
-put and delete actions working
 2014-03-03 11:21:25 -05:00
drigato 64c1dd2c1e CC-5701: Airtime File API 
Beginnings of fil rest api
index, get, post actions working without authentication
 2014-02-27 17:11:17 -05:00
drigato 753003639f CC-5696: Two shows or even three shows playing at once. Unstopable even after reboot 
The problem was that we weren't updating the first show's start time if deleting
a repeat show day changes it. This affected the difference between the original
show start time and the new one.
 2014-02-25 17:22:17 -05:00
drigato f1658f6490 CC-5697: Editing a linked show's repeat day sets wrong day for show content 
Fixed a problem where we can't store the original cc_show_day data
because none can exist at some points. If the user changes the only
repeat day, the cc_show_day rule is deleted first then recreated
 2014-02-25 17:16:14 -05:00
drigato 3db1cd412a CC-5697: Editing a linked show's repeat day sets wrong day for show content 
Optimized how we store the instance ids that already exist
 2014-02-25 16:51:48 -05:00
drigato cd592827fd CC-5698: Library -> Scheduled column doesn't get updated when bulk adding items 
Array storing file ids of scheduled files was in wrong place
and was getting re-created everytime a file was inserted into a show
 2014-02-24 17:46:16 -05:00
drigato 6cd84363a6 CC-5697: Editing a linked show's repeat day sets wrong day for show content 
Added comment
 2014-02-24 16:04:48 -05:00
drigato 787f19f69a CC-5697: Editing a linked show's repeat day sets wrong day for show content 
When a user edits a show and changes the repeat day, we are really deleting the instances from the original
repeat day and creating new instances. Therefore, we don't need to update the show content's start/end time
in this case.
 2014-02-24 14:49:11 -05:00
Albert Santoni 86dafaf61c SAAS-404: Separate the Airtime API version from the Airtime version 
* Airtime PHP side can be version bumped without pypo freaking out now
 2014-02-14 16:22:15 -05:00
drigato acb3b9b179 Merge branch '2.5.x' into 2.5.x-saas 2014-02-11 10:29:50 -05:00
drigato 3b9608a8df CC-5693: API call to notify-item-start-playing fails because an invalid schedule id is sent 
Temporary fix for this bug. Throw an exception if no schedule item is found.
 2014-02-10 16:19:26 -05:00
drigato 09040dc021 Merge branch '2.5.x' into 2.5.x-saas 2014-02-03 12:33:57 -05:00
drigato 63ec20d9f1 CC-5681: I18N: Fail to switch language 
Check if Zend_Auth class exists with the autoloader
 2014-02-03 12:33:35 -05:00
drigato b7c79df6ec Merge branch 'unittests' into 2.5.x 2014-01-31 15:02:41 -05:00
Albert Santoni c7c2d37b30 Merge branch '2.5.x' into 2.5.x-saas 2014-01-31 13:21:33 -05:00
drigato 883e8885c7 CC-5677: Library -> Scheduled column gets updated on incorrect file 2014-01-30 12:38:18 -05:00
drigato ce7eddf563 CC-5678: Scheduler: Show's contents won't follow show's scheduled time change 
Fixed by storing original cc_show_day object by value
 2014-01-30 12:07:24 -05:00
Albert Santoni d68227939f Merge branch '2.5.x-saas' of github.com:sourcefabric/Airtime into 2.5.x-saas 2014-01-29 17:20:53 -05:00
Albert Santoni 03015a6b69 Nerf the APC cache on SaaS 
* We have multiple webservers on SaaS so we need a distributed data
  cache like memcached.
* Fixes CC-5671: Live streaming: UI won't update connection status unless reload apache2
 2014-01-29 17:19:24 -05:00
drigato 719d582e0f Merge branch '2.5.x' into 2.5.x-saas 2014-01-29 12:13:24 -05:00
drigato 7a04f7d98e CC-5672: Webstream warnings on SaaS 
Don't parse/use header info if get_headers returns false
 2014-01-29 12:09:05 -05:00
Albert Santoni a0cae1d8f3 Merge branch '2.5.x' into 2.5.x-saas 2014-01-27 15:23:01 -05:00
Albert Santoni c9d98e4e10 Small Airtime Pro fix for ShowFormService 2014-01-27 14:31:33 -05:00
Albert Santoni ed78625fce Merge branch '2.5.x' into 2.5.x-saas 2014-01-27 12:01:11 -05:00
Albert Santoni 52c3971fc6 Fixed a bug in Application_Model_SetShowsPopulatedUntil 2014-01-22 17:58:25 -05:00
drigato d5112f0368 Added comments for a show_service function 2014-01-20 17:05:37 -05:00
drigato 0b4ae6b94d CC-5651: Unit Test the Scheduler 
Added test for deleting repeating show instances
 2014-01-14 14:16:37 -05:00
Albert Santoni fe9beec778 CC-5651: Unit Test the Scheduler 
* Added runtests.sh script for unit tests
* Use the airtime_test database config in Config.php, propel
* First unit test passes! :-)
 2014-01-13 11:43:17 -05:00
drigato 0f107dbad3 Initial unit test configuration 2014-01-13 11:43:16 -05:00
drigato 9e5cfe0d39 CC-5666: Deleting a show instance can revert the 'no end' option 2014-01-13 11:41:44 -05:00
drigato a648f7fa2d CC-5665: Timeout can occur when scheduling large playlists into linked shows 
Added a temporary fix by extending the php time limit
 2014-01-09 11:57:32 -05:00
drigato 2cdad4932a CC-5660: Unable to create shows with a rebroadcast 
Used wrong formating for minutes
 2014-01-06 14:04:18 -05:00
drigato 11284d0d41 CC-5660: Unable to create shows with a rebroadcast 
Two variables that are needed for the rebroadcast validation were deleted
before the 2.5.1 release. Just had to add them back in.
 2014-01-06 13:51:06 -05: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
drigato dc05d9ddaf CC-5649: Remove unused function, Application_Model_Show::populateAllShowsInRange 2013-12-17 17:09:59 -05:00
Naomi 8daca16fac Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-16 17:14:55 -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
drigato 27c3637591 CC-5640: End time does not get updated when editing the current playing show 
Was checking if the start time was in the past, but we should check if the
end time is in the past. This way you can extend or shrink shows that are currently playing.
 2013-12-16 15:27:51 -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
Albert Santoni 15370702a4 Use the user timezone, not the station timezone in the Add Show form (by 
default)

* Fixes really annoying problem where you click on the calendar, and it
  adds your show in the wrong spot.
 2013-12-13 18:27:36 -05:00
Albert Santoni 6a468ff549 Fix a rendering problem if a zero length show happens 2013-12-13 18:27:14 -05:00
Albert Santoni 346036a9ca Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 
Conflicts:
	airtime_mvc/application/models/Show.php
 2013-12-13 16:12:26 -05:00
Albert Santoni fa0a190277 Prevent division by zero if show lengths end up being zero 2013-12-13 16:10:36 -05:00
Naomi 99902bc10c CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-13 15:16:51 -05:00
Naomi 445f1ebe4f CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 
removing old crappy method.
 2013-12-13 15:14:38 -05:00
Naomi 7a51b8d2ad CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-13 15:06:52 -05:00
Naomi a45235d39b CC-5627 : Check all Application_Common_DateHelper calculations that use timezone 2013-12-13 15:03:02 -05:00
drigato 1dfcfd3e34 CC-5639: Repeating show's instances will vanish when editing single instance with overlapping warning 
The wrong action was getting set when there were errors in the show form
 2013-12-13 14:20:43 -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
drigato e8a8aeaf00 CC-5636: Php 5.5: Cannot update repeating show's name if that instance is updated 
Made all show fields readonly when editing a repeating instance
 2013-12-13 12:13:58 -05:00
Naomi bbccc2e7d3 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-12 17:18:17 -05:00
Naomi 87ac5dc294 CC-5627 : Check all Application_Common_DateHelper calculations that use timezone 2013-12-12 17:18:03 -05:00
drigato d0474f4247 Changed function title when editing a repeating instance 
Removed a function call we don't need when editing a repeating instance
 2013-12-12 16:47:55 -05:00
Albert Santoni 1577b7c41e CC-5627: Check all Application_Common_DateHelper calculations that use 
timezone.

* Use the user timezone in eventFeedAction(), will fix a bug where
  shows at the edge of a week can disappear from the calendar if
  the user timezone is not the same as the station timezone.
 2013-12-12 16:39:20 -05:00
Albert Santoni 27f0fa27e9 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-12 13:32:25 -05:00
Albert Santoni a96c2551ef CC-5627 : Check all Application_Common_DateHelper calculations that use 
timezone.

* Fixed GetPlayOrderRange to be consistently return everything in UTC.
* ApiController liveInfoAction now returns everything consistently in
  the station timezone. This fixes negative remaining time that could
  occur in the embeddable JS Airtime widgets if you were logged in to
  Airtime while you viewed your website. (The widgets display in
  the browser's local time.)
* ScheduleController getCurrentPlaylistAction() returns everything
  consistently in the user timezone now.
 2013-12-12 13:28:51 -05:00
drigato f37b9a3796 CC-5634: Can add/remove content to a linked show while one instance is currently playing 
small logic fix
 2013-12-12 13:23:20 -05:00
drigato fb793ff3e1 CC-5634: Can add/remove content to a linked show while one instance is currently playing 
Fixed by removing option from context menu
 2013-12-12 13:01:33 -05:00
drigato 974be86691 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-12 11:48:11 -05:00
drigato 9bbc3cf713 CC-5633: Can schedule overlapping shows 
The overlapping show check was returning false too early
 2013-12-12 11:48:00 -05:00
Albert Santoni f2fe04ba1d Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-12 11:33:28 -05:00
Albert Santoni 8986f1bc4f CC-5627 : Check all Application_Common_DateHelper calculations that use 
timezone.

* Changed getRangeStartAndEnd() to use UTC explictly
 2013-12-12 11:32:40 -05:00
Naomi 37ea29380b Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 18:56:29 -05:00
Naomi 67031a75fe CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-11 18:56:19 -05:00
Albert Santoni abf3a50694 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 18:22:08 -05:00
Albert Santoni a9bd34fbcb CC-5627: Check all Application_Common_DateHelper calculations that use 
timezone.

* Eliminate more strtotime usage, could fix on air light weirdness in
  some circumstances.
 2013-12-11 18:20:40 -05:00
Naomi e6c971387b Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 17:35:47 -05:00
Naomi e6d28b250e CC-5629 : Smart Block timestamps aren't saved in UTC time 2013-12-11 17:35:31 -05:00
drigato 3a50f7a6dc Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 16:55:47 -05:00
drigato cfb6195523 CC-5632: System preferences don't get saved 2013-12-11 16:55:35 -05:00
Albert Santoni d575a478b5 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 15:56:03 -05:00
Albert Santoni 4d77d14d33 CC-5627: Check all Application_Common_DateHelper calculations that use 
timezone.

* Removed strtotime usage from AddShowRepeats.php
 2013-12-11 15:54:13 -05:00
Naomi c5f30c2b54 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 15:20:40 -05:00
Naomi b13d12eaac CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-11 15:20:19 -05:00
drigato 8aa838bb34 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 14:45:28 -05:00
drigato 9237692782 CC-5630: Shows created on a DST border get scheduled an extra hour longer 
The show start and end time need to be in the show's local timezone when adding
or subtracting time to the start and end time (in case of DST crossings). In this
case the end time was already converted to UTC when we tried to change the time.
 2013-12-11 14:45:16 -05:00
Naomi 3d1f0b0d0e CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-10 17:41:59 -05:00
Naomi 3a2f9a24b5 CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 
working on getting widgets to work properly returning station local time.
 2013-12-10 16:45:05 -05:00
Albert Santoni 0919915c6b Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-09 16:27:06 -05:00
drigato 310cfddd3a CC-5626: Context menu -> Edit -> Doesn't populate show forms properly 2013-12-09 14:53:58 -05:00
Naomi 0f28e0f1aa Merge branch '2.5.x' into cc-5594-date_default 2013-12-06 18:18:17 -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
Albert Santoni d056ee8c2e Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-06 17:14:35 -05:00
Albert Santoni 2c7db0e83c CC-5555: Fix user preferences logic in preferences cache 
* Fixes stream settings not dislaying
 2013-12-06 17:11:07 -05:00
drigato cdfdbc4da2 Removed unused code 2013-12-06 16:51:13 -05:00
Naomi 7e9ca3e950 CC-5594 : Remove all date_default_timezone_get() 
updating move show code to work with the user's timezone.
unified method signature for updateScheduleStartTime to always use the $diff param.
 2013-12-06 12:33:36 -05:00
Naomi 061897a58b CC-5594 : Remove all date_default_timezone_get() 
never rely on this method.
 2013-12-05 16:00:52 -05:00
Naomi ec6a991090 CC-5594 : Remove all date_default_timezone_get() 
missed a place to set show timezone,
setting UTC timezone in CcSchedule, very important!!
 2013-12-05 15:57:00 -05:00
Naomi b1842fff34 Merge branch '2.5.x' into cc-5594-date_default 2013-12-05 15:13:54 -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
Naomi c732b44903 CC-5594 : Remove all date_default_timezone_get() 
must allow 24 hours, but nothing greater to match old usage.
 2013-12-05 13:11:36 -05:00
Naomi eb4cefa3ff CC-5594 : Remove all date_default_timezone_get() 
DateTime here was relying on a timezone that wasn't what the user selects in the timezone drop down on the form.
 2013-12-05 13:04:02 -05:00
Naomi ed74470803 CC-5594 : Remove all date_default_timezone_get() 
updating dashbaord information for timezone.
 2013-12-04 17:54:28 -05:00
Naomi 8f1e73edf5 CC-5594 : Remove all date_default_timezone_get() 
fixing up controllers
 2013-12-04 16:26:11 -05:00
Naomi 20b32bab80 CC-5594 : Remove all date_default_timezone_get() 
simplifying code, removing unnecessary calculations.
 2013-12-04 16:05:18 -05:00
Naomi e508d141ed CC-5594 : Remove all date_default_timezone_get() 
resizing must calculate from displayed calendar settings.
 2013-12-04 15:48:32 -05:00
Naomi e71f306c7d CC-5594 : Remove all date_default_timezone_get() 
setting display time using user timezone.
last played was never converted properly for display previously.
 2013-12-04 15:24:27 -05:00
Naomi 10d8351f93 CC-5594 : Remove all date_default_timezone_get() 
setting display timezone to be user's timezone for library utime and mtime.
 2013-12-04 15:16:07 -05:00
Naomi aafeeb6aed CC-5594 : Remove all date_default_timezone_get() 
replacing timezone with the user timezone pref.
 2013-12-04 15:11:40 -05:00
Naomi c8cfdadb90 CC-5594 : Remove all date_default_timezone_get() 
removing unused old methods, changing listener stats to use the user timezone for display.
 2013-12-04 15:06:07 -05:00
drigato 86ed77a106 CC-5599: Can drag and drop an edited repeating instance on calendar 
Fixed by properly checking if a show is repeating or not
 2013-12-04 15:02:14 -05:00
drigato ab435ce3ec CC-5598: Deleting an edited, repeated instance deletes the entire show 
Fixed by setting the correct url action
 2013-12-04 14:50:22 -05:00
Naomi 82b40f52e7 Merge branch '2.5.x' into cc-5594-date_default 2013-12-04 14:42:30 -05:00
Naomi 447ad4e3c6 CC-5594 : Remove all date_default_timezone_get() 
correcting show contents timezone.
 2013-12-04 14:39:56 -05:00
Naomi e6808b0c12 CC-5594 : Remove all date_default_timezone_get() 
removing now unused old methods
 2013-12-04 14:31:23 -05:00
drigato 49ed0cf0f1 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 
Removed redundant function call to update last_scheduled column on a cc_show_instance
 2013-12-04 14:28:16 -05:00
drigato 7f8f084c98 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 
Refactored cc_show_day->getLocalEndDateAndTime() function
 2013-12-04 14:17:19 -05:00
Naomi c9773d2a0e CC-5594 : Remove all date_default_timezone_get() 2013-12-04 14:13:19 -05:00
drigato 463d286ac5 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 
Refactored cc_show->isRepeating() function
 2013-12-04 14:00:31 -05:00
drigato b78fa994f7 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 
Removed redundant timestamp var
Removed redundant DateTime object creation
 2013-12-04 12:20:16 -05:00
drigato 22595c1098 CC-5596: Can Recreate an Instance in a Location that has been modified 
Fixed by updating the modified instance's start/end time and leaving as a placeholder
for future show updates
 2013-12-04 11:36:38 -05:00
drigato 6c71b17024 CC-5595: Improper day of week comparison 
Need to convert show instance start time to the show's local timezone before getting
the repeat day of week
 2013-12-04 10:05:32 -05:00
drigato 02453c52ee Copy/paste error 
Was setting cc_show_days twice
 2013-12-04 09:00:43 -05:00
drigato a164416c84 Fixed minor bugs 2013-12-04 09:00:43 -05:00
drigato ef8af1b724 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 
- Fixed resizing repeating shows to not include edited instances
- Fixed context menu on repeating shows with edited instances
- Fixed populated the show form when editing a single instance
 2013-12-04 09:00:43 -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
drigato 4253608948 Small fix to overlapping show check 2013-12-03 15:14:53 -05:00
drigato c18d53f403 CC-5593: Overlapping Show Bug 
Get instance depending on whether instance id is provided or not
 2013-12-03 15:07:40 -05:00
drigato d49131db48 CC-5593: Overlapping Show Bug 
Need to check if the show instance has been deleted
 2013-12-03 14:39:53 -05:00
drigato eae93008b4 CC-5589: SQL error when adding/moving a scheduled item 
Error was occuring when a moved item didn't exist in a linked show instance
Error was also occuring when trying to insert item into a schedule localtion
that does not exist in a linked instance.

Fixed by skipping the move action if the file does not exist in a linked instance,
cleaning up the position numbers after deleting schedule items, and by
setting the insert time to the show start time in a linked instance is empty
 2013-12-02 16:40:15 -05:00
drigato f571000657 Fixed updating single show instance problem where it wasn't fetching 
the current instance
 2013-11-26 12:32:05 -05:00
drigato 6ea0cb5918 CC-5571: Overlapping show check in wrong sometimes 
The incorrect number of days we're getting added to create repeat instances
because we were checking the start week day in UTC instead of local time
 2013-11-22 10:51:16 -05:00
drigato 89feb3d0fb Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-11-22 09:39:37 -05:00
drigato 52f0d5a13b CC-5570: Tracks get scheduled ahead of their show start time 2013-11-22 09:39:19 -05:00
Naomi 757e35aaf9 CC-5555 : Implement simple caching for preferences 
comment out logging to not flood logs.
 2013-11-11 17:22:55 -05:00
Naomi b8a084998e CC-5555 : Implement simple caching for preferences 
cache key creation change.
 2013-11-11 17:08:15 -05:00
Naomi 0bae60138f CC-5555 : Implement simple caching for preferences 
forgot to get rid of user id here.
 2013-11-11 16:50:35 -05:00
Naomi f615e176e2 CC-5555 : Implement simple caching for preferences 
better to include the key in the error message
 2013-11-11 16:36:21 -05:00
Naomi f69dd123ca CC-5555 : Implement simple caching for preferences 
making sure locale/timezone is returned properly in generic calls.
 2013-11-11 16:32:43 -05:00
Naomi 06323a40fd CC-5555 : Implement simple caching for preferences 
fixing up code so user id is never passed in manually to a preference getter.
 2013-11-11 16:20:51 -05:00
Naomi f45708682f CC-5555 : Implement simple caching for preferences 
using apc to save/fetch preferences to/from a cache.
 2013-11-11 15:07:13 -05:00
Albert Santoni 050d984882 CC-5487 : Calendar won't load under certain situation with linked shows 2013-10-30 18:09:57 -04:00
drigato c9549c6a1d Delete unused code 2013-10-28 10:34:18 -04:00
Naomi 24663d9851 Merge branch '24hourfileimport' into 2.5.x 2013-10-16 17:29:22 -04:00
Naomi 02dbde82ec CC-5429 : importing file > 24 hours doesn't work 2013-10-16 17:27:40 -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
Naomi fa5c1018bf CRLF 2013-10-16 16:01:30 -04:00
Naomi 60cbd15381 CC-5428 : Ordering by length not working 2013-10-16 15:56:32 -04:00
Naomi 109b313d37 CC-5424 : Same webstream playing will switch off ON AIR light 2013-10-16 12:26:39 -04:00
denise 787ecdc3fa CC-5384: Drag & drop show sets wrong time 
Was not setting new start time on cc_show_day object
 2013-10-15 16:01:42 -04:00
denise b62fde46e7 CC-5407: Scheduling problem with global crossfade 
Sometimes we set a flag to not apply the global crossfade value when inserting tracks.
This flag needs to get reset when more than one track is getting inserted or when
inserting an item into a linked show
 2013-10-15 15:20:58 -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 f2a794168d CRLF 2013-10-11 16:31:34 -04:00
Naomi 470f0b2a7f CC-5408 : Can't add content to now playing show on calendar page 
can schedule the now playing show from the calendar page.
 2013-10-11 16:30:49 -04:00
denise 9fa2f010b4 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-11 13:22:12 -04:00
denise 4abdbfae1f CC-5401: Stream settings -> Can't save show source info 
Typo in sprintf formatting
 2013-10-11 13:22:02 -04:00
Naomi 4c331aa955 CRLF 2013-10-11 11:08:49 -04:00
Naomi 61bab553ff CC-5396 : Playout History: Restart airtime-liquidsoap will cause redundant items in history log 2013-10-11 11:07:59 -04:00
Naomi 66a82bb39c Merge branch 'calendar-resize-problem' into 2.5.x 2013-10-10 17:39:42 -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
Naomi 0c4dcda508 CC-5394 : File Summary Fix 
need to check if length is set.
 2013-10-10 16:01:53 -04:00
denise c85833239c CC-5379: adding a file after a gap in now playing - starts too early 
Fixed the start time in cc_schedule
Track still starts playing later than cue in (CC-5019)
 2013-10-10 12:11:23 -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 febadd08b9 Updated comment to explain newer repeat types 2013-10-10 10:43:45 +01:00
denise 3261bd6307 Small formatting change 2013-10-09 17:38:06 -04:00
denise 05e4195165 CC-5390: Cannot drag & drop record show that has a rebroadcast 
Was using wrong method to query for the rebroadcast show's
original recorded show
 2013-10-09 17:24:16 -04:00
denise 4daa34d14b CC-5364: Problem with drag & drop recording show on calendar 2013-10-09 17:11:39 -04:00
denise aadbf0b200 CC-5384: Drag & drop show sets wrong time 
Start time was getting stored in UTC in cc_show_days when it
should be stored in the show's local timezone
 2013-10-09 16:55:56 -04:00
denise 256ec9292d CC-5388: Calendar won't load 2013-10-09 16:20:43 -04:00
denise 807833e3f3 CC-5361: Create show from repeating instance could have wrong time 2013-10-08 17:38:03 -04:00
denise 38634810a3 Update .po files 2013-10-08 11:48:24 -04:00
denise c687b6ad24 Merge branch 'master' of https://github.com/jamieconnor/Airtime 
Conflicts:
	airtime_mvc/application/services/ShowService.php
 2013-10-08 11:16:25 -04:00
denise 7c2e92f6e5 CC-5293: Calendar page cannot be loaded sometimes 2013-10-07 17:16:52 -04:00
denise ff28daf28e CC-5378: Subseconds are gone from cc_schedule calulations 
Formatting error
 2013-10-07 16:58:57 -04:00
denise 8a25d9cd2e CC-5376: Sometimes schedule times don't get updated 2013-10-07 15:53:33 -04: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
denise ac8f1d73f3 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-07 14:16:36 -04:00
denise ff46883c1b CC-5360: Updating a Show over a timezone change period has problems 
Need to apply the old timezone to show start time when attempting to
fetch current instance
 2013-10-07 14:16:20 -04:00
Albert Santoni 7b1cd5c908 CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
denise 60b4eb5c8a Removed unnecessary formating when comparing DateTime objects 2013-10-04 09:49:23 -04:00
drigato 37a0c271f6 CC-5359: Update show fails sometimes with overlapping check 
Some DateTime objects were not getting created in correct timezone
Used format() to get the day of week value instead of getTimestamp()
getTimestamp() sometimes returns the wrong value
 2013-10-03 18:02:15 -04:00
Naomi c707967567 CRLF 2013-10-02 11:25:40 -04:00
Naomi faa6c7210c Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-02 11:25:08 -04:00
Naomi 4d01e3b11f CC-5347 : isScheduled doesn't work for webstreams 2013-10-02 11:24:48 -04:00
denise 1e59ab836d CC-5277: Selecting weekly repeat without selecting days fails silently 
- added a check in the 'when' form since the validation there relies on the repeat form being valid
- added validation for this in the 'repeat' form
 2013-10-01 14:19:02 -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
Naomi 1fa13eed13 CRLF 2013-09-30 13:59:08 -04:00
Naomi 0dd5458269 Merge branch '2.5.x' into CC-5293-calendar-pref 2013-09-30 13:57:23 -04:00
Naomi 7d739a0f66 CC-5316 : Playout History: Doesn't support webstream 
adding the webstream metadata to the history table.
 2013-09-30 13:56:27 -04:00
Albert Santoni 11ae76beb8 Fix SAAS-349 by preventing password changes in demo mode. 
* Added a NotDemoValidate validator class to ensure no changes to a field in demo mode.
* Prevent the user from changing the password of any user in demo mode.
* Fixes SAAS-349.
 2013-09-26 16:23:22 -04:00
Albert Santoni 28a032388b Start of bugfixing for SAAS-349. 
* Also identity verification for erry on Freenode.
 2013-09-26 15:18:41 -04:00
denise a8a02704f3 Merge branch '2.5.x' into cc-5232-show-timezone 2013-09-25 17:24:44 -04:00
denise 34e2344100 CC-5323: User's Timezone Can Improperly Edit Show 
Sometimes show form would populate the start/end time with wrong timezone
 2013-09-25 17:18:23 -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
denise 3e5a6b2a3d CC-5323: User's Timezone Can Improperly Edit Show 
Edit show from was displaying rebroadcast dates in user's timezone
instead of in the show's timezone
 2013-09-25 16:40:55 -04:00
Albert Santoni 99669c78a0 Fixed CC-5045 and Now Playing time remaining style improvements 2013-09-25 16:40:20 -04:00
denise e8dc1c5729 CC-5323: User's Timezone Can Improperly Edit Show 
- fixed to use show's timezone instead of user's timezone when updating a show's
  start and end time after a show has been edited
 2013-09-25 16:22:30 -04:00
denise 2114383519 CC-5323: User's Timezone Can Improperly Edit Show 
-overlapping show check was using the user's local timezone to compare new
 shows instead of the show's timezone
 2013-09-25 16:22:30 -04:00
denise af03502592 CC-5323: User's Timezone Can Improperly Edit Show 
-added comments to timezone getters and setters in Prefences model
 to reduce confusion on station timezone and user timezone
 2013-09-25 16:22:30 -04:00
denise 6aa6d576cd CC-5323: User's Timezone Can Improperly Edit Show 
-made localizeDate a static function in ShowFormService
 2013-09-25 16:22:30 -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
Naomi Aro 24861545ce crlf fix 2013-09-24 12:24:13 +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 53341d40f7 CC-5334 : Localize Ryerson History Feature 2013-09-24 09:56:04 +02:00
Daniel James 577bbf14b6 Remove swear words from source code 2013-09-23 16:16:51 +01:00
Naomi Aro 9de8b6634c CC-5334 : Localize Ryerson History Feature 
crlf
 2013-09-23 14:58:56 +02:00
Naomi Aro 9ec6156c92 CC-5334 : Localize Ryerson History Feature 2013-09-23 14:57:44 +02:00
Naomi Aro ee45f10aeb CC-5334 : Localize Ryerson History Feature 2013-09-23 14:42:35 +02:00
Naomi Aro ae1c41e4ce CC-5333 : Rebroadcast Shows are not created 2013-09-23 12:20:10 +02:00
Naomi Aro 4c6d96e062 CC-5333 : Rebroadcast Shows are not created 2013-09-20 16:35:46 +02:00
Jamie Connor 1c6d7725ca Modified weekInfo from ApiController to display current week and next, changed widget to display extra days. 2013-09-18 17:35:32 +12:00
Naomi Aro 0d089b787d Merge branch '2.4.x' into ryerson-history 2013-09-07 16:41:57 +02:00
Jamie Connor f7f2cdc51c Follow up changes relating to adding in new show repeat options 2013-09-07 14:54:03 +12:00
Jamie Connor 6da9b6bf42 Removed repeated code 2013-09-07 14:52:45 +12:00
Naomi Aro 5a85fce89d CC-5321 : Changing Timezone after Creating shows creates Problems 2013-09-06 12:35:31 +02:00
Naomi Aro 0734a4a98c CC-5320 : UTC not included in Timezone List 2013-09-05 11:54:25 +02:00
Jamie Connor 03f383f764 added more options for show repeats 2013-09-03 12:25:22 +12: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 4a4ef2767e CC-5318 : Playout History: The last song of the show will display wrong end time. 2013-09-01 17:59:47 -04:00
Naomi Aro 619dbf7bbf format/json to prevent zend errors. 2013-09-01 13:38:18 -04:00
Naomi Aro 9c0bee3877 adding show instance to the create form if it's already set. 2013-08-31 23:34:37 -04:00
Naomi 075342c637 don't delete a history item if a show instance is removed from the database. 2013-08-30 16:43:05 -04:00
Naomi 4fd37a4fa0 Merge branch '2.4.x' into ryerson-history 2013-08-30 16:07:41 -04:00
Naomi 0c379ef840 a working show instance select. 2013-08-30 15:03:43 -04:00
Naomi Aro 0e017374b7 change default text to "No Show" 2013-08-30 01:30:23 -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 Aro 0f0958ee6b changing the query to only filter by instance id not starts/ends if instance id is set. 2013-08-29 18:32:42 -04:00
Naomi d50cdd16c2 starting association of a show instance. 2013-08-29 17:40:08 -04:00
Naomi f97069bd0b displaying show list in proper time zone. 2013-08-29 15:58:24 -04:00
Naomi 8208f8596b ordering by show start time 2013-08-29 15:37:33 -04:00
Naomi 5780eb5bbe show tables filtering by instance id. 2013-08-29 15:17:24 -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 5aa983be36 adding an instance id to the playout history table. 2013-08-28 17:15:36 -04:00
Naomi e6b09308a5 IM-932 : File Metadata Distinction/Template Design 2013-08-28 15:40:10 -04:00
Naomi 969889859b improper naming of propel tables in php caused cc_mount_name to not get any generated files, double declaration of some variables for cc_timestamp. 2013-08-28 13:07:55 -04:00
Naomi Aro 6d5531f341 CC-5310 : Playlist -> Crash happens on draging a song after a webstream into a playlist 2013-08-27 19:30:17 -04:00
Jamie Connor b1e71e5adf added optional parameter number_of_days for getting schedule information 2013-08-26 11:26:09 +12:00
Naomi c2b9bb01ac crlf 2013-08-23 15:53:18 -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 Aro af822bb5b9 showing time first for endtime box. 2013-08-22 21:39:46 -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 fa6de28bcf not allowing double file metadata to be added to avoid query problems. 2013-08-22 14:15:40 -04:00
Naomi 84efdfd64a crlf 2013-08-20 17:23:48 -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 Aro 7230b3ef58 removing tabletools from schedule page. 2013-08-16 12:57:04 -04:00
denise 50d5685199 CC-5270: looping on InvalidContentType 2013-08-14 17:43:14 -04:00
Naomi 7cf654551d crlf 2013-08-14 16:39:50 -04:00
Naomi 673c422015 replacing booleans in table with checkbox + column title 2013-08-14 16:38:59 -04:00
denise 5f588afdd5 CC-5293: Calendar page cannot be loaded sometimes 2013-08-14 13:07:06 -04:00
drigato c48f556b7d CC-5303: Interface freezes sometimes when using smart blocks 2013-08-13 16:41:32 -04:00
drigato 033693721e CC-5302: Undefined variable in zend log 2013-08-13 16:36:04 -04:00
Naomi c3c64e6fb1 crlf 2013-08-12 18:18:58 -04:00
Naomi fdf18ec3ce upgrading table tools to version 2.1.5 2013-08-12 18:18:33 -04:00
Naomi b65007868a crlf fix 2013-08-12 15:08:09 -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 557b7b641c downgrading UI to a version that still supports our custom CSS (not enough time to upgrade further) 2013-08-09 16:02:07 -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 31c604d09c can update an existing history item entry. Form is pre-populated. 2013-08-02 18:16:23 -04:00
Naomi 590837a357 crlf 2013-08-02 16:16:04 -04:00
Naomi e047c2f71d can configure the file summary template as well now. 2013-08-02 16:15:32 -04:00
Naomi 774027c9bd crlf 2013-08-02 15:30:35 -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 b480a5ae18 crlf 2013-08-02 11:19:46 -04:00
Naomi 6e43094d10 pagination working properly (but not with filtering, have removed serach for now anyways.) 2013-08-02 11:18:15 -04:00
denise 8ba95b3587 CC-5262: PHP error happens when creating shows 
SAAS only because there is no recording show form
 2013-08-02 11:03:14 -04:00
Naomi 35f552361e more informative names 2013-08-01 17:50:10 -04:00
Naomi af38d3cb02 CRLF 2013-08-01 17:10:04 -04:00
Naomi 2341b7b68c can order data in the item table 2013-08-01 17:09:42 -04:00
Naomi 557b3f9c9b CRLF 2013-08-01 16:37:10 -04:00
Naomi a5a99da21e Editing templates, strictly typing metadata for datatables (for unions) 2013-08-01 16:36:18 -04:00
denise 06f5f2f5a7 CC-5283: Calendar gets messy, possibly after upgrade 2013-08-01 15:38:34 -04:00
Naomi b33f33964a crlf 2013-07-31 17:39:45 -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 0c9c0c16e8 working on sql for custom templates 2013-07-30 20:04:10 -04:00
Naomi 07819d895d fix added to avoid a blank row in aggregate view 2013-07-30 19:32:31 -04:00
Naomi a170ee7308 crlf 2013-07-30 19:25:06 -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 06e21029d0 saving a template to the DB. 2013-07-29 17:35:07 -04:00
Naomi a2d4af5449 CRLF 2013-07-29 17:22:44 -04:00
Naomi 8eecbb18c0 propel rename done for template fields, template name input. 2013-07-29 17:21:46 -04:00
Naomi db4e025c05 CRLF fix 2013-07-29 16:32:05 -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
denise 59721ccb51 Merge branch '2.4.x' into 2.4.x-saas 2013-07-29 16:01:06 -04:00
denise 7d70a5ed28 Deleting show code improvement. 2013-07-29 15:13:47 -04:00
denise ff557ec75f CC-5283: Calendar gets messy, possibly after upgrade 2013-07-29 15:10:24 -04:00
denise 1046a0916d CC-5289: Exception about linked show in zendphp.log 2013-07-29 14:13:56 -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
drigato 4cbbd1145b CC-5285: API Request: Get ON AIR light status 2013-07-24 15:30:49 -04:00
drigato d9859ff006 CC-5285: API Request: Get ON AIR light status 2013-07-24 15:17:10 -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
denise c2f2a541c7 CC-5285: API Request: Get ON AIR light status 2013-07-23 17:39:38 -04:00
Naomi 69afc715d1 creating templates for validation. 2013-07-22 18:11:44 -04:00
Naomi Aro 19ba788bae CLRF 2013-07-22 10:47:11 -04:00
Naomi Aro 634eb40a0c creating an entry. 2013-07-22 10:45:39 -04:00
Naomi Aro ec44b81f6a clrf 2013-07-18 01:37:39 -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 1abbe85d6d IM-733 Create Development timetable for Airtime Development 
IM-777
Database structure for new History Feature

dos2unix fix
 2013-07-03 16:02:17 -04:00
Naomi e63518f2da IM-733 Create Development timetable for Airtime Development 
IM-777
Database structure for new History Feature

moving original functionality into the service.
 2013-07-03 16:00:48 -04:00
Naomi 9f7e85b273 IM-733 Create Development timetable for Airtime Development 
IM-777
Database structure for new History Feature
 2013-07-03 15:20:40 -04:00
Naomi 328c1f3cac IM-733 Create Development timetable for Airtime Development 
IM-777
Database structure for new History Feature
 2013-07-03 15:19:05 -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
Naomi Aro e0d2de642d CC-5254 : Listener Status for SHOUTcast doesn't work 
clrf
 2013-06-24 17:26:20 -04:00
Naomi Aro c5221aae6a CC-5254 : Listener Status for SHOUTcast doesn't work 2013-06-24 17:24:43 -04:00
Naomi Aro 3858371b16 CC-5251 : clrf 2013-06-24 11:15:09 -04:00
Naomi Aro a680421281 CC-5251 : Playlist length is not shown in Library 2013-06-24 11:09:03 -04:00
Naomi Aro bec56e5f4b CC-5247 : Single file audition pop-up has non-functional forward and reverse buttons 2013-06-24 10:19:10 -04:00
drigato c2e9f90eb9 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-06-20 15:22:00 -04:00
drigato f82cb364c1 CC-5246: Calendar: ON AIR show has an incorrect context menu 2013-06-20 15:21:33 -04:00
Naomi Aro 6b0ab535e5 CC-5244 : Exception when creating Smartblock 2013-06-20 14:03:13 -04:00
drigato 28d73264da CC-5240: Overnight Linked Shows, newly generated not getting content 2013-06-19 01:17:32 -04:00
denise b95a0d7c4a CC-5241: deleting a linked show, show comes back in the schedule 2013-06-18 16:56:16 -04:00
Martin Konecny 2a0c9769aa Merge branch '2.4.x' 
Conflicts:
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	python_apps/pypo/liquidsoap_scripts/fdkaac.liq
	python_apps/pypo/schedule/pypofetch.py
	python_apps/pypo/schedule/telnetliquidsoap.py
 2013-06-14 16:45:52 -04:00
Naomi 440163f199 CC-5225 : Library: Fail to open Metadata Editor 2013-06-12 13:05:58 -04:00
denise 3b353b47b1 CC-5216: Library length does not consider cue points 2013-06-07 14:19:46 -04:00
denise 3f1c47b764 CC-5215: Linked shows sometimes lose crossfades 2013-06-07 13:47:12 -04:00