Commit Graph

56 Commits

Author SHA1 Message Date
Daniel ae0d3c560c CC-3394: Add play button to timeline table.
- added image information to row in ShowBuilder.php to enable audio preview of shows.
- moved around code so the audio preview functionaly is standalone
- fixed the firefox bug for issue CC-3429
2012-03-15 17:56:51 -04:00
Daniel 1aab682104 CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
- updates to audio preview on library and playlist
2012-03-05 19:00:14 -05:00
Martin Konecny d03d01bce9 CC-3366: Pypo: Use local files instead of downloading them
-done
2012-03-01 18:00:46 -05:00
Martin Konecny 54cbc86a0a Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Nowplaying.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/application/models/airtime/CcShowInstances.php
2012-02-14 14:47:07 -05:00
Naomi Aro e07ad45b1a incorrect path for the new qtip. 2012-02-09 18:07:32 +01:00
James 33fcbddcb9 CC-3284: Don't make browser users clear their cache when Airtime is upgraded
- use airtime version string instead of filemtime function

Conflicts:

	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
2012-02-08 16:21:57 -05:00
James ba3cc45d36 CC-3284: Don't make browser users clear their cache when Airtime is upgraded
- use airtime version string instead of filemtime function
2012-02-08 15:57:42 -05:00
Naomi Aro 3728ffaddc CC-3174 : showbuilder
upgraded full calendar to 1.5.3 so that it works with jquery 1.7.1

need to replace context menu on the page, old one doesn't work anymore anyways.
2012-02-07 23:58:36 +01:00
Naomi Aro 776d1b65e8 CC-3174 : showbuilder
fixing merge, testing that affected functionality still works.
2012-02-06 11:23:10 +01:00
Naomi Aro 42452b8ea9 Merge branch 'CC-3174' into devel
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Playlist.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/airtime/library/spl.js
2012-02-06 11:07:10 +01:00
Naomi Aro 16863ee95e CC-3174 : showbuilder/library
playlist fades are working again, still need more error checking to be done.
2012-02-05 23:38:12 +01:00
Naomi Aro bdc9707052 CC-2970 : playlist drop indicator
looking into customizing the placeholder, connected library to playlist sortable.
2012-02-04 02:07:32 +01:00
Naomi Aro 0afa904ffe CC-3174 : showbuilder
refactoring playlists for the group add/delete
2012-02-03 18:15:10 +01:00
Naomi Aro 6da4397a96 CC-3174 : show builder
can add playlists to the time line
upgraded datatables to 1.9
upgraded qtip2 to a newer version
put qtips on type column on lib table.
2012-02-02 23:15:39 +01:00
James 3643c9caaf SAAS-174: Ability to add Google Analytics to the demo instance
- done
2012-02-01 11:44:20 -05:00
James 8e40c95e9a SAAS-174: Ability to add Google Analytics to the demo instance
- done
2012-02-01 10:57:38 -05:00
james e05e2ea49c CC-3284: Version the javascript directories so that upgrades
work correctly for clients.

- appended timestamp of last modified time on all js and css file import

Conflicts:

	airtime_mvc/application/controllers/LibraryController.php
2012-01-27 15:37:53 -05:00
james 9f2d0fc8d5 CC-3284: Version the javascript directories so that upgrades
work correctly for clients.

