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

6032 Commits

Author SHA1 Message Date
James 3643c9caaf SAAS-174: Ability to add Google Analytics to the demo instance 
- done
 2012-02-01 11:44:20 -05:00
James 4ffe79a286 CC-3290: A file should be removed from playlists if it is removed 
through the interface

- fixed
 2012-02-01 10:59:04 -05:00
Daniel Franklin 5d02581d38 CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI 
Modified the error message to prepend a The, simple change.
 2012-02-01 10:59:04 -05:00
Daniel Franklin d495eac326 CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI 
-fixed using the return result of the rename call to verifty the upload worked.
 2012-02-01 10:59:04 -05:00
James 6812f69962 CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2 
- fixed a bug.
- extra fix: handle cancel recording event gracefully
- better log
 2012-02-01 10:59:03 -05:00
James 1df1388602 CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2 
- bug fix
 2012-02-01 10:59:03 -05:00
James 25ab4d39b2 CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2 
- The issue was that the recorder wasn't pulling any schedule from
Airtime. It should pull it when real timeout(every 1 hr) happens
 2012-02-01 10:59:03 -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 5026da56cb SAAS-178: Demo instance should prevent changing of admin password 
- Error msg is returned when try to update admin account
 2012-01-25 14:14:27 -05:00
James 087d893a60 Merge branch 'airtime-2.0.x' into devel 2012-01-17 14:48:04 -05:00
James 3a8ba36e0d SAAS-155: Add possibility to show additional information on 
login page (for demo site)

- username and password are auto filled on demo site
- added informative msg on demo site about username and password
 2012-01-17 14:47:26 -05:00
James ff428d2c4f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-17 11:35:48 -05:00
James dae7e73a84 CC-3250: UI design for mount monitor for media monitor 
( Manage Media Folder and Playlist Builder screen)

- initial commit
 2012-01-17 11:35:31 -05:00
Naomi Aro 63b2fa94de Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-17 14:11:26 +01:00
Naomi Aro 3588cca654 CC-3258 : Deleting a rebroadcasting show deletes also the recorded show 2012-01-17 14:11:12 +01:00
Daniel James 695d9c5f3c Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-17 12:06:30 +00:00
Daniel James 7a9b1710ad Updated information about phing (CC-3237) 2012-01-17 12:05:19 +00:00
Naomi Aro 169141d530 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-17 12:46:49 +01:00
Naomi Aro a69be24831 CC-3256 : Recorded/repeated/rebroadcast is invalid after show update 
only the original rebroadcasts are left when toggling the repeat option.
 2012-01-17 12:45:05 +01:00
Daniel James 908401841b Removed mention of phing from license file (CC-3237) 2012-01-17 11:34:26 +00:00
Martin Konecny 54ee177f7d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-16 13:58:45 -05:00
Martin Konecny 1b3433e7a8 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-16 13:57:07 -05:00
Martin Konecny 9a64c49ef0 CC-3237: Remove phing dependency of end user database installation 
-Done
 2012-01-16 13:48:43 -05:00
Martin Konecny 9d7a0f31ca CC-3254: lsb-release package should be installed by install_full scripts 
-fixed
 2012-01-16 13:47:50 -05:00
martin 6add525fb1 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-13 18:31:21 -05:00
martin 229db4cdb0 -small fix for debian upgrade-test script 2012-01-13 18:30:59 -05:00
James c82394b7a0 CC-3246: Hardware audio output cannot be switched off 
- fixed
 2012-01-13 16:57:02 -05:00
James ccef97190a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-13 16:56:29 -05:00
James bcbbf42f62 CC-3246: Hardware audio output cannot be switched off 
- fixed
 2012-01-13 16:56:02 -05:00
Yuchen Wang d8ca0cc393 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-13 16:46:56 -05:00
Yuchen Wang d753b0bb02 CC-3226: Record cancel dialog says "stop playback?" instead of "stop recording?" 
Done
 2012-01-13 16:46:37 -05:00
James f9aab1b5ac Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-13 16:26:38 -05:00
James ecdd957525 CC-3245: upgrade 1.8->2.0 cause error in show recorder 
- new cofig field was missing from recorder.cfg.200
- better log when execption happens
 2012-01-13 16:25:56 -05:00
James a24310e690 CC-3245: upgrade 1.8->2.0 cause error in show recorder 
- new cofig field was missing from recorder.cfg.200
- better log when execption happens
 2012-01-13 16:24:16 -05:00
Yuchen Wang 9629e2bbae Merge branch 'group_action_playlist_builder' into devel 2012-01-13 14:21:29 -05:00
Yuchen Wang 258521ffbf CC-1977: Allow multiple files to be selected and acted upon in the library and playlist 
- Fixed issues in "Manage Users" page
- Moved some code to more appropriate place
 2012-01-13 14:17:39 -05:00
Yuchen Wang b215d816ac CC-3186: Design tweaks for tooltip 
Updated the icon to make it stand out more
 2012-01-13 10:28:42 -05:00
James 41b072b412 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-12 17:55:25 -05:00
James 08a09e4096 CC-2977: Never delete files from the database 
- using mtab(previous and current) files to figure out directories to be
added or removed
- adding index to cc_files
- see the tickets and media monitor design page for more info
 2012-01-12 17:55:05 -05:00
James 09d50e7e25 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-12 16:38:21 -05:00
James 04b592b831 CC-3245: upgrade 1.8->2.0 cause error in show recorder 
- fixed
 2012-01-12 16:36:14 -05:00
Martin Konecny fd622a630e Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-12 15:50:05 -05:00
Martin Konecny 69275066af CC-3237: Remove phing dependency of end user database installation 
-remove phing from airtime-full-install
 2012-01-12 15:49:53 -05:00
Yuchen Wang d7f2341725 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-12 15:48:05 -05:00
Yuchen Wang 044f511455 SAAS-141: Tweaks for trial balloon 
Done
 2012-01-12 15:47:08 -05:00
Martin Konecny e70b490327 -fix for when airtime dir exists from previous Airtime installation (fab_release_test.py) 2012-01-12 15:07:55 -05:00
Martin Konecny 793909bafc Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-12 14:31:48 -05:00
Martin Konecny 982a55371d -another debian fix 2012-01-12 14:30:28 -05:00
Yuchen Wang 6b7523513e Merge branch 'group_action_playlist_builder' into devel 2012-01-12 14:28:12 -05:00
Yuchen Wang 186aa9e898 CC-1977: Allow multiple files to be selected and acted upon in the library and playlist 
Fixed bugs introduced by backend changes from before
 2012-01-12 14:27:43 -05:00