Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6578 commits 3 branches 0 tags 405 MiB
Commit graph

1106 commits

Author SHA1 Message Date
James
b644a94363 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-30 16:29:50 -05:00
James
80970efa9c SAAS-174: Ability to add Google Analytics to the demo instance 
- done
 2012-01-30 16:29:35 -05:00
James
c5f3e40397 SAAS-174: Ability to add Google Analytics to the demo instance 
- done
 2012-01-30 16:28:27 -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
Naomi Aro
3f3117cf0e CC-3174 : Show builder 
creating a scheduling system to work with the new timeline in mind using propel.
 2012-01-27 21:06:04 +01:00
Naomi Aro
f5761fd03c CC-3174 : show builder 
status icon on left side of table
static check mark in the footer currently
 2012-01-26 19:10:37 +01:00
Naomi Aro
b0c3bace1c CC-3174 : show builder 
made sure the column reordering/visibility selection works with
modified show header/footer rows (their td spans the entire tr)
 2012-01-26 15:21:04 +01: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
192c30bacc Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-01-25 14:12:42 -05:00
James
2027db3609 SAAS-178: Demo instance should prevent changing of admin password 
- Error msg is returned when try to update admin account
 2012-01-25 14:12:19 -05:00
Naomi Aro
1080bf692f CC-3277 : Overbooking a show to include 24+ hours of audio 
truncating time values greater that the max allowed for time without timezone
 2012-01-24 18:08:39 +01:00
Naomi Aro
ecaebbeb67 CC-3174 : Show builder, working on date choice pickers, make sure they accomodate client/server timezones. 2012-01-23 19:07:07 +01:00
James
863de54fc8 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-18 10:29:19 -05:00
Yuchen Wang
93dfb253c1 CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter 
Fixed
 2012-01-18 10:28:41 -05:00
Naomi Aro
cc20db5d30 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-18 16:22:22 +01:00
Naomi Aro
fa872894f3 CC-3259 : change repeating state of show. 2012-01-18 16:21:46 +01:00
Paul Baranowski
07bd5dacae Improved tooltip for Stream Settings: Icecast Vorbis Metadata 2012-01-17 16:03:41 -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
3588cca654 CC-3258 : Deleting a rebroadcasting show deletes also the recorded show 2012-01-17 14:11:12 +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
Naomi Aro
424206b9a9 CC-3174 : Show Builder 
data tables column resizing, starting separating out events.
 2012-01-17 11:18:17 +01:00
Martin Konecny
54ee177f7d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-16 13:58:45 -05:00
Naomi Aro
df33a457b1 Merge branch 'devel' into CC-3174 2012-01-16 09:58:02 +01:00
Naomi Aro
859213b760 CC-3174 Show Builder 
experimenting
 2012-01-16 09:56:57 +01: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
d753b0bb02 CC-3226: Record cancel dialog says "stop playback?" instead of "stop recording?" 
Done
 2012-01-13 16:46:37 -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
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
Yuchen Wang
044f511455 SAAS-141: Tweaks for trial balloon 
Done
 2012-01-12 15:47:08 -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
Yuchen Wang
4a372715a3 CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter 
Fixed
 2012-01-12 12:19:05 -05:00
Martin Konecny
67ddda4a2d -Remove phing path from conf.php 2012-01-12 12:16:10 -05:00
Martin Konecny
79141fa070 CC-3240: When playlist is longer than a show, the now playing bar shows as if the playlist is still playing after show ends 
-Fixed
 2012-01-12 12:14:38 -05:00
Martin Konecny
d1de836a92 -make rabbitmq_host configurable via $_SERVER var (.htaccess etc.) 2012-01-11 16:28:03 -05:00
Martin Konecny
4f546a1bc3 CC-3238: When ICEcast is not on local host, Jplayer is not playing anything 
-fixed with workaround to show the user what ip they're listening on.
 2012-01-11 16:27:14 -05:00
James
d5d4d50a9e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/models/airtime/om/BaseCcFiles.php
	airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php
 2012-01-11 12:31:54 -05:00
James
f6f1b143d7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-11 12:18:28 -05:00
James
04b48d47cc CC-2977: Never delete files from the database 
- Files are marked deleted(file_exists to false) on deletion.
- Dirs are marked removed(removed flag to true) on removal of watched
folder in a usual way. If dir is unmounted, without being removed from
watched list first, it will be marked as not exists(exist flag to false)
- Manage Media Folders will show if dirs exist or not( mounted or not)
- Playlist builder will show if files exists or not
 2012-01-11 12:17:48 -05:00
Yuchen Wang
f3ce8e77d1 Merge branch 'group_action_playlist_builder' into devel 2012-01-11 10:42:35 -05:00