- appended timestamp of last modified time on all js and css file import
2012-01-27 15:30:44 -05:00
Martin Konecny 54ee177f7d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-16 13:58:45 -05:00
Naomi Aro 859213b760 CC-3174 Show Builder
experimenting
2012-01-16 09:56:57 +01:00
Martin Konecny c3430e5411 -various optimizations 2012-01-09 17:47:58 -05:00
Naomi Aro 52b0e3c5f9 CC-3110 : Password reset
basic functionality password reset using sendmail
2011-12-21 16:01:29 -08:00
Yuchen Wang e583511b21 SAAS-57: Add LiveChat to Airtime Pro
Didn't consider the case of client_id being an empty string,
thus making the javascript syntax invalid
2011-12-09 12:37:31 -05:00
Yuchen Wang 764d6c3347 SAAS-57: Add LiveChat to Airtime Pro
Create a javascript variable to hold the client_id
2011-12-09 11:12:42 -05:00
Yuchen Wang 2d04d7eb83 SAAS-57: Add LiveChat to Airtime Pro
Fixing the issue of livechat showing up in the stream player pop-up
2011-12-08 18:04:32 -05:00
Yuchen Wang 201667936c SAAS-57: Add LiveChat to Airtime Pro
Adding code to non-saas side
2011-12-08 16:45:11 -05:00
Martin Konecny efbaebbbf5 CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed.
-fixed
2011-12-02 16:22:54 -05:00
Martin Konecny 82f3a25f69 -set log path earlier 2011-12-02 15:06:21 -05:00
Martin Konecny bc7553a5fc CC-3099: Does Airtime upgrade work when the database username + password is changed from default?
-fixed for non-install issues as well.
2011-11-29 16:07:38 -05:00
James a723430462 SAAS-69: Support Settings: Change/hide some sections for SaaS
- Some sections are hidden when saas is enabeld
as described in the ticket.
2011-11-15 16:10:40 -05:00
Yuchen Wang 1a1db1892f CC-2950: Tell users if they are running an out-of-date version or not
Initial implementation.
- added some code in phone_home_stat to retrieve latest version from stat server
  and store result in db

- created new view helper VersionNotify.php, which queries and calculates version
  difference, then returns the necessary information in html to the view files

- created new javascript file versiontooltip.js, which sets up the qtip stuff so that
  when the version notification icon is clicked, a tooltip is displayed
2011-11-14 00:34:53 -05:00
James 04bcd47a31 CC-2936: Soundcloud: handle the case where the soundcloud server
is not responsive

- fixed
2011-10-05 17:48:25 -04:00
James b4d4c54c31 CC-2795: Give option to set download flag of recorded shows uploaded
to Soundcloud by default

- fixed name of Soundcloud Model class
2011-10-03 18:02:01 -04:00
martin 20c2405f20 CC-2907: Stream player window gets a 404 when clicked
from "Stream settings" page

-fixed
2011-09-30 14:46:09 -04:00
martin b9863e660e CC-2806: Create upgrade template file
-initial commit
2011-09-29 18:18:08 -04:00
martin df4bf9e1c7 CC-2833: Use ClassLoaders for PHP Files 2011-09-26 17:01:43 -04:00
martin fb9ab448b7 CC-2833: Use ClassLoaders for PHP Files 2011-09-26 15:43:58 -04:00
martin 685cc87951 CC-2833: Use ClassLoaders for PHP Files
-temporarily reenable some files from being always loaded
2011-09-26 15:32:56 -04:00
martin 9e6a1ebf44 CC-2833: Use ClassLoaders for PHP Files
-autoload DateHelper class
2011-09-26 15:29:12 -04:00
martin b8838a5bda CC-2833: Use ClassLoaders for PHP Files
-autoload AtSoundcloud class
2011-09-26 15:25:03 -04:00
martin dfe43c98bb CC-2833: Use ClassLoaders for PHP Files
-autoload RabbitMq class
2011-09-26 15:19:23 -04:00
martin 5cc7de95ee CC-2833: Use ClassLoaders for PHP Files
-Done for class User
2011-09-23 17:00:55 -04:00
martin 1e9a8a28fe CC-2833: Use ClassLoaders for PHP Files
-Done for class Schedule and ScheduleGroup
2011-09-23 16:50:00 -04:00
martin 9bb901945e CC-2833: Use ClassLoaders for PHP Files
-shows.php
2011-09-23 10:54:20 -04:00
martin c84690adaa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
2011-09-22 12:25:30 -04:00
martin 2be0960ed5 CC-2833: Use ClassLoaders for PHP Files
-made MusicDir, Playlist and StoredFile autoload
2011-09-22 12:24:17 -04:00
James 73dc4b851d CC-2591: Allow upload of any audio clip to Soundcloud
- done
- need more styling
- note there were changes in style.css
2011-09-22 11:47:24 -04:00
martin e580c5ae0d CC-2438: Add a button to listen to the stream immediately
-initial commit
2011-08-23 12:45:03 -04:00
martin fdf1b4c100 CC-2692: Integrate ZFDebug into Airtime
-done
2011-08-22 10:12:53 -04:00
martin b538f1cc82 CC-1942: Add ability to set timezone in preferences
-change timezone in python
2011-08-15 10:06:42 -04:00