Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,111 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

75 Commits

Author SHA1 Message Date
Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Playlist.php
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
 2012-07-16 14:31:03 -04:00
Martin Konecny ee3447f903 CC-4090: Make code style PSR compliant 
-User.php
-removed all trailing whitespace
 2012-07-10 18:51:32 -04:00
denise 69bbc53b98 CC-4037: Remove SaaS specific code from Airtime codebase 
-removed live chat popup
 2012-07-10 15:09:28 -04:00
denise 4015949d2a CC-3933: Replace Airtime version number in source code with a hash of the version + uniqueId. 
-done
 2012-06-27 10:27:53 -04:00
denise ffb7f2ff65 CC-3933: Replace Airtime version number in source code with a hash of the version + uniqueId. 
-done
 2012-06-22 18:01:00 -04:00
denise 561934c8ef SAAS-244: Live chat box appears in stream-player and preview windows 
-fixed
 2012-05-25 16:23:33 -04:00
Martin Konecny 6c4bb1ef9e -rename playlists.js to dashboard.js 2012-05-08 20:41:09 -04:00
Martin Konecny adee58bcbc -better handling of timezones 2012-05-05 22:29:31 -04:00
Martin Konecny e12bd35ee2 CC-3671: add show on week/day view doesn't get start time/end time filled in 
-use str formatter for padding
 2012-04-25 16:39:58 -04:00
Martin Konecny da8a5296b0 CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window 
-add user type into javascript as a variable so we can check permissions on js side
 2012-04-20 11:31:24 -04:00
paul.baranowski 9ec584e90c CC-1927 Remove PEAR DB 
Removed remaining references to $CC_DBC
 2012-04-19 16:35:19 -04:00
paul.baranowski c0da27b445 CC-1927: Remove Pear DB 
Final touches on install/upgrade scripts, now they are working.
Still need to remove last traces of PEAR throughout the code.
 2012-04-19 16:34:14 -04:00
paul.baranowski 95d69a3bbe CC-1927: Remove PEAR DB 
Fixed all install/upgrade scripts.
 2012-04-19 16:34:14 -04:00
paul.baranowski 7f78a7f663 CC-1927: Remove PEAR DB 
First pass through the model classes to remove use of $CC_DBC.
Web application is working.
There are still other parts of the app that use PEAR DB.
 2012-04-19 16:33:05 -04:00
Naomi Aro 102bcb1d46 CC-3416 : Create password reset form 2012-04-17 18:16:10 +02:00
James 0ad9177dac CC-3648: Airtime Station time is broken 
- fixed
 2012-04-16 10:19:34 -04:00
James 44e3217f3a CC-3482: Live Stream: UI Design for Source Stream panel on dashboard 
- fixed order of css insertion.
 2012-04-03 13:53:08 -04:00
James a49a3a1d2e CC-3482: Live Stream: UI Design for Source Stream panel on dashboard 
- master panel UI integration
 2012-04-03 11:58:48 -04:00
Naomi Aro cfb5fbc0c9 CC-3518 : Airtime requires internet access to run 2012-03-30 17:37:21 +02:00
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