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

1686 Commits

Author SHA1 Message Date
Albert Santoni 230cdcccb4 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	CREDITS
 2015-01-22 11:29:38 -05:00
Duncan Sommerville 6492128ce9 Hide Now Playing toolbar for Guest users 2015-01-21 15:15:22 -05:00
Albert Santoni 620029c04e Stop Chrome from flashing white between page loads 2015-01-15 16:45:14 -05:00
Albert Santoni c4d3a8fa62 Massive simplification of the GeneralPreferences dialog 
* The purpose of this was so that we can use Zend_Form_Element
  decorators, which I need.
 2015-01-13 20:51:46 -05:00
drigato f08535cc10 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
 2014-11-26 10:35:48 -05:00
Duncan Sommerville 4dab2abf4e Replaced reoccurring strings with string formatting to aid dynamic translations 2014-11-06 18:40:19 -05:00
Duncan Sommerville 3046003a1b Removed unnecessary cookie declaration for default locale 2014-11-05 17:27:41 -05:00
Duncan Sommerville 3b588dcce8 Removed unnecessary call to set locale data on the Login page 2014-11-05 17:27:08 -05:00
Duncan Sommerville 534b56351e Added styles to completely hide csrf elements on the page; changed tabs to spaces 2014-11-05 17:26:05 -05:00
Duncan Sommerville 273afaa126 Added Japanese language text files to js i18n datatables 2014-11-05 16:47:09 -05:00
Duncan Sommerville 00e85de3c8 Updated preEditShowValidationCheck to behave properly when dealing with shows with cc_show_days rows in the past, updated serialized form data in add-show to accommodate the change 2014-11-05 10:06:59 -05:00
drigato 52b0db5ccd Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-11-03 10:29:53 -05:00
Albert Santoni 8616cee9a3 Merge pull request #73 from RobertElder/2.5.x-relder-jplayer-upgrade 
Upgrade jPlayer library from 2.5.0 (7th November 2013) to 2.7.0 (1st Sep...
 2014-10-31 15:49:45 -04:00
drigato 54d1bcf81e Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-10-30 12:15:41 -04:00
Albert Santoni fd39db2e24 Merge pull request #75 - Saas relder csrf delete file 2014-10-29 17:55:42 -04:00
Duncan Sommerville d467714f84 Fixed bug where timezone wasn't adjusting correctly when adding or editing a show 2014-10-27 15:42:30 -04:00
Robert Elder e1b2c51130 Upgrade jPlayer library from 2.5.0 (7th November 2013) to 2.7.0 (1st September 2014) to resolve playback issues. 2014-10-21 20:15:05 +00:00
drigato c4692cc0d7 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/controllers/PluploadController.php
	airtime_mvc/application/views/scripts/plupload/index.phtml
 2014-10-08 11:46:08 -04:00
dpsommer 9a21b99fdf Merge pull request #70 from RobertElder/more-tokens 
More tokens
 2014-10-07 10:10:14 -04:00
dpsommer 159ab47857 Merge pull request #69 from RobertElder/tokens 
Add form tokens to several forms.
 2014-10-07 10:05:59 -04:00
Robert Elder feff7f4343 tokens for multipart data upload. 2014-10-02 02:04:03 +00:00
Robert Elder 2be4a5f9d0 Add form tokens to several forms. 2014-09-30 23:09:27 +00:00
Robert Elder f0397bbc59 PHP ini settings for cookies. 2014-09-29 18:22:10 +00:00
drigato afa9a27bb9 Japanese Plupload i18n file 2014-09-16 16:51:53 -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
Albert Santoni 08badfb421 SAAS-436: Fix widgets 2014-05-20 17:43:06 -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 4add0f0b7b CC-5786: Quota Enforcement in the File Upload API 2014-04-14 11:24:39 -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 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
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
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