Albert Santoni
df48de607b
Revert billing client ID change
2015-03-05 17:45:07 -05:00
Duncan Sommerville
918631d676
When calling /change, don't set prefs if empty/no parameters are given
2015-03-05 12:24:02 -05:00
Albert Santoni
278aa31d2f
Hack: avoid calling WHMCS to get the station instance id
2015-03-04 15:53:43 -05:00
Duncan Sommerville
e2054c13c8
Added provisioning code for change requests
2015-03-03 16:04:45 -05:00
Duncan Sommerville
95db8533b5
Made provisioning helper slightly more robust
2015-03-03 15:29:34 -05:00
Duncan Sommerville
52813045a6
Additional parameters in provisioning when creating stations from dashboard
2015-03-03 15:10:10 -05:00
Albert Santoni
76141b38b8
Merge branch 'saas' into saas-media-refactor
2015-03-02 09:52:05 -05:00
Albert Santoni
2e2f1f9762
Fixed SAAS-612: Recreating a station can wipe its database
2015-02-26 17:14:46 -05:00
Albert Santoni
ac3ad3d23b
Prevent overwriting the database if it already exists
2015-02-26 15:33:35 -05:00
Albert Santoni
7d534d1cda
Airtime Pro SSL compatibility hack
2015-02-25 16:19:01 -05:00
Albert Santoni
5acad059de
Insert leading slash into basedir for station URL
2015-02-25 16:09:08 -05:00
Albert Santoni
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
Albert Santoni
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
Albert Santoni
2e2c3d6276
Merge of cc-5709-airtime-analyzer-saas-refactor into saas
2015-02-20 14:27:16 -05:00
Duncan Sommerville
33ebca00db
Small fix to BPM sanitization
2015-02-20 14:23:36 -05:00
Duncan Sommerville
61a47aeb27
Small fix to BPM sanitization
2015-02-20 14:01:29 -05:00
Albert Santoni
0177e40083
Pull the logic for Media REST API out of the controller
2015-02-19 15:10:01 -05:00
Albert Santoni
5a644ae0b8
Merge branch 'cc-5709-airtime-analyzer' into saas
2015-02-19 09:31:58 -05:00
Albert Santoni
487ab9bd99
CC-5868: Make the BPM field less strict
2015-02-19 09:31:23 -05:00
Albert Santoni
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
Albert Santoni
17f1d0e96d
Simplify the metadata sanitization and bugfix it
...
* SAAS-376 and CC-5868
2015-02-18 16:29:08 -05:00
Albert Santoni
717d322dc8
Fix typo breaking provisioning/create/
2015-02-18 15:22:47 -05:00
Albert Santoni
12c0617e57
Set up the cc_music_dirs entry in /provisioning/create
2015-02-18 13:27:52 -05:00
Albert Santoni
dcac7ab652
Fixed a couple of bugs in the new /provisioning/create API
2015-02-18 12:21:15 -05:00
Albert Santoni
d2fae5adae
Testing out only creating the database tables ...
2015-02-17 16:49:52 -05:00
Duncan Sommerville
a07a1edcc0
SAAS-595 - Updated validation and sanitization
2015-02-17 12:17:49 -05:00
Albert Santoni
e603597101
Cleanup and comments
2015-02-17 12:13:37 -05:00
Duncan Sommerville
ad5536dedd
SAAS-582 - Added provisioning class to create database from within Airtime
2015-02-12 15:39:22 -05:00
Albert Santoni
e216a03d37
SAAS-562: UpgradeController broken
2015-01-27 12:13:58 -05:00
Albert Santoni
dbba5a7427
Decouple Billing and S3 cloud storage stuff from Zend
2015-01-26 13:10:10 -05:00
drigato
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
Mark Lewis
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
Albert Santoni
a62e98beb4
Fix logins from WHMCS by disabling CSRF token on login page for trusted
...
origins
2014-11-20 19:33:11 -05:00
Duncan Sommerville
eef7116142
Updated i18n to use multiple domains
2014-11-04 17:03:52 -05:00
Albert Santoni
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
Duncan Sommerville
275ca5eed6
Resolved differences merging 2.5.x into saas
2014-10-27 16:25:42 -04:00
Robert Elder
a88c0233d6
Don't throw exceptions for localhost in CORSHelper.
2014-10-27 15:07:12 +00:00
Duncan Sommerville
598b18b65a
Added live-info-v2 and station metadata api calls
2014-10-24 15:11:27 -04:00
Albert Santoni
142060d600
Merge remote-tracking branch 'origin/2.5.x' into saas
2014-09-08 20:47:38 -04:00
Albert Santoni
ef46b1facc
Whitelist account.sourcefabric.com for CORS
2014-09-04 19:11:09 -04:00
Albert Santoni
4c1e6d3fe3
Fixed base URL
...
Conflicts:
airtime_mvc/application/controllers/LocaleController.php
2014-09-04 17:09:09 -04:00
Albert Santoni
a5822aa07a
CORS refactoring
2014-07-03 12:26:09 -04:00
Albert Santoni
a96c2551ef
CC-5627 : Check all Application_Common_DateHelper calculations that use
...
timezone.
* Fixed GetPlayOrderRange to be consistently return everything in UTC.
* ApiController liveInfoAction now returns everything consistently in
the station timezone. This fixes negative remaining time that could
occur in the embeddable JS Airtime widgets if you were logged in to
Airtime while you viewed your website. (The widgets display in
the browser's local time.)
* ScheduleController getCurrentPlaylistAction() returns everything
consistently in the user timezone now.
2013-12-12 13:28:51 -05:00
Naomi
67031a75fe
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-11 18:56:19 -05:00
Naomi
e6d28b250e
CC-5629 : Smart Block timestamps aren't saved in UTC time
2013-12-11 17:35:31 -05:00
Naomi
b13d12eaac
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-11 15:20:19 -05:00
Naomi
3d1f0b0d0e
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-10 17:41:59 -05:00
Naomi
3a2f9a24b5
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
...
working on getting widgets to work properly returning station local time.
2013-12-10 16:45:05 -05:00
Naomi
7e9ca3e950
CC-5594 : Remove all date_default_timezone_get()
...
updating move show code to work with the user's timezone.
unified method signature for updateScheduleStartTime to always use the $diff param.
2013-12-06 12:33:36 -05:00
Naomi
ed74470803
CC-5594 : Remove all date_default_timezone_get()
...
updating dashbaord information for timezone.
2013-12-04 17:54:28 -05:00
Naomi Aro
0734a4a98c
CC-5320 : UTC not included in Timezone List
2013-09-05 11:54:25 +02:00
Martin Konecny
21df9013ee
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 14:43:59 -04:00
Martin Konecny
92c7c9c951
should constants instead of literals - only in function for now...
2013-05-09 13:28:26 -04:00
Martin Konecny
9f6a1033ea
CC-5109: Fix race-condition when updating cc_pref table
2013-05-07 16:21:34 -04:00
denise
418bf0b5ff
Created calendar service and moved the context menu creation there
2013-03-26 16:03:53 -04:00
Martin Konecny
d7d1170ee1
CC-5003:
...
Some tracks are being cut off before fully playout out
-fixed
2013-03-04 18:52:51 -05:00
denise
ad0879996d
CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect.
...
-use existing function to convert seconds to time format
2013-01-18 14:35:17 -05:00
denise
22ecc3f1fc
CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect.
...
-fixed
2013-01-18 14:28:45 -05:00
Martin Konecny
fae3f3a03f
CC-2184: Hardcoded CSS path should be relative path instead
...
-Make '/' the default root
2013-01-14 16:00:38 -05:00
denise
db62b538dd
CC-4816: Timezones should be a user preference
...
-done
2013-01-09 13:38:38 -05:00
denise
b2699fa914
merge from devel
2012-12-03 11:06:56 -05:00
denise
9958d8da9f
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper function to all strings in layout, and common
2012-11-20 11:33:37 -05:00
denise
d32495d100
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 11:09:34 -04:00
Martin Konecny
75620be761
remove all mosty carriage return characters
2012-09-17 16:46:51 -04:00
Rudi Grinberg
8eda4a7035
Subtle bug fixed in smartPrepareAndExecute.
2012-09-13 10:34:15 -04:00
Rudi Grinberg
78b0dcedfc
Added smartPrepareAndExecute. Warning: Test before using
2012-09-07 17:58:16 -04:00
James
7d3ac8eb07
CC-4346: Prepared statements - part 2
...
- done
2012-09-06 16:46:22 -04:00
Rudi Grinberg
88c5ef484f
Formatting
2012-09-06 10:38:14 -04:00
Rudi Grinberg
5481191730
added type hint
2012-09-05 18:01:20 -04:00
denise
78c81aa434
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/common/Database.php
2012-09-05 17:55:26 -04:00
denise
26c2c2c0d1
CC-4345: Prepared statements - part 1
...
-added extra parameter to prepareAndExecute()
2012-09-05 17:52:53 -04:00
Rudi Grinberg
73e152ebcf
added type annotation again
2012-09-05 17:51:50 -04:00
Rudi Grinberg
aa6e061118
conflicts merged
2012-09-05 17:51:16 -04:00
Rudi Grinberg
d2e883da7a
Added type annotation
2012-09-05 17:48:15 -04:00
Martin Konecny
0ae1b9fea6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/common/Database.php
2012-09-05 17:45:13 -04:00
Martin Konecny
139950fac2
PSR fixes
2012-09-05 17:44:09 -04:00
James
4af9bfaa9d
CC-4346: Prepared statements - part 2
...
- fix spelling
2012-09-05 17:41:18 -04:00
James
326ba012c1
CC-4346: Prepared statements - part 2
...
- CRLF
- adding include in bootstrap
2012-09-05 16:15:02 -04:00
James
4ac2d6ac4e
CC-4346: Prepared statements - part 2
...
- adding common function to prepare param to PDO statement and excute.
2012-09-05 15:59:15 -04:00
denise
4ee232944d
CC-4169: Playlist Builder: Smart Playlist time validates even if time isn't given
...
-fixed
2012-08-07 16:27:18 -04:00
denise
97943a6af8
CC-4157: Playlist Builder -> Smart Playlist -> Wrong warning msg if trying to input 0000-00-00 into Upload criteria
...
-fixed
2012-08-07 16:17:24 -04:00
James
0d2d8218bf
CC-84: Smart Playlists
...
- audio preview on playlist
- cleaning up some code
2012-08-02 16:36:12 -04:00
James
1f3cbd8aba
CC-84: Smart Playlists
...
- introducing smart-block
2012-07-25 12:44:37 -04:00
James
2e7cf68777
CC-4110: Smart Playlist: some search criteria don't work
...
- added bunch of validation
- fixed a bug with range modifier not working correctly
2012-07-19 16:57:24 -04:00
james
7342ea4d4b
CC-4053: Widget not showing correct day on Sunday
...
- fixed weekly widget
- also fixed today's show widget
2012-07-03 13:17:48 -04:00
James
548a6ce16a
CC-3957: Make Schedule Widgets show future Sunday instead of past Sunday
...
- bug fix
2012-06-12 17:49:34 -04:00
James
06d90c53aa
CC-3957: Make Schedule Widgets show future Sunday instead of past Sunday
...
- fixed
2012-06-11 16:42:12 -04:00
Martin Konecny
77bffcd8e9
join function should be static
2012-05-06 20:30:49 -04:00
Martin Konecny
6e755b000b
CC-3707: copy files to stor, extra forwardslash
...
-fixed
2012-04-24 16:15:22 -04:00
James
ffc17ba705
CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format
...
- DateHelper.php is moved from model to common folder
- created OsPath.php file which contains normpath()
- normpath() is used instead of realpath()
2012-04-13 17:45:28 -04:00