814fc67e90
Work on station podcast editor view
2015-10-21 19:21:52 -04:00
6580c12ad3
Add station podcast privacy toggle
2015-10-21 17:30:24 -04:00
16a0172542
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-10-21 16:26:04 -04:00
a4b42344dd
CC-6140: Switch to Windows linebreaks for stream M3U
2015-10-21 16:25:59 -04:00
eba99728ae
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-10-21 16:14:54 -04:00
cb8c34c3d5
SAAS-1126: Make player widget localizable
2015-10-21 16:14:36 -04:00
3b81ea02c8
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-10-21 16:14:11 -04:00
4d1d96c8f7
CC-6140: M3U streaming link
2015-10-21 16:14:06 -04:00
92ffa955c3
SAAS-1081 - implement station podcast download counter that resets monthly
2015-10-21 12:54:50 -04:00
6c0055895c
Set auto ingest timestamp when updating
2015-10-21 11:18:33 -04:00
b98f573531
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-10-21 11:01:20 -04:00
1cfa708717
SAAS-1125: Cue in and out points should be editable in the track metadata editor
...
Also made improvement by showing errors when the form has invalid data
2015-10-21 10:58:22 -04:00
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
6cbc2f5316
Slight CSS rework for SAAS-1136
2015-10-20 17:39:46 -04:00
f441f2d385
SAAS-1136: Disk usage div overflows if your disk usage is over 100%
2015-10-20 16:57:31 -04:00
f79ca8650f
Unpaid invoice usability hint and invoice page style fix - SAAS-1134
2015-10-20 15:44:24 -04:00
885f47c20e
Better solution for upgrade problems (SAAS-1133)
2015-10-20 14:52:17 -04:00
9d4cc6c205
Temporary workaround for upgrade problems
2015-10-20 12:28:18 -04:00
c8e1408dbe
Handle error case with bad user timezone strings break advanced search
2015-10-20 11:45:26 -04:00
195f1f0e9a
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-10-19 17:31:31 -04:00
f8a6721703
Increase transaction isolation level for track scheduling and moving
2015-10-19 17:31:26 -04:00
3a791ef9b5
Remove unnecessary field
2015-10-19 17:00:03 -04:00
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
1a5250205c
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-10-19 16:10:25 -04:00
bd3a16ae7b
SAAS-1110 - Fix header sizing at most screen resolutions
2015-10-19 16:10:20 -04:00
bcbd8a8050
Fix bug in auto ingest, immediately retry on failure
2015-10-19 15:36:34 -04:00
da6e613a24
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-10-19 15:23:57 -04:00
fb4aef405c
Increase transaction isolation level to avoid duplicate shows, SAAS-1111
2015-10-19 15:23:50 -04:00
9d0beabd3f
Make playout history page visible for Program Managers
2015-10-19 14:09:42 -04:00
c8069aaedd
Initial publishing fixes and tweaks
2015-10-19 13:42:27 -04:00
be3a3fbd9f
* Fix error in automatic podcast ingest
...
* Switch from text-scrolling to using title attributes to display overflowing text strings
2015-10-19 12:57:18 -04:00
97cc4050a4
CC-6139: User timezone setting displays incorrectly in user settings
2015-10-19 12:37:34 -04:00
14104a93ae
SAAS-1080: Station podcast feed
2015-10-19 11:54:53 -04:00
30d742af92
Added msising publish-dialog.phtml and fixed .gitignore file
2015-10-15 18:03:03 -04:00
bddc121c2d
Initial work on automatic ingest for imported podcasts
2015-10-15 14:44:17 -04:00
a2d725f2b9
Fix podcast episode ingest
2015-10-15 11:33:09 -04:00
40d0619f10
Override Podcast->fromArray
2015-10-15 08:06:01 -04:00
d98459a55d
Fix head title on Radio Page
2015-10-14 15:20:49 -04:00
eea5fff1fa
Fixed jQuery being broken on Radio Page
2015-10-14 15:15:25 -04:00
2713bd7beb
Merge branch 'saas-dev' into saas-3.x-sessionoptimizations
2015-10-14 14:50:54 -04:00
591b3d1539
Fix SAAS-1128 more robustly to fix timezone/lang popup for sign up too
2015-10-14 14:40:23 -04:00
a90b97fb55
SAAS-1128: Logging in from www.airtime.pro doesn't trigger lang/timezone setup dialog
2015-10-14 14:28:39 -04:00
08344895d6
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-10-14 11:59:05 -04:00
9a03b1b50a
Force users to click OK in the language/timezone popup
2015-10-14 11:58:44 -04:00
96e6038d87
updated translation resources
2015-10-14 15:49:16 +00:00
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
d647bf67ea
Refactoring Podcast classes and services
2015-10-14 10:58:13 -04:00
7f64edafff
SAAS-1121: New link show instances don't get created sometimes if there is no show content
...
Fixed by checking if the linked show is empty before trying to copy its
tracks into new show instances
2015-10-13 11:08:17 -04:00
cfb21f8425
Bunch of schema changes
2015-10-13 10:14:23 -04:00
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
ee70a0dbea
SAAS-1094 - update backend to prevent removal of items in linked shows while on air
2015-09-30 14:44:48 -04:00
b01fdc6805
SAAS-1094 - update backend to prevent removal of items in linked shows while on air
2015-09-30 14:44:06 -04:00
98d565ff3d
SAAS-1101 - add workaround for pages obstructed by livechat box
2015-09-30 14:24:21 -04:00
c0372c1745
Fix webstream tab change behaviour
2015-09-30 12:07:31 -04:00
2ee7e4bf71
SAAS-1088 - move 'All My Shows' checkbox to dropdown instead
2015-09-30 11:38:33 -04:00
258500f650
SAAS-1102 - fix datatables pagination layout issues
2015-09-30 11:24:29 -04:00
efa3999041
SAAS-1016 - fix some stream settings not being saved correctly
2015-09-30 10:30:32 -04:00
bdab0f7b1a
Revert medatdata editor fix
2015-09-30 10:03:34 -04:00
f91d28e3f2
Css fix for playlist editor
2015-09-30 09:02:35 -04:00
2e024bcfdd
Css fixes for metadata and playlist editors
2015-09-30 08:58:39 -04:00
c7dd2e7256
Working on changing schema
2015-09-30 08:53:13 -04:00
4b882064f2
updated translation resources
2015-09-30 11:32:44 +00:00
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
70e538ebb4
SAAS-1069 - disable add button when track metadata tab is open
2015-09-29 16:39:54 -04:00
c08994a60b
Fix bug where user could open mutiple copies of same webstream tab
2015-09-29 16:34:23 -04:00
80515ef263
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-29 16:26:47 -04:00
d3e9665063
Fix bug where switching to a webstream tab would throw an error
2015-09-29 16:26:39 -04:00
81bf601a12
SAAS-1099: Dashboard messed up in Safari
2015-09-29 16:03:14 -04:00
3df1081c60
SAAS-1088 - fix broken 'all my shows' checkbox
2015-09-29 15:51:09 -04:00
3fcc3c507a
Fix tabs bug
2015-09-29 15:09:09 -04:00
0029844fa7
Fix layout of schedule tracks dialog
2015-09-29 13:54:43 -04:00
f25457d1eb
SAAS-1098: Max filesize restricted by new uploader
2015-09-29 13:29:06 -04:00
b00ac6750c
Testing
2015-09-29 13:04:22 -04:00
eb5fcec485
SAAS-1096: Tabs layout in Schedule Tracks broken in Firefox, sometimes Chrome
2015-09-29 13:02:22 -04:00
4c52bd99f6
Temporarily fix the Help video label breaking the Help page layout
2015-09-29 12:36:56 -04:00
c2cd768398
SAAS-1094 - fix selector for scheduled show selection + context menu
2015-09-29 12:27:45 -04:00
f4fad13eb8
SAAS-1086 - centre cursor when dragging
2015-09-29 12:07:24 -04:00
db1e69c00f
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-29 12:00:07 -04:00
8cc5e5835c
Fix double processing icon when adding/removing tracks from playlists
2015-09-29 12:00:02 -04:00
a9eb3f737d
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-09-29 11:50:18 -04:00
6f185d094b
SAAS-1095: Unknown schedule type: array
2015-09-29 11:49:53 -04:00
99a5f7facb
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
...
Conflicts:
airtime_mvc/build/sql/defaultdata.sql
2015-09-29 11:37:53 -04:00
f5afc0957f
SAAS-1087 - fix DJ list overflow + styling
2015-09-29 11:36:00 -04:00
7a44a05cb2
Style tweaks
2015-09-29 11:28:30 -04:00
a75a9676f2
More robust solution for not showing what's new popup to new users
2015-09-29 11:28:20 -04:00
41cf4b389a
Cleanup for defaultdata.sql
2015-09-29 11:03:19 -04:00
477708ecc9
Style tweaks
2015-09-29 10:29:21 -04:00
f1c5a8b244
Fix the timezone/language picker and fix the What's New dialog popping up for new users
2015-09-29 09:19:33 -04:00
6658fca10b
Some polish for the What's New popup
2015-09-28 22:17:34 -04:00
943048dd87
Hacky fix for SAAS-1090 - Allow airtime-system to work with session optimizations
2015-09-28 17:48:04 -04:00
67c20630a3
UI revamp what's new dialog
2015-09-28 17:19:02 -04:00
d09941dffa
Set TaskManager run interval back to 30 seconds
2015-09-28 14:15:08 -04:00
c1a16d7973
Add filter string to generic Table object; add call to refetch podcast episode table data
2015-09-28 14:14:01 -04:00
375d83ab43
Update to podcast frontend
2015-09-28 10:40:04 -04:00
febc5fa99d
SAAS-1089 - fix scrolling in metadata editor
2015-09-28 10:17:40 -04:00
d3f5b046f3
Colour palette improved for the calendar
2015-09-25 17:56:29 -04:00
e03428327c
Fixed missing return statement
2015-09-25 15:54:26 -04:00
8b6833180d
Refactored double Set-Cookie prevention code, and session reopening code
2015-09-25 12:03:10 -04:00
91c584ba16
Test alternate session reopening code to alleviate double Set-Cookie header
2015-09-25 11:37:36 -04:00
c03e9cbe9a
SAAS-1085: Optimization - Don't start sessions unless we actually need them.
2015-09-25 10:41:51 -04:00
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
a24565669b
Fix bug where library would sometimes reference wrong table
2015-09-24 15:55:37 -04:00
ca51dcf3ae
SAAS-1071 - more work on backend podcast implementation
2015-09-24 12:58:02 -04:00
dcb30b3aa7
Move file extension check to before database object insertion
2015-09-24 12:57:19 -04:00
778b67982b
Remove duplicate imports and add new table imports to ScheduleController
2015-09-24 12:56:32 -04:00
e5deae89a4
Generalize datatables style fixes
2015-09-24 12:54:24 -04:00
c587dcf4e4
Added extra fields to podcast table
2015-09-24 10:32:16 -04:00
a86e3ed4a8
Improvements to the preferences screen
2015-09-23 18:21:30 -04:00
07b63abfe1
Small Podcast API fix
2015-09-23 15:54:42 -04:00
e610ce8af7
Fix for switching to simplepie
2015-09-23 15:35:24 -04:00
4de42ada6e
Disable simplepie caching
2015-09-23 14:50:32 -04:00
727abac0b8
Switch Podcast reader to use simplepie
2015-09-23 14:47:40 -04:00
c5b00e56bb
Fix bug that prevented multiple podcast tabs from being opened
2015-09-23 12:38:08 -04:00
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
55d5fc62a2
SAAS-1071 - more work on celery backend
2015-09-22 20:22:06 -04:00
ee1ceb9281
Update TaskManager to be a bit easier to extend
2015-09-22 20:21:19 -04:00
576a457fdb
Small tweaks to tabs, fix merge conflicts in podcast
2015-09-22 20:19:57 -04:00
3790b0fa81
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing
...
Conflicts:
airtime_mvc/public/js/airtime/library/podcast.js
2015-09-22 18:37:41 -04:00
ed33714340
SAAS-1064: Publish action for library context menu
2015-09-22 18:33:27 -04:00
44a5e5a240
Improve tabs functionality and add comments
2015-09-22 17:34:24 -04:00
50996a081f
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-22 15:27:18 -04:00
4238d5a201
Refactor tabs functionality
2015-09-22 15:27:08 -04:00
cf1de5fb66
SAAS-1071 - initial work on podcast celery backend; tweak SoundCloud service
2015-09-22 15:26:08 -04:00
79db208cd4
Refactor SoundCloud/Third party controllers to fit new service architecture
2015-09-22 14:18:48 -04:00
13d1534042
Merge pull request #124 from danielhjames/saas
...
IN-1956 Update Transifex project link
2015-09-22 11:47:33 -04:00
d86b00c53e
SAAS-1077: REST API for podcast episodes
...
Empty PUT action
2015-09-22 11:19:39 -04:00
0fc324f3ba
SAAS-1077: REST API for podcast episodes
2015-09-22 11:13:18 -04:00
5bd8a508b1
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/public/js/airtime/library/spl.js
2015-09-21 18:12:27 -04:00
479153df17
Merge branch 'saas' into saas-dev
...
Conflicts:
airtime_mvc/public/css/billing.css
2015-09-21 18:01:56 -04:00
2a79424a64
Increase the CSRF token timeout
2015-09-21 18:00:04 -04:00
a21c4612c9
Renamed a podcast.js function for clarity
2015-09-21 17:59:31 -04:00
f9ace20075
Simplify third-party/celery/soundcloud implementation
2015-09-21 17:03:46 -04:00
b721545c68
Stub publish action for context menu
2015-09-21 16:54:00 -04:00
73e489fdc8
Cleanup a comment
2015-09-21 15:41:24 -04:00
4115f4939e
Frontend tweaks
2015-09-21 15:37:57 -04:00
77a53491b0
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-21 14:51:55 -04:00
3198d822bf
SAAS-1058: Podcast table schema
...
Remove not null constraint on podcast_episodes file_id column
2015-09-21 14:51:32 -04:00
ad2e26a1c3
IN-1956 Update Transifex project link
2015-09-21 17:44:00 +01:00
373ff55923
Frontend tweaks to podcasting + new abstract datatables functionality
2015-09-21 12:40:05 -04:00
3db20bd3b5
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-21 07:08:55 -04:00
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
18fb0f3509
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-18 18:29:54 -04:00
0710accbe2
SAAS-1062 - more work on podcasting frontend
2015-09-18 18:29:50 -04:00
515d892f6e
Fixed small table widget ctrl-selection bug
2015-09-18 16:11:49 -04:00
a6450353e5
Add missing phtml file
2015-09-18 15:52:54 -04:00
7da1f86659
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-18 15:39:19 -04:00
6de6e2767c
SAAS-1062 - Podcast skeleton work; slight rework to backend functionality
2015-09-18 15:39:12 -04:00
6934bcfdab
Update tabs functionality
2015-09-18 15:38:00 -04:00
6900af8d47
Fix bug where switching from #podcast to other media view would not work as intended
2015-09-18 15:37:41 -04:00
be39b6b7c0
* Initial podcast skeleton functionality
...
* Rename SoundCloud/Celery classes to fit conventions
* Small fixes to Table class functionality
2015-09-18 15:34:55 -04:00
11f3aa7b76
Fix typo
2015-09-18 14:36:54 -04:00
a810010448
Dropped percentage from educational discount
2015-09-18 14:01:30 -04:00
2cad7c1848
Added educational pricing page link
2015-09-18 13:59:55 -04:00
d95b5a9034
SAAS-1063: REST API for podcasts
...
Update composer.json with rss reader library
2015-09-18 09:52:24 -04:00
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
f6f23864ce
SAAS-1063: REST API for podcasts
...
/rest/podcast mostly done
2015-09-18 08:15:48 -04:00
8308ce9cac
October promo banner
2015-09-17 15:38:00 -04:00
3d07260a9d
Small VAT checker bugfix
2015-09-17 15:17:18 -04:00
ea0121f5c1
Cleanup and capitalisation for the Table widget
2015-09-17 15:09:50 -04:00
8a7a97f48e
Updated the podcast table widget columns
2015-09-17 15:06:51 -04:00
0826c64719
Refactor table widget to use prototype inheritance better
2015-09-17 14:52:32 -04:00
d31e0f950d
Fix podcast api permission
2015-09-17 13:19:11 -04:00
9f03115ee5
Custom button event handlers for new table widget
2015-09-17 13:07:22 -04:00
71919ad529
Basic integration of table widget into Dashboard podcasts view
2015-09-16 18:32:16 -04:00
39b2bd6a86
Actually move library search bar out of header; add angular.js to libs
2015-09-16 17:58:16 -04:00
a78a0d0cc8
* Fix track number bug in analyzer
...
* Move library search bar out of header
2015-09-16 17:50:21 -04:00
dc840bf25f
Fix bad file extension
2015-09-16 15:31:59 -04:00
cce18ec911
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-16 15:29:18 -04:00
9ed3145473
Create oauth controller interface for oauth-specific actions; small refactoring on tabs.js
2015-09-16 15:29:10 -04:00
c1899f18af
remove comment
2015-09-16 15:07:38 -04:00
2ede56c26d
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-16 14:22:34 -04:00
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
7006b55818
js tweaks
2015-09-16 11:26:11 -04:00
8dcea06077
* Move tab functionality to a separate module
...
* Fix broken library placeholders
* Restrict tab width and add text panning to tab name
* General bugfixing and cleanup of tab functionality
2015-09-15 18:53:25 -04:00
e55e99365b
SAAS-1068: Crossfade button broken when editing new smart block
...
* Shouldn't have been enabled in the first place.
2015-09-15 17:27:20 -04:00
0d80f857d3
Fix broken import
2015-09-15 16:08:19 -04:00
7b76c8d6d3
Rename CeleryService to avoid confusion; fix wording and reduce redundancy in task functions
2015-09-15 15:06:03 -04:00
a444751397
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-15 14:21:27 -04:00
f6a33802db
Merge branch 'saas-dev-tablerefactor' into saas-dev-publishing
2015-09-15 14:21:53 -04:00
ff24976bed
Fix up celery downloads a bit
2015-09-15 14:21:19 -04:00
ffdc83dc26
Reusable datatable control that hooks up to any of our REST APIs
...
* Implements item selection (single, shift, ctrl), pagination, and
sorting. To be used in the future.
* Added example code for how to use the table widget
* Temporarily added a table test page to the DashboardController
2015-09-15 14:18:35 -04:00
73d154ba17
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-15 14:07:59 -04:00
c8baa6e4b3
Merge branch 'saas-dev-publishing' into soundcloud
...
Conflicts:
airtime_mvc/application/views/scripts/playlist/playlist.phtml
airtime_mvc/application/views/scripts/playlist/smart-block.phtml
airtime_mvc/public/js/airtime/library/spl.js
2015-09-15 14:03:11 -04:00
1a26679357
SAAS-1058: Podcast table schema
...
Add additional podcast table column - type
2015-09-15 14:00:26 -04:00
dd09676f88
Hide celery user
2015-09-15 13:59:48 -04:00
893d60ed44
Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"
...
This reverts commit 0fcf6a8dac
2015-09-14 18:29:43 -04:00
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
0fcf6a8dac
SAAS-1061 - implement podcast list view skeleton; small bugfixes
2015-09-14 18:26:28 -04:00
28493497fd
SAAS-1058: Podcast table schema
...
SAAS-1059: Add description field to cc_files
2015-09-14 17:00:54 -04:00
fe5db4761e
updated translation resources
2015-09-14 10:01:23 +00:00
4851b01540
Force more tracks to be shown in the library view
2015-09-11 12:54:28 -04:00
2d2ed25fcc
CC-6137 - datatables is the devil
2015-09-10 16:47:36 -04:00
3586845549
Merge branch 'saas' into saas-dev
2015-09-10 10:37:45 -04:00
32f5492e85
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-09-09 18:59:44 -04:00
c77749a096
SAAS: Show logo is deleted on disk when a show instance is deleted
...
* Default to returning the station logo in response if we can't find the
show logo on disk (but it's in our DB).
2015-09-09 18:59:00 -04:00
b26d4833fe
Merge branch 'saas' into saas-dev
2015-09-09 18:47:53 -04:00
2296aab8d5
Fix bug where show logo was removed when deleting an instance of a repeating show
2015-09-09 18:47:43 -04:00
1649d9db77
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-09 17:25:45 -04:00
fb1ee2e284
Fix some issues with the users page
2015-09-09 17:25:40 -04:00
1f319f84a4
Two small radio page tweaks
...
* SAAS-1055: Radio Page About tab scales poorly with small viewport
heights
* Also fixed misaligned of currently playing track with mobile view
2015-09-09 16:03:25 -04:00
bd4fc62e04
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
...
Conflicts:
airtime_mvc/public/js/airtime/library/spl.js
2015-09-09 13:55:27 -04:00
2569ce4d0a
CC-6136: Playlist fade values don't get or set properly
...
Fix smartblock design and fade out saving bug
2015-09-09 13:54:16 -04:00
03e23daba0
Apply highlight to active submenu item
2015-09-08 17:42:52 -04:00
e6494e7ff0
Better way to disable and reenable xfade button in playlist/sb editors
2015-09-08 16:56:55 -04:00
8c3f1cf535
Fix some issues with playlist/smart-block fade buttons
2015-09-08 16:44:33 -04:00
63784d4e6b
Fix some behaviour with playlist/smartblock fade button
2015-09-08 16:39:33 -04:00
d18d52a37a
Merge branch 'saas-dev' into soundcloud
2015-09-08 16:15:24 -04:00
5c7d9fe31c
Change links for SoundCloud functionality to use same casing as navigation
2015-09-08 16:15:08 -04:00
f243014d9f
Merge branch 'saas-dev' into soundcloud
2015-09-08 16:01:06 -04:00
17c2ec2fd4
Fix responsiveness bugs
2015-09-08 15:25:28 -04:00
c2d1b788c5
Added missing opening php tag on billing - upgrades page
2015-09-08 11:03:33 -04:00
b80c18c288
updated translation resources
2015-09-07 10:34:19 +00:00
57e3059c16
updated translation resources
2015-09-05 08:34:23 +00:00
84a1f9071b
Merge branch 'saas-showbuilder-fade-editor-restyling' into saas-dev
2015-09-04 18:36:26 -04:00
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
65ffe43589
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-04 16:11:48 -04:00
3dc8a5f98d
CC-6135 - fix playlist bugs
2015-09-04 16:11:41 -04:00
ba26adc904
CC-6130 - fix empty placeholders appearing when search returns no results
2015-09-04 15:37:04 -04:00
1db1af3f2e
Merge branch 'saas-dev' into saas-showbuilder-fade-editor-restyling
2015-09-04 11:21:00 -04:00
8499fd989c
Regenerate the translation files
2015-09-04 11:17:18 -04:00
274881c6e0
Add _pro macros to a bunch of billing page stuff
2015-09-04 11:17:01 -04:00
d4287e9abd
updated translation resources
2015-09-04 14:47:15 +00:00
d257daa510
updated translation resources
2015-09-04 08:16:31 +00:00
53b835715a
Fix responsiveness of upload page
2015-09-03 15:51:09 -04:00
83cd51de92
Reword usability hint text to match calendar context menu
2015-09-03 15:42:27 -04:00
56a8293be6
Fix plupload typo
2015-09-03 15:04:46 -04:00
363305fa8d
Fix blank tracks view when no local session is set
2015-09-03 14:56:57 -04:00
f396bb4390
CSS tweaks
2015-09-03 14:51:58 -04:00
4e0f3ddd99
SAAS-1046 - remove misplaced ) character; add some translation strings to LocaleController
2015-09-03 13:53:43 -04:00
c928627d8b
CC-6131 - add div to show when search is active; css tweaks
2015-09-03 13:41:29 -04:00
888762739e
SAAS-1050 - fix track remove buttons in playlist/smart block editors
2015-09-03 12:09:55 -04:00
9071c8d4b6
Update the translations
2015-09-03 10:26:33 -04:00
4b5980d898
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 18:17:19 -04:00
daf854af04
Fix some issues with search, hack to always display options buttons in library view
2015-09-02 18:17:11 -04:00
65fd40bd6e
CC-6115: Redesign the navbar upload button
2015-09-02 17:39:00 -04:00
7a91677d01
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 16:25:35 -04:00
01b3ae1bf0
Allow smart blocks with no criteria
2015-09-02 16:25:30 -04:00
ab11974799
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 15:28:44 -04:00
63ce022a8d
SAAS-1040 - station logo functionality improvements
2015-09-02 15:28:36 -04:00
f05157c376
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 15:07:31 -04:00
6046f8843b
CC-6129: Static smart block errors don't appear
2015-09-02 15:07:17 -04:00
8d0cfdc202
Fix empty-name playlist bug
2015-09-02 13:58:38 -04:00
80d78e9fc5
SAAS-1043 - fix flexbox settings for editors to work in firefox
2015-09-02 13:08:16 -04:00
c020e3449d
SAAS-1044 - fix links in usability hints
2015-09-02 12:55:36 -04:00
69293703f2
SAAS-1041 - add confirmation window when deleting a user
2015-09-02 12:53:24 -04:00
0722225211
Front end tweaks and fixes
2015-09-02 12:45:37 -04:00
9d373791c0
SAAS-1038 - fix bug where 403's weren't being redirected properly
2015-09-02 12:23:23 -04:00
c45f1ddd1c
SAAS-1039 - add processing overlay to listener stats screen
2015-09-02 11:52:43 -04:00
3e29ecad79
CC-6128 - open placeholder 'Learn more' links in new tab
2015-09-02 11:41:51 -04:00
1fd7f0ea36
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 11:22:32 -04:00
63f563f06d
Fix calendar context menu word wrapping
2015-09-02 11:22:24 -04:00
a17001a90a
Merge branch 'saas' into saas-dev
...
Conflicts:
airtime_mvc/application/views/scripts/billing/upgrade.phtml
airtime_mvc/public/css/billing.css
2015-09-02 10:47:37 -04:00
6251fd62d5
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 10:42:23 -04:00
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
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
a99bc26715
Set autofocus on login username field
2015-09-01 16:07:16 -04:00
92f722452a
Adjust user settings form widths to be consistent
2015-09-01 16:05:59 -04:00
f283d69481
Add vertical scrollbar to recent uploads table
2015-09-01 14:27:54 -04:00
46e126145e
CC-6122 - change library behaviour for guest users
2015-09-01 13:53:59 -04:00
34e7c09ab7
CC-6118: Playlist crossfade panel needs restyling
...
Started re-styling the playlist fade editor
2015-09-01 12:05:08 -04:00
c7d926f8e8
Merge branch 'saas-dev' into saas-showbuilder
2015-08-31 17:11:07 -04:00
bfa01e45aa
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-08-31 17:10:51 -04:00
f7a7d4c042
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-31 15:25:27 -04:00
f21e53b12e
CC-6121 - Fix up user settings page
2015-08-31 15:25:17 -04:00
b0e9b41b0c
Nudge the Airtime logo over a bit to center it better
2015-08-31 15:07:13 -04:00
e0cb33b89c
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-31 15:03:25 -04:00
109a336504
CC-6124 - Fix Add to Current Playlist button
2015-08-31 14:36:44 -04:00
7c9f0a09ae
Fix button styling bugs
2015-08-31 14:21:35 -04:00
f64d7096d1
Fix button styling bugs
2015-08-31 14:21:09 -04:00
cd7d07e5f5
CC-6119 - Fix New button styling
2015-08-31 14:01:31 -04:00
c1e2daaac4
CC-6114 - Remove New button from nav bar
2015-08-31 13:48:22 -04:00
fa340c3e30
SAAS-976: September 1st: Undo the billing page changes for the August promotion
2015-08-31 13:37:20 -04:00
d2f46882c1
CC-6113 - Remove select dropdown from library pane
2015-08-31 13:35:46 -04:00
c6a6a97c55
CC-6117 - Change submit button text for file metadata editor so behaviour is consistent with button text
2015-08-31 13:33:23 -04:00
e06f88cd49
CC-6116 - Library new buttons keep colour when disabled
2015-08-31 13:30:00 -04:00
e633bc8899
CC-6112 - Remove button labels at small screen resolutions
2015-08-31 13:25:29 -04:00
5e024023eb
CC-6110 - Change header to be more responsive
2015-08-31 13:10:16 -04:00
34a7019c5b
updated translation resources
2015-08-31 17:07:52 +00:00
d7d27d3c36
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-31 12:35:27 -04:00
2611766498
CC-6109 - Fix display of long usernames in header panel
2015-08-31 12:35:20 -04:00
2748f223de
CC-6092: Calendar add show form style issues
2015-08-31 12:32:07 -04:00
e349c3013c
CC-6107: Webstreams datatable should refresh when new webstream is created
2015-08-31 10:03:26 -04:00
582bc292aa
CC-6108: Manage User table layout is messed up
2015-08-31 09:26:22 -04:00
765211da39
Merge branch 'saas-showbuilder' into saas-showbuilder-colors
2015-08-28 21:11:26 -04:00
f8d1ee09b2
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-28 20:09:11 -04:00
21eb3c502e
Fixed New Show button sliding when you clicked on the calendar
2015-08-28 20:08:52 -04:00
e1d5126e8b
Pick default colors for the calendar based on start time
2015-08-28 18:16:55 -04:00
b312189a7b
CC-6105: DJs can edit playlists, smartblocks, and webstreams they do not own
2015-08-28 17:46:03 -04:00
13f62cc118
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-28 16:21:53 -04:00
311956eb74
CC-6069: Pick consistent design for New buttons
...
* First shot at blue New buttons
2015-08-28 16:21:20 -04:00
8a3f36dea3
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-28 16:09:26 -04:00
005eec5aa5
CC-6095 - better styling for learn about x links
2015-08-28 16:09:18 -04:00
71f149f95f
Unbreak the playlist form during reordering
2015-08-28 15:57:57 -04:00
901ca54fd6
CC-6095 - placeholder div for empty library views; placeholder icons
2015-08-28 15:40:32 -04:00
6446c9e314
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-28 14:28:18 -04:00
e743c3589e
More smart block and playlist editor improvements
...
* Fixed smart block/playlist form validation error messages not showing up.
* Improved styling of all save/error messages across the application.
* Removed broken fade editors
2015-08-28 14:27:18 -04:00
6811646aaa
CC-6106: Permission problems with bulk and single edit in the Dashboard
2015-08-28 13:40:38 -04:00
f36ff944c2
SAAS-1031: Can't add tracks to a new playlist
2015-08-28 13:22:08 -04:00
91cad81c4b
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-28 13:07:08 -04:00
b2edaa8668
Merge branch 'saas' into saas-showbuilder
2015-08-28 13:07:00 -04:00
17074e5f70
SAAS-1032: Shows with missing show art on disk can't be edited
2015-08-28 12:28:34 -04:00
c4cb856283
CC-6078: Help page updates
...
Added a 'File a Support Ticket' link
2015-08-28 12:18:44 -04:00
f597ee075e
CC-6078: Help page updates
...
Removed help center link
2015-08-28 11:55:22 -04:00
eb2f7263c8
CC-6078: Help page updates
2015-08-28 11:45:00 -04:00
e3b09e9aa9
Make widgets page accessible to all user types
2015-08-28 11:32:19 -04:00
4307e326f1
CC-6104: Playout History layouts need help
2015-08-28 11:31:08 -04:00
88a9594aca
CC-6090 - restyle editor processing divs
2015-08-28 10:50:10 -04:00
bc4822d8e4
bugfix
2015-08-28 10:36:18 -04:00
ec9b98c48c
CC-6090 - restyle datatables processing divs
2015-08-28 10:34:49 -04:00
4cf40d312a
SAAS-1030 - fix bug where editing multiple tracks saves wrong metadata
2015-08-28 09:44:45 -04:00
8c90fbe4eb
Added metadata editor title and ellipsis
2015-08-27 20:23:53 -04:00
a08d5b71cf
Calendar colour adjustments
...
* CC-6099: Improve default show colour
* CC-6100: Choose show background colours randomly from a predefined palette
2015-08-27 20:02:32 -04:00
099fc0107e
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-27 19:04:18 -04:00
b6f33f6083
Completed smart block, playlist, and webstream editor form overhauls
...
* CC-6088: Smart Block form needs to have a form layout
* CC-6089: Editor view name fields must be made <input> fields
* CC-6103: Cannot create webstreams
* Reworked a big chunk of the smart block editor flow to send only the
playlist contents back rather than the entire HTML fragment for the
editor.
* Keep more of the playlist/smartblock editor view persistent across
saves, generates, and shuffles.
2015-08-27 19:00:23 -04:00
294298c9bf
CC-6096, CC-6093 - update calendar context menu and usability hint wording; bugfixes
2015-08-27 16:59:21 -04:00
acc4ef0054
CC-6085, CC-6101 - uploader styling
2015-08-27 15:44:59 -04:00
0ebe7a85e1
CC-6066 - Add/Remove content screen update
2015-08-26 17:56:17 -04:00
ef892bb565
Fix some small bugs with Dashboard navigation links
2015-08-26 17:02:01 -04:00
7d8c6dc90d
Fix upload page styling
2015-08-26 16:11:49 -04:00
c728be38ab
CC-6078: Help page updates
...
Small text changes
Removed about page
2015-08-26 14:37:32 -04:00
98ac8fd851
Major layout work on the smartblock and playlist editors
...
* CC-6088: Smart Block form needs to have a form layout
* CC-6089: Editor view name fields must be made <input> fields
2015-08-26 13:10:51 -04:00
706caa8458
SAAS-1025: Restyle the billing page
...
Fix header padding
Change current plan font
2015-08-26 11:27:00 -04:00
7e1fe030fe
SAAS-1025: Restyle the billing page
...
Changed pricing grid header
Added paypal and 2checkout badges
2015-08-26 10:26:03 -04:00
9951abd897
SAAS-1025: Restyle the billing page
...
Make Account Plans the default view
2015-08-26 09:16:06 -04:00
6ecb208962
SAAS-1021: Billing page restyle
2015-08-26 09:11:25 -04:00
afa3b47e42
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-25 17:09:17 -04:00
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
b6cf517d10
CC-6093: Review and fix the usability hints text
2015-08-25 16:48:31 -04:00
498b3243e0
Fix navbar highlights when navigating via usability hints
2015-08-25 16:43:10 -04:00
b99ec51863
CC-6102: Can't upload M4A and FLAC anymore - rejected by dropzone
2015-08-25 15:15:03 -04:00
0752e78b2c
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-25 13:27:48 -04:00
700c3c4005
Merge branch 'saas-dev' into saas-showbuilder
2015-08-25 13:27:40 -04:00
2ec715d814
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-25 13:19:40 -04:00
c921aabfd4
Small css fix on recent uploads table
2015-08-25 13:19:18 -04:00
161746fbae
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-25 13:16:11 -04:00
d4527a0460
CC-6091: Settings->General doesn't highlight when you click Settings
2015-08-25 13:15:57 -04:00
0c50247909
SAAS-1022: Re-implement disk quota status on side nav bar
...
Small css fix
2015-08-25 13:09:07 -04:00
bb2757127d
SAAS-1022: Re-implement disk quota status on side nav bar
...
Small css tweak
2015-08-25 12:56:02 -04:00
a41793666d
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-25 12:43:15 -04:00
2da431895f
SAAS-1022: Re-implement disk quota status on side nav bar
...
Changed "upload" page layout - panels are side by side and storage
status is at bottom of left panel
2015-08-25 12:43:08 -04:00
371a26ff97
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-25 11:46:30 -04:00
afe6ca7002
Cosmetic updates
2015-08-25 11:46:20 -04:00
3592eceb22
Merge branch 'saas' into saas-dev
2015-08-24 17:11:52 -04:00
e188fcde32
Merge branch 'saas-dev' into saas-showbuilder
2015-08-24 16:53:32 -04:00
e6761b54da
CC-6066 - more work on add/remove content screen
2015-08-24 12:05:57 -04:00
b15160d0fb
Fix more selection bugs
2015-08-21 14:39:30 -04:00
6cfc2db0ca
CC-6086 - fix logout button redirecting to a 404 from certain pages when no baseurl is set
2015-08-21 14:29:00 -04:00
812dca9409
CC-6066 - initial work on add/remove content dialog; some selection fixes
2015-08-21 14:19:28 -04:00
f7733757f6
Fixed select menu styling and eliminated ColVis fade time
2015-08-21 13:14:20 -04:00
604b81071c
CC-6084 - fix calendar drag and drop
2015-08-21 11:09:45 -04:00
48f1c5b9a4
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
...
Conflicts:
airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
2015-08-21 11:09:07 -04:00
277a066534
Layout and styling fixes for sub-menu layout pages
2015-08-21 10:43:20 -04:00
6f0b7f6d32
SAAS-1022: Re-implement disk quota status on side nav bar
...
Layout tweak
2015-08-21 10:06:40 -04:00
38d9963a8d
SAAS-1024: Merge layout.phtml and page-sub-menu.phtml
2015-08-21 09:25:01 -04:00
f48c7186ca
SAAS-1022: Re-implement disk quota status on side nav bar
2015-08-21 09:08:36 -04:00
d9455f86ea
Change menu item order and change trial box position
2015-08-20 10:56:11 -04:00
b718171729
Fixed aspect ratio of logo
2015-08-19 18:26:05 -04:00
beb0eed1c8
Make muses 'pixel' invisible, remove scrollbar from player widget page
2015-08-19 17:33:55 -04:00
a8955e2ea1
Fix side-menu position
2015-08-19 17:18:42 -04:00
cfa543e835
Small adjustment to logo
2015-08-19 16:59:04 -04:00
a71752f5c4
Lightened up sidebar icons and fixed context menu arrow alignment
2015-08-19 16:21:10 -04:00
93d2d8ad67
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
...
Conflicts:
airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
2015-08-19 15:00:35 -04:00
f82558a5c0
Navigation sidebar finalization
2015-08-19 14:59:33 -04:00
8dab79da1c
Restyle top panel to account for larger nav panel width
2015-08-19 14:29:54 -04:00
42bbfc3834
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-19 13:02:16 -04:00
ae66b2272b
Fix editor styling and layout issues
2015-08-19 13:02:14 -04:00
f9cc8b41df
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-19 12:58:49 -04:00
8dcd0a2595
CC-6071: Icons for navigation bar
2015-08-19 12:58:31 -04:00
a3e9a7355c
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-19 11:47:20 -04:00
0471d4bbdb
Tweaked text shadow on usability hints
2015-08-19 11:47:13 -04:00
ff930549db
Fix broken sortable placeholders
2015-08-19 11:32:41 -04:00
59a9862ba3
CC-6072: Wrapper has weird positioning during page load
2015-08-19 10:56:41 -04:00
11652da40b
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-18 18:45:58 -04:00
63f9403b11
Fix more selection bugs, implement new selection on schedule table
2015-08-18 18:45:55 -04:00
95cfe463d5
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-18 18:40:52 -04:00
8afc652ff1
Submenu and body background color tweaks
2015-08-18 18:40:09 -04:00
e7367c3374
Fix more selection bugs
2015-08-18 18:01:12 -04:00
504a720ff2
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-18 17:52:26 -04:00
2c443bd27a
Some navbar and page title fixes
2015-08-18 17:52:23 -04:00
5f4935481a
Fix selection bug
2015-08-18 17:51:41 -04:00
0ad51dae09
Fix add/remove content dialog, try to increase speed of selection/deselection
2015-08-18 17:46:16 -04:00
a84c33f0ed
Cleanup and fix media type selector highlight in calendar page
2015-08-18 17:29:23 -04:00
b3371c2a2f
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-18 17:13:35 -04:00
a04f5afcbd
More navbar and submenu layout fixes
2015-08-18 17:13:17 -04:00
a9d30fec15
Fix error when trying to preview playlists/smart blocks
2015-08-18 16:22:14 -04:00
1f8e8f85b9
Fix bug where success banner for saving playlist can appear for other open playlists
2015-08-18 15:58:09 -04:00
20a810fc52
Fixed one more navbar highlight inconsistency
2015-08-18 15:50:10 -04:00
49a6b6ab71
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-18 15:48:37 -04:00
5a4bf6bb80
Fixed main navigation sidebar highlight inconsistencies
2015-08-18 15:48:33 -04:00
13a60c39b9
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-18 15:30:31 -04:00
884e51291c
CC-6083 - ctrl clicking a selected item deselects
2015-08-18 15:30:24 -04:00
3f25ab2647
CC-6079 - merge and remove underscore files
2015-08-18 15:23:42 -04:00
ac974e56a9
Fixed ColReorder includes in ScheduleController.php
2015-08-18 15:08:03 -04:00
5ab0850d9a
Partially revert datatables strings
2015-08-18 15:00:25 -04:00
a271b53c2e
CC-6077: Implement actions menu for library view
2015-08-18 14:55:32 -04:00
b645f1c2ed
Merge branch 'saas-showbuilder' into saas-showbuilder-contextmenus
2015-08-18 13:11:17 -04:00
cee2fe5a63
CC-6082 - add y-scrollbar to file metadata editor at small resolutions
2015-08-18 12:58:34 -04:00
263c2709bf
CC-6067 - implement hybrid selection
2015-08-18 12:20:06 -04:00
4bfb8fa0cb
CC-6067 - deselect when adding library items
2015-08-18 12:01:23 -04:00
a3a3d0a635
Merge branch 'saas-showbuilder' into saas-showbuilder-contextmenus
2015-08-18 09:53:47 -04:00
d30e32c2d3
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-18 07:46:39 -04:00
4adb9cc55a
CC-6070 - standardize editor buttons
2015-08-17 18:34:39 -04:00
07752dd9a5
Break the context menus
2015-08-17 18:13:37 -04:00
096c96b1b6
CC-6075 - fix error
2015-08-17 17:39:16 -04:00
38022f4ff0
SAAS-1019: Re-work Navigation Menu
...
Added user settings to the Settings sub-menu
2015-08-17 16:22:55 -04:00
e5f5ff4c88
SAAS-1019: Re-work Navigation Menu
...
Created Widget sub menu and moved widgets into separate controller
actions
2015-08-17 16:15:26 -04:00
74a1e0929d
Fixed styling on Listener Stats page
2015-08-17 16:08:58 -04:00
3aee9a49bc
SAAS-1019: Re-work Navigation Menu
2015-08-17 12:46:32 -04:00
68523d9e02
Specialize the datatables string for playout history, users, and recent uploads tables
2015-08-14 20:20:30 -04:00
31982a7238
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-14 20:00:17 -04:00
8aa39ae28d
Moved datatables translation stuff to PHP for consistency
2015-08-14 20:00:05 -04:00
cb2d0bd444
SAAS-948 - js fixes for dashboard nav, change logo image in master panel
2015-08-14 16:42:39 -04:00
7ce9dfa1b3
SAAS-948 - add title to library pane
2015-08-14 15:33:45 -04:00
536bbfb678
SAAS-948 - css tweaks to top panel
2015-08-14 15:11:46 -04:00
fb1f22b913
SAAS-948 - css tweaks
2015-08-14 13:29:26 -04:00
12c4e4a374
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
...
Conflicts:
airtime_mvc/public/js/airtime/common/common.js
2015-08-14 10:54:53 -04:00
809b743785
SAAS-948 - Add livechat event listeners
2015-08-14 10:24:49 -04:00
3e66363cdd
SAAS-1017: Move top nav bar to side
...
Reload datatable if user clicks the browser's back button
2015-08-14 08:43:47 -04:00
e90fe728a2
SAAS-1017: Move top nav bar to side
2015-08-14 08:30:52 -04:00
6c7a6aaad3
Expand user management height
2015-08-13 10:11:25 -04:00
8dd580e623
Applied context menu restyling globally
2015-08-12 17:47:55 -04:00
0c83b62545
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-12 17:37:01 -04:00
9d30a26968
Text for show schedule toolbar buttons, Embedded Widgets page styling
2015-08-12 17:36:54 -04:00
32100e2d9b
SAAS-948 - frontend tweaks
2015-08-12 16:54:45 -04:00
61d1e6bb50
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-12 16:45:07 -04:00
409e9e2a78
Stream settings, Add Show form CSS revamp, etc.
2015-08-12 16:44:45 -04:00
32e1e70418
SAAS-948 - update tab functionality
2015-08-12 15:50:32 -04:00
c931b81b35
SAAS-948 - library datatable header tweaks
2015-08-12 15:10:56 -04:00
1957c7827f
SAAS-948, SAAS-983 - Showbuilder editor redesign, look and feel fixes
2015-08-12 14:35:27 -04:00
21250e91c4
More calendar tweaks
2015-08-12 14:33:34 -04:00
0cfc55116d
Colour tweaks
2015-08-12 13:50:42 -04:00
2a1d09bc08
Factor out default show background colour and fix some style issues
2015-08-12 12:55:39 -04:00
f63ce23c9f
Flatten datatable headers and restyled Manage Users screen
2015-08-12 10:53:14 -04:00
e5f70e7ec3
Re-enable the task manager, it made no difference
2015-08-11 17:32:40 -04:00
60a02cfdee
Temporarily disable the task manager to test lock contention
2015-08-11 16:34:28 -04:00
249d3b1d2d
SAAS-1011: Files stored locally with incorrect file extensions won't play out
2015-08-11 09:33:29 -04:00
c9f9bed2d6
SAAS-948 - fix smartblock save and tab close functionality, implement 'super' checkbox
2015-08-10 18:46:12 -04:00
849b8038ce
Mostly new graphics for the calendar page
2015-08-10 17:11:40 -04:00
a28df91c56
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-10 14:17:24 -04:00
2af5eb3314
Add Media page visual refresh, and use dropzone
2015-08-10 14:17:16 -04:00
641486e852
SAAS-948 - Showbuilder fixes
2015-08-10 13:44:57 -04:00
c2d1556cfd
Showbuilder css changes
2015-08-10 12:37:21 -04:00
3bb1dccd65
Ditched hiding overflow, more styling changes
2015-08-10 12:32:39 -04:00
974f979bef
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-10 12:23:30 -04:00
fc7a700654
Consolidated some CSS
2015-08-10 12:23:22 -04:00
75914b791c
Merge branch 'saas-dev' into saas
...
Conflicts:
airtime_mvc/application/common/FileDataHelper.php
2015-08-10 09:00:54 -04:00
fc5d20f4d6
Safen up getUsingCustomStreamSettings()
2015-08-10 08:57:21 -04:00
bf6244c835
SAAS-948
2015-08-07 19:20:29 -04:00
cdc9f88c1c
Big style update for the new show builder screen
...
* Restyled the tables
* Blue currently playing track
* Labels for library view buttons
2015-08-07 19:08:17 -04:00
133db1c6a6
Merge branch 'saas-dev' into saas-showbuilder
2015-08-07 16:50:28 -04:00
Duncan Sommerville
Albert Santoni
drigato
Localizer
Albert Santoni
Daniel James
Duncan Sommerville