7a6184cf23
Merge branch 'saas' into saas-dev
2015-05-28 15:29:28 -04:00
187ef926ff
Allow public APIs to be accessed with the API key regardless of the public API setting.
2015-05-28 15:28:51 -04:00
8f8b0b7f4d
Merge branch 'saas-dev' into saas-landing-page
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/views/scripts/embed/player.phtml
2015-05-28 13:25:18 -04:00
450300ddd8
Small TuneIn validation fix
...
Was not setting error message when station id is invalid
2015-05-28 12:00:20 -04:00
018bb3a648
SAAS-823: Tunein preference check box issue
2015-05-28 11:54:23 -04:00
182b12e0e3
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Fix for incorrect previous/next metadata when tracks are shuffled around
in current playing show.
2015-05-28 09:47:58 -04:00
b50aa15587
Retun 200 from ProvisioningHelper when a database exists to accommodate recreating terminated stations
2015-05-27 15:16:13 -04:00
51a3f19f43
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-05-27 14:02:00 -04:00
1fa45bfc48
SAAS-777 - Changed deleteAllFilesAction to remove files and any current/future schedule items
2015-05-27 14:01:49 -04:00
27868fbfe5
SAAS-813: Wire up schedule widget on Radio Page
2015-05-27 13:50:25 -04:00
a569387c5a
Removed extra white space
2015-05-27 10:19:15 -04:00
a74a161936
SAAS-812: Remove live chat from radio page
2015-05-27 10:18:50 -04:00
2d577dbcb0
Small fix to embed player metadata
2015-05-27 10:09:13 -04:00
793e959cae
SAAS-811: Insert extra radio page buttons onto player bar
2015-05-27 10:08:51 -04:00
532bd1ea85
SAAS-772: Send metadata to Tunein
...
Made Improvement so Airtime always makes a request to TuneIn every 4
minutes so TuneIn does not turn metadata off
2015-05-25 15:37:45 -04:00
6fad0a3ee6
Merge branch 'saas-dev' into saas-installer-albert
2015-05-22 19:09:30 -04:00
6ca0e340a4
Merge branch '2.5.x-installer' into saas-installer-albert
...
Conflicts:
python_apps/pypo/pypo/pypofile.py
2015-05-22 18:26:16 -04:00
027adc7749
Three bugfixes
...
* Removed Support Settings nav link
* SAAS-801: pypo log configuration files are overkill and must be removed
* CC-6043: CTRL-C doesn't work in pypo / airtime-playout
2015-05-22 18:20:45 -04:00
11c6818e61
Merge branch '2.5.x-installer' into saas-installer-albert
...
Conflicts:
.gitignore
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/conf.php
airtime_mvc/application/controllers/SystemstatusController.php
airtime_mvc/application/controllers/UpgradeController.php
airtime_mvc/application/upgrade/Upgrades.php
airtime_mvc/application/views/scripts/systemstatus/index.phtml
airtime_mvc/build/airtime.conf
airtime_mvc/build/sql/defaultdata.sql
airtime_mvc/public/index.php
airtime_mvc/tests/application/helpers/AirtimeInstall.php
install_minimal/airtime-install
install_minimal/include/airtime-constants.php
install_minimal/include/airtime-copy-files.sh
install_minimal/include/airtime-db-install.php
install_minimal/include/airtime-initialize.sh
install_minimal/include/airtime-install.php
install_minimal/include/airtime-installed-check.php
install_minimal/include/airtime-remove-files.sh
install_minimal/include/airtime-upgrade.php
python_apps/media-monitor/install/media-monitor-copy-files.py
python_apps/monit/monit-airtime-generic.cfg
python_apps/pypo/airtime-playout
python_apps/pypo/install/pypo-copy-files.py
python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
python_apps/pypo/liquidsoap/ls_script.liq
python_apps/pypo/pypo/__main__.py
python_apps/pypo/pypo/media/update/replaygain.py
python_apps/pypo/pypo/media/update/replaygainupdater.py
python_apps/pypo/pypo/media/update/silananalyzer.py
python_apps/python-virtualenv/airtime_virtual_env.pybundle
python_apps/python-virtualenv/requirements
utils/airtime-check-system.php
2015-05-22 16:05:29 -04:00
c67549d9c6
Merge branch 'saas-temp-testing' into saas-dev
2015-05-22 10:54:04 -04:00
c85457ec0b
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Fix for undefined variable
2015-05-22 10:53:29 -04:00
94b949adaa
SAAS-772: Send metadata to Tunein
...
Removed unused code
2015-05-22 10:35:36 -04:00
099537a1b7
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Renamed function
Removed old function
2015-05-22 09:47:55 -04:00
8b02002f5e
Merge branch 'saas-dev' into saas-temp-testing
2015-05-22 08:56:43 -04:00
c9a6260cc0
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Removed commented code
2015-05-22 08:53:29 -04:00
5330859f00
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
small fix
2015-05-22 08:51:32 -04:00
b80c102e99
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Fixes for webstreams
2015-05-22 08:09:59 -04:00
e86e1cb4ac
Merge branch 'saas-dev' into saas-speedy
2015-05-21 15:10:01 -04:00
2b8e40a12c
Merge branch 'saas' into saas-speedy
2015-05-21 15:09:57 -04:00
3052e1f23b
Changed Preferences and Stream Settings pages to use new-style csrf token generation
2015-05-21 10:17:05 -04:00
537fd2f148
SAAS-794 Schedule/get-current-playlist can take too long to respond
...
Replaced GetPrevCurrentNext function with new one that is much simpler
and less taxing on the database and web server.
2015-05-20 16:10:31 -04:00
506b9cb248
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-05-20 07:06:22 -04:00
e5a8f14a9a
Commented out request to tunein when station is offline
2015-05-20 07:05:26 -04:00
b8dd7f0df3
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-05-19 16:21:16 -04:00
ae3fef383e
Removed station_domain from messages to airtime_analyzer, unused.
2015-05-19 16:20:51 -04:00
a8bf8e5ec9
SAAS-786: Implement Landing Page Design
...
Fixed player iframe to bottom of screen
2015-05-19 16:03:59 -04:00
5b6a88f7fd
Fix bad merge that added soundcloud settings back into preferences page
2015-05-19 15:51:04 -04:00
a2a9e54553
Merge branch 'saas-dev' into saas-tunein
...
Conflicts:
airtime_mvc/application/views/scripts/form/preferences.phtml
2015-05-19 15:50:16 -04:00
2da4e264e5
SAAS-772: Send metadata to Tunein
...
Update metadata when station goes offline
2015-05-19 15:42:07 -04:00
c3457ae03f
tunein testing
2015-05-19 15:19:09 -04:00
4451c49c06
SAAS-772: Send metadata to Tunein
...
This is pretty much working except with master source metadata
2015-05-19 14:39:05 -04:00
1c88d6dccd
Merge branch 'saas' into saas-dev
2015-05-19 12:18:54 -04:00
20649f73bd
Added missing translation for disk quota error message
2015-05-19 12:18:01 -04:00
e91b520b42
SAAS-786: Implement Landing Page Design
...
- Separated embed player css from radio page css because I had to change
the responsive design a bit.
- Trying to embed the iframe on the radio page but there are some
conflicting styles
2015-05-15 16:19:18 -04:00
479dbc5525
SAAS-786: Implement Landing Page Design
...
Implemented logo, station name and description
2015-05-15 09:01:20 -04:00
b023f191e3
SAAS-772: Send metadata to Tunein
...
Added form validation by making a test request to the TuneIn API with
the user-entered values
2015-05-14 13:13:33 -04:00
70735e7bae
Retun 200 from ProvisioningHelper when a database exists to accommodate recreating terminated stations
2015-05-14 10:51:53 -04:00
612aa37738
Merge branch 'saas' into saas-dev
2015-05-13 19:32:53 -04:00
bff04820f2
Add quiet flag to StoredFile delete to avoid unnecessary sentry errors when clearing library
2015-05-13 17:58:11 -04:00
9d822b6e8b
Only use API authentication (not session) when validating termination requests
2015-05-13 17:58:02 -04:00
cf24c141fd
SAAS-772: Send metadata to Tunein
...
This is pretty much working for scheduled metadata - just to need to
test with a TuneIn account.
2015-05-13 16:05:37 -04:00
15bebc6267
Dangerous options subform on Preferences page and Delete all tracks button
2015-05-13 15:56:08 -04:00
10ca987a51
SAAS-762: Implement schedule widget design
2015-05-12 11:56:35 -04:00
24ebc8c8e4
Merge branch 'saas' into saas-landing-page
2015-05-11 15:54:02 -04:00
77241bb6fc
Merge branch '2.5.x' into saas
2015-05-11 14:57:58 -04:00
2953576921
CC-5997: Tracks get scheduled outside of the show start and end time
2015-05-11 14:57:20 -04:00
aee5615cd3
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-05-11 14:34:40 -04:00
689a431867
Deprecated RabbitMQ::SendMessageToHaproxyConfigDaemon()
2015-05-11 14:34:21 -04:00
21886a509d
Merge branch '2.5.x' into saas
2015-05-11 12:18:09 -04:00
56e5e959ec
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2015-05-11 12:16:55 -04:00
28997344fc
CC-5997: Tracks get scheduled outside of the show start and end time
2015-05-11 12:16:32 -04:00
3d99c423a9
Merge branch '2.5.x' into saas
2015-05-11 11:08:52 -04:00
efad7be91a
CC-5120: Can't add PLS webstreams
2015-05-11 11:08:43 -04:00
4941ae1a6d
Separated weekly schedule widget css into separate file
2015-05-07 14:27:59 -04:00
9ad0628efa
SAAS-732: Clean up weekly program widget
2015-05-05 15:07:12 -04:00
8b380086c3
Merge branch 'saas-dev' into saas-speedy
2015-05-04 13:09:51 -04:00
f375115825
Merge branch 'saas' into saas-landing-page
2015-05-04 09:40:26 -04:00
fc36ff5797
Updated user manual constant to new manual url
2015-04-30 14:51:35 -04:00
272bb11fcf
Fixed player displaying nothing (instead of Offline) when no show is scheduled
2015-04-30 14:36:33 -04:00
e78bd82c8c
SAAS-749, SAAS-753 - Fix for odd linked and repeating show behaviour
2015-04-30 14:14:56 -04:00
59b90360a1
SAAS-755 - Updated User Manual link
2015-04-30 11:52:23 -04:00
0418cdbc04
Nerf a player console.log call
2015-04-29 17:26:51 -04:00
85cc373328
Embedded player: Display the show name during master/show source
2015-04-29 16:03:36 -04:00
e73a6df796
Fix for invalid date format issue in Firefox
2015-04-29 15:23:29 -04:00
1215eb1895
Prevent NaN from causing problems with player timeout
2015-04-29 12:58:32 -04:00
c72cdbc19d
More preventative coding for the player and fixed the live-info-v2 API
2015-04-29 12:17:44 -04:00
c0bd28f6d5
Prevent negative timeouts in player
2015-04-29 11:59:17 -04:00
9019377d0e
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-04-29 11:48:15 -04:00
b3a19ae49e
Bugfix for embedded player sending too many requests on load, quieter logging for boto
2015-04-29 11:46:44 -04:00
4e37788d92
Fix for SAAS-747
2015-04-28 11:42:18 -04:00
94fc2131ff
SAAS-738 - Changed disk quota exceeded link to point to billing/upgrade
2015-04-27 16:19:15 -04:00
574fdf4b27
Merged 2.5.x into saas
2015-04-27 14:01:28 -04:00
4b307d6b47
Fix for vertical scrollbar issue
2015-04-27 13:52:55 -04:00
9b7acb24c6
SAAS-728: Make schedule widgets embeddable
2015-04-22 12:46:41 -04:00
7d1b112db9
Stopped redirecting to /login if no valid session
2015-04-21 11:26:48 -04:00
de8edf982a
SAAS-723: Add compatibility chart to player page
2015-04-20 10:52:49 -04:00
9cee7bcc86
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-04-20 10:05:55 -04:00
926d1704bf
SAAS-723: Add compatibility chart to player page
2015-04-20 09:59:17 -04:00
074ad31228
Squash warnings in ProvisioningController
2015-04-17 12:40:52 -04:00
1964cbb75e
Merge branch 'saas' into saas-suspend
2015-04-17 12:18:56 -04:00
bd7c0be514
Whoops, invert the suspension logic
2015-04-17 12:18:49 -04:00
3ca16db524
Comments
2015-04-17 12:09:05 -04:00
6dc8837aff
Removed unused status page stuff for Pro and cleanup for code review
2015-04-17 11:17:35 -04:00
02dff34328
Fixed last day of month calendar view bug
2015-04-16 16:45:20 -04:00
acbaac0bc5
Fixed month view not displaying a full 42 days
2015-04-16 16:30:12 -04:00
d20c8e8df4
Merge branch 'saas' into saas-speedy
2015-04-16 15:59:08 -04:00
56716e9af6
Fixed preferences not saving in some cases
2015-04-16 15:11:46 -04:00
dc20b5c252
Bugfixes for my optimizations
...
* Fixed saving not working in the user settings page
* Fixed first day of week not loading correctly in week view
* Fixed timezone handling in functions off of EventPreloadAction
* Fixed show instance "percent filled" not being embedded in our JSON
response correctly if you started on the month view.
2015-04-16 14:58:28 -04:00
b61df4d681
Merge branch '2.5.x' into saas
2015-04-16 12:11:49 -04:00
aa0d0f959a
Remove unnecessary LOCK TABLE that can cause deadlocks in rare circumstances
2015-04-16 12:10:56 -04:00
8449194ca1
Merge branch 'saas' into saas-speedy
2015-04-15 16:44:43 -04:00
f0bcc1e42b
Merge branch '2.5.x' into saas
2015-04-15 16:44:26 -04:00
4267c4e86d
CC-6024: Cannot drag and drop tracks between shows in the Now Playing screen
2015-04-15 16:44:04 -04:00
7c7bacfcaf
Remove console.log
2015-04-15 14:20:31 -04:00
d5dfa9af81
player testing console.log
2015-04-15 13:53:24 -04:00
838f7e84bf
Merge branch 'saas-player-testing' into saas
2015-04-15 13:22:32 -04:00
880cca4733
SAAS-715: Indicate errors on the player
...
Fix error handling in flash mode
2015-04-15 13:21:54 -04:00
d5a29398c6
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-04-15 10:50:57 -04:00
1c2a307d34
Fixed a repeating show bug
...
If the first instance has already started or ended we were getting the
wrong next instance because the result set was not ordered
2015-04-15 10:50:16 -04:00
3b33f55652
Fixed a repeating show bug
...
If the first instance has already started or ended we were getting the
wrong next instance because the result set was not ordered
2015-04-15 10:48:31 -04:00
3695049a6c
Added Admin_Only decorator and greyed out read-only text-areas
2015-04-14 14:35:37 -04:00
66a236a842
Better error handling for player in flash mode
2015-04-14 10:51:52 -04:00
83c21d4381
SAAS-715: Indicate errors on the player
...
logging for flash testing
2015-04-13 14:29:39 -04:00
24b6751eeb
Remove unused code from player
2015-04-13 09:18:36 -04:00
1194a0f959
Some big performance optimizations to Now Playing JavaScript.
...
* Big decrease in page load time
* Big decrease in load time during schedule operations (drag and drop)
2015-04-10 22:53:39 -04:00
b11e98ea24
Reduced the Now Playing screen AJAX on load from 9 to 2.
2015-04-10 19:52:06 -04:00
988fcae989
Remove console.log
2015-04-10 18:17:22 -04:00
63c3236e7a
Player metadata fix
2015-04-10 17:38:39 -04:00
088ada1d2c
Reformatted Bootstrap, added Station Suspended notice
2015-04-10 17:14:56 -04:00
b8e8a1a983
Player HTML5 error handling fix
2015-04-10 16:44:51 -04:00
1d79f13716
Player HTML5 error handling fix
2015-04-10 16:06:19 -04:00
c80d437601
Fixed player HTML5 error handling
2015-04-10 15:25:49 -04:00
095ca86b34
Open session for writing when we need it (fixes login/logout)
2015-04-10 15:03:25 -04:00
4d7d48d6fb
Player - fix height
2015-04-10 10:55:39 -04:00
9e62c71690
Fix player's manual mode
2015-04-10 10:52:40 -04:00
fbcd5bc5bd
Merge branch 'saas' into saas-embed-player
2015-04-09 15:09:03 -04:00
f238faa937
SAAS-712: UI Improvements
2015-04-09 14:22:50 -04:00
1734cc35c8
Refactored session_write_close() optimization and dashboard preloading
...
hack
2015-04-09 13:03:06 -04:00
84231f811a
SAAS-720: Player can't be accessed unless a user has a valid session
2015-04-09 12:25:27 -04:00
3e255bfd37
Merge branch 'saas' into saas-speedy
2015-04-09 12:20:23 -04:00
4429117f6a
SAAS-712: UI Improvements
2015-04-09 09:43:15 -04:00
78b2631980
Remove stream url js escaping and do it on server side instead
2015-04-08 15:19:22 -04:00
94a7643ebc
Escape stream urls in the player js
2015-04-08 15:00:02 -04:00
23bf866211
SAAS-712: UI Improvements
2015-04-08 14:01:57 -04:00
f6d5b34cca
Embed player - code review fixes
2015-04-07 17:49:21 -04:00
481d21ff70
SAAS-662: Make player auto-connect if there is a problem with the stream
...
HTML5 error handling
2015-04-07 11:34:21 -04:00
faee0fba98
SAAS-673: Warn if public api is not enabled under Preferences
2015-04-02 16:54:57 -04:00
e8c8fde8bd
Fix airtime.pro link on player
2015-04-02 15:27:01 -04:00
369a59c564
Changed mobile option text on streams page
2015-04-02 15:13:34 -04:00
fdd8cdfaea
Fixed Airtime badge spacing
2015-04-02 14:35:13 -04:00
3e2cd54be7
Fixed double sending of headers problem with S3 cache
2015-04-01 17:29:21 -04:00
9b85fc59a6
Another attempt at squashing header() warning
2015-04-01 16:29:59 -04:00
69b03cdefa
Three small bugfixes
...
* Remove files from the database even if they couldn't be removed from disk. (log a warning)
* Return a better error message if the user attempts to delete a scheduled file
* Attempt to squash headers already sent warning during buffer flushing
in FileIO.php
2015-04-01 16:16:46 -04:00
7fd58ac51b
Merge branch 'saas-s3proxy' into saas
2015-04-01 13:49:47 -04:00
353bfe86a5
Addded default for mobile stream setting
2015-04-01 13:05:08 -04:00
eaeed9be77
SAAS-669: Long station names overlap with link to airtime.pro
2015-04-01 12:50:49 -04:00
c1038cd92f
SAAS-706: Remove volume bar from player
2015-04-01 11:25:58 -04:00
57cd2eda13
bad merge
2015-03-31 18:21:25 -04:00
220f21ab22
Merge branch 'saas' into saas-embed-player
...
Conflicts:
airtime_mvc/application/configs/ACL.php
2015-03-31 17:44:14 -04:00
15a8e3fa1f
Moved html5 error listener to MusesPlayer constructor
2015-03-31 17:20:42 -04:00
778df97d3c
SAAS-662: Make player auto-connect if there is a problem with the stream
...
Kind of working in HTML5 mode
2015-03-31 16:51:14 -04:00
79d2ae12fb
Added 2.5.12 upgrader and increased show/show instance description field
...
length
2015-03-31 12:38:42 -04:00
d31de0937f
Refactored file storage code slightly to allow multiple download URLs
2015-03-30 11:31:07 -04:00
d0f7f820a7
SAAS-675: Implement "auto" mode
2015-03-27 16:34:04 -04:00
271dc266fa
S3 proxy cache support + 1 minor analyzer bugfix
2015-03-26 12:08:52 -04:00
775635cdc7
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-03-25 17:36:05 -04:00
669d980565
Fixed conf.php
2015-03-25 17:35:43 -04:00
b1c00932c6
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-03-25 17:34:59 -04:00
58624ec100
Try to silence another permissions error problem
2015-03-25 17:34:38 -04:00
040eb1443d
CSS fixes to make page header more responsive
2015-03-25 17:29:28 -04:00
47f7ad2e98
Fix to upgrade path
2015-03-25 12:03:01 -04:00
3d2b189dba
removed logging statement
2015-03-25 11:47:23 -04:00
17358a761f
SAAS-663: Integrate player design
2015-03-25 11:44:28 -04:00
99d16444d2
Squash unlink warning in CcFiles.php
2015-03-25 10:51:51 -04:00
48b4eaacd6
Squashed ob_end_flush(): failed to delete and flush buffer warning
2015-03-24 17:02:04 -04:00
25d6ecac0e
Disabled broken maintenance screen code to squash warnings on upgrade
2015-03-24 16:54:57 -04:00
d1b28fd564
Fixed a bug in FTP upload hook, other minor improvements
...
* Ensure we have write permissions on any newly uploaded files by FTP
* Don't silence warnings in moveFileToStor()
* Reduced the FTP upload max retry count
* Log E_NOTICE and E_WARNING levels to Sentry
2015-03-24 14:56:03 -04:00
bc2acaea51
Don't fire conversion tracking for the sourcefabric_admin user
2015-03-24 11:18:03 -04:00
084c6dd662
PHP compatibility fix
2015-03-24 10:34:48 -04:00
3d03f837d2
Trial->Paid conversion tracking with GTM
...
* Added trial to paid conversion tracking with GTM
* Removed WHMCS roundtrip from Showbuilder
* Moved all Analytics code into common/GoogleAnalytics.php
* Added a new Thank You page after plan changes to capture conversions
* Added a ConversionTracking plugin to facilitate that
* Also backported some minor staticBaseDir compatibility changes
* Fixed a logic error in creating the baseDir
2015-03-24 10:11:25 -04:00
e32744668f
SAAS-661: Add mobile stream identifier on Stream Settings page
2015-03-23 16:06:35 -04:00
e2ca218ac2
Merge remote-tracking branch 'stash/saas-four-streams' into saas-embed-player
2015-03-23 15:54:04 -04:00
5a373ac604
Merge branch 'saas' into saas-embed-player
2015-03-23 15:46:03 -04:00
2ae4d6c1c3
Embed Player
...
Added stream modes
Unhardcoded some values
Disabled opus streams
2015-03-23 12:37:22 -04:00
7b9efb988f
Fixed logic error Amazon_S3StorageBackend
2015-03-20 18:03:23 -04:00
8c7ae6c890
Added safety checks to Amazon_S3StorageBackend
2015-03-20 17:23:53 -04:00
32aa962138
Fixed error logging and refactored ErrorController to get invoked
...
correctly when using API key authentication
* Along with the bugfixes, backported improved ErrorController from upstream branch,
including style improvements.
2015-03-20 17:20:34 -04:00
ddd75cb8e3
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-03-20 12:36:46 -04:00
68c4cdcab3
Added missing downgrade() function to the 2.5.11 upgrader
2015-03-20 12:36:28 -04:00
28786e7bf1
SAAS-655: Extract muses player events into our own js object
...
Moved player creation into musesPlayer constructor
2015-03-20 07:41:10 -04:00
20d774874e
SAAS-655: Extract muses player events into our own js object
...
Added skeleton functions for setVolume and setURL
2015-03-20 07:35:18 -04:00
59206bc73b
Fixed typo
2015-03-19 17:53:53 -04:00
2ec2403cce
Moved provisioning change function into controller from helper
2015-03-19 17:32:02 -04:00
16ddf09d6d
SAAS-655: Extract muses player events into our own js object
2015-03-19 16:59:05 -04:00
875ed0e41e
Got muses working without a skin
...
Had to leave the skin visible but "hide" it by setting the width and
height to 1px
2015-03-19 13:42:19 -04:00
bd72252e9e
Fixed typos
2015-03-19 12:07:02 -04:00
766f649f56
Merge branch 'saas-dashboard-provisioning' into saas
2015-03-19 11:59:01 -04:00
bafd9eeb6f
Cleaning up player code
2015-03-18 15:03:34 -04:00
ed891fb145
Committing lots of trial and error embed player code changes
2015-03-18 14:23:38 -04:00
1f2f8a27a5
SAAS-650: Fix up player page UI in Airtime
2015-03-16 13:24:58 -04:00
dc0855de18
SAAS-643: Embed Player -> Restrict the setting of an OPUS stream
2015-03-16 11:29:24 -04:00
34de6da2c7
Major performance improvements to the Dashboard and Calendar views
...
* Close the PHP session for writing as early as possible in most AJAX
calls for those views
* Reduce the number of roundtrips to the server in both the Dashboard
and Calendar views by putting the data in our HTML response (this
makes a massive difference)
* Eliminated a couple of unneccessary AJAX calls
* Use lazy loading in full calendar
* Fixed a bug in the week view that only occurs near the end of the
week (date->gmdate bug!)
2015-03-13 18:22:27 -04:00
694430f542
SAAS-637: Un-hardcode all player variables
2015-03-12 15:45:53 -04:00
ac2181a52d
Merge branch 'saas' into saas-embed-player
2015-03-11 17:13:04 -04:00
052055bfff
Merge pull request #106 from sourcefabric/saas-update-disk-usage-upgrader
...
SAAS-628: Create script to update disk_usage for all Airtime pro station...
2015-03-11 16:48:28 -04:00
55ed21a155
SAAS-606: Enable disk quota on Airtime Pro
2015-03-11 13:50:17 -04:00
5b3edaa2ca
Add order by clause to /rest/media index action
2015-03-11 13:25:27 -04:00
0042fb50fe
Refactor some stuff related to four streams, Liquidsoap is a piece of
...
shit too - no dynamic variables
2015-03-10 19:15:38 -04:00
8198d89095
small change to player form
2015-03-10 16:47:08 -04:00
6c46f0a156
Added player preview to view
...
Everything is hardcoded right now
2015-03-10 16:32:35 -04:00
716244011a
Removed unnecessary conditional around /provisioning/change in Bootstrap
2015-03-10 13:20:11 -04:00
b398fea7e7
SAAS-628: Create script to update disk_usage for all Airtime pro stations
2015-03-10 12:29:30 -04:00
0d790213e3
Merge pull request #103 from sourcefabric/saas-paginagte-rest-media-index-action
...
Saas paginagte rest media index action
2015-03-06 14:31:06 -05:00
e315498a5c
SAAS-624: Request to rest/media throws an exception if the data set is too large
...
Modified /rest/media to return items where file_exists = true
2015-03-06 12:21:51 -05:00
47e6879766
Fixed Billing.php again
2015-03-06 11:18:48 -05:00
6cecb7c239
Simplified the FTP upload hook
2015-03-06 11:06:17 -05:00
962f5d925d
SAAS-624: Request to rest/media throws an exception if the data set is too large
...
Fixed small typo
2015-03-06 09:32:14 -05:00
e9adf1a7ed
Merge branch 'saas-623' into saas
...
Conflicts:
airtime_mvc/application/common/Billing.php
2015-03-05 18:23:09 -05:00
8cdecff022
Fixed Billing::GetClientInstanceId()
2015-03-05 18:22:04 -05:00
df48de607b
Revert billing client ID change
2015-03-05 17:45:07 -05:00
7607888257
Merge branch 'saas' into saas-paginagte-rest-media-index-action
2015-03-05 14:27:32 -05:00
62d6849d4e
SAAS-624: Request to rest/media throws an exception if the data set is too large
...
Added offset and limit parameters to /rest/media index action.
2015-03-05 14:25:48 -05:00
918631d676
When calling /change, don't set prefs if empty/no parameters are given
2015-03-05 12:24:02 -05:00
181db7617a
Use Billing::getClientInstanceId() in Amazon_S3StorageBackend
2015-03-04 17:02:30 -05:00
df28b47b92
SAAS-624: Request to rest/media throws an exception if the data set is too large
2015-03-04 16:26:35 -05:00
278aa31d2f
Hack: avoid calling WHMCS to get the station instance id
2015-03-04 15:53:43 -05:00
d61b75f105
Added a working 4th stream
2015-03-03 16:08:53 -05:00
e2054c13c8
Added provisioning code for change requests
2015-03-03 16:04:45 -05:00
95db8533b5
Made provisioning helper slightly more robust
2015-03-03 15:29:34 -05:00
52813045a6
Additional parameters in provisioning when creating stations from dashboard
2015-03-03 15:10:10 -05:00
1f6f880dad
Fixed deleting failed uploads
2015-03-03 13:44:42 -05:00
8a6ee8ad14
Fixed /rest/media endpoint DELETE
2015-03-03 12:52:41 -05:00
6082738439
Merge branch 'saas' into saas-media-refactor
2015-03-02 16:02:34 -05:00
17d51eb0f9
Added csrf verification to show image upload and deletion
2015-03-02 16:00:11 -05:00
ccb4b1552e
Merge branch '2.5.x-albertenhancements' into saas
2015-03-02 15:26:13 -05:00
0272eaef44
Changed is_null to empty
2015-03-02 15:25:52 -05:00
a7cedbb34f
Merge branch '2.5.x-albertenhancements' into saas
2015-03-02 15:10:37 -05:00
b6a6f038a9
Added call to setStationDescription in preferences action
2015-03-02 15:10:04 -05:00
7a035e91ec
Merge branch '2.5.x-albertenhancements' into saas
2015-03-02 14:58:33 -05:00
13bd0b7589
Fixed removing image when saving preferences with no upload
2015-03-02 14:57:50 -05:00
936d11b367
Merge branch '2.5.x-albertenhancements' into saas
2015-02-27 17:21:20 -05:00
78c7170c4e
Reformatted logo remove button to use Zend
2015-02-27 17:19:37 -05:00
2e2f1f9762
Fixed SAAS-612: Recreating a station can wipe its database
2015-02-26 17:14:46 -05:00
ac3ad3d23b
Prevent overwriting the database if it already exists
2015-02-26 15:33:35 -05:00
f1a311dad6
Merge branch 'saas' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-26 14:26:33 -05:00
6047670dbd
Fix corner case where failed uploads could show up in the library
2015-02-26 14:12:51 -05:00
0b1af01822
Better exception logging and small pypo exception fix
2015-02-26 13:52:51 -05:00
c57d4e3fc4
Check if station is on a trial plan before displaying the trial box
2015-02-26 13:30:35 -05:00
ab6d83f49d
Merge branch 'saas' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-26 13:10:13 -05:00
93f62eaadd
Added check to hide LiveChat for existing hobbyist users
2015-02-26 12:49:52 -05:00
bfd6ef72b1
Fixed download URLs for non-cloud files
2015-02-26 11:29:08 -05:00
3885abbdb8
Fixed webstream previewing
2015-02-26 11:09:43 -05:00
2272451e08
Added placeholders for player embed code and preview
2015-02-25 17:10:41 -05:00
7d534d1cda
Airtime Pro SSL compatibility hack
2015-02-25 16:19:01 -05:00
48b4e3fb62
Also need to diable disk usage in media controller
2015-02-25 16:11:52 -05:00
5acad059de
Insert leading slash into basedir for station URL
2015-02-25 16:09:08 -05:00
7e167e5a47
Temporarily disabling disk quota limit until all file sizes have been set
2015-02-25 15:28:48 -05:00
e0a050ac60
Fix file deletion bug
2015-02-25 15:09:02 -05:00
3a1141d4c8
Merge branch 'saas' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
airtime_mvc/application/controllers/ApiController.php
2015-02-25 13:02:11 -05:00
cf11291877
Merge branch 'saas' into saas-embed-player
2015-02-25 12:13:41 -05:00
38aa1d1cd9
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
2015-02-24 16:44:17 -05:00
e13e4413ea
Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas
2015-02-24 15:03:06 -05:00
5e256df061
Added remove button for station logo on preferences page
2015-02-24 12:12:30 -05:00
c0db309e32
Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2015-02-24 11:18:49 -05:00
7600b8ae82
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-refactor
2015-02-24 11:16:44 -05:00
90aa1faea4
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2015-02-24 11:16:19 -05:00
e2130df51c
Merge branch 'cc-5709-airtime-analyzer-csrf' into cc-5709-airtime-analyzer
2015-02-24 11:15:27 -05:00
73e5fb938f
Use more secure random number generation for CSRF auth tokens
...
* Also cleaned up pull request
2015-02-24 11:13:39 -05:00
be7a6854f0
SAAS-596: Store file size and hash in database
...
Have pypo fetch the file size and md5, if necessary, and make request to
Airtime to set these values
2015-02-24 11:00:41 -05:00
69d588d2f6
Merge branch '2.5.x' into 2.5.x-albertenhancements
2015-02-24 10:45:52 -05:00
47a7b0245e
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
2015-02-23 10:29:34 -05:00
51aa846a4c
Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/models/RabbitMq.php
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
python_apps/airtime_analyzer/airtime_analyzer/message_listener.py
2015-02-20 18:25:38 -05:00
c868136d26
Make airtime_analyzer respect the storage_backend setting passed to it
...
by Airtime
2015-02-20 18:21:49 -05:00
0c537194ec
Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor
2015-02-20 17:36:15 -05:00
909cbae5f4
Added new parameter to CcFiles::createFromLocalFile() for flexibility
2015-02-20 17:34:58 -05:00
6858316dfc
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2015-02-20 17:26:53 -05:00
ce36c1be18
Removed unnecessary call to BaseCcFiles->delete
2015-02-20 16:58:09 -05:00
903de66349
Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
airtime_mvc/application/configs/conf.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/CcFiles.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/services/MediaService.php
2015-02-20 16:52:00 -05:00
84f0f135ef
More refactoring: Allow files to be imported from disk directly
2015-02-20 16:36:36 -05:00
5e9252a562
SAAS-587: Add stream urls to station-metadata API
...
Fix typo
2015-02-20 15:52:13 -05:00
6dcc7ee2fc
SAAS-587: Add stream urls to station-metadata API
2015-02-20 15:50:40 -05:00
a931e282e1
SAAS-585: Create Embeddable Player form
...
Fixed up the stream urls options
2015-02-20 15:44:25 -05:00
40d6249229
Merge branch 'saas' into saas-embed-player
2015-02-20 14:47:57 -05:00
2e2c3d6276
Merge of cc-5709-airtime-analyzer-saas-refactor into saas
2015-02-20 14:27:16 -05:00
33ebca00db
Small fix to BPM sanitization
2015-02-20 14:23:36 -05:00
61a47aeb27
Small fix to BPM sanitization
2015-02-20 14:01:29 -05:00
2a89e4d5a0
Massive refactor of the analyzer branch and sync it back up with the
...
cloud storage branch (for the last time)
* Backported all the bugfixes from cc-5709-airtime-analyzer-cloud-storage
* Backported missing FileStorageBackend.php
* Fixed CC-6001: Track titles and artist names with slashes break audio preview
* Refactored all the MediaController code, pulling out the logic into MediaService
* Fixed an API key leak to guests in the Media API
* Made this branch work without cloud_storage.conf (defaults to file storage)
* Made ApiController's getMediaAction use the MediaService code
2015-02-20 14:01:06 -05:00
be7cae4408
Fixed CSRF prevention checks for REST calls, moved CSRF initialization to Bootstrap
2015-02-20 13:12:49 -05:00
6d00da89db
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/models/airtime/CcFiles.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-20 11:14:11 -05:00
fd0db11450
SAAS-596: Store file size and hash in database
...
Added upgrader class to add new filesize column
2015-02-19 16:27:50 -05:00
0177e40083
Pull the logic for Media REST API out of the controller
2015-02-19 15:10:01 -05:00
6ef085f460
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
2015-02-19 11:43:34 -05:00
2905d0394b
Merge branch 'saas-store-file-size-and-hash-in-db' of https://github.com/sourcefabric/Airtime into saas-store-file-size-and-hash-in-db
2015-02-19 10:35:07 -05:00
e5d6797ce7
SAAS-596: Store file size and hash in database
...
Removed md5_hash column from cc_files since there is already a md5
column
2015-02-19 10:34:35 -05:00
73cb14155c
Replace the version hashing with git revision hashing to fix browser
...
caching
2015-02-19 10:01:09 -05:00
5a644ae0b8
Merge branch 'cc-5709-airtime-analyzer' into saas
2015-02-19 09:31:58 -05:00
487ab9bd99
CC-5868: Make the BPM field less strict
2015-02-19 09:31:23 -05:00
ddab1943f6
Merge branch '2.5.x' into saas
2015-02-19 09:20:57 -05:00
b3a46b948f
CC-5999: Unknown file type: audio/vorbis
2015-02-19 09:19:27 -05:00
961cdfc2ee
CC-5849: Audio preview audio/x-wav exception
2015-02-18 19:41:56 -05:00
857ad9615e
CC-5849: Audio preview audio/x-wav exception
2015-02-18 19:40:27 -05:00
d0bd4bfe81
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 19:29:45 -05:00
08c53a9292
Fixed incorrect authorization for ShowImage API
2015-02-18 18:34:52 -05:00
0535626df1
Merge branch 'saas-file-sanitization' into saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 17:19:26 -05:00
9098e204e5
Merge branch 'cc-5709-airtime-analyzer' into saas-file-sanitization
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 17:18:43 -05:00
b76ab27230
Fixed the unit tests: Ensure key in $_SERVER exists.
2015-02-18 17:03:16 -05:00
964d7d1326
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 16:42:04 -05:00
17f1d0e96d
Simplify the metadata sanitization and bugfix it
...
* SAAS-376 and CC-5868
2015-02-18 16:29:08 -05:00
2ae921e9d7
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2015-02-18 16:16:41 -05:00
717d322dc8
Fix typo breaking provisioning/create/
2015-02-18 15:22:47 -05:00
12c0617e57
Set up the cc_music_dirs entry in /provisioning/create
2015-02-18 13:27:52 -05:00
dcac7ab652
Fixed a couple of bugs in the new /provisioning/create API
2015-02-18 12:21:15 -05:00
5bd3371ec2
SAAS-596: Store file size and hash in database
...
Removed getFileSize from CloudFile.php since it can call the parent
function.
Moved setting filesize metadata from cloud_storage_uploader.
2015-02-17 16:51:25 -05:00
d2fae5adae
Testing out only creating the database tables ...
2015-02-17 16:49:52 -05:00
fe7071b5e3
SAAS-596: Store file size and hash in database
...
Fixing bad merge ?(not really sure what happened here)
2015-02-17 16:28:33 -05:00
c1086842d3
Merge branch 'cc-5709-airtime-analyzer-store-file-size-and-hash-in-db' into saas-store-file-size-and-hash-in-db
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-17 16:19:58 -05:00
72e4a036a4
Cleaning up editFileMD in LibraryController
2015-02-17 15:09:18 -05:00
6ccc634782
SAAS-596: Store file size and hash in database
...
Updated schema and added filesize and md5_hash columns.
Changed getFileSize functions to return the value stored in the
database.
Removed getFileSize from the cloud storage classes.
2015-02-17 14:51:51 -05:00
29d7e20622
Fixing file metadata sanitization
2015-02-17 12:39:58 -05:00
29c6ae15b0
Merged cc-5709-airtime-analyzer into saas-file-sanitization
2015-02-17 12:19:11 -05:00
a07a1edcc0
SAAS-595 - Updated validation and sanitization
2015-02-17 12:17:49 -05:00
e603597101
Cleanup and comments
2015-02-17 12:13:37 -05:00
04e138b124
Merged cc-5709-airtime-analyzer into saas-file-sanitization
2015-02-17 11:51:00 -05:00
4fd7b4c622
SAAS-585: Create Embeddable Player form
...
Added stream urls - hardcoded for now
2015-02-17 11:48:43 -05:00
eb40379152
SAAS-595 - Changed Zend validation and added sanitization in file import process to throw out bad track number metadata
2015-02-17 11:44:31 -05:00
ad5536dedd
SAAS-582 - Added provisioning class to create database from within Airtime
2015-02-12 15:39:22 -05:00
56cae34259
Fix typo
2015-02-12 14:20:54 -05:00
c261182c8f
Skeleton player form/view/controller
2015-02-12 14:08:06 -05:00
d46f4a52eb
Installer tweaks and a pypo bugfix
...
* Moved all the remaining DEB requirements into the requirements files
* The installer should now be distro agnostic (unless you ask it to
install third-party deps for you)
* Fixed pypo not being able to find replaygainupdater
* Tweaked a bunch of styling for the installer
2015-02-10 18:06:46 -05:00
dd095e8933
Added create endpoint to provisioning controller, fixed RestAuth helper
2015-02-09 17:41:03 -05:00
a1436bfebb
ShowImageController update to add comments and remove unnecessary code
2015-02-09 12:15:19 -05:00
2cf0f7da7a
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/configs/ACL.php
2015-02-06 16:06:32 -05:00
2a9790adf3
Backport ACL REST permission fix
2015-02-06 16:05:51 -05:00
a20f90cd2d
Marginally better error handling for 401 in REST controller
2015-02-06 15:20:01 -05:00
7bf96e09a5
Tweaked ACL plugin again temporarily
2015-02-06 14:45:07 -05:00
bcd7e3d70f
Rollback last commit due to REST error when downloading files
2015-02-06 14:43:34 -05:00
ed190c30f3
Merge branch 'cc-5709-airtime-analyzer' into saas
2015-02-06 14:33:17 -05:00
4b6e5671c3
REST permission fix
2015-02-06 14:33:02 -05:00
74e142c3d7
Fix for ACL REST error
2015-02-06 14:28:25 -05:00
cee0ff4881
SAAS-560: Deploy separate cloud storage config files for each development environment
...
Default to production config files if dev env specific files are not
found.
Fix analyzer unit tests.
2015-02-05 14:31:20 -05:00
e2ff452b8a
Merge branch 'saas' into saas-cloud-storage-config-per-dev-env
2015-02-05 10:15:48 -05:00
826ae17552
SAAS-580 - Fixed routing issue causing show art to not upload; changed ShowController to be more RESTful
2015-02-04 15:09:27 -05:00
c6fc184559
Merge branch 'saas' into saas-cloud-storage-config-per-dev-env
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
python_apps/airtime_analyzer/airtime_analyzer/message_listener.py
2015-02-04 13:36:35 -05:00
7eef9d941e
Recommitting filesize checks in smartReadFile
2015-02-03 16:33:48 -05:00
d5477dfb5b
Fix misordering of params in readfile function
2015-02-03 16:23:26 -05:00
b5f6077c04
Quick fix for pro
2015-02-03 16:22:12 -05:00
7b3f9af04c
SAAS-560: Deploy separate cloud storage config files for each development environment
...
Changed analyzer upstart to take the cloud storage config file as a command line option
Dropped the dev env portion from the rabbitmq-analyzer.ini filename
2015-02-03 15:55:47 -05:00
6601e016a6
Removed unused variable
2015-02-03 15:19:41 -05:00
e0269e1e22
smartReadFile fix for saas show-logo
2015-02-03 14:16:44 -05:00
75ce732512
Fixed bad merge
2015-02-02 18:04:08 -05:00
7717692b41
Merge branch '2.5.x' into saas
2015-02-02 18:03:39 -05:00
df4bc01ff8
Log all PHP errors (including parse errors) to our zend log
2015-02-02 18:03:13 -05:00
147ded498b
PHP 5.3 compatibility fix for my Sentry code
2015-02-02 16:56:03 -05:00
f69e5afbff
SAAS-576: Fixed the Sentry data sanitizer and moved DSN into a config file
2015-02-02 14:42:20 -05:00
5040eb498d
SAAS-560: Deploy separate cloud storage config files for each development environment
2015-02-02 12:54:56 -05:00
45309bb605
Merge branch '2.5.x' into 2.5.x-installer
2015-01-28 13:28:13 -05:00
bc604b992e
CC-5986 - Fixed unit tests, removed unnecessary code from service execution files
2015-01-28 13:19:50 -05:00
8e4aa298d0
Scrub Sentry API KEY (old one is revoked)
2015-01-27 19:55:30 -05:00
c9231e9136
Sentry logging for Airtime Pro
2015-01-27 19:54:42 -05:00
1ddc27bb77
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/public/index.php
2015-01-27 18:26:39 -05:00
e83c86a0ff
Refactored the logging class to reduce code, use error levels correctly, and improve performance.
2015-01-27 18:24:13 -05:00
f7d26c0dde
Merge branch '2.5.x' into saas
2015-01-27 15:39:40 -05:00
2b323400fc
Indentation and undefined variable fix in Block.php
2015-01-27 15:39:21 -05:00
ebfce1f68b
Merge branch '2.5.x' into saas
2015-01-27 15:16:24 -05:00
0ba5452e03
Log the SERVER_NAME too
2015-01-27 15:16:11 -05:00
f93bc85f67
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-01-27 12:14:24 -05:00
e216a03d37
SAAS-562: UpgradeController broken
2015-01-27 12:13:58 -05:00
8d4f94a41f
Merge branch '2.5.x' into saas
2015-01-26 17:50:18 -05:00
e3165a12c3
Regex tweak
2015-01-26 17:49:58 -05:00
b569e9a294
Merge branch '2.5.x' into saas
2015-01-26 17:44:41 -05:00
322d85931b
CC-5988 - Better error message & regex for Transition Fade field on stream settings page
2015-01-26 17:41:10 -05:00
44ff8f830f
Fixed Amazon S3 Proxy class bug
2015-01-26 16:06:32 -05:00
8f59ec0861
ProxyStorageBackend::getFilePrefix() bugfix
2015-01-26 14:18:59 -05:00
8cfe2ec839
Fix capitalization of Amazon cloud storage config section
2015-01-26 14:11:41 -05:00
bd3110b3af
Renamed Amazon_S3 class to Amazon_S3StorageBackend
2015-01-26 14:06:03 -05:00
8e2366f6fb
Remove Rabbitmq.php dependency on Amazon S3 stuff (which was the main purpose of the last commit)...
2015-01-26 13:19:48 -05:00
dbba5a7427
Decouple Billing and S3 cloud storage stuff from Zend
2015-01-26 13:10:10 -05:00
49667e3d2d
Squash logging
2015-01-26 12:12:27 -05:00
ac8fadfc80
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
CREDITS
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-23 16:36:31 -05:00
7d00f5213d
SAAS-559: Turn off sql notices during upgrade
2015-01-23 16:08:22 -05:00
ca9750f415
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/ACL.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/build/sql/schema.sql
2015-01-23 11:32:45 -05:00
6e43505379
Merge branch '2.5.x' into 2.5.x-installer
2015-01-22 17:36:12 -05:00
134ade877c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/build/sql/schema.sql
2015-01-22 15:48:34 -05:00
d5ee710f89
Fixed CSRF token checking in MediaController (broken by last 2 commits)
...
* Also fixed getOwnerId(), no longer calls a non-existent function
2015-01-22 12:20:13 -05:00
230cdcccb4
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
CREDITS
2015-01-22 11:29:38 -05:00
bade613e80
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-01-22 11:19:25 -05:00
fd42c67b0b
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-01-21 18:08:05 -05:00
a40067ca55
Moved REST authorization boilerplate to Zend Acl_plugin
2015-01-21 17:20:04 -05:00
2c2f7ebc5f
Initial commit for update to ACL for REST module; NEEDS TESTING
2015-01-21 15:34:15 -05:00
7e2cc65f32
Merge branch '2.5.x' into saas
2015-01-21 15:15:58 -05:00
345b2b5d26
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-01-21 15:14:34 -05:00
62f2a0babf
CC-5981: Admin users can't delete webstreams created by other users
2015-01-21 11:31:28 -05:00
2fadc8f8f1
Merge branch '2.5.x' into saas
...
Conflicts:
CREDITS
2015-01-20 11:44:53 -05:00
6ac5a2950f
SAAS-551: Cannot schedule shows due to overlapping show check bug
2015-01-20 11:32:15 -05:00
dec7dddd83
Merge branch '2.5.x' into 2.5.x-installer
2015-01-19 15:40:07 -05:00
0c3395289d
Merge pull request #78 from Robbt/realtime-smart-blocks
...
Added sort tracks by upload time to smart blocks criteria
2015-01-19 15:36:28 -05:00
c5a60d2f09
Last updates before 2.5.2 RC, mainly small fixes for Ubuntu Precise
2015-01-19 15:05:13 -05:00
2cb26db84b
SAAS-547: Refactor upgrade procedure in 2.5.x-installer branch
...
* Start using "schema_version" key instead of "system_version"
* Refactored the upgrade code a bit and make it be automatically invoked
from the Zend bootstrap if a schema update is needed.
* Fixed error logging in certain cases
* Fixed an exception in Show related to image_path
2015-01-19 13:41:23 -05:00
5abe364a69
Forgot to rename the 2.5.5 upgrade.sql to 2.5.2
2015-01-16 17:31:11 -05:00
c03dd38c00
Merge branch '2.5.x' into 2.5.x-installer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Show.php
2015-01-16 17:27:52 -05:00
44018b2cbf
Changed status page to use config-check (tentative) and removed time-intensive check in index routing
2015-01-16 16:15:16 -05:00
38882abd1a
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
2015-01-16 15:15:37 -05:00
527d2851af
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
2015-01-16 15:15:14 -05:00
19626ed4f5
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
2015-01-16 13:26:55 -05:00
775008b274
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
2015-01-16 12:13:04 -05:00
57a7218a79
SAAS-540: Change the Provisioning Controller's terminate endpoint to reflect new S3 file prefix
2015-01-16 11:09:13 -05:00
04a1d82172
Upgrade step from 2.5.1 installs
2015-01-16 09:32:55 -05:00
36c889a3a2
Merge branch '2.5.x-installer' of https://github.com/sourcefabric/Airtime into 2.5.x-installer
2015-01-15 17:34:33 -05:00
4552089c19
Fixes to install & uninstall procedure
2015-01-15 17:33:47 -05:00
791466b023
Fixes for code review https://github.com/sourcefabric/Airtime/pull/84
2015-01-15 16:33:33 -05:00
7c28b66ce9
Merge branch '2.5.x-albertenhancements' into saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/Preferences.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-15 16:32:29 -05:00
f9bf71a349
Moved the Station Logo field to GeneralPreferences, and stopped using
...
AJAX on the general prefs form
2015-01-15 16:28:18 -05:00
11acca32f9
Update comment at the top of conf.php to reflect config file
...
amalgamation
2015-01-15 15:36:22 -05:00
ee9163fa8e
2.5.2: Reorganize upgrade path so that 2.5.2 contains the show art schema changes
...
* Also bump the system_version number to 2.5.2. This will be deprecated sooner or later...
2015-01-15 12:42:36 -05:00
cfe3527b93
Fix link to user manual
2015-01-15 16:33:03 +00:00
a5cc529c4a
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-01-15 11:24:16 -05:00
5e22f929c7
Reverted commit mistakenly changing file modifiers to 755
2015-01-14 20:45:03 -05:00
df2576e5a0
Updated installer to better accommodate running over existing installs
2015-01-14 16:11:49 -05:00
754c7bfc64
Removed code that was deleting the cloud_file database records in the case of
...
station termination. The database will remain as is in case we have to restore
the files.
2015-01-14 15:15:23 -05:00
609a46dfa3
Comment Airtime_Decorator_SuperAdmin_Only
2015-01-14 15:12:20 -05:00
c24a040689
Fixed my SuperAdmin_Only decorator
2015-01-14 14:34:14 -05:00
d5b969f94f
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-13 21:31:57 -05:00
3247f6992a
Merge branch 'saas-pullreq77' into saas
2015-01-13 20:59:02 -05:00
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
a0e5c975dd
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2015-01-13 15:50:38 -05:00
a4461dc79a
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-13 15:50:20 -05:00
2185fc9ca4
SAAS-536: Check for future scheduled files uses cloud_file id instead of cc_files id
2015-01-13 15:49:57 -05:00
c264747a54
Removed silly logging statement
2015-01-13 15:25:36 -05:00
d99147bad4
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-13 14:23:51 -05:00
caf37e1b87
CC-5975: Default fade-in/out, and crossfade time validators don't work
...
* Fixed the number formatting and validation in the preferences and streaming preferences
(the silly 00.5-style numbers are gone)
* Regex decmical validation of the default fade-in, fade-out, and
crossfade duration was totally broken (you could enter words and it would work). That's fixed now.
2015-01-13 12:18:57 -05:00
9cfcaf2ffd
SAAS-537: Fixed the week view of the schedule widgets
...
* Also improved the instructions inline for how to use them...
(this is a stop-gap measure until we get a real iframe widget)
* ALSO renamed the field HTML Code since it's not JS! (it was
misleading before)
2015-01-12 22:29:21 -05:00
e17b330186
Remove just previously added logging statements
2015-01-12 16:26:27 -05:00
c7c683966d
Logging
2015-01-12 16:21:53 -05:00
7bdf34fcd1
Logging
2015-01-12 15:58:50 -05:00
8f0f69abd9
More logging
2015-01-12 15:45:33 -05:00
44b82fdd8a
More logging statements
2015-01-12 15:37:48 -05:00
85557d4886
Logging statements
2015-01-12 15:29:41 -05:00
02e4c18931
SAAS-531: Finalize S3 folder hierarchy
2015-01-12 14:50:42 -05:00
f0bad70cee
Merge branch '2.5.x' into saas-pullreq77
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/ApiController.php
2015-01-09 13:10:54 -05:00
17a577fbbb
use is_numeric instead of is_int as values are strings
2015-01-09 13:02:25 -05:00
1b03bd7fbd
use new var instaead of calling getShowListContent again
2015-01-09 13:02:25 -05:00
fc8e65944e
added error checked for required params
2015-01-09 13:02:25 -05:00
1cc1f8a378
return error for missing instance_id on show-tracks action
2015-01-09 13:02:25 -05:00
174cf79d84
clean up shows endpoint, remove dependency on Show model
2015-01-09 13:02:25 -05:00
a27ca2f583
cleanup new HTTP apiendpoints, added HTTPHelper and getStartEndFromRequest and updated all controllers that called their own versions of this function
2015-01-09 13:02:25 -05:00
03dae5be2b
fix spacing in ApiController
2015-01-09 13:01:43 -05:00
44b4faf6d9
added shows, show-schedules, show-preview, show-history-feed, item-history-feed endpoints to the HTTP api to be used via NewscoopAirtimePlugin
2015-01-09 13:01:42 -05:00
8d56e9e1ff
Merge branch '2.5.x' into saas
2015-01-09 10:44:47 -05:00
05c9e21e48
Recognize audio/aac as a MIME type for webstreams
2015-01-09 10:44:24 -05:00
1ddda846d6
Updates to running background services as web user
2015-01-08 18:52:58 -05:00
08738cf391
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
2015-01-06 15:46:20 -05:00
8d914bcd13
SAAS-529: Replace Apache Libcloud with Python-Boto SDK
2015-01-06 15:44:34 -05:00
f4c5cf1353
Added virtualenv back into install process
2015-01-05 16:41:03 -05:00
9c324c1b6f
Updated configuration checklist
2014-12-19 11:58:47 -05:00
32f40f3dc8
Updated configuration checklist to include running services
2014-12-19 11:44:23 -05:00
6ee97d9c53
Upgrade sql was missing the storage_backend column
2014-12-18 18:55:37 -05:00
19e6f1a535
SAAS-526: Change prefix from station name to station id
...
Done.
2014-12-17 16:48:20 -05:00
a0f5e33855
Added "Help Center" link to Help menu for Josh
2014-12-17 16:10:04 -05:00
b094e59df3
SAAS-526: Change prefix from station name to station id
...
Just seeing if we can get the hosting id from a function in the Billing Controller
2014-12-17 15:39:18 -05:00
ec1c8669c8
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-17 14:14:03 -05:00
cdabbc6648
SAAS-527: Allow files to be uploaded to either the cloud or on local file storage
...
Done.
2014-12-17 13:11:11 -05:00
6e2f07f875
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage
2014-12-16 18:47:55 -05:00
1de326283e
SAAS-527: Allow files to be uploaded to either the cloud or on local file storage
...
Not quite done.
2014-12-16 18:47:42 -05:00
4043ebfd25
More work on monitless installer
2014-12-16 16:26:58 -05:00
7059820ca0
Add a comment about the proxy pattern
2014-12-16 14:54:53 -05:00
ff0a685243
Updated propel models
2014-12-16 14:20:28 -05:00
ab4ebb2969
SAAS-525: Station Termination -> Delete cloud_file table records
...
Deleted cloud_file records.
Renamed the function that does this.
2014-12-16 14:13:57 -05:00
4dfd49d12c
Initial work on monitless installation
2014-12-16 12:24:41 -05:00
09c30bde1b
Regenerated Propel models because some fields and methods were missing.
2014-12-16 10:53:39 -05:00
2af14e099b
SAAS-519: webstreams not being deleted
2014-12-15 12:49:13 -05:00
ed7b85c69b
Removed references to image path and instance_description
2014-12-15 09:50:25 -05:00
c24320a094
Removed call to session_write_close()
2014-12-15 09:49:35 -05:00
8f99595f54
Added button to redirect to login page from config-check page on success
2014-12-15 09:49:00 -05:00
797bafa453
Make the LiveChat changes from yesterday slightly more reslient to
...
missing database keys.
2014-12-12 11:57:16 -05:00
f50354bc60
Merge branch '2.5.x' into 2.5.x-installer
2014-12-12 11:23:17 -05:00
ad56d6cafb
Show the plan and station URL in Live Chat
2014-12-11 17:40:34 -05:00
891cfdb48e
SAAS-517: Create Provisioning controller with a terminate endpoint
2014-12-11 13:35:34 -05:00
e9a966a8a4
Test closing the session to prevent asnyc blocking to see if it impacts load performance
2014-12-11 12:53:45 -05:00
008ffa025a
SAAS-517: Create Provisioning controller with a terminate endpoint
...
Not quite done but getting there
2014-12-10 17:04:14 -05:00
57868d2351
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-10 12:47:22 -05:00
d73b331376
SAAS-515: Prefix object names with station name
2014-12-10 12:40:08 -05:00
644e6b00d8
SAAS-516: Replace Zend_Service_Amazon_S3 with AWS SDK for PHP
2014-12-09 17:58:36 -05:00
f5b4928538
More work on web installer
2014-12-09 17:48:16 -05:00
89925e52ed
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
python_apps/pypo/pypofile.py
2014-12-08 15:34:30 -05:00
ec189fc27a
SAAS-509: PYPO can't download files via the REST API
2014-12-08 15:33:02 -05:00
435c49da98
Changed PYPO's download URL scheme from https to http
2014-12-08 13:57:28 -05:00
70c6801a6c
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-08 13:51:15 -05:00
59ceb11f00
SAAS-510: PYPO -> Files are downloaded even if they already exist in tmp cache dir
2014-12-08 13:21:24 -05:00
80af25fdf4
Undoing last commit
2014-12-03 18:07:24 -05:00
9fed113f74
More work on setup/installation process
2014-12-03 18:04:47 -05:00
963207e26f
Trying the PYPO download URL without ssl
2014-12-03 18:01:08 -05:00
024150f023
SAAS-503: PYPO -> Use the REST API to download files
...
Fixed disabling SSL verication
2014-12-03 14:50:58 -05:00
a1062e951f
SAAS-503: PYPO -> Use the REST API to download files
...
Change download URL to use https
2014-12-03 14:03:21 -05:00
cf9eabbc74
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-12-03 13:35:32 -05:00
16dc286420
SAAS-503: PYPO -> Use the REST API to download files
2014-12-03 13:22:52 -05:00
e1f1807f5a
SAAS-503: PYPO -> Use the REST API to download files
...
Removed Amazon S3 specific code
2014-12-02 18:46:17 -05:00
bf91677f91
SAAS-505: Extract Amazon_S3 class and have it inherit from a general 'cloud backend' class
...
Fixed reading credentials in from cloud_storage.conf
2014-12-02 09:06:28 -05:00
7c0a25be7f
SAAS-505: Extract Amazon_S3 class and have it inherit from a general 'cloud backend' class
2014-12-01 21:05:46 -05:00
183fa7b3a3
Bind CURL calls to WHMCS to ipv4 adapter because WHMCS IP whitelist
...
doesn't support IPv6
* Fixes WHMCS login for all airtime.pro users
2014-12-01 16:10:03 -05:00
acaf47c592
More work on web setup form
2014-12-01 15:49:53 -05:00
94d9577539
Temporarily disable the Google Tag Manager generation for debugging
2014-12-01 11:34:47 -05:00
8f46b4dca7
More work on new installer
2014-11-28 15:30:11 -05:00
432245b18e
SAAS-502: Analyzer -> Set the station id and domain in the cloud object's metadata
...
Set the domain name in the cloud object's metadata
2014-11-27 16:54:22 -05:00
92feacd46f
SAAS-501: Re-jig cloud_storage.conf
2014-11-27 15:50:40 -05:00
8601452c71
Merge conflict
2014-11-27 15:46:39 -05:00
2f9382679a
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage
2014-11-27 15:45:26 -05:00
6cb993cc80
SAAS-504: Store provider in db
2014-11-27 15:44:53 -05:00
e59cd11370
Close the session when a track is previewed or downloaded.
...
Close the file pointer when we are down with it.
2014-11-27 13:48:34 -05:00
670a63df87
Error handling for if propel isn't found / composer wasn't run
2014-11-26 18:04:46 -05:00
8fbe7dd649
Report an error and die if amazon.conf is missing
2014-11-26 17:50:59 -05:00
477ac337e5
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-11-26 11:54:07 -05:00
884a4c493d
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-11-26 11:42:40 -05:00
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
bec62ec906
SAAS-496: Create a provisioning controller with a terminate endpoint
2014-11-25 16:04:08 -05:00
86ce4673ab
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2014-11-25 12:27:50 -05:00
a62e98beb4
Fix logins from WHMCS by disabling CSRF token on login page for trusted
...
origins
2014-11-20 19:33:11 -05:00
df933b57f7
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-20 17:12:52 -05:00
544767a775
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage
2014-11-20 17:11:50 -05:00
8e8fe2d288
SAAS-489: Cannot preview tracks stored on disk
2014-11-20 17:11:23 -05:00
ca7d0688e7
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-20 16:47:35 -05:00
7db571d103
Remove clearAction from the media REST API for security
2014-11-20 16:47:02 -05:00
8ffd70781b
Remove clearAction from the media REST API for security
2014-11-20 16:46:21 -05:00
29fd728d7d
Undo live stream auth action breakage
2014-11-20 14:30:42 -05:00
0890de4cdd
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2014-11-20 14:00:12 -05:00
cea3fc5302
Temporarily fix live stream auth (show source)
2014-11-20 13:59:59 -05:00
00fbda193e
Schedule->removeItems optimization fix for deleting the current playing track
2014-11-20 09:57:37 -05:00
767562922a
Schedule->removeItems optimization fix for deleting the current playing track
2014-11-19 17:09:54 -05:00
766c827094
Removed undefined index from show info array
2014-11-19 16:04:06 -05:00
c627342e28
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2014-11-19 15:21:14 -05:00
48ae8ac69c
Scheduler->removeItems optimization
2014-11-19 15:13:33 -05:00
5fdca78041
Scheduler->removeItems optimization
2014-11-19 14:30:18 -05:00
755df62a00
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
2014-11-18 18:18:44 -05:00
c829b6bf95
Fix bad merge
2014-11-18 18:17:19 -05:00
dd3b54f8ed
Actually delete files from the database via the media REST API
2014-11-18 18:15:45 -05:00
4f7f64af7a
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-18 17:45:08 -05:00
11a31375df
Slightly more robust fix for the last issue
2014-11-18 17:41:44 -05:00
162995bb49
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-18 17:14:01 -05:00
6460854fda
Fixed 'clear' button not working when files failed to import
2014-11-18 17:13:48 -05:00
e7e1926896
CC-5950: Fix for issue where clear button in Recent Uploads didn't work
...
sometimes
2014-11-18 17:11:09 -05:00
34453b5548
Removed setting the directory for cloud files
2014-11-18 10:57:21 -05:00
501b22c48d
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-18 10:32:28 -05:00
3c73abc786
SAAS-491: Edit meta data not working
...
Fixed: Propel 1.7 does not cast string types to integers
2014-11-18 10:32:03 -05:00
4d8b32556b
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-18 09:24:38 -05:00
91e7f7053d
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-18 09:16:25 -05:00
fcbb1c2ee7
String updates
2014-11-14 10:01:06 -05:00
21ea2a2933
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/models/Show.php
2014-11-13 14:22:25 -05:00
51274920e1
Cosmetic updates
2014-11-13 10:20:58 -05:00
7d86ea3115
Better error handling on media PUT request
2014-11-13 09:41:46 -05:00
2827db8ba3
Fix bad merge
2014-11-13 09:05:02 -05:00
864352c6a7
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py
2014-11-12 17:04:00 -05:00
97b74a0997
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/models/Schedule.php
2014-11-12 15:08:35 -05:00
f1fa4929ae
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
python_apps/airtime_analyzer/setup.py
2014-11-12 14:51:18 -05:00
95517cac87
Fix exception thrown when the analyzer doesn't return filesize with the metadata
2014-11-12 14:45:50 -05:00
c132cac43d
Code cleanup
2014-11-12 14:42:34 -05:00
c580e8a569
Removed references to show instance description
2014-11-11 19:07:33 -05:00
10db978a2b
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-11 16:30:50 -05:00
5cf5ff4fa1
code cleanup
2014-11-11 16:29:54 -05:00
b304e2fa34
Bug fix
2014-11-11 13:56:17 -05:00
785651ec4b
Merged 2.5.x into 2.5.x-installer
2014-11-10 17:15:41 -05:00
769e0e1d82
Fixed 'clear' button not working when files failed to import
2014-11-10 16:07:51 -05:00
4893d087e2
Bug fix
2014-11-10 12:53:07 -05:00
8733788807
Added NOT NULL to cloud_file foreign key field
2014-11-10 10:55:15 -05:00
6b058ade0b
Upgrade script fix
2014-11-10 10:50:15 -05:00
13f6b693d6
Fixed upgrade.sql script
2014-11-10 10:37:01 -05:00
af8c6c2f48
Merged 2.5.x into saas
2014-11-10 09:08:03 -05:00
4b10e024da
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-07 12:35:23 -05:00
f6bf2f8cc5
Changed tabs to spaces
2014-11-07 12:05:29 -05:00
1dc72d5ebe
Changed Amazon S3 download URL format so it works with S3_EU_WEST region.
...
Updated amazon config file path in the downloader class
2014-11-07 11:51:11 -05:00
8fc7178d82
Added several global constants for reoccurring strings in Airtime to aid dynamic translations
2014-11-06 18:40:19 -05:00
efd05c4b77
Added the _initTranslationGlobals function to bind PHP globals to javascript vars for dynamic translation purposes
2014-11-06 18:40:06 -05:00
795e239ff3
Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls.
2014-11-06 18:39:48 -05:00
62a915f109
Added global define for application name
2014-11-06 11:57:05 -05:00
4d263ce897
Merged 2.5.x into saas
2014-11-05 17:36:58 -05:00
e5e7942b42
Added getUserLocale function to pull locale data into the Login form
2014-11-05 17:24:54 -05:00
eecd3fa188
Added setDefaults call to initialize the locale field to user's locale, or the station default; removed unnecessary field
2014-11-05 17:24:08 -05:00
b94d34f719
Removed calls to set user locale and timezone on user creation; these calls were updating the current user instead of the created user, and so served no purpose
2014-11-05 17:22:13 -05:00
564e8d9311
Replaced hardcoded locale defaults with the station default locale
2014-11-05 17:21:19 -05:00
90626a2fcb
Formatting; Changed tabs to spaces
2014-11-05 17:04:18 -05:00
e24b4f43fd
Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.
...
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
2014-11-05 16:25:11 -05:00
6adb33e89b
Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.
...
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
2014-11-05 16:24:03 -05:00
02be09b5ff
Fixed issue with improper array initialization
2014-11-05 10:15:16 -05:00
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
0f3c1914e1
CC-5948 - Fixed bug where user couldn't edit repeating instances of a show while another instance was playing
2014-11-04 18:38:31 -05:00
eef7116142
Updated i18n to use multiple domains
2014-11-04 17:03:52 -05:00
5275669211
Updated i18n to use multiple domains
2014-11-04 17:03:52 -05:00
2f16385b53
Fixed upgrades
2014-11-04 13:33:20 -05:00
298d8630f3
Initial commit of InstallWizardController
2014-11-04 11:07:56 -05:00
e8950c8815
Changed tabs to spaces
2014-11-04 11:07:24 -05:00
3024daba0e
Changed tabs to spaces
2014-11-04 11:06:17 -05:00
f147fb34bb
Cloud storage upgrade script
2014-11-03 16:56:25 -05:00
6cda01fba9
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-03 13:15:21 -05:00
27b8f0ac13
Removed delete-success view script because action no longer exists.
2014-11-03 13:15:04 -05:00
87d5d3cb02
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/modules/rest/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-03 13:11:22 -05:00
5f98151009
Removed unused route from rest Media Controller
2014-11-03 12:57:41 -05:00
0a45de7fba
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
.gitignore
airtime_mvc/application/configs/airtime-conf.php
airtime_mvc/application/configs/classmap-airtime-conf.php
airtime_mvc/application/models/RabbitMq.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
airtime_mvc/application/models/airtime/map/CcShowTableMap.php
airtime_mvc/application/models/airtime/om/BaseCcShow.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
airtime_mvc/application/modules/rest/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
airtime_mvc/public/index.php
2014-11-03 12:29:58 -05:00
b871b32175
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-10-30 12:17:34 -04:00
54d1bcf81e
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-10-30 12:15:41 -04:00
e23649173d
Added comments to CcFiles and CloudFile classes.
2014-10-30 12:12:47 -04:00
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
ceb51100ec
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-10-29 17:58:56 -04:00
c590869311
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-10-29 17:57:25 -04:00
fd39db2e24
Merge pull request #75 - Saas relder csrf delete file
2014-10-29 17:55:42 -04:00
dd5176c209
Merge pull request #76 from RobertElder/saas-relder-cors-localhost
...
Don't throw exceptions for localhost in CORSHelper.
2014-10-29 17:35:25 -04:00
2f96885d65
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2014-10-28 13:30:16 -04:00
53c4301024
Wrapped json_encode call in PHP version check
2014-10-28 13:29:35 -04:00
10f3c0a290
Merge branch '2.5.x' into saas
2014-10-28 10:29:42 -04:00
1d3180cc80
CC-5932: Update is_scheduled query is too slow
...
Forgot to remove some debugging statements
2014-10-28 10:29:25 -04:00
64a68c972d
Merge branch '2.5.x' into saas
2014-10-28 10:26:14 -04:00
eae1b4e17c
CC-5932: Update is_scheduled query is too slow
2014-10-28 10:25:40 -04:00
1a90184a69
Merging 2.5.x into saas
2014-10-27 16:27:45 -04:00
275ca5eed6
Resolved differences merging 2.5.x into saas
2014-10-27 16:25:42 -04:00
d4e8eed51d
Marked old functions for API calls as deprecated
2014-10-27 15:52:58 -04:00
e6cf1c7cb9
Updated occurrence of GetPlayOrderRange to use old version for backwards compatibility
2014-10-27 15:52:14 -04:00
7018f45c0a
Check filesize is greater than zero before deleteing a file from library
2014-10-27 12:39:02 -04:00
a88c0233d6
Don't throw exceptions for localhost in CORSHelper.
2014-10-27 15:07:12 +00:00
7edd993fa3
Reverted pypo's copy file method to how it was without cloud files
...
and instead directly call the cloud file's downloader method.
2014-10-24 15:50:52 -04:00
e6b9a71d00
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2014-10-24 15:12:17 -04:00
598b18b65a
Added live-info-v2 and station metadata api calls
2014-10-24 15:11:27 -04:00
c02ed026f4
Support for tokens in multipart file upload using API.
2014-10-24 03:57:35 +00:00
70ff67374b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/filemover_analyzer.py
2014-10-22 17:16:46 -04:00
8134687c24
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-10-22 17:13:42 -04:00
9726fb80d2
Removed amazon s3 signature from pypo cache file name.
...
Stopped pyppo from downloading amazon s3 files if it already exists in the pypo cache dir.
2014-10-22 14:17:44 -04:00
aec189089a
Merge branch '2.5.x' into saas
2014-10-22 14:46:32 +00:00
f29f30e3ac
Include base_dir in session namespaces.
2014-10-22 14:37:47 +00:00
f775bedb49
Stopped returning filesize in delete functions.
...
Created an Amazon S3 wrapper class around Zend_Service_Amazon_S3 to add more functionality.
2014-10-21 16:05:50 -04:00
fe291cdc8c
Added sort tracks by upload time to smart blocks criteria
2014-10-19 23:02:40 -04:00
544d20ebc2
Replaced spaces with dashes in resource_id generation
...
Fixed track preview and download signed urls
Removed cloud_storage_deleter.py file
Changed cloud_storage settings in airtime.conf
2014-10-17 17:16:53 -04:00
a10e287368
Fixed a fresh install bug that wasn't using composer installs.
...
Fixed a cloud file download bug where it was downloading the wrong track.
Working on amazon s3 signed urls for private objects.
Added cloud storage configuration to install script.
2014-10-14 16:54:58 -04:00
9fb35c448e
Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.
2014-10-10 19:57:22 +00:00
0196aa21f5
Fixed testcases to account for show image path in and show instance description
2014-10-09 09:39:50 -04:00
6ade74163d
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2014-10-08 18:03:16 -04:00
a84e0761ca
Updated file deletion to remove cc_files rows properly when deleting from the Library
2014-10-08 18:01:06 -04:00
2423ea6787
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-10-08 11:46:30 -04:00
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
5cc93eac3c
Merge pull request #68 from RobertElder/session
...
Regenerate session ids.
2014-10-07 10:10:41 -04:00
9a21b99fdf
Merge pull request #70 from RobertElder/more-tokens
...
More tokens
2014-10-07 10:10:14 -04:00
185d84dc01
Increase the time token is valid for in case of long uploads.
2014-10-03 02:18:04 +00:00
feff7f4343
tokens for multipart data upload.
2014-10-02 02:04:03 +00:00
5c69eda010
Tokens for Stream Settings page.
2014-10-01 20:55:07 +00:00
29b05343bd
Tokens for add User.
2014-10-01 19:36:36 +00:00
dbed915469
Tokens for preferences form.
2014-10-01 19:36:17 +00:00
2be4a5f9d0
Add form tokens to several forms.
2014-09-30 23:09:27 +00:00
78cc43d33d
Regenerate session ids.
2014-09-29 22:48:52 +00:00
1bb17c5614
Blacklist free products from upgrade page
2014-09-23 16:01:28 -04:00
bc603ddd33
Merge branch '2.5.x' into saas
2014-09-19 15:42:05 -04:00
3c797c044a
Undoing make API on by default for now. This needs to be done in the db
2014-09-19 15:41:55 -04:00
36b908b4d1
Merge branch '2.5.x' into saas
2014-09-19 15:30:16 -04:00
66b97158b7
Make API on by default - fix
2014-09-19 15:30:06 -04:00
a0b40e1f7d
Merge branch '2.5.x' into saas
2014-09-19 15:00:58 -04:00
28399b70cc
Make API on by default
2014-09-19 14:57:43 -04:00
365184c2b1
Merging upstream pull
2014-09-19 13:15:53 -04:00
9952c2b58f
Auto generated schema file updates
2014-09-19 13:03:09 -04:00
0789de9392
Updated Show services to account for added show instance description field
2014-09-19 13:02:38 -04:00
2630d88a03
Updated SQL queries to include instance descriptions for API calls
2014-09-19 13:00:44 -04:00
62c50234ab
Added 2.5.5 upgrades
2014-09-19 12:59:53 -04:00
28d2bdbbec
Updated upgrade functions to have a directory parameter, since __DIR__
2014-09-19 12:58:31 -04:00
abc9481a58
Updated to conform to naming conventions
2014-09-19 12:55:47 -04:00
3a1efa39eb
Added instance description field
2014-09-19 12:55:02 -04:00
05a8fdf091
Removed disk quota check from image upload, updated doc for processUploadedImage function
2014-09-18 18:23:13 -04:00
be90839dbe
Added description field to database calls for getting API information
2014-09-18 18:21:27 -04:00
c65fa8ce37
Added button to remove current show logo
2014-09-18 16:38:18 -04:00
d5f6e8a682
Moved validation workaround for show logo in from Schedule Controller, added check to prevent warning about invalid path in readfile
2014-09-18 16:37:03 -04:00
5dfadf6ecc
Changed check for image deletion
2014-09-18 16:35:32 -04:00
6c0b94f9bb
Moved validation workaround to Service
2014-09-18 16:34:35 -04:00
5af735654c
Added Airtime255 class in Upgrades
2014-09-18 16:33:01 -04:00
5e18e1881f
Removed unnecessary validator override functions
2014-09-18 16:30:47 -04:00
28824219f8
Added delete images endpoint to ShowController
2014-09-18 16:30:03 -04:00
b525638829
Changed extension check to MIME-type checking
2014-09-18 10:36:40 -04:00
080b2581b6
Changed RestAuth functions to static for ease-of-access
2014-09-18 10:35:26 -04:00
323f53d6ac
Changed data uri method to return empty string instead of malformed uri when given an incorrect path (oddball case)
2014-09-18 10:34:38 -04:00
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
1cf3a5ca3a
Fixed always deleting file tree for show image even if directory was non-existant
2014-09-17 19:53:23 -04:00
17ea198ea4
Added accessor function for Show image path
2014-09-17 19:49:22 -04:00
45939138cd
Added previews of uploaded and current show images
2014-09-17 19:48:17 -04:00
b505f16b8f
Commented out $calendar_info logging
2014-09-17 19:47:05 -04:00
c08252bc99
Added function to convert static image file in stor to data URI for display
2014-09-17 19:45:45 -04:00
c4b38043e8
Removed unnecessary image_path field from showData and ccShow object
2014-09-17 19:43:26 -04:00
f2eecebeed
Checkout commit
2014-09-17 13:07:18 -04:00
f724d86b6a
Updated mkdir call to allow for creation of nested directories
2014-09-17 12:16:35 -04:00
d6476fffcd
Added Logging to image upload
2014-09-17 12:05:39 -04:00
6e1244ca33
Added Logging to imag upload
2014-09-17 12:02:55 -04:00
f64b7d0813
Updated show edit functionality to accommodate uploading new show image
2014-09-17 10:27:14 -04:00
b2d81f370a
Merged changes
2014-09-16 18:34:59 -04:00
3f754c032a
Updated Show model to include show image path
2014-09-16 18:28:39 -04:00
940d74ce39
Files auto-updated by Propel
2014-09-16 18:26:18 -04:00
f5a607ad90
Added functionality for deleting saved images when the show is deleted, updating the show image, and returning the showId to be used by ShowController
2014-09-16 18:24:22 -04:00
f3548ff893
Moved functionality for uploading to RESTful ShowController class
2014-09-16 18:18:26 -04:00
3be8e10691
Removed unneccessary upload-image view
2014-09-16 18:16:28 -04:00
8494f813ee
Updated sql schema to include image_path in Cc_Show table
2014-09-16 18:13:46 -04:00
3655c261ac
Shifted Auth functions into separate class to avoid code duplication (not moved from MediaController yet)
2014-09-16 18:11:41 -04:00
e31eb17cfa
Added ShowController to handle show image uploads
2014-09-16 18:10:29 -04:00
da293f610f
Added setNoRender call to MediaController and removed unnecessary views
2014-09-16 18:06:45 -04:00
afffd0c876
Added requires for REST controllers to Bootstrap
2014-09-16 18:04:22 -04:00
5434311f7d
More work on show image uploads
2014-09-16 18:03:14 -04:00
2a2fcdcf10
More work on show image uploading functionality
2014-09-15 17:14:48 -04:00
cb80423fdd
Work on adding image upload to add-show form
2014-09-12 18:05:24 -04:00
ac60a927d4
Merge branch '2.5.x' into saas
2014-09-12 16:31:58 -04:00
2729202dc4
Corrected japanese locale from ja to ja_JP
2014-09-12 16:29:47 -04:00
662f9d3486
LocaleController path fix
2014-09-08 21:18:57 -04:00
2a96c6ec5b
Merge branch '2.5.x' into saas
2014-09-08 20:49:55 -04:00
f7b6e3379e
Enable Japanese locale
2014-09-08 20:49:08 -04:00
142060d600
Merge remote-tracking branch 'origin/2.5.x' into saas
2014-09-08 20:47:38 -04:00
a21b4f177d
Fixed a bug where we weren't checking if a variable was empty before using it
2014-09-08 13:14:23 -04:00
6598401266
Fixed a bug where we weren't checking if a variable was empty before using it
2014-09-08 11:48:18 -04:00
ef46b1facc
Whitelist account.sourcefabric.com for CORS
2014-09-04 19:11:09 -04:00
4c1e6d3fe3
Fixed base URL
...
Conflicts:
airtime_mvc/application/controllers/LocaleController.php
2014-09-04 17:09:09 -04:00
f157cad877
Fix silly CAPTCHA flow, now only asks if you get your password wrong 4
...
times in a row
2014-09-03 11:43:06 -04:00
2cc7557cb7
Remove php short tag for better compatibility
2014-08-29 17:10:55 -04:00
ace883c975
Merge branch 'cc-5709-airtime-analyzer' into saas-fix-modules-bootstrap-14-04
...
Conflicts:
airtime_mvc/application/configs/application.ini
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/models/Cache.php
2014-08-28 17:01:03 -04:00
0ccc7e7dc9
SAAS-470: Zend Rest module doesn't work on Ubuntu 14.04
...
The Bootstrap.php in the modules directory didn't like
short php tags.
2014-08-28 16:52:47 -04:00
52f3ed816e
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 12:01:42 -04:00
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
716cc5a754
Disable the APC cache for Ubuntu 14.04. APC is deprecated now so we need a better solution anyways.
2014-08-27 18:51:06 -04:00
77ff4ffc3a
Merge branch '2.5.x' into saas
2014-08-26 13:34:09 -04:00
d1971b6d2b
Remove cc_locale table and add Selenium running script
...
* Fixes CC-5906
2014-08-26 13:32:35 -04:00
20a5649dbe
Removed unused code.
...
Changed linked show warning message in the edit show form.
2014-08-25 18:33:29 -04:00
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
32e06a7456
Clean up and simplifcation of linked show filling
2014-08-25 18:33:00 -04:00
e3596dfed3
Added comments and removed some unused code
2014-08-25 18:32:41 -04:00
29c07f2438
Removed old comments
2014-08-25 18:32:27 -04:00
d81de5c6eb
Better way of getting the linked show schedule and moved that into its own function.
...
Store the ids of the new, created show instances so we can pass them to the
fillNewLinkedInstances function
2014-08-25 18:32:08 -04:00
57c1e76dc7
Added criteria parameter to CcShow->getFutureInstanceIds so we can retrieve results from database instead of cache
2014-08-25 18:31:58 -04:00
08e82cb32e
CC-5904: New linked show instances may get an old copy of the schedule
...
Change the way get the show stamp
2014-08-25 18:31:45 -04:00
9a6e617f7c
CC-5904: New linked show instances may get an old copy of the schedule
...
Better way of getting show stamp
Renamed variables
2014-08-25 18:31:33 -04:00
81357bc51f
CC-5904: New linked show instances may get an old copy of the schedule
2014-08-25 18:31:20 -04:00
ee52c7692c
CC-5902: Linked Shows -> Replace content check assumes content of shows have the same number of tracks
...
Conflicts:
airtime_mvc/application/services/SchedulerService.php
2014-08-25 18:30:27 -04:00
afc3d981e8
Commented out unnecessary functions using too much memory
2014-08-25 18:26:46 -04:00
192c4e884f
Bugfix in LocaleController
2014-08-25 18:19:11 -04:00
c55a3a4d74
Use SSL with Recaptcha to fix it
2014-08-25 18:19:00 -04:00
d438587ddc
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/airtime/CcShow.php
airtime_mvc/application/services/SchedulerService.php
airtime_mvc/application/services/ShowService.php
2014-08-25 18:09:51 -04:00
80b9bcdfc6
Use SSL with Recaptcha to fix it
2014-08-25 14:45:04 -04:00
0fb9429a9e
Bugfix in LocaleController
2014-08-25 14:18:23 -04:00
55682dc7a9
Bugfix in Airtime 2.5.3 upgrader class
2014-08-25 14:04:25 -04:00
bc63669853
Removed unused code.
...
Changed linked show warning message in the edit show form.
2014-08-21 17:12:54 -04:00
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
11de8bd988
Clean up and simplifcation of linked show filling
2014-08-21 13:39:25 -04:00
2a2b4bd05a
Added comments and removed some unused code
2014-10-15 17:11:38 -04:00
660b1a0596
Removed old comments
2014-08-21 09:47:54 -04:00
4c03e12ea1
Better way of getting the linked show schedule and moved that into its own function.
...
Store the ids of the new, created show instances so we can pass them to the
fillNewLinkedInstances function
2014-08-20 16:37:44 -04:00
a5704eac6e
Added criteria parameter to CcShow->getFutureInstanceIds so we can retrieve results from database instead of cache
2014-08-20 16:35:59 -04:00
4a124a8faf
CC-5904: New linked show instances may get an old copy of the schedule
...
Change the way get the show stamp
2014-08-18 19:27:42 -04:00
3fa15913c0
CC-5904: New linked show instances may get an old copy of the schedule
...
Better way of getting show stamp
Renamed variables
2014-08-18 18:55:03 -04:00
b9ecd00d33
CC-5904: New linked show instances may get an old copy of the schedule
2014-08-18 18:10:45 -04:00
62f8a65573
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
...
Conflicts:
airtime_mvc/application/services/SchedulerService.php
2014-08-18 13:03:22 -04:00
2cfc20d0c1
CC-5902: Linked Shows -> Replace content check assumes content of shows have the same number of tracks
2014-08-18 12:59:43 -04:00
60f4d112e7
Optimized linked shows schedule filling
...
* Fairly big improvement in memory usage and execution time for 24 hour linked
shows (memory usage no longer grows with show length)
2014-08-15 18:18:57 -04:00
f072d60ff1
Optimized linked shows schedule filling
...
* Fairly big improvement in memory usage and execution time for 24 hour linked
shows (memory usage no longer grows with show length)
2014-08-15 18:17:23 -04:00
33f397f577
remove memory usage log statements
2014-08-15 16:25:37 -04:00
f863f4dfcf
More mem usage logs
2014-08-15 15:41:00 -04:00
2bc8f6d403
Logging memory usage
2014-08-15 15:36:13 -04:00
26b210ded9
Commented out unnecessary functions using too much memory
2014-08-15 15:32:52 -04:00
f2929d02f6
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Commented function
2014-08-15 15:41:55 -04:00
22218079af
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Refactored show creation into separate function
2014-08-15 15:35:58 -04:00
7bd443f668
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Commented function
2014-08-15 11:09:05 -04:00
20bd2ad9d5
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Refactored show creation into separate function
2014-08-15 11:08:55 -04:00
fe8e004d87
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Create and fill show instances when pypo requests the schedule
Changed getCcShowInstancess function to return all instances
Changed some function calls to retrieve only show instances scheduled in the future
2014-08-15 11:07:26 -04:00
520387fcad
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Create and fill show instances when pypo requests the schedule
Changed getCcShowInstancess function to return all instances
Changed some function calls to retrieve only show instances scheduled in the future
2014-08-16 11:05:55 -04:00
ca62086e16
Removed cloud file deletion from Airtime Analyzer. Deletion is done from PHP now.
2014-08-12 12:59:50 -04:00
879e776c8d
CC-5888: Handle file deletion if the file is stored in the cloud
2014-08-12 12:32:49 -04:00
46228341b2
Audio preview fix
2014-08-12 11:39:29 -04:00
35c450be3f
Audio preview fix
2014-08-12 11:33:10 -04:00
1d43200041
Syntax error fix
2014-08-01 15:46:08 -04:00
1ab30c26e6
Enforce non-empty passwords when editing user settings
2014-08-01 15:38:35 -04:00
0203be0f10
Revert zend routing changes to fix uploads
2014-08-01 15:30:37 -04:00
1c676dee6d
Fix user settings again for Super Admins, also Zend routing tweak
...
* Better fix for language and interface settings not being able to change for Super Admins
* Fixes Zend routing on Trusty, for whatever reason
2014-08-01 12:50:02 -04:00
aa8a26271c
Fix zend routing on Trusty (weird error due to REST module)
2014-08-01 11:51:20 -04:00
02ea553f43
Removed media api delete-success callback because it's no longer in use
2014-07-31 23:21:39 -04:00
dd37ffbdd7
CC-5888: Handle file deletion if the file is stored in the cloud
...
Execute a python script that deletes a file from the cloud
2014-07-31 23:11:49 -04:00
8c2754972e
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Refactored storedfile->delete()
Added a deletePhysicalFile function to CcFile and CloudFile
Cleaned up schedule events that get passed to Pypo
2014-07-29 15:07:51 -04:00
b7d1852fc0
CC-5896: Store cloud files in separate table, inherited from cc_files
2014-07-28 16:11:05 -04:00
6fa7ddba9a
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Added delete on cascade for cloud files
2014-07-28 16:03:57 -04:00
f6aa2e5a3b
CC-5896: Store cloud files in separate table, inherited from cc_files
...
For cloud files, return the original filename when downloading a file instead of the cloud object name
2014-07-28 16:02:06 -04:00
ecb072b84c
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Fixed broken metadata display on Library page
Fixed broken download/preview option from Library page
2014-07-28 15:17:46 -04:00
d320651735
SAAS-461: Re-enable timezone and language settings for Super Admins
2014-07-28 12:37:40 -04:00
4b4554476a
Error checking if a locale isn't installed
2014-07-28 11:35:19 -04:00
e759b8969b
Fix undefined variable
2014-07-25 15:18:17 -04:00
1803e1fd8f
Logging::warning bugfix and updated translations
2014-07-25 15:05:35 -04:00
f1ea100411
CC-5896: Store cloud files in separate table, inherited from cc_files
2014-07-24 16:56:15 -04:00
f07e3b65eb
Better error handling if the WHMCS API call for GTM code generation
...
fails
2014-07-24 16:49:03 -04:00
b38f3d7e03
CC-5895: Upgrade Propel to 1.7
...
Add vendor directory to include path
2014-07-23 16:13:55 -04:00
7490c81a8f
CC-5895: Upgrade Propel to 1.7
...
Moved composer.json to top level of repo so propel will get installed there
Updated install scripts to reflect this change
2014-07-23 15:56:23 -04:00
41ff0cce67
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Using Class Table Inheritance - delegate behaviour, created a cloud_file
table to store cloud files
2014-07-23 15:22:42 -04:00
72841de714
CC-5895: Upgrade Propel to 1.7
...
Used composer to download Propel 1.7
The Propel library will no longer be stored in the Airtime repo
2014-07-23 15:03:51 -04:00
c09457ce7c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-07-16 15:03:39 -04:00
82d7f09382
Small code cleanup
2014-07-16 12:44:09 -04:00
7ca6b91cdf
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-16 12:03:22 -04:00
aaee522ec6
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-15 17:20:04 -04:00
490a9c0d06
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-07-15 16:46:20 -04:00
7438ecd2b4
Use track metadata from Airtime in playout engine
...
* Resolves CC-5893: Metadata not updated on Airtime Pro
* Report track metadata in the schedule API, and make pypo pass that
along to Liquidsoap via annotations.
* Move HTTP response sanitization for file metadata out of the REST module and into CcFiles
* Slightly improved the terrible exception handling in pypo
2014-07-15 16:41:55 -04:00
1aa99e2896
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
2014-07-15 16:41:29 -04:00
8e714bcb64
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-15 07:26:39 -04:00
b8a9d72da6
Give Submit Order button an ID for GTM
2014-07-11 16:37:48 -04:00
9d0f564190
Prevent analyzer from crashing if it is reporting a failure to Airtime
2014-07-11 16:17:13 -04:00
039a51121b
CC-5885: Factor out cloud storage code into separate class
2014-07-11 16:16:30 -04:00
e7dfc08128
CC-5892: Handle when a file is downloaded from the Airtime library
2014-07-10 17:59:27 -04:00
c2411b6f41
CC-5884: Modify Pypo -> Download files from cloud storage
2014-07-10 17:56:41 -04:00
52b8f3af87
Show plan updated confirmation on invoices page
2014-07-09 14:06:51 -04:00
0ab1eaa08c
Fix account upgrade invoicing issue
...
* Don't generate upgrade orders if the plan and the billing cycle didn't
change. WHMCS freaks out otherwise.
* Clean up some deadcode in BillingUpgradeDowngrade.php
* Squash an error in the invoice view if there's no invoices
2014-07-09 13:49:25 -04:00
20f55314b4
Logging to debug account upgrade, possibly broken by WHMCS update
2014-07-09 12:56:53 -04:00
3c05e14e4d
Fix error when upgrading account
2014-07-09 12:51:12 -04:00
9b3a26c19a
Fix user deletion, remove spurious logging
2014-07-08 17:45:22 -04:00
2750b6aa0b
Fixed unit tests in saas branch
2014-07-07 15:30:18 -04:00
0b41cd1d38
Validate VAT every time the Account Plans page loads
2014-07-07 15:20:41 -04:00
2b704178ea
Set resource_id and directory to 'cloud' type on PUT request
2014-07-04 16:35:01 -04:00
aeb3bb7aa0
SAAS-447: Cloud Storage
...
Added resource_id column to cc_files table
2014-07-04 16:34:00 -04:00
3c88f66162
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 17:13:06 -04:00
64d3cb7b1b
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 17:12:50 -04:00
63113b4e75
Fix for Chrome radio button disabling
2014-07-03 17:12:33 -04:00
e18a281991
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 16:53:11 -04:00
e8bc6a3080
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 16:53:01 -04:00
dea68878f4
Fix for radio button disabling bug in Billing view
2014-07-03 16:51:59 -04:00
20a4323af9
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 16:49:37 -04:00
a831fbe5b7
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 16:49:28 -04:00
c551097d57
Default to monthly billing for invalid values
2014-07-03 16:46:25 -04:00
6494db3ccf
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 13:06:14 -04:00
cec2132e5f
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 13:06:04 -04:00
10acbb8ad6
Fix WHMCS login for multiple users again
2014-07-03 13:05:44 -04:00
db73c94f5a
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 12:39:42 -04:00
1f08f3c482
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 12:39:33 -04:00
6f9c87db3d
WHMCS login bugfix
2014-07-03 12:39:18 -04:00
9c14cfd47c
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 12:27:01 -04:00
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
585a2859a6
Merge branch 'cc-5709-airtime-analyzer-buy-now' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-buy-now
2014-07-03 12:26:20 -04:00
a5822aa07a
CORS refactoring
2014-07-03 12:26:09 -04:00
ac930607ad
Redirect index action to upgrade action
2014-07-03 11:08:54 -04:00
cda812dd73
Trialbox: Don't open My Account in new window
2014-07-02 14:49:11 -04:00
758423a7f7
Billing page fix for customers with multiple stations
2014-07-02 14:47:10 -04:00
0695f7da20
Promote the sourcefabric_admin user too
2014-07-02 14:11:02 -04:00
35e98e468d
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
...
Conflicts:
airtime_mvc/application/controllers/LoginController.php
2014-07-02 13:43:09 -04:00
54fdb34fc4
Disable APC cache clearing on SaaS
2014-07-02 12:49:37 -04:00
523bb8e7b6
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-02 12:45:44 -04:00
b0cab62e80
More syntax fixes for PHP 5.3
2014-07-02 12:45:17 -04:00
368ac19d52
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-02 12:43:20 -04:00
4b7f8abc3d
Same thing again
2014-07-02 12:43:06 -04:00
96f370e071
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-02 12:41:07 -04:00
cd26671627
Weird syntax fix for PHP 5.3
2014-07-02 12:40:32 -04:00
f068d5bd9a
Fixed cache merge
2014-07-02 12:36:03 -04:00
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
728fccc2fe
Fixed Upgrade caching bugs
2014-07-02 12:30:52 -04:00
9de92a87a4
Refactored the upgrade process for Airtime Pro
2014-07-01 13:36:09 -04:00
e9cca4c441
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-27 15:50:51 -04:00
3357c1f032
Select current plan and show that correctly
2014-06-27 15:50:05 -04:00
907c53b94f
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-26 19:14:07 -04:00
2504a34818
Fallback to letting VAT validate if the VIES service is down
2014-06-26 19:13:40 -04:00
54590de6ee
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-26 18:59:14 -04:00
5745288113
Redirect Edit User screen for super admins
2014-06-26 18:58:03 -04:00
fe0485e66b
Invoice view bugfix
2014-06-26 18:04:37 -04:00
d34c0d91cd
Invoice view bugfix
2014-06-26 18:03:40 -04:00
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
d785d92953
VAT fixes
2014-06-26 17:44:53 -04:00
18c828defd
Finished up VAT validation for Plans page
2014-06-26 17:31:34 -04:00
94bbd3c8a5
Don't open trialbox My Account link in new window
2014-06-25 20:36:08 -04:00
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
b36967a690
Nicer auto-styling for the Billing Details form
2014-06-25 20:32:41 -04:00
fce6116d60
Made the invoices view nice!
2014-06-25 20:01:14 -04:00
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
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
4157c21b28
Merge branch '2.5.x' into saas
2014-06-25 11:25:50 -04:00
6c11ef2769
Even better fix, fixes unit tests too
2014-06-25 11:24:19 -04:00
bb21f08d87
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Auth.php
2014-06-25 11:18:56 -04:00
15013afa40
Better session handling fix
2014-06-25 11:15:14 -04:00
8a5a796858
Undo session fix temporarily until issues resolved
2014-06-24 16:46:10 -04:00
6f1727d8f3
Merge branch 'cc-5709-airtime-analyzer-buy-now' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-buy-now
...
Conflicts:
airtime_mvc/application/controllers/BillingController.php
2014-06-24 16:26:06 -04:00
bfb5631105
Removed hardcoded client ids.
...
Added a function that calculates vat and adds it to an invoice
2014-06-24 16:23:23 -04:00
8c20592423
Start of form customization for billing
2014-06-24 15:52:43 -04:00
5d69ba5f91
Custom fields were not saving
2014-06-24 12:51:02 -04:00
73724bdd04
Custom fields were not saving
2014-06-24 12:46:11 -04:00
3307cc8645
Merge branch 'cc-5709-airtime-analyzer-buy-now' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-buy-now
2014-06-23 17:04:50 -04:00
806525e28c
Fetch service id from whmcs api for upgrades
2014-06-23 17:04:23 -04:00
da6263c677
Merge branch 'cc-5709-airtime-analyzer-saas' into saas
2014-06-23 16:27:38 -04:00
701139e433
Merge branch 'gtm-saas' into cc-5709-airtime-analyzer-saas
2014-06-23 15:45:03 -04:00
72ef576f03
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-23 15:28:50 -04:00
24d842c4a6
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
2014-06-23 15:26:53 -04:00
a2bef67d33
Fix user session storage in multi-tenancy mode
2014-06-23 15:22:44 -04:00
380b5526d6
Merge branch 'whmcs-login-saas' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-23 13:25:40 -04:00
3919fbd839
Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
2014-06-23 13:25:19 -04:00
55ff95a34f
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-23 13:24:47 -04:00
6302e3b335
Fix CORS with Chrome
2014-06-23 13:24:28 -04:00
f40cdbc8cd
Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-23 10:59:07 -04:00
0439413ac0
Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
2014-06-20 17:46:08 -04:00
a881790408
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-20 17:44:44 -04:00
9a84bdfda1
Fixed syntax error
2014-06-20 17:44:30 -04:00
e43c1c00cf
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-20 17:43:37 -04:00
0eab0c609b
Permissions fixes for Super Admin users
2014-06-20 17:43:20 -04:00
25e4036d2f
typo
2014-06-20 17:29:56 -04:00
5d0ea2d015
Add billing section to main menu
2014-06-20 17:25:05 -04:00
497841225b
Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
2014-06-20 16:54:41 -04:00
f6a4a9d0d0
Removed invalid client id - for testing purposes
2014-06-20 16:54:05 -04:00
7275986158
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-20 16:42:18 -04:00
4179123ce0
Set up CORS for microsite autologin after signup
2014-06-20 16:41:48 -04:00
1e1dc1dd03
Validation
...
Refactoring
2014-06-20 16:31:26 -04:00
01bf2883e5
Save client info on upgrade
2014-06-20 15:00:28 -04:00
82220a44a3
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-20 13:36:37 -04:00
faa12c8065
Super Admin edit page points to billing now
...
* Also prevent super admin from being deleted
2014-06-20 13:36:06 -04:00
40f2796972
Created an invoice view
...
Some refactoring
Some validation
2014-06-19 16:55:01 -04:00
540b9167a1
Invoice action
2014-06-19 07:10:30 -04:00
83dbc789af
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-18 20:22:33 -04:00
29e9182fcd
Fixed syntax error... grumble grumble
2014-06-18 20:22:13 -04:00
6402e6d2b6
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-18 20:20:30 -04:00
76659c80c4
Fixed bad client ID / subdomain check in WhmcsLoginController
2014-06-18 20:20:08 -04:00
20c069fc65
Merge branch 'saas' into whmcs-login-saas
2014-06-18 18:43:15 -04:00
ee928a2963
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-18 18:43:12 -04:00
81699b3c65
Fixed missing constant
2014-06-18 18:42:55 -04:00
b6ab9fa2c5
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-18 18:29:14 -04:00
971e81756c
Added ability to login directly with WHMCS credentials (on Airtime login
...
screen)
2014-06-18 18:27:16 -04:00
b12d88ddf7
Fix a whoopsies
2014-06-18 11:03:26 -04:00
70a7410b1a
Remove key
2014-06-18 10:42:50 -04:00
0ba09c2dda
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-17 17:41:46 -04:00
7f6fc7770a
Added Super Admin role and WHMCS login
2014-06-17 17:40:55 -04:00
dc583a6e41
Messing around with AutoAuth for whmcs
...
Client form wasn't getting populated with new values after a save - fixed
2014-06-17 17:07:33 -04:00
d81afca7e3
Adding detailed log statements for actions involving show scheduling
2014-06-17 14:17:28 -04:00
1f4c8b755d
Created a separate view for upgrades and client info
2014-06-17 12:47:08 -04:00
d39f7548cd
un-hardcoded client id
2014-06-12 17:58:02 -04:00
81ceafbfbd
whmcs client form
2014-06-12 17:54:20 -04:00
267cc78699
'My Account' link on free trial box was broken
2014-06-12 09:37:16 -04:00
782a746a36
Merge branch 'gtm-saas' into saas
2014-06-11 14:13:50 -04:00
e3850f79da
Fix for detecting account duration
2014-06-11 14:09:40 -04:00
994dbddac2
Use document ready() event to fire data layer
2014-06-11 13:52:42 -04:00
d984ec9b43
Don't use NumberFormatter because of PECL intl dependency
2014-06-11 13:45:23 -04:00
a731f94f70
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-11 13:35:34 -04:00
e5a74e7285
Fix error due to bad exception throwing
2014-06-11 13:35:10 -04:00
5df522f226
Added GTM code and data layer
2014-06-11 13:24:03 -04:00
9c4b254bab
CC-5756: Scheduler: Different results between Show contents and Add/Remove Contents
2014-06-09 15:35:50 -04:00
94f1c95934
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-06-09 12:07:45 -04:00
66e6c23311
CC-5634: Can add/remove content to a linked show while one instance is currently playing
2014-06-09 12:07:27 -04:00
fa3c7bd67a
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-09 11:37:06 -04:00
560d1a9b14
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
2014-06-09 11:36:51 -04:00
345c782eb9
Fixed the unit tests and changed ops->zu
2014-06-09 11:34:25 -04:00
a07121787f
CC-5833: Update airtime demo w/o o.p.s.
2014-06-06 17:12:55 -04:00
ee489b39f9
CC-5869: Changing a repeating show to non-repeating and changing start time does not work
2014-06-06 14:51:01 -04:00
e4bb97bcc4
CC-5867: Can't edit show instance
2014-06-06 12:22:59 -04:00
cc19b18d7f
CC-5588: Specific user can't see Library because ColReorder is null for
...
their account
2014-06-05 18:04:42 -04:00
a12ebf2cb1
CC-5836: Status page still reports media-monitor even AA enabled
2014-06-04 18:23:18 -04:00
6e5d99b828
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-04 14:16:06 -04:00
e3c2ae03b3
Fixed upload file count being wrong in Add Media page (lemma to CC-5863)
2014-06-04 14:15:36 -04:00
65ea0e6d6f
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-03 12:44:35 -04:00
a969f8fc44
CC-5856: Analyzer metadata exception
...
* Fixed parsing of metadata when there's empty lists returned (mutagen's
API is awful)
* Return HTTP 422 if there's any exception in validating the metadata
2014-06-03 12:43:01 -04:00
e8de3b5750
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-02 14:15:06 -04:00
2e6d3821ae
CC-5863: Deleted files still shown in Recent Uploads view
...
* Fixed
2014-06-02 14:14:09 -04:00
1624aa4007
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-30 17:13:00 -04:00
9f9c32aec3
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-05-30 17:12:42 -04:00
61be4875fb
CC-5343: Missing files can be scheduled via playlists
...
* Fixed it by adding a check for this.
2014-05-30 17:11:12 -04:00
8ae1be265b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-30 13:04:08 -04:00
1373d4984f
CC-5862: Invalid UTF-8 chars cause DB error
...
* Strip and validate UTF-8 strings in the Media API
* Also properly parse track numbers containing "-"
2014-05-30 13:02:19 -04:00
01fc9e6ffc
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-26 19:11:47 -04:00
9eb0f2f3b3
CC-5859: Airtime Analyzer: format fields before writing to db
2014-05-26 17:13:45 -04:00
f8b7accc4a
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-22 19:17:15 -04:00
e1a0429939
Handle error case that could cause invalid disk usage reading
2014-05-22 19:16:42 -04:00
1db308330b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-22 18:47:21 -04:00
091be8cea3
SAAS-439: Genres longer than 64 characters cause Media API exception
...
* Truncate the genre field in the Media API
2014-05-22 18:40:05 -04:00
8432799b9a
CC-5853: Tracks marked as 'hidden' won't be marked as unavailable in Now Playing page
2014-05-22 14:47:14 -04:00
fb12ee7e54
CC-5855: Output to zendlog when files are deleted from library
...
Added host name to log message
2014-05-20 14:21:41 -04:00
f684ce4ab9
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-20 14:16:24 -04:00
4cdd855a21
CC-5855: Output to zendlog when files are deleted from library
2014-05-20 14:15:51 -04:00
d312c844bc
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-12 11:30:26 -04:00
691841eba4
CC-5844: Airtime Analyzer: Auto format the 'year' tag.
2014-05-12 11:29:58 -04:00
c9ddcc28e0
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-08 13:02:22 -04:00
0040965222
CC-5840: Add Media -> Endless retries if there is a validation error
...
Fixed by not adding message to retry queue if request returns a
validation specific error code (422)
2014-05-08 13:01:49 -04:00
fe8226e549
Removing logging statements
2014-05-08 11:02:50 -04:00
9cfdb04c89
Logging statements
2014-05-08 10:57:35 -04:00
8ea8226299
Removed some logging statements
2014-05-08 10:55:47 -04:00
f5e7c7e796
Logging statements
2014-05-08 10:51:55 -04:00
4c0d3a9d04
More logging statements for debugging
2014-05-08 10:50:49 -04:00
82ef08ad1e
Logging statements
2014-05-08 10:45:22 -04:00
c291439483
Adding back analyzer deadlock workaround.
...
Removing command to delete empty sub folders inside organize.
2014-05-07 15:01:31 -04:00
83d9ec413d
Commenting out where we delete empty sub folders inside organize folder
2014-05-07 13:58:39 -04:00
be69d956aa
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
2014-05-06 14:52:50 -04:00
bc080a26f7
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
2014-05-06 14:50:13 -04:00
eafbd7d5e9
CC-5838: Editing a repeating show yields in error if an instance is in the past
...
Was not checking if show is repeating properly
2014-05-06 13:01:20 -04:00
e963157a22
Merge branch 'cc-5709-airtime-analyzer-saas' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-saas
2014-05-05 12:42:49 -04:00
f89c66922b
Merge branch '2.5.x-saas' into cc-5709-airtime-analyzer-saas
2014-05-05 12:42:42 -04:00
5762bb9df5
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-05 12:26:01 -04:00
16fb9d75d3
Changed GetDiskUsage so it will always return 0 if the value has not been set yet
2014-05-05 12:25:42 -04:00
a8c428bfb0
Fix disk quota message
2014-05-05 11:52:13 -04:00
e11afd4e71
Fix for new saas instances getting created with a 'disk quota reached' message
2014-05-05 11:41:43 -04:00
39db3d4aee
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/application/controllers/UpgradeController.php
2014-05-05 11:21:02 -04:00
094382c766
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-05-05 11:19:27 -04:00
e4e5590b9f
CC-5802: Upgrade application.ini file
...
Remove this upgrade step from the upgrade controller
2014-05-05 11:19:14 -04:00
250d5d083e
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-02 16:06:15 -04:00
4b4fd5432f
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-05-02 15:52:31 -04:00
2d6748457c
Remove database credentials from application.ini
2014-05-02 15:50:37 -04:00
721e4e1a4a
CC-5806: Airtime Analyzer: Please implement "remove all files"
2014-05-01 10:58:51 -04:00
cb20c30723
CC-5806: Airtime Analyzer: Please implement "remove all files"
...
saas-specific changes for updating disk_usage
2014-04-29 16:08:03 -04:00
b0a711d918
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-29 16:06:43 -04:00
a5eb5e9901
CC-5806: Airtime Analyzer: Please implement "remove all files"
2014-04-29 16:06:25 -04:00
88b6b28c62
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-29 11:09:55 -04:00
04da9b3d61
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
...
Imported file path had album name twice - fixed
2014-04-29 11:09:31 -04:00
f0fdf85524
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-29 10:35:58 -04:00
94375ee441
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
...
Cleaner way of removing empty sub folders after ftp uploads
2014-04-29 10:35:39 -04:00
6adb7c53ae
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-29 10:05:35 -04:00
6f1dd7987f
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
2014-04-29 10:05:17 -04:00
c3c5720dac
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-28 16:25:13 -04:00
79687499aa
Logging statement. To remove later.
2014-04-28 16:24:59 -04:00
48742abd6b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-28 16:20:44 -04:00
f428a2d960
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
...
Delete the empty folder after files have been copied into imported
2014-04-28 16:20:26 -04:00
9a0abb29b3
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-28 15:52:49 -04:00
c586e3e2b8
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
...
Was using wrong position when using substr()
2014-04-28 15:52:08 -04:00
0c0c65f69b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-04-28 14:46:03 -04:00
fae5b15a9f
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
...
$_FILES does not store the original file path so we were losing the folder name.
Fixed by explicitly passing the full filepath in via the ftp-upload-hook.sh script
2014-04-28 14:44:52 -04:00
b4a9882e9c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-28 10:27:07 -04:00
d081ff10b2
CC-5807: Disk Space will be updated when file is not actually deleted
2014-04-28 10:25:36 -04:00
1de58c64d6
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/application/controllers/UpgradeController.php
2014-04-28 09:44:14 -04:00
42806b1cbf
CC-5802: Upgrade application.ini file
2014-04-28 09:43:21 -04:00
2fdb8d1deb
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-25 15:00:29 -04:00
8d9b9c1fb7
Moved deleting the maintenace temporary file flag to very end of upgrade task
2014-04-25 15:00:13 -04:00
f98b03f270
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/application/controllers/UpgradeController.php
2014-04-25 14:54:47 -04:00
66000a2847
CC-5802: Upgrade application.ini file
...
Changed where we insert new application.ini file lines
2014-04-25 14:53:58 -04:00
61df7c1a44
Moved some comments around
2014-04-25 14:20:04 -04:00
57ad1beaa9
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/application/controllers/UpgradeController.php
2014-04-25 14:18:56 -04:00
f432ea9f75
CC-5802: Upgrade application.ini file
...
Execute raw sql upgrade file at the end in case errors occured during the upgrade before it gets executed
2014-04-25 14:16:18 -04:00
aeec9172f9
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/application/controllers/UpgradeController.php
2014-04-25 11:16:21 -04:00
1009719e1c
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-04-25 11:05:51 -04:00
6890dcc3bc
CC-5802: Upgrade application.ini file
...
Used a transaction for upgrades. If upgrading the application.ini file fails, the database upgrades will get rolled back.
2014-04-25 11:05:33 -04:00
25e484cc2f
Delete code that was copied in twice
2014-04-25 10:22:38 -04:00
22b9cc3be1
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-25 01:08:24 -04:00
d9adba117a
One more time...
2014-04-25 01:08:08 -04:00
7a2f27fe41
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-25 01:03:05 -04:00
cdc88d25e1
Argh, fixed typo... it's late
2014-04-25 01:02:47 -04:00
3e2a165dd2
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-25 00:48:54 -04:00
e7ea5e5301
Try fixing UpgradeController version check again...
2014-04-25 00:48:13 -04:00
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
54db74f622
Allow upgrades from Airtime 2.5.1 because the version wasn't bumped
...
internally to 2.5.2
2014-04-25 00:40:51 -04:00
42f3bb17e1
CC-5814: 'Down for maintenance' page during upgrades
2014-04-24 16:23:57 -04:00
f536a7b1b4
CC-5814: 'Down for maintenance' page during upgrades
2014-04-24 16:19:55 -04:00
fcd8ea8ba5
CC-5802: Upgrade application.ini file
2014-04-24 10:22:52 -04:00
069ebd3991
CC-5802: Upgrade application.ini file
2014-04-24 10:12:24 -04:00
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
578f758274
CC-5810 : Installation can have race conditions with the cache
...
Preferences.php is used to set values since it will save the value to cache there as well.
defaultdata.sql is used where possible.
2014-04-23 15:41:15 -04:00
2f8461b2a6
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-23 14:58:36 -04:00
3e34f1cf96
fixing up some datatables queries, propel usage.
2014-04-23 12:53:43 -04:00
41e2b5d840
Fix the failed uploads view
2014-04-23 11:52:10 -04:00
50ab4cc9bc
Merge branch 'cc-5709-airtime-analyzer-saas' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-saas
2014-04-22 16:11:59 -04:00
1a71a848e1
CC-5802: Upgrade application.ini file
...
Attempting to write new lines to application.ini file via the upgrade controller
2014-04-22 16:11:46 -04:00
0a4a0d387a
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/application/configs/conf.php
2014-04-22 15:57:08 -04:00
e7482e52f7
Double equals typo *ducks*
2014-04-22 15:56:29 -04:00
dc27465b21
Fix config parsing for dev_env
...
Conflicts:
airtime_mvc/application/configs/conf.php
2014-04-22 15:29:21 -04:00
97ce5bdbc5
Fix config parsing for dev_env
2014-04-22 15:27:43 -04:00
43483dc112
Added dev env to RabbitMQ stuff for Analyzer (fixed)
2014-04-22 12:28:20 -04:00
a79f53758f
Fixed the RabbitMQ thingy
2014-04-22 11:40:35 -04:00
f106bf8fad
Separate RabbitMQ settings by development environment
2014-04-22 11:13:15 -04:00
411af6838b
Remove logging statement
2014-04-17 17:02:14 -04:00
64ebd9e720
Logging statement
2014-04-17 16:15:04 -04:00
8979e4e5a9
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-17 16:09:03 -04:00
df9482f2ff
CC-5795: Airtime Analyzer: "Delete file" in Library doesnt remove it from path
...
Media monitor was still being used to delete the file from stor
2014-04-17 16:08:02 -04:00
d00e390511
Removed last change
2014-04-17 13:58:56 -04:00
0a6b72ad99
Removing something for testing purposes
2014-04-17 13:56:02 -04:00
c8121f9bc8
CC-5781: Upgrade script for new storage quota implementation
...
Was using du wrong. Wasn't returning value in bytes
2014-04-17 13:53:24 -04:00
3ebf9e56dd
Upgrade script testing
2014-04-16 17:30:44 -04:00
b348286448
Upgrade script testing
2014-04-16 17:28:55 -04:00
456ac40fe6
Upgrade action testing
2014-04-16 17:27:15 -04:00
cd6c4f7ede
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-16 17:24:56 -04:00
a3be55fd60
CC-5781: Upgrade script for new storage quota implementation
...
Changed airtime conf file path so it works for saas or self-hosted users
2014-04-16 17:24:02 -04:00
edeb4b052a
Remove logging statements
2014-04-16 16:53:17 -04:00
f33317ebee
Logging for testing
2014-04-16 16:44:31 -04:00
7c39ab294d
Logging for testing
2014-04-16 16:37:38 -04:00
837decb5c3
Logging for testing
2014-04-16 16:36:19 -04:00
284a1b8895
Upgrade logging test
2014-04-16 16:29:36 -04:00
db62ffff90
Log statment for testing upgrades
2014-04-16 16:01:48 -04:00
634b429391
Logging statment for testing upgrades - will be removed
2014-04-16 15:56:45 -04:00
d05eae629a
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-16 12:16:08 -04:00
f5a2e59b6d
Removed disk space check from StoredFile. This is now done in the Media controller
2014-04-16 12:15:34 -04:00
5045d3ab7c
Remove logging statements
2014-04-16 12:11:46 -04:00
10cf16f53a
Logging statments
2014-04-16 12:04:18 -04:00
51af3ba36e
Undo-ing imported filepath change
2014-04-16 11:56:14 -04:00
368be9002e
Changing imported path for ftp script
2014-04-16 11:54:20 -04:00
a4b1db91b1
Logging for ftp
2014-04-16 11:41:29 -04:00
9cea1f079b
Logging for ftp script
2014-04-16 11:31:42 -04:00
0c2092b33f
Logging for ftp script
2014-04-16 11:04:46 -04:00
cf13952b45
Logging messages for debugging the ftp script
2014-04-16 11:01:02 -04:00
87f365038f
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-14 12:22:15 -04:00
53ffa29b6b
CC-5786: Quota Enforcement in the File Upload API
...
small fix
2014-04-14 12:21:59 -04:00
e8cf288d5d
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-14 12:14:02 -04:00
acf91bc627
CC-5786: Quota Enforcement in the File Upload API
...
Small refactor
2014-04-14 12:13:48 -04:00
9041801103
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-14 12:09:48 -04:00
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
edcf8844e3
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-14 11:25:02 -04:00
4add0f0b7b
CC-5786: Quota Enforcement in the File Upload API
2014-04-14 11:24:39 -04:00
4afccfe225
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-10 15:55:49 -04:00
7fbd285dd0
Fix typo
2014-04-10 15:55:21 -04:00
51c80bc033
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-10 15:50:58 -04:00
819862c37b
CC-5781: Upgrade script for new storage quota implementation
...
cleaned up upgrade controller
2014-04-10 10:55:47 -04:00
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
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
5971f51b53
CC-5781: Upgrade script for new storage quota implementation
...
First draft of an upgrade controller
2014-04-10 07:12:31 -04:00
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
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
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
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
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
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
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
64a95c7c59
CC-5709: Airtime Analyzer
...
* Nuked another unused function
2014-04-03 16:36:42 -04:00
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
0398072d45
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-03 11:35:37 -04:00
2ca911616f
Setting hidden flag to true on post request
2014-04-03 10:12:20 -04:00
e3757d892b
CC-5709: Airtime Analyzer
...
* Fix hack for Airtime Pro
2014-04-02 17:27:10 -04:00
aabb8ec01f
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-02 16:48:04 -04:00
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
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
a6e80e2789
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-01 12:29:20 -04:00
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
70228a675e
Changed default import_status value on cc_files table to 1 (pending)
2014-04-01 11:28:33 -04:00
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
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
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
6952902b22
CC-5709: Airtime Analyzer
...
* Unbreak stuff
2014-03-24 16:05:53 -04:00
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
e5e4d5bb01
SAAS-417: quick fix for typo
2014-03-21 16:27:32 -04:00
efca227388
SAAS-417: Disable Live Chat for Starter Plans
...
* Disable Live Chat for Starter Plans
2014-03-21 14:30:41 -04:00
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
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
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
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
2b696dbee5
CC-5741: Create a download action for the File API
2014-03-18 13:04:06 -04:00
2a783f3825
Merge branch '2.5.x' into 2.5.x-saas
2014-03-17 15:41:14 -04:00
16c56e6aff
CC-5709: Airtime Analyzer
...
* Fixed error in media API authentication
* Improved documentation
2014-03-17 14:43:50 -04:00
86a34635bb
CC-5701: Airtime File API
...
Fixed saving filepath and directory
2014-03-17 10:56:49 -04:00
f7cb923ceb
CC-5709: Airtime Analyzer
...
* Fixed breakage
2014-03-17 10:25:26 -04:00
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
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
65ab49baee
CC-5733: RESTful API data sanitization and validation
...
Renamed sanitize function to sanitizeResponse
2014-03-14 17:53:03 -04:00
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
6a68967f81
CC-5734: RESTful API media ownership
2014-03-13 17:00:15 -04:00
9b390518b7
CC-5709: Airtime Analyzer
...
* Fix the callback URL
* Imports files successfully now!
2014-03-13 14:59:48 -04:00
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
f4ea417b83
CC-5709: Airtime Analyzer
...
* Renamed a function in MediaController for clarity
* Updated airtime_analyzer README
2014-03-13 12:12:12 -04:00
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
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
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
c668d91e08
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-03-10 18:33:15 -04:00
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
725b5da154
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-03-10 17:42:12 -04:00
14c670aa20
CC-5728: Problem when removing repeat option and changing start date
2014-03-10 17:41:57 -04:00
1854d76f03
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-03-10 17:39:36 -04:00
5f3199b4bb
CC-5727 : History search range using incorrect timezone offset
2014-03-10 17:39:17 -04:00
8ad866c2a2
Fixed changing the start date on a non-repeating show
2014-03-10 17:32:54 -04:00
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
6b91d2daf8
CC-5725: Changing a show's repeat type removes first instance from repeating series
2014-03-07 14:52:32 -05:00
c0818682af
CC-5709: Airtime Analyzer
...
* Fixed the /rest/media endpoint
2014-03-06 17:38:57 -05:00
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
35fd639c1c
CC-5725: Changing a show's repeat type removes first instance from repeating series
2014-03-06 11:18:13 -05:00
51b5cc2052
CC-5725: Changing a show's repeat type removes first instance from repeating series
2014-03-06 10:54:40 -05:00
bcda9ea5e6
Broke unit test for adding content to single show
2014-03-05 14:50:35 -05:00
426b75b635
CC-5724: Changing start date of a repeating show will update content incorrectly
2014-03-05 14:37:07 -05:00
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
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
b433a529ab
CC-5696: Two shows or even three shows playing at once. Unstopable even after reboot
2014-03-03 16:42:52 -05:00
b6dd2e3152
CC-5701: Airtime File API
2014-03-03 16:04:34 -05:00
f33f49259d
CC-5701: Airtime File API
...
Fixed http response code for delete
2014-03-03 11:28:18 -05:00
aba2fb44d1
CC-5701: Airtime File API
...
-put and delete actions working
2014-03-03 11:21:25 -05:00
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
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
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
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
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
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
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
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
acb3b9b179
Merge branch '2.5.x' into 2.5.x-saas
2014-02-11 10:29:50 -05:00
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
09040dc021
Merge branch '2.5.x' into 2.5.x-saas
2014-02-03 12:33:57 -05:00
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
b7c79df6ec
Merge branch 'unittests' into 2.5.x
2014-01-31 15:02:41 -05:00
c7c2d37b30
Merge branch '2.5.x' into 2.5.x-saas
2014-01-31 13:21:33 -05:00
883e8885c7
CC-5677: Library -> Scheduled column gets updated on incorrect file
2014-01-30 12:38:18 -05:00
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
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
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
719d582e0f
Merge branch '2.5.x' into 2.5.x-saas
2014-01-29 12:13:24 -05:00
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
a0cae1d8f3
Merge branch '2.5.x' into 2.5.x-saas
2014-01-27 15:23:01 -05:00
c9d98e4e10
Small Airtime Pro fix for ShowFormService
2014-01-27 14:31:33 -05:00
ed78625fce
Merge branch '2.5.x' into 2.5.x-saas
2014-01-27 12:01:11 -05:00
52c3971fc6
Fixed a bug in Application_Model_SetShowsPopulatedUntil
2014-01-22 17:58:25 -05:00
d5112f0368
Added comments for a show_service function
2014-01-20 17:05:37 -05:00
0b4ae6b94d
CC-5651: Unit Test the Scheduler
...
Added test for deleting repeating show instances
2014-01-14 14:16:37 -05:00
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
0f107dbad3
Initial unit test configuration
2014-01-13 11:43:16 -05:00
9e5cfe0d39
CC-5666: Deleting a show instance can revert the 'no end' option
2014-01-13 11:41:44 -05:00
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
2cdad4932a
CC-5660: Unable to create shows with a rebroadcast
...
Used wrong formating for minutes
2014-01-06 14:04:18 -05:00
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
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
dc05d9ddaf
CC-5649: Remove unused function, Application_Model_Show::populateAllShowsInRange
2013-12-17 17:09:59 -05:00
8daca16fac
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-16 17:14:55 -05:00
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
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
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
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
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
6a468ff549
Fix a rendering problem if a zero length show happens
2013-12-13 18:27:14 -05:00
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
fa0a190277
Prevent division by zero if show lengths end up being zero
2013-12-13 16:10:36 -05:00
99902bc10c
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-13 15:16:51 -05:00
445f1ebe4f
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
...
removing old crappy method.
2013-12-13 15:14:38 -05:00
7a51b8d2ad
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-13 15:06:52 -05:00
a45235d39b
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone
2013-12-13 15:03:02 -05:00
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
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
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
bbccc2e7d3
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-12 17:18:17 -05:00
87ac5dc294
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone
2013-12-12 17:18:03 -05:00
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
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
27f0fa27e9
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-12 13:32:25 -05:00
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
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
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
974be86691
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-12 11:48:11 -05:00
9bbc3cf713
CC-5633: Can schedule overlapping shows
...
The overlapping show check was returning false too early
2013-12-12 11:48:00 -05:00
f2fe04ba1d
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-12 11:33:28 -05:00
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
37ea29380b
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-11 18:56:29 -05:00
67031a75fe
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-11 18:56:19 -05:00
abf3a50694
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-11 18:22:08 -05:00
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
e6c971387b
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-11 17:35:47 -05:00
e6d28b250e
CC-5629 : Smart Block timestamps aren't saved in UTC time
2013-12-11 17:35:31 -05:00
3a50f7a6dc
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-11 16:55:47 -05:00
cfb6195523
CC-5632: System preferences don't get saved
2013-12-11 16:55:35 -05:00
d575a478b5
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-11 15:56:03 -05:00
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
c5f30c2b54
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-11 15:20:40 -05:00
b13d12eaac
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-11 15:20:19 -05:00
8aa838bb34
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-11 14:45:28 -05:00
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
3d1f0b0d0e
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-10 17:41:59 -05:00
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
0919915c6b
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-09 16:27:06 -05:00
310cfddd3a
CC-5626: Context menu -> Edit -> Doesn't populate show forms properly
2013-12-09 14:53:58 -05:00
0f28e0f1aa
Merge branch '2.5.x' into cc-5594-date_default
2013-12-06 18:18:17 -05:00
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
d056ee8c2e
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-06 17:14:35 -05:00
2c7db0e83c
CC-5555: Fix user preferences logic in preferences cache
...
* Fixes stream settings not dislaying
2013-12-06 17:11:07 -05:00
cdfdbc4da2
Removed unused code
2013-12-06 16:51:13 -05:00
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
061897a58b
CC-5594 : Remove all date_default_timezone_get()
...
never rely on this method.
2013-12-05 16:00:52 -05:00
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
b1842fff34
Merge branch '2.5.x' into cc-5594-date_default
2013-12-05 15:13:54 -05:00
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
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
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
ed74470803
CC-5594 : Remove all date_default_timezone_get()
...
updating dashbaord information for timezone.
2013-12-04 17:54:28 -05:00
8f1e73edf5
CC-5594 : Remove all date_default_timezone_get()
...
fixing up controllers
2013-12-04 16:26:11 -05:00
20b32bab80
CC-5594 : Remove all date_default_timezone_get()
...
simplifying code, removing unnecessary calculations.
2013-12-04 16:05:18 -05:00
e508d141ed
CC-5594 : Remove all date_default_timezone_get()
...
resizing must calculate from displayed calendar settings.
2013-12-04 15:48:32 -05:00
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
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
aafeeb6aed
CC-5594 : Remove all date_default_timezone_get()
...
replacing timezone with the user timezone pref.
2013-12-04 15:11:40 -05:00
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
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
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
82b40f52e7
Merge branch '2.5.x' into cc-5594-date_default
2013-12-04 14:42:30 -05:00
447ad4e3c6
CC-5594 : Remove all date_default_timezone_get()
...
correcting show contents timezone.
2013-12-04 14:39:56 -05:00
e6808b0c12
CC-5594 : Remove all date_default_timezone_get()
...
removing now unused old methods
2013-12-04 14:31:23 -05:00
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
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
c9773d2a0e
CC-5594 : Remove all date_default_timezone_get()
2013-12-04 14:13:19 -05:00
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
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
Albert Santoni
drigato
Duncan Sommerville
Denise Rigato
Albert Santoni
Daniel James
Mark Lewis
Robert Elder
Robbt
Naomi