Robb
44d3d46904
Merge pull request #80 from radiorabe/feature/reset-password-without-whmcs
...
Make password reset work for eveyone
2017-03-14 19:07:27 -04:00
Robb
3eaa999130
Merge pull request #81 from radiorabe/feature/email-from-header-config
...
Change default email sender
2017-03-14 00:06:30 -04:00
Robb Ebright
67ffd2d34a
Making show and master source ports and mount points editable.
2017-03-14 01:15:14 +00:00
Robb Ebright
99a3150db5
changed default streamsetting to match the baseurl vs. out.airtime.pro
2017-03-13 20:37:51 +00:00
Lucas Bickel
88b3eb22a0
Change default email sender
...
The new noreply@ address is now libretime.org and the address gets moved to contants.php rather than being hardcoded in the email model.
2017-03-13 20:46:39 +01:00
Lucas Bickel
61cde1557f
Make password reset work for eveyone
...
This stops distinguishing between superadmin users from whmcs vs regular local users on the password reset page.
2017-03-13 20:39:21 +01:00
Robb Ebright
ba9f7879a4
modified smart block to not exceed the time limits.
2017-03-12 22:36:36 -04:00
Lucas Bickel
260ebe2476
Fix listenerstat page
...
Deactivates the bandwidth limit stuff if none is configured.
2017-03-12 15:13:45 +01:00
Robb
ff83784864
Merge pull request #56 from radiorabe/feature/version-reporting
...
Harmonize version reporting in ui and api
2017-03-11 19:06:28 -05:00
Robb
2be8ef0f2b
Merge pull request #55 from radiorabe/feature/autodj
...
Robbs AutoDJ
2017-03-11 18:41:08 -05:00
Lucas Bickel
bd18caf69d
Harmonize version reporting in ui and api
...
Everything should use the version from the VERSION file created by the installer like this.
2017-03-10 20:38:43 +01:00
Lucas Bickel
86ff6e8e12
Remove remainder of legacy doctrine code
2017-03-10 18:37:11 +01:00
Lucas Bickel
2a53241ba3
Whitespace and deadcode nitpick
2017-03-10 16:27:46 +01:00
Robb Ebright
32a1a66378
Added AutoPlaylist Functionality to Show Scheduler enabling shows to have tracks added automatically.
2017-03-10 15:33:32 +01:00
Lucas Bickel
baa0f9ba77
Make CORS great again
...
This fixes CORS to work properly with most 2.5 api endpoints while keeping the JSONP format available.
* [x] return JSONP or JSON with proper CORS headers from API
* [x] Field in Genereal Preferences Form to configure CORS enabled URLs
See #17 for what triggered this refactor. I beleive this should make integrating the APIs on the client side trivial without mandating the use of JSONP.
2017-03-10 15:10:56 +01:00
Robb
be00c68ed0
Merge pull request #45 from radiorabe/feature/remove-pref-cache-in-mvc
...
completely remove deactivated cache
2017-03-09 20:37:42 -05:00
Robb
945998f836
Merge pull request #49 from radiorabe/feature/refactor-help-menu
...
Update naming and links in constants
2017-03-08 20:30:12 -05:00
Lucas Bickel
272c295974
Update naming and links in constants
...
This is to get the help section to look better and point to somewhere users can find us. It also takes care of /dashboard/about and maybe more.
Some of the links I'm adding are 404 as we have yet to write them, I'd rather link something we have under our control rather than legacy transifex or others.
2017-03-08 16:26:18 +01:00
Lucas Bickel
70e6135e93
Restore full disk usage not based on quota
...
This is mostly a restore of how this used to be implemented.
2017-03-08 15:56:43 +01:00
Lucas Bickel
21356d1894
completely remove deactivated cache
...
Cache handling has been disabled on saas-dev and 2.5.x at least for a while. This gets completely rid of it.
You should do caching on the byte-code level in PHP using the tool best fitting your needs and depending on the exact PHP version you are running this on.
Proper cache hygiene ist a routine part of maintenance and may need seperate addressing depending on the needs of your station.
2017-03-07 05:43:05 +01:00
Robb
6085a8fd27
Merge pull request #22 from radiorabe/feature/use-zend-file-transfer-for-plupload
...
Use Zend_File_Transfer instead of $_FILES
2017-03-04 22:15:19 -05:00
Lucas Bickel
7c86991c50
Merge pull request #11 from radiorabe/feature/disable-billing
...
Problem: Billing is always on
2017-03-04 16:10:50 +01:00
Lucas Bickel
0b704e95f1
Use Zend_File_Transfer instead of $_FILES
...
This should give us more information in the case of an error and is the framework idiomatic way to handle a RESTful file upload.
I'm hoping this helps debug https://github.com/LibreTime/libretime/issues/3
2017-03-04 11:09:06 +01:00
Lucas Bickel
e28ad471f9
Rewrite config from /etc/airtime-saas to plain /etc/airtime
...
This is the results of sed -i -e 's|/etc/airtime-saas/|/etc/airtime/|' `grep -irl 'airtime-saas' airtime_mvc/ python_apps/` :P
It might need more testing, the airtime-saas part never really made sense, zf1 has environments for that, ie you would create a saas env based on production for instance.
I beleive legacy upstream was using this to share configuration between customers (ie. analyser runs only once and writes to a shared S3 bucket). I assume they mount the airtime-saas folder onto individual customers instances with a global config. Like I said, I don't feel that this makes sense since all it does is make hacking at the configs in airtime-saas a bit easier. A serious SaaS operation should be using something like puppet or ansible to achieve this.
2017-03-03 15:57:41 +01:00
Lucas Bickel
6e03863fa1
Problem: Billing is always on
...
Solution: Make billing configurable through LIBRETIME_ENABLE_BILLING and deactivate it
This should catch all the changes needed to deactive billing in LibreTime.
* [x] only call billing when it is enabled
* [x] let super admins edit their info
* [x] dont link to billing if it is disabled
2017-03-03 15:34:54 +01:00
Lucas Bickel
21a319767f
Fix missing AMQPConnection errors in setup
...
Also fixes them elsewhere, apart from having switched to a vendorized version, I also used one that is already namespaced.
The easy way out here is to use it in the namespaced fashion, it is only used in a few places and I know the library well enough to be certain that nothing much changed apart from the namespacing.
2017-03-02 12:38:44 +01:00
Lucas Bickel
625f92fe44
Vendorize ZF1, fix PHPUnit and configure travis
...
This a a rather large commit due to the nature of the stuff it is touching. To get PHPUnit up and running again I had to update some deps and I did so by vendorizing them. The vendorizing of zf1 makes sense since distros are already considering to drop it from their repos.
* [x] install vendorized zf1 with composer
* [x] load composer autoloader before zf1
* [x] Implement headAction for all Zend_Rest_Controller based controllers
* [x] switch to yml dataset to get around string only limitations of xml sets (also removed warning in readme)
* [x] use year 2044 as hardcoded date for tests since it is in the future and has the same days like previously used 2016
* [x] make tests easier to run when accessing phpunit directly
* [x] clean up test helper to always use airtime.conf
* [x] switch test dbname to libretime_test
* [x] test db username password switched to libretime/libretime
* [x] install phpunit with composer in a clear version (make tests easier to reproduce on other platforms)
* [x] remove local libs from airtime repo (most of airtime_mvc/library was not needed of in vendor already)
* [x] configure composer autoloading and use it (also removed requires that are not needed anymore)
* [x] add LibreTime prefix for FileNotFoundException (phing had a similar class and these are all pre-namespace style)
* [x] add .travis.yml file
* [x] make etc and logdir configurable with LIBRETIME_CONF_DIR and LIBRETIME_LOG_DIR env (so travis can change it)
* [x] slight cleanup in config for travis not to fail
* [x] add cloud_storage.conf for during test runs
* [x] rewrite mvc testing docs and move them to docs/ folder
* [x] don't use `static::class` in a class that does not have a parent class, use `__CLASS__` instead.
* [x] don't use `<ClassName>::class`, since we already know what class we want `"<ClassName>"` ist just fine.
* [x] fix "can't use method in write context" errors on 5.4 (also helps the optimizer)
* [x] add build status badge on main README.md
Fixes https://github.com/LibreTime/libretime/issues/4
The PHP parts of https://github.com/LibreTime/libretime/pull/10 get obsoleted by this change and it will need rebasing.
This also contains https://github.com/LibreTime/libretime/pull/8 , the late static binding compat code was broken for no reason and until CentOS drops php 5.4 there is no reason I'm aware of not to support it. I inlined #8 since the test would be failing on php 5.4 without the change.
If you want to run tests you need to run `composer install` in the root directory and then `cd airtime_mvc/tests && ../../vendor/bin/phpunit`. For the tests to run the user `libretime` needs to be allowed to create the `libretime_test` database. See `docs/TESTING.md` for more info on getting set up.
2017-02-27 17:59:01 +01:00
Robb Ebright
276a69aa1b
Porting commits from downloaded zip file of saas-dev branch
2017-02-13 18:22:22 +01:00
Albert Santoni
db596d54b5
Fix bug in my last commit
2015-12-11 12:29:59 -05:00
Albert Santoni
2594105a5e
Handle unknown plan types more gracefully with the bandwidth limit
2015-12-11 10:19:11 -05:00
Albert Santoni
4cfdda46b4
SAAS-1266: Webstream metadata doesn't show in API or dashboard header
2015-12-03 16:57:18 -05:00
Duncan Sommerville
17a03e088f
SAAS-1244 - improve pending podcast episode sweeping; small bugfixes
2015-11-26 15:25:38 -05:00
drigato
34eb7d6e22
Merge branch 'saas-dev' into saas-dev-bandwidth-limits
2015-11-26 11:30:03 -05:00
Duncan Sommerville
24f488cac2
Fix typo in pref keys
2015-11-25 16:08:31 -05:00
Duncan Sommerville
3f241b2f25
SAAS-1229 - add default bandwidth limit values
2015-11-25 15:04:45 -05:00
Duncan Sommerville
82544f34d9
SAAS-1229, SAAS-1230 - initial implementation of station suspend when over bandwidth limit
2015-11-24 13:36:54 -05:00
Duncan Sommerville
553299e9f5
Try to fix some schedule bugs
2015-11-23 14:55:37 -05:00
Duncan Sommerville
bac1e553d9
SAAS-1229 - add comments in Preference and set update timer
2015-11-23 10:53:25 -05:00
Duncan Sommerville
6c2d1f008b
SAAS-1229 - initial work on bandwidth limit within Airtime; overhaul TaskFactory to get tasks reflectively
2015-11-19 16:08:25 -05:00
Albert Santoni
ba832ffe3a
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing
2015-11-18 12:38:22 -05:00
Albert Santoni
965a78c54a
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
2015-11-18 12:38:18 -05:00
drigato
ceafccd685
Hide podcast from radio page for hobbyist plans
2015-11-18 12:12:57 -05:00
Duncan Sommerville
9a8e80f74b
Change station podcast RSS links back to https; style fix for menu in some browsers
2015-11-18 11:10:14 -05:00
Duncan Sommerville
eae8c7b638
Temporary fix to make enclosure urls iTunes compatible
2015-11-17 21:06:51 -05:00
Duncan Sommerville
4828e82d2a
Change download key parameter regex
2015-11-17 19:51:41 -05:00
Duncan Sommerville
1571887928
Change how station logo default is returned
2015-11-17 18:58:58 -05:00
Duncan Sommerville
bdddd6f6ce
Try to fix iTunes RSS compatibility
2015-11-17 17:50:16 -05:00
Albert Santoni
591f7d59f0
Slightly better error handling for uploads
2015-11-13 10:53:47 -05:00
Duncan Sommerville
c5a5839eff
Better errors from podcast 'Add' dialog
2015-11-10 19:26:25 -05:00
Albert Santoni
0e6e82a0c6
Fixed session start issue with new API
2015-11-06 13:04:33 -05:00
Albert Santoni
4a86544738
Skip non-files for XXXX-260
2015-11-06 12:50:30 -05:00
Albert Santoni
ee99a7304f
XXXX-260 - Recalculate schedule API as part of bugfix
...
Conflicts:
airtime_mvc/application/configs/constants.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/Scheduler.php
2015-11-06 12:49:53 -05:00
Duncan Sommerville
22f8b0f328
* SAAS-1153 - more work on station podcast frontend. Add delete and edit button functionality for episode table
...
* Various fixes and backend updates
* Move station podcast creation to id getter in Preferences
2015-11-03 16:23:17 -05:00
Duncan Sommerville
95aae317c6
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
airtime_mvc/public/css/dashboard.css
airtime_mvc/public/js/airtime/library/spl.js
2015-10-29 11:21:24 -04:00
drigato
1211e8db7f
Fix typo
2015-10-26 15:55:03 -04:00
Duncan Sommerville
6580c12ad3
Add station podcast privacy toggle
2015-10-21 17:30:24 -04:00
Duncan Sommerville
92ffa955c3
SAAS-1081 - implement station podcast download counter that resets monthly
2015-10-21 12:54:50 -04:00
Duncan Sommerville
0b1df6baf3
* SAAS-1084 - initial work on publishing API backend
...
* More work on automatic ingest
* Add automatic_ingest_timestamp column to ImportedPodcast
2015-10-20 19:03:34 -04:00
Albert Santoni
c8e1408dbe
Handle error case with bad user timezone strings break advanced search
2015-10-20 11:45:26 -04:00
Albert Santoni
f8a6721703
Increase transaction isolation level for track scheduling and moving
2015-10-19 17:31:26 -04:00
Duncan Sommerville
12f6536e74
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2015-10-19 16:18:19 -04:00
Albert Santoni
fb4aef405c
Increase transaction isolation level to avoid duplicate shows, SAAS-1111
2015-10-19 15:23:50 -04:00
drigato
14104a93ae
SAAS-1080: Station podcast feed
2015-10-19 11:54:53 -04:00
Duncan Sommerville
bddc121c2d
Initial work on automatic ingest for imported podcasts
2015-10-15 14:44:17 -04:00
drigato
40d0619f10
Override Podcast->fromArray
2015-10-15 08:06:01 -04:00
Albert Santoni
2713bd7beb
Merge branch 'saas-dev' into saas-3.x-sessionoptimizations
2015-10-14 14:50:54 -04:00
drigato
c166b4f00e
Merge branch 'saas-dev-publishing' into saas-dev-publishing-schema-change
...
Conflicts:
airtime_mvc/application/models/airtime/Podcast.php
2015-10-14 11:04:41 -04:00
drigato
d647bf67ea
Refactoring Podcast classes and services
2015-10-14 10:58:13 -04:00
drigato
cfb21f8425
Bunch of schema changes
2015-10-13 10:14:23 -04:00
Duncan Sommerville
c3c4abdd0c
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/public/css/dashboard.css
airtime_mvc/public/css/styles.css
airtime_mvc/public/js/airtime/library/library.js
airtime_mvc/public/js/airtime/library/spl.js
2015-09-30 16:26:02 -04:00
Duncan Sommerville
ee70a0dbea
SAAS-1094 - update backend to prevent removal of items in linked shows while on air
2015-09-30 14:44:48 -04:00
Duncan Sommerville
b01fdc6805
SAAS-1094 - update backend to prevent removal of items in linked shows while on air
2015-09-30 14:44:06 -04:00
drigato
c7dd2e7256
Working on changing schema
2015-09-30 08:53:13 -04:00
Albert Santoni
8b33acacd3
Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/constants.php
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/UserController.php
airtime_mvc/public/js/airtime/preferences/preferences.js
2015-09-29 18:58:55 -04:00
drigato
b00ac6750c
Testing
2015-09-29 13:04:22 -04:00
Albert Santoni
a9eb3f737d
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-09-29 11:50:18 -04:00
Albert Santoni
6f185d094b
SAAS-1095: Unknown schedule type: array
2015-09-29 11:49:53 -04:00
Duncan Sommerville
a75a9676f2
More robust solution for not showing what's new popup to new users
2015-09-29 11:28:20 -04:00
Albert Santoni
943048dd87
Hacky fix for SAAS-1090 - Allow airtime-system to work with session optimizations
2015-09-28 17:48:04 -04:00
Duncan Sommerville
67c20630a3
UI revamp what's new dialog
2015-09-28 17:19:02 -04:00
Duncan Sommerville
375d83ab43
Update to podcast frontend
2015-09-28 10:40:04 -04:00
Albert Santoni
d3f5b046f3
Colour palette improved for the calendar
2015-09-25 17:56:29 -04:00
Albert Santoni
c03e9cbe9a
SAAS-1085: Optimization - Don't start sessions unless we actually need them.
2015-09-25 10:41:51 -04:00
Duncan Sommerville
43e9fb59ce
SAAS-1071 - more work on celery backend for podcasts; add upgrade to make file_id field in third_party_track_references nullable
2015-09-24 15:57:38 -04:00
Duncan Sommerville
ca51dcf3ae
SAAS-1071 - more work on backend podcast implementation
2015-09-24 12:58:02 -04:00
Duncan Sommerville
dcb30b3aa7
Move file extension check to before database object insertion
2015-09-24 12:57:19 -04:00
drigato
c587dcf4e4
Added extra fields to podcast table
2015-09-24 10:32:16 -04:00
drigato
07b63abfe1
Small Podcast API fix
2015-09-23 15:54:42 -04:00
drigato
e610ce8af7
Fix for switching to simplepie
2015-09-23 15:35:24 -04:00
drigato
727abac0b8
Switch Podcast reader to use simplepie
2015-09-23 14:47:40 -04:00
Duncan Sommerville
827a83392f
Remove unnecessary fields from bulk get, add explicit casting back to podcast item array for testing
2015-09-22 20:24:53 -04:00
drigato
0fc324f3ba
SAAS-1077: REST API for podcast episodes
2015-09-22 11:13:18 -04:00
drigato
77a53491b0
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-21 14:51:55 -04:00
drigato
3198d822bf
SAAS-1058: Podcast table schema
...
Remove not null constraint on podcast_episodes file_id column
2015-09-21 14:51:32 -04:00
Duncan Sommerville
373ff55923
Frontend tweaks to podcasting + new abstract datatables functionality
2015-09-21 12:40:05 -04:00
drigato
1445e85795
SAAS-1058: Podcast table schema
...
Changed podcast table column sizes
Added some podcast table column size validation
2015-09-20 12:06:51 -04:00
Duncan Sommerville
7da1f86659
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-18 15:39:19 -04:00
Duncan Sommerville
6de6e2767c
SAAS-1062 - Podcast skeleton work; slight rework to backend functionality
2015-09-18 15:39:12 -04:00
drigato
11f3aa7b76
Fix typo
2015-09-18 14:36:54 -04:00
drigato
d95b5a9034
SAAS-1063: REST API for podcasts
...
Update composer.json with rss reader library
2015-09-18 09:52:24 -04:00
drigato
9a2e9d1b3b
SAAS-1058: Podcast table schema
...
Renamed podcast_contents to podcast_episodes
Added new columns to podcast_episodes table
2015-09-18 09:51:44 -04:00
drigato
f6f23864ce
SAAS-1063: REST API for podcasts
...
/rest/podcast mostly done
2015-09-18 08:15:48 -04:00
drigato
c1899f18af
remove comment
2015-09-16 15:07:38 -04:00
drigato
67db2c1d25
SAAS-1063: REST API for podcasts
...
Hierarchy routing is working
Basic implentation of podcast INDEX and POST actions done
2015-09-16 14:22:13 -04:00
drigato
73d154ba17
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-15 14:07:59 -04:00
drigato
1a26679357
SAAS-1058: Podcast table schema
...
Add additional podcast table column - type
2015-09-15 14:00:26 -04:00
Duncan Sommerville
893d60ed44
Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"
...
This reverts commit 0fcf6a8dac
.
2015-09-14 18:29:43 -04:00
Duncan Sommerville
8c65ba8f66
SAAS-1061 - implement podcast list view skeleton; small bugfixes
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2015-09-14 18:29:13 -04:00
Duncan Sommerville
0fcf6a8dac
SAAS-1061 - implement podcast list view skeleton; small bugfixes
2015-09-14 18:26:28 -04:00
drigato
28493497fd
SAAS-1058: Podcast table schema
...
SAAS-1059: Add description field to cc_files
2015-09-14 17:00:54 -04:00
Albert Santoni
de322171df
CC-6118: Playlist crossfade panel needs restyling
...
* Fixed it as much as possible. Unfortunately, the milliseconds are dropped
by Propel so we should probably restrict the fade time to whole
seconds....
2015-09-04 18:35:11 -04:00
Duncan Sommerville
4b5980d898
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 18:17:19 -04:00
Duncan Sommerville
daf854af04
Fix some issues with search, hack to always display options buttons in library view
2015-09-02 18:17:11 -04:00
Albert Santoni
7a91677d01
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 16:25:35 -04:00
Albert Santoni
01b3ae1bf0
Allow smart blocks with no criteria
2015-09-02 16:25:30 -04:00
Duncan Sommerville
63ce022a8d
SAAS-1040 - station logo functionality improvements
2015-09-02 15:28:36 -04:00
Albert Santoni
6251fd62d5
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 10:42:23 -04:00
Albert Santoni
6959c459cd
Scheduler transaction improvement and preferences transaction removal
...
* Added a transaction to createAndFillShowInstancesPastPopulatedUntilDate
to ensure two requests don't trigger duplicate repeated show instances
in the calendar.
* Removed the transaction from setValue() in Preference and opt for
a row-level lock instead.
2015-09-02 10:40:38 -04:00
Duncan Sommerville
37df86723d
CC-6127 - Add 'Use station default' option to user settings timezone, don't set user timezone by default when creating the admin user
2015-09-01 16:10:33 -04:00
Albert Santoni
e1d5126e8b
Pick default colors for the calendar based on start time
2015-08-28 18:16:55 -04:00
Duncan Sommerville
afa3b47e42
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-25 17:09:17 -04:00
Duncan Sommerville
84baef1996
CC-6097, CC-6091, CC-6080, CC-6066 - css fixes and more work on add/remove content screen
2015-08-25 17:09:05 -04:00
Albert Santoni
700c3c4005
Merge branch 'saas-dev' into saas-showbuilder
2015-08-25 13:27:40 -04:00
Duncan Sommerville
371a26ff97
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-25 11:46:30 -04:00
Duncan Sommerville
afe6ca7002
Cosmetic updates
2015-08-25 11:46:20 -04:00
Albert Santoni
3592eceb22
Merge branch 'saas' into saas-dev
2015-08-24 17:11:52 -04:00
Albert Santoni
e188fcde32
Merge branch 'saas-dev' into saas-showbuilder
2015-08-24 16:53:32 -04:00
Albert Santoni
2a1d09bc08
Factor out default show background colour and fix some style issues
2015-08-12 12:55:39 -04:00
Albert Santoni
249d3b1d2d
SAAS-1011: Files stored locally with incorrect file extensions won't play out
2015-08-11 09:33:29 -04:00
Albert Santoni
75914b791c
Merge branch 'saas-dev' into saas
...
Conflicts:
airtime_mvc/application/common/FileDataHelper.php
2015-08-10 09:00:54 -04:00
Albert Santoni
fc5d20f4d6
Safen up getUsingCustomStreamSettings()
2015-08-10 08:57:21 -04:00
Duncan Sommerville
133db1c6a6
Merge branch 'saas-dev' into saas-showbuilder
2015-08-07 16:50:28 -04:00
Albert Santoni
e760df0e5e
Added missing newline to password reset email
2015-08-07 14:29:10 -04:00
Albert Santoni
ea2a6b3f68
Clean up and bugfixes for password reset (SAAS-1009)
2015-08-07 13:57:42 -04:00
Duncan Sommerville
0c3d9a8af4
Merge branch 'saas-dev' into saas-showbuilder
2015-08-06 19:16:31 -04:00
drigato
f833ab9690
SAAS-838: Undefined variable previousMediaName
2015-08-06 17:09:54 -04:00
drigato
ea86675d07
SAAS-994: The Scheduled Play switch should not be able to be turned off without a warning message
...
Hid the element in the dashboard so it can never be turned off.
2015-08-06 11:14:43 -04:00
Duncan Sommerville
36f2e1844f
Merge branch 'saas-dev' into saas-showbuilder
2015-08-05 15:32:04 -04:00
Albert Santoni
9c5a634754
Fix default Icecast hostname
2015-08-05 15:30:14 -04:00
Albert Santoni
1d39117b21
Merge remote-tracking branch 'origin/saas-email' into saas-dev
2015-08-05 14:50:58 -04:00
Albert Santoni
e49d337db0
Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev
2015-08-05 14:50:31 -04:00
Albert Santoni
eef61a65fc
Cleanup and comments for the timezone/language popup
2015-08-05 14:49:43 -04:00
Albert Santoni
2aaba99b9a
Merge remote-tracking branch 'origin/saas-dev-lang-tz-setup' into saas-dev
2015-08-05 12:32:33 -04:00
drigato
23fe12651f
SAAS-838: Undefined variable previousMediaName
2015-08-05 09:48:31 -04:00
Albert Santoni
c934866063
Two small code improvements
2015-08-04 17:42:53 -04:00
Duncan Sommerville
f138dc6b47
SAAS-948 - tab layout for right-hand pane
2015-07-31 18:28:16 -04:00
drigato
7839a712e6
Merge branch 'saas-dev' into saas-dev-lang-tz-setup
2015-07-29 08:10:58 -04:00
Duncan Sommerville
5e58403c7f
Merge branch 'saas-dev' into saas-showbuilder
2015-07-27 15:38:30 -04:00
Duncan Sommerville
59d89b0b9e
SAAS-948 - ShowBuilder redesign editors and fixes
2015-07-27 15:37:55 -04:00
drigato
ee2bfe7664
SAAS-945: Language + Timezone Setup Popup
2015-07-27 07:06:22 -04:00