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

1105 commits

Author SHA1 Message Date
James
2ef6d230f9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-17 15:39:50 -05:00
James
bb1cdc4a8f SAAS-196: Stats: Check if easy_install installation method detection 
is working properly

- fixed
 2012-02-17 15:39:31 -05:00
Daniel
6d71ec8c9c CC-3331 : Optimize "Now Playing" to load in less than 1/2 second 
- The logic to build the NowPlaying list was updated to refactor the quering of the database for playlist tracks played from in the loop per show ID to outside the loop for a given duration. The resulting list was then partitioned off for each show.
 2012-02-17 11:13:34 -05:00
Naomi Aro
09ae26a531 CC-3174 : showbuilder 
fixing bug moving item to beginning of show
 2012-02-17 12:19:42 +01:00
Naomi Aro
ac11d8bcf6 Merge branch 'CC-3174' into devel 
Conflicts:
	airtime_mvc/application/models/StoredFile.php
 2012-02-17 11:50:49 +01:00
Naomi Aro
9bed56a2c3 CC-3174 : showbuilder 
incorrect variable name fixed for updating last scheduled timestamp.
 2012-02-17 11:14:44 +01:00
Naomi Aro
b2d0565ec4 CC-3174 : showbuilder 
checking to make sure UI is up to date with db
 2012-02-16 19:46:14 +01:00
Naomi Aro
e1d5d6de73 CC-3174 : showbuilder 
checking modification time before deleting items.
Throws a ScheduleOutdatedException
 2012-02-16 16:29:11 +01:00
Naomi Aro
f14ebce239 CC-3174 : showbuilder 
adding new column last_scheduled to cc_show_instance
changing column time_filled to be of type interval.
 2012-02-15 18:27:59 +01:00
Daniel
190490d6f4 CC-3329: Library: Add "track number" to the list of available columns to show (was in 1.9, disappeared in 2.0) 
- updated the view columns to include track_number from db as track
- updated sql query to include track_number from db
 2012-02-15 11:21:21 -05:00
Naomi Aro
b1fbeeb448 CC-3174 : showbuilder 
adding a showbuilder form, can filter by show,
or if you're a host user by all shows you can schedule in a range.
 2012-02-15 00:39:27 +01:00
Daniel
14a9225b97 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-14 18:12:51 -05:00
Daniel
14cd9ed0e9 CC-323: Show appropriate error message if disk is full when attempting to upload files via the web UI 
- Updated the StoreFile logic so it won't die while trying to copy a file, and instead pass error messages to the controller which can decide if it wants to die, which 	I've set ApiController and PluploadController todo on receipt of error code.
 2012-02-14 18:12:29 -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
eba84ee878 CC-3174 : showbuilder 
disabling editing of past/current shows.
 2012-02-14 14:44:46 +01:00
Naomi Aro
b7b1c401f6 CC-3174 : showbuilder 
fixing classes on show footer, selector for the select all.
only adding a checkbox on a row if a user is allowed to schedule there.
 2012-02-14 13:33:25 +01:00
Naomi Aro
4f5b5d8562 CC-3174 : Show Content Builder 
adding time filled/empty row data.
 2012-02-13 18:29:39 +01:00
Martin Konecny
3df396756f CC-3323: Don't send description text to Full Calendar since it is never used. 
-Done
 2012-02-13 12:10:23 -05:00
Martin Konecny
fbd6df1986 CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade. 2012-02-12 15:31:17 -05:00
Martin Konecny
5059d13156 -handle case gracefully when pypo hasn't registered with Airtime server yet. 2012-02-12 01:34:53 -05:00
Martin Konecny
eadf68cb61 CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback 
-fixed
 2012-02-10 18:43:40 -05:00
Martin Konecny
babfa1830c CC-3317: PHP Undefined variable error in SystemstatusController 
-fixed
 2012-02-10 13:12:18 -05:00
