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

1370 Commits

Author SHA1 Message Date
Duncan Sommerville af8c6c2f48 Merged 2.5.x into saas 2014-11-10 09:08:03 -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 4d263ce897 Merged 2.5.x into saas 2014-11-05 17:36:58 -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 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
Albert Santoni 359727fc66 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2014-10-29 18:01:31 -04:00
Albert Santoni ceb51100ec Merge branch 'cc-5709-airtime-analyzer' into saas 2014-10-29 17:58:56 -04:00
Albert Santoni fd39db2e24 Merge pull request #75 - Saas relder csrf delete file 2014-10-29 17:55:42 -04:00
Duncan Sommerville 275ca5eed6 Resolved differences merging 2.5.x into saas 2014-10-27 16:25: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 9fb35c448e Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas. 2014-10-10 19:57:22 +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
Robert Elder feff7f4343 tokens for multipart data upload. 2014-10-02 02:04:03 +00: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 5434311f7d More work on show image uploads 2014-09-16 18:03:14 -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 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 325310f681 CC-5818: Fix Live Chat on Airtime Pro (2.5.3) 2014-04-28 11:23:59 -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
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
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
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 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