Naomi
|
75e4e0c9b6
|
CC-2301 : only showing waveform buttons if the browser supports the audio api.
|
2013-05-03 14:42:42 -04:00 |
|
Naomi
|
435bb83588
|
CC-2301 : dos2unix being run
|
2013-05-02 16:52:30 -04:00 |
|
Naomi
|
3e320f1e2e
|
Merge branch 'master' into CC-2301
|
2013-05-02 16:15:58 -04:00 |
|
Naomi
|
517bb7557a
|
CC-2301 : testing default crossfade settings
|
2013-05-02 16:15:21 -04:00 |
denise
|
0e5ba2f07f
|
CC-5085: Linked show: Changing a regular show to linked show and updating the weekday, all the contents will lost
|
2013-05-02 15:36:14 -04:00 |
|
denise
|
5ba5864d8c
|
CC-5078: Wrong start time if dragging dynamic smart block into a show
|
2013-05-01 11:29:32 -04:00 |
|
Naomi
|
92ef0608d6
|
Merge branch 'master' into CC-2301
|
2013-05-01 11:04:14 -04:00 |
|
Naomi
|
2a1ac0ddb9
|
CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps.
|
2013-04-30 16:27:31 -04:00 |
|
Naomi
|
2462e4f144
|
CC-2301 : CRLF fix.
|
2013-04-30 15:34:20 -04:00 |
|
Naomi
|
0db557a570
|
CC-2301 : fades editor saving offset to database for playlists and smart blocks.
|
2013-04-30 15:32:43 -04:00 |
Martin Konecny
|
decb12f6b8
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2013-04-30 15:00:45 -04:00 |
|
Martin Konecny
|
de4934a317
|
ensure that uploaded file is UTF-8 encoded
|
2013-04-30 15:00:31 -04:00 |
|
denise
|
4ca60ca676
|
CC-5074: Editing a linked instance sets incorrect schedule start times
|
2013-04-30 13:58:03 -04:00 |
|
Naomi
|
2e03e1982f
|
CC-2301 : changing more CRLF files
|
2013-04-29 18:11:11 -04:00 |
|
Naomi
|
b2a490ac47
|
CC-2301 : working on creating a crossfade method for waveforms.
|
2013-04-29 18:09:12 -04:00 |
|
Naomi
|
58957cc919
|
CC-2301 : running dos2unix on 3 files.
|
2013-04-29 17:01:08 -04:00 |
|
Naomi
|
410d298272
|
CC-2301 : creating an offset column to help create crossfades in the playlist.
changing default fade to be a separate default fade in/out
|
2013-04-29 16:55:08 -04:00 |
|
denise
|
71526a94cc
|
Merge branch 'cc-4961-show-linking'
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
|
2013-04-29 15:35:16 -04:00 |
|
denise
|
de8f7b0ff7
|
CC-4961: Show linking
|
2013-04-29 15:27:14 -04:00 |
|
denise
|
a5264aac1e
|
CC-4961: Show linking
|
2013-04-26 16:10:01 -04:00 |
|
denise
|
52655ab375
|
CC-4961: Show linking
|
2013-04-26 13:43:30 -04:00 |
|
denise
|
0f1383d541
|
CC-4961: Show linking
|
2013-04-25 09:00:37 -04:00 |
|
Naomi
|
179621d687
|
CC-2301 : fades editor is loading now with a leftoffset for the second track and the cues for both tracks.
|
2013-04-24 14:15:07 -04:00 |
|
Martin Konecny
|
8f6b583fcb
|
CC-5061:
Use propel transactions for StoredFile class
|
2013-04-19 20:40:31 -04:00 |
|
Martin Konecny
|
fd78ad29bf
|
cleanup of function names
|
2013-04-19 20:24:05 -04:00 |
|
Martin Konecny
|
f39f9329cc
|
CC-4992:
Decouple pypo from Airtime install
-first commit
|
2013-04-19 20:10:51 -04:00 |
|
denise
|
a9b5d00d87
|
CC-4961: Show linking
|
2013-04-18 16:12:26 -04:00 |
|
Martin Konecny
|
479e69de12
|
CC-5009:
Use Silan to silently update track length in the background
-done
|
2013-04-18 15:40:33 -04:00 |
|
denise
|
1a2a05c3cf
|
CC-4961: Show linking
|
2013-04-12 16:34:36 -04:00 |
|
denise
|
9b4a0ba9c1
|
CC-4961: Show linking
Removed stamp tables
|
2013-04-12 10:52:13 -04:00 |
|
denise
|
9b2fb3bece
|
CC-4961: Show linking
|
2013-04-09 15:55:18 -04:00 |
|
denise
|
e64f6fb3fd
|
CC-4961: Show linking
-modified db
|
2013-04-08 14:43:27 -04:00 |
|
denise
|
76bfce21b1
|
CC-4961: Show linking
-modified db
|
2013-04-08 14:42:37 -04:00 |
|
denise
|
62d1b22fcc
|
CC-4961: Show linking
created new cc_show_stamp table
|
2013-04-05 12:27:54 -04:00 |
|
denise
|
f9d7167638
|
CC-4961: Show linking
|
2013-04-04 16:30:33 -04:00 |
|
Martin Konecny
|
5ac51e289d
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-04-01 19:15:02 -04:00 |
|
Martin Konecny
|
6ae8da98e4
|
removing logging
|
2013-04-01 19:14:55 -04:00 |
|
denise
|
ab10ae68a2
|
CC-5036: Add back edit show instance functionality
|
2013-04-01 14:42:35 -04:00 |
|
denise
|
418bf0b5ff
|
Created calendar service and moved the context menu creation there
|
2013-03-26 16:03:53 -04:00 |
|
denise
|
ef8f87df5d
|
Show linking
|
2013-03-25 16:28:53 -04:00 |
|
denise
|
6766d208aa
|
CC-4961: Show linking
Removed logic out of edit-show action
Created new SchedulerService
Fixed overlapping show bug
|
2013-03-21 16:31:05 -04:00 |
|
denise
|
a7601d290f
|
CC-4961: Show linking
Refactored services
Removed ShowDaysService and ShowInstanceService
Combined all show actions into one ShowService
|
2013-03-21 10:05:11 -04:00 |
|
denise
|
896e03d76b
|
CC-4961: Show linking
Refactoring all services thus far
|
2013-03-15 16:56:22 -04:00 |
|
denise
|
f9f4e4f1fb
|
CC-4961: Show linking
Made some progress on show editing
|
2013-03-12 18:01:12 -04:00 |
|
denise
|
c721b81a13
|
CC-4961: Show linking
Refactoring
|
2013-03-12 10:30:31 -04:00 |
|
denise
|
7347be35b1
|
Created a new service for show days
Created a new user service
Started refactoring edit show action
|
2013-03-11 16:18:40 -04:00 |
|
denise
|
8415dfdf6f
|
Add comments
|
2013-03-08 12:18:24 -05:00 |
|
denise
|
af622eb4b8
|
CC-4961: Show linking
Refactored some more show instance creation functions
|
2013-03-06 09:58:35 -05:00 |
|
denise
|
d497cfa857
|
Created show service
|
2013-03-06 09:58:35 -05:00 |
|
denise
|
99c07272fd
|
- Moved all form validation to it's own function in schedule service
- Moved show creation to it's own function in schedule service
|
2013-03-06 09:58:35 -05:00 |