Naomi Aro
941da1fe44 CC-3174 : showbuilder 
adding add/remove to the context menu.
airtimeline now has default set start/end times in the inputs.
 2012-02-09 23:41:12 +01:00
Naomi Aro
fdd962f5ce CC-3174 : showbuilder 
replacing context menus on calendar screen.
 2012-02-09 21:19:21 +01:00
Daniel
a4a41f301f Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-09 15:05:36 -05:00
Daniel
b603726a39 CC-3289: Widgets should have a version string so users can make sure widgets are up to date 
-I've updated the messages used to notify the user to be more explicit.
-I've moved the constant used to track widget api versioning to /application/configs/constants.php
 2012-02-09 15:04:52 -05:00
Naomi Aro
4691799326 Merge branch 'devel' into CC-3174 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
 2012-02-09 19:41:31 +01:00
Daniel
9fc0ed198e CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI 
- moved the logic used to test that the destination folder has enought space to copy the given audio file into.
 2012-02-09 12:45:39 -05:00
Naomi Aro
e07ad45b1a incorrect path for the new qtip. 2012-02-09 18:07:32 +01:00
Daniel
73555714b8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-08 17:56:42 -05:00
Daniel
cdc72beb6b CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI 
- Updated the code to get the remaining free disk space and compare it to the size of the file to be uploaded and notify the user if the file is larger then diskspace.
 2012-02-08 17:56:26 -05: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
Martin Konecny
0f9d3021cd Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 16:17:35 -05:00
Martin Konecny
6254467e02 CC-3305: 404 Error after meta data edit on Airtime Pro 
-Fixed
 2012-02-08 16:17:18 -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
Daniel
b1a281be4e Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 14:59:11 -05:00
Daniel
5d31e4c2a0 CC-3289: Widgets should have a version string so users can make sure widgets are up to date 
- I updated the ApiController.php file to add a widgetsVersion value used in the response to widgets
- I updated the widgets jquery.showinfo.js file to check the version and report back to the user.
 2012-02-08 14:57:48 -05:00
Martin Konecny
09ef22520e CC-3310: Editing metadata of a song shows Artist instead of Creator. 
-fixed
 2012-02-08 14:15:15 -05:00
Naomi Aro
d257ddf482 CC-3285 : Nowplaying 
nowplaying didn't show correct start date if show crossed 0:00 boundry.
 2012-02-08 16:00:37 +01:00
Naomi Aro
252777c3f9 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 15:14:33 +01:00
Naomi Aro
c23491b257 CC-3285 : show over booked error message 
checking if percentage is over 100.
 2012-02-08 15:13:17 +01:00
Naomi Aro
a2f38b94a2 CC-3174 : showbuilder 
changing show context menus
 2012-02-08 13:12:08 +01:00
Naomi Aro
581f86a1de CC-3174 : showbuilder 
show editing menu added.
 2012-02-08 12:53:46 +01:00
Naomi Aro
216ce80ceb CC-3174 : showbuilder 
have to replace context menus on calendar page.
 2012-02-08 11:16:23 +01: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
668e214371 CC-3174 : showbuilder 
unsetting playlist id in the session properly.
 2012-02-07 18:42:34 +01:00
Naomi Aro
529f3fa52f CC-3174 : showbuilder 
forgot to actually return fades.... heh
 2012-02-07 17:52:04 +01:00
Naomi Aro
aa7afce245 CC-3174 : showbuilder 
modifying times to work with scheduling times.
 2012-02-07 17:29:52 +01:00
Naomi Aro
251f3a3e5b CC-3174 : showbuilder 
testing newly returned times, fixing the secondsToPlaylistTime method
to not drop subsecond precision for the calculations.
 2012-02-07 14:58:16 +01:00
Naomi Aro
f651024a6e CC-3174 : showbuilder 
overriding some propel setter/getters to support subseconds
or using fades in ss.uuuuuu time as a default.
 2012-02-07 13:29:50 +01:00