Duncan Sommerville
|
cb2d0bd444
|
SAAS-948 - js fixes for dashboard nav, change logo image in master panel
|
2015-08-14 16:42:39 -04:00 |
|
Duncan Sommerville
|
fb1f22b913
|
SAAS-948 - css tweaks
|
2015-08-14 13:29:26 -04:00 |
Duncan Sommerville
|
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 |
|
Duncan Sommerville
|
809b743785
|
SAAS-948 - Add livechat event listeners
|
2015-08-14 10:24:49 -04:00 |
drigato
|
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 |
|
drigato
|
e90fe728a2
|
SAAS-1017: Move top nav bar to side
|
2015-08-14 08:30:52 -04:00 |
Albert Santoni
|
0c83b62545
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
|
2015-08-12 17:37:01 -04:00 |
|
Albert Santoni
|
9d30a26968
|
Text for show schedule toolbar buttons, Embedded Widgets page styling
|
2015-08-12 17:36:54 -04:00 |
|
Duncan Sommerville
|
32100e2d9b
|
SAAS-948 - frontend tweaks
|
2015-08-12 16:54:45 -04:00 |
|
Albert Santoni
|
61d1e6bb50
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
|
2015-08-12 16:45:07 -04:00 |
|
Albert Santoni
|
409e9e2a78
|
Stream settings, Add Show form CSS revamp, etc.
|
2015-08-12 16:44:45 -04:00 |
|
Duncan Sommerville
|
32e1e70418
|
SAAS-948 - update tab functionality
|
2015-08-12 15:50:32 -04:00 |
|
Duncan Sommerville
|
c931b81b35
|
SAAS-948 - library datatable header tweaks
|
2015-08-12 15:10:56 -04:00 |
|
Duncan Sommerville
|
1957c7827f
|
SAAS-948, SAAS-983 - Showbuilder editor redesign, look and feel fixes
|
2015-08-12 14:35:27 -04:00 |
|
Albert Santoni
|
0cfc55116d
|
Colour tweaks
|
2015-08-12 13:50:42 -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
|
f63ce23c9f
|
Flatten datatable headers and restyled Manage Users screen
|
2015-08-12 10:53:14 -04:00 |
|
Duncan Sommerville
|
c9f9bed2d6
|
SAAS-948 - fix smartblock save and tab close functionality, implement 'super' checkbox
|
2015-08-10 18:46:12 -04:00 |
|
Albert Santoni
|
849b8038ce
|
Mostly new graphics for the calendar page
|
2015-08-10 17:11:40 -04:00 |
|
Albert Santoni
|
a28df91c56
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
|
2015-08-10 14:17:24 -04:00 |
|
Albert Santoni
|
2af5eb3314
|
Add Media page visual refresh, and use dropzone
|
2015-08-10 14:17:16 -04:00 |
|
Duncan Sommerville
|
c2d1556cfd
|
Showbuilder css changes
|
2015-08-10 12:37:21 -04:00 |
|
Albert Santoni
|
974f979bef
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
|
2015-08-10 12:23:30 -04:00 |
|
Albert Santoni
|
fc7a700654
|
Consolidated some CSS
|
2015-08-10 12:23:22 -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 |
|
Duncan Sommerville
|
bf6244c835
|
SAAS-948
|
2015-08-07 19:20:29 -04:00 |
|
Albert Santoni
|
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 |
|
Duncan Sommerville
|
133db1c6a6
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-08-07 16:50:28 -04:00 |
|
Duncan Sommerville
|
e6609896a5
|
SAAS-948 - showbuilder styling
|
2015-08-07 16:49:05 -04:00 |
|
Albert Santoni
|
ea2a6b3f68
|
Clean up and bugfixes for password reset (SAAS-1009)
|
2015-08-07 13:57:42 -04:00 |
|
Duncan Sommerville
|
02d96d7bd0
|
SAAS-991 - initial playlist editor redesign
|
2015-08-06 19:16:04 -04:00 |
|
Duncan Sommerville
|
cc36fcd37b
|
Showbuilder checkboxes and style fixes
|
2015-08-06 16:01:44 -04:00 |
|
Duncan Sommerville
|
83902ebbbe
|
Fix small showbuilder bugs
|
2015-08-06 10:40:50 -04:00 |
|
Duncan Sommerville
|
4cbc49391b
|
Reintroduce checkboxes
|
2015-08-05 18:14:56 -04:00 |
|
Duncan Sommerville
|
36f2e1844f
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-08-05 15:32:04 -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 |
|
Duncan Sommerville
|
33d2fe0900
|
SAAS-989 - Move file metadata editor to right-hand showbuilder pane
|
2015-08-04 19:56:12 -04:00 |
|
Albert Santoni
|
c934866063
|
Two small code improvements
|
2015-08-04 17:42:53 -04:00 |
|
Duncan Sommerville
|
57c1d74286
|
SAAS-985 - Port sandwich menu to showbuilder branch
|
2015-08-04 16:37:45 -04:00 |
|
Duncan Sommerville
|
4200f56265
|
SAAS-999 - Change Advanced Search Options to dropdown
|
2015-08-04 15:38:48 -04:00 |
|
Duncan Sommerville
|
f138dc6b47
|
SAAS-948 - tab layout for right-hand pane
|
2015-07-31 18:28:16 -04:00 |
|
Duncan Sommerville
|
8f5f0eb5fe
|
SAAS-948 - CSS overhaul for new show builder page
|
2015-07-29 20:28:54 -04:00 |
|
Duncan Sommerville
|
661a87dfbc
|
SAAS-948 - Frontend tweaks and fixes
|
2015-07-29 13:35:01 -04:00 |
|
Duncan Sommerville
|
fcbc37977f
|
SAAS-948 - Frontend tweaks
|
2015-07-28 11:42:04 -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
|
989b4994aa
|
SAAS-945: Language + Timezone Setup Popup
forgot to auto detect user's timezone
|
2015-07-27 14:38:42 -04:00 |
|
drigato
|
ee2bfe7664
|
SAAS-945: Language + Timezone Setup Popup
|
2015-07-27 07:06:22 -04:00 |
|
drigato
|
ce7765a8cb
|
Merge branch 'saas' into saas-dev
|
2015-07-21 11:03:31 -04:00 |
|
drigato
|
3e60713590
|
SAAS-962: "Now" option should not be available for linked shows
Also added fix for SAAS-957
|
2015-07-20 15:20:50 -04:00 |
|
Duncan Sommerville
|
ba90b1f1eb
|
Merge branch 'saas-dev' into saas-showbuilder
Conflicts:
airtime_mvc/public/css/styles.css
|
2015-07-20 12:23:11 -04:00 |
|
Duncan Sommerville
|
0324c59100
|
Don't reload datatable when selecting same media type
|
2015-07-18 17:28:17 -04:00 |
|
drigato
|
a6854ea507
|
SAAS-957: Error on "update show"
|
2015-07-17 16:28:33 -04:00 |
|
Duncan Sommerville
|
1816be156f
|
SAAS-922 - change file extensions in pypo based on mime-type, update lists of accepted mime types
|
2015-07-16 16:26:52 -04:00 |
|
Duncan Sommerville
|
d7d9a994d5
|
SAAS-948 - ShowBuilder redesign initial commit
|
2015-07-15 18:53:19 -04:00 |
|
drigato
|
b37b574cea
|
Real fix for calendar context menu width problem
|
2015-07-15 10:30:59 -04:00 |
|
drigato
|
dddc6e6591
|
Fix for context menu on calendar being too small sometimes
|
2015-07-15 07:19:48 -04:00 |
|
drigato
|
8309289356
|
Merge branch 'saas-dev-usability-hints' of https://github.com/sourcefabric/Airtime into saas-dev-usability-hints
|
2015-07-14 11:52:10 -04:00 |
|
drigato
|
e5c574229f
|
SAAS-940: Provide usability hints to user
fix hint message transitions
|
2015-07-14 11:51:50 -04:00 |
|
Albert Santoni
|
2693c9f02c
|
Small bugfix for CC-6064
|
2015-07-14 11:25:11 -04:00 |
|
Albert Santoni
|
30b8ada622
|
Merge branch 'saas-dev-usability-hints' of github.com:sourcefabric/Airtime into saas-dev-usability-hints
|
2015-07-14 10:56:18 -04:00 |
|
Albert Santoni
|
45b09a0d24
|
Merge branch 'saas-dev' into saas-dev-usability-hints
Conflicts:
airtime_mvc/public/js/airtime/schedule/add-show.js
|
2015-07-14 10:56:12 -04:00 |
|
drigato
|
e24307180c
|
Merge branch 'saas-dev-usability-hints' of https://github.com/sourcefabric/Airtime into saas-dev-usability-hints
|
2015-07-14 10:40:10 -04:00 |
|
drigato
|
794a4a21d8
|
SAAS-940: Provide usability hints to user
Update hints after library table has changed
|
2015-07-14 10:39:58 -04:00 |
|
Albert Santoni
|
5a2ef8d3db
|
Merge branch 'saas-dev-usability-hints' of github.com:sourcefabric/Airtime into saas-dev-usability-hints
|
2015-07-14 10:35:47 -04:00 |
|
Albert Santoni
|
66caf2574a
|
CC-6064: Allow shows to be started "now"
|
2015-07-14 10:35:21 -04:00 |
|
drigato
|
71e8909365
|
SAAS-940: Provide usability hints to user
Fixed bug where hints were not showing up sometimes
|
2015-07-14 10:08:56 -04:00 |
|
drigato
|
25ef70767b
|
SAAS-940: Provide usability hints to user
Customized hints depending on what page the user is on and what action
they just completed.
|
2015-07-13 17:02:31 -04:00 |
|
Duncan Sommerville
|
755ec79e7d
|
SAAS-876 - frontend tweaks
|
2015-07-13 15:17:47 -04:00 |
|
Duncan Sommerville
|
c05d4bac2f
|
Merge branch 'saas-dev' into saas-stream-settings
|
2015-07-13 13:27:34 -04:00 |
|
Duncan Sommerville
|
6d883d2fa4
|
Fix Add Show button bug and update styling
|
2015-07-13 13:23:24 -04:00 |
|
Duncan Sommerville
|
c99165a8dd
|
SAAS-876 - better implementation of toggle between Airtime Pro/Custom streaming options
|
2015-07-10 13:17:20 -04:00 |
|
Duncan Sommerville
|
ac2e1a2d4b
|
SAAS-876 - More work on stream settings page
|
2015-07-08 16:04:09 -04:00 |
|
Duncan Sommerville
|
6b9d9e8063
|
Merge branch 'saas-dev' into saas-stream-settings
|
2015-07-08 12:47:24 -04:00 |
|
Duncan Sommerville
|
31ce52b857
|
CC-6062 - Fix stretching last column after adding show in calendar view
|
2015-07-06 11:52:04 -04:00 |
|
Duncan Sommerville
|
457230ba07
|
SAAS-876 - Initial commit
|
2015-07-03 13:32:41 -04:00 |
|
Duncan Sommerville
|
e3101e90b2
|
Resize player windows to correct dimensions on open
|
2015-07-02 16:07:49 -04:00 |
|
Duncan Sommerville
|
a8f214803b
|
Fix javascript error on some browsers
|
2015-06-29 17:07:17 -04:00 |
|
Duncan Sommerville
|
19fb67c8d6
|
Fix broken delete button
|
2015-06-29 11:28:27 -04:00 |
|
Duncan Sommerville
|
5cc8774e56
|
Merge branch 'saas-dev' into soundcloud
Conflicts:
airtime_mvc/application/configs/constants.php
|
2015-06-29 10:02:58 -04:00 |
|
Duncan Sommerville
|
ca9c805ce4
|
SAAS-906 - Change wording on Add to Show button
|
2015-06-26 15:25:58 -04:00 |
|
Duncan Sommerville
|
c79e4fb9ea
|
CC-4922
|
2015-06-26 15:12:52 -04:00 |
|
Duncan Sommerville
|
c44bae8140
|
Merge branch 'saas-dev' into soundcloud
Conflicts:
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/public/js/airtime/preferences/preferences.js
|
2015-06-26 10:37:30 -04:00 |
|
Duncan Sommerville
|
79f51f77cb
|
Merge branch '2.5.x-installer' into saas-dev
|
2015-06-25 18:21:40 -04:00 |
|
Duncan Sommerville
|
c59f401eb1
|
Fix shift selection in library and builder views
|
2015-06-25 18:21:22 -04:00 |
|
Duncan Sommerville
|
6497bc28c5
|
Show collapsible sections (other than 'dangerous settings') by default on preferences page
|
2015-06-25 17:43:15 -04:00 |
|
Duncan Sommerville
|
6fb9c6a30c
|
SAAS-885, SAAS-857, SAAS-878 - Cosmetic fixes, remove js widget box in preferences
|
2015-06-25 14:13:09 -04:00 |
|
Duncan Sommerville
|
67155b136a
|
Add downgrade action to UpgradeController, fix SoundCloud schema and bugs
|
2015-06-24 18:38:04 -04:00 |
|
Duncan Sommerville
|
8fcaf7fc74
|
Merge branch 'saas-dev' into soundcloud
Conflicts:
airtime_mvc/application/configs/constants.php
|
2015-06-24 16:35:06 -04:00 |
|
Duncan Sommerville
|
a3f1cf1d56
|
CC-6060 - Fix breaking tooltips when viewing context menu in library
|
2015-06-22 10:47:34 -04:00 |
|
Duncan Sommerville
|
e36c8a16d4
|
CC-6060 - Fix breaking tooltips when viewing context menu in library
|
2015-06-22 10:46:29 -04:00 |
|
Duncan Sommerville
|
76a7aa9a24
|
Fix SoundCloud and TaskManager bugs, switch tasks to use acks_late, and provide feedback from SoundCloud context menu items
|
2015-06-18 18:18:48 -04:00 |
|
Albert Santoni
|
8c9981a155
|
Merge branch '2.5.x' into 2.5.x-installer
Conflicts:
airtime_mvc/public/index.php
|
2015-06-16 10:37:06 -04:00 |
|
Duncan Sommerville
|
3902c8c746
|
Add SoundCloud delete functionality and fixes; implement TaskManager to run background jobs
|
2015-06-15 15:12:37 -04:00 |
|
Duncan Sommerville
|
459f9494c3
|
Merge saas-dev into soundcloud
|
2015-06-10 16:08:52 -04:00 |
|
Duncan Sommerville
|
626489bb3b
|
SAAS-853 - Celery backend for SoundCloud uploads
|
2015-06-10 15:04:49 -04:00 |
|
Duncan Sommerville
|
b0b6e037ac
|
CC-6046, CC-6045, CC-6047 - New SoundCloud implementation
|
2015-06-03 16:57:17 -04:00 |
|
Albert Santoni
|
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 |
|
Albert Santoni
|
e86e1cb4ac
|
Merge branch 'saas-dev' into saas-speedy
|
2015-05-21 15:10:01 -04:00 |