ff46883c1b
CC-5360: Updating a Show over a timezone change period has problems
...
Need to apply the old timezone to show start time when attempting to
fetch current instance
2013-10-07 14:16:20 -04:00
7cca01ab08
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-04 14:15:32 -04:00
7b1cd5c908
CC-5354: Remove PHP short open tags for better compatibility
2013-10-04 14:15:23 -04:00
548d3eef0e
Merge branch 'all-record-icons' into 2.5.x
2013-10-04 11:06:46 -04:00
4ca2554999
CC-5362 : In Calendar Week/Day view crappy JS for now playing show makes everything a record show
...
fc-show-instance is now a class since agenda day/week are prerendered, thought only 1 was rendered at a time.
better handling of adding the now playing icon.
2013-10-04 11:05:35 -04:00
60b4eb5c8a
Removed unnecessary formating when comparing DateTime objects
2013-10-04 09:49:23 -04:00
37a0c271f6
CC-5359: Update show fails sometimes with overlapping check
...
Some DateTime objects were not getting created in correct timezone
Used format() to get the day of week value instead of getTimestamp()
getTimestamp() sometimes returns the wrong value
2013-10-03 18:02:15 -04:00
c707967567
CRLF
2013-10-02 11:25:40 -04:00
faa6c7210c
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-02 11:25:08 -04:00
4d01e3b11f
CC-5347 : isScheduled doesn't work for webstreams
2013-10-02 11:24:48 -04:00
632b11c0ab
CC-5331: Now Playing keeps refreshing sometimes
...
- typo in GET request parameters causing overriding of data
2013-10-01 16:49:08 -04:00
1e59ab836d
CC-5277: Selecting weekly repeat without selecting days fails silently
...
- added a check in the 'when' form since the validation there relies on the repeat form being valid
- added validation for this in the 'repeat' form
2013-10-01 14:19:02 -04:00
3d9bc85fa0
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-01 08:49:10 -04:00
1fa13eed13
CRLF
2013-09-30 13:59:08 -04:00
0dd5458269
Merge branch '2.5.x' into CC-5293-calendar-pref
2013-09-30 13:57:23 -04:00
7d739a0f66
CC-5316 : Playout History: Doesn't support webstream
...
adding the webstream metadata to the history table.
2013-09-30 13:56:27 -04:00
11ae76beb8
Fix SAAS-349 by preventing password changes in demo mode.
...
* Added a NotDemoValidate validator class to ensure no changes to a field in demo mode.
* Prevent the user from changing the password of any user in demo mode.
* Fixes SAAS-349.
2013-09-26 16:23:22 -04:00
28a032388b
Start of bugfixing for SAAS-349.
...
* Also identity verification for erry on Freenode.
2013-09-26 15:18:41 -04:00
52b7dbb226
Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x
2013-09-26 08:36:11 -04:00
a8a02704f3
Merge branch '2.5.x' into cc-5232-show-timezone
2013-09-25 17:24:44 -04:00
34e2344100
CC-5323: User's Timezone Can Improperly Edit Show
...
Sometimes show form would populate the start/end time with wrong timezone
2013-09-25 17:18:23 -04:00
a1f3309cf7
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-09-25 16:41:35 -04:00
3e5a6b2a3d
CC-5323: User's Timezone Can Improperly Edit Show
...
Edit show from was displaying rebroadcast dates in user's timezone
instead of in the show's timezone
2013-09-25 16:40:55 -04:00
99669c78a0
Fixed CC-5045 and Now Playing time remaining style improvements
2013-09-25 16:40:20 -04:00
e8dc1c5729
CC-5323: User's Timezone Can Improperly Edit Show
...
- fixed to use show's timezone instead of user's timezone when updating a show's
start and end time after a show has been edited
2013-09-25 16:22:30 -04:00
2114383519
CC-5323: User's Timezone Can Improperly Edit Show
...
-overlapping show check was using the user's local timezone to compare new
shows instead of the show's timezone
2013-09-25 16:22:30 -04:00
af03502592
CC-5323: User's Timezone Can Improperly Edit Show
...
-added comments to timezone getters and setters in Prefences model
to reduce confusion on station timezone and user timezone
2013-09-25 16:22:30 -04:00
6aa6d576cd
CC-5323: User's Timezone Can Improperly Edit Show
...
-made localizeDate a static function in ShowFormService
2013-09-25 16:22:30 -04:00
8ddb2974f1
CC-5323: User's Timezone Can Improperly Edit Show
2013-09-25 16:22:30 -04:00
107263ae20
CC-5323: User's Timezone Can Improperly Edit Show
2013-09-25 16:22:30 -04:00
2ab5e6b26a
CC-5344: Edit Recorded Show -> Rebroadcasts get deleted
...
When editing a show the record option was getting posted with a false value
even if the value was true. This was caused because on show-edit action the
record form field is disabled
2013-09-25 16:17:20 -04:00
8dc100126a
Alert icon for missing file in Now Playing should be orange, to match Media Builder
2013-09-25 17:36:50 +01:00
e47b446804
CC-5338 : Uncaught SyntaxError: audio resources unavailable for AudioContext construction
...
creating a single global audio context to avoid resource problems.
2013-09-24 18:50:41 +02:00
24861545ce
crlf fix
2013-09-24 12:24:13 +02:00
7e96828cdd
CC-5317 : Guest user can't see Now playing page
...
removed the library module completely from page if the user does not have permission to view it.
2013-09-24 12:21:04 +02:00
71001480d2
CC-5335 : I18N: Calendar picker strings are not translated.
...
loading the same strings as the jquery calendar.
2013-09-24 11:47:20 +02:00
59f6578e2e
CC-5334 : Localize Ryerson History Feature
...
adding string "New log sheet template"
2013-09-24 09:58:53 +02:00
53341d40f7
CC-5334 : Localize Ryerson History Feature
2013-09-24 09:56:04 +02:00
86c570744a
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-09-23 17:58:58 +02:00
68f715587c
Update Chinese translation
...
Update Chinese translation after CC-5334
2013-09-23 11:58:40 -04:00
577bbf14b6
Remove swear words from source code
2013-09-23 16:16:51 +01:00
9de8b6634c
CC-5334 : Localize Ryerson History Feature
...
crlf
2013-09-23 14:58:56 +02:00
9ec6156c92
CC-5334 : Localize Ryerson History Feature
2013-09-23 14:57:44 +02:00
ee45f10aeb
CC-5334 : Localize Ryerson History Feature
2013-09-23 14:42:35 +02:00
ae1c41e4ce
CC-5333 : Rebroadcast Shows are not created
2013-09-23 12:20:10 +02:00
4c6d96e062
CC-5333 : Rebroadcast Shows are not created
2013-09-20 16:35:46 +02:00
1c6d7725ca
Modified weekInfo from ApiController to display current week and next, changed widget to display extra days.
2013-09-18 17:35:32 +12:00
0e20e5b50b
Merge branch '2.4.x' into ryerson-history
2013-09-07 16:51:22 +02:00
0d089b787d
Merge branch '2.4.x' into ryerson-history
2013-09-07 16:41:57 +02:00
f7f2cdc51c
Follow up changes relating to adding in new show repeat options
2013-09-07 14:54:03 +12:00
6da9b6bf42
Removed repeated code
2013-09-07 14:52:45 +12:00
0b66f62045
Removed old jquery syntax
2013-09-06 11:08:01 -04:00
5a85fce89d
CC-5321 : Changing Timezone after Creating shows creates Problems
2013-09-06 12:35:31 +02:00
0734a4a98c
CC-5320 : UTC not included in Timezone List
2013-09-05 11:54:25 +02:00
03f383f764
added more options for show repeats
2013-09-03 12:25:22 +12:00
4a4ef2767e
CC-5318 : Playout History: The last song of the show will display wrong end time.
2013-09-01 17:59:47 -04:00
619dbf7bbf
format/json to prevent zend errors.
2013-09-01 13:38:18 -04:00
9c0bee3877
adding show instance to the create form if it's already set.
2013-08-31 23:34:37 -04:00
614a8174d5
put "no show" at the end of the select by default.
2013-08-31 22:56:22 -04:00
075342c637
don't delete a history item if a show instance is removed from the database.
2013-08-30 16:43:05 -04:00
4fd37a4fa0
Merge branch '2.4.x' into ryerson-history
2013-08-30 16:07:41 -04:00
d790dc63c2
taking the modified calendar from 2.4.1
2013-08-30 16:03:17 -04:00
98412e59ff
underscore templates updated
2013-08-30 15:25:57 -04:00
8c66c5bb18
default no show option
2013-08-30 15:06:59 -04:00
0c379ef840
a working show instance select.
2013-08-30 15:03:43 -04:00
ab8cf60fe3
refreshing view on navigation.
2013-08-30 02:39:14 -04:00
de225c589f
restricting search properly for select all/none.
2013-08-30 02:31:23 -04:00
ad531f9512
clearing internal selected items array.
2013-08-30 02:24:16 -04:00
846c90bc8f
fixing select all/none button
2013-08-30 02:11:26 -04:00
a4e9cd1add
can research times in show summary now.
2013-08-30 01:51:33 -04:00
8971e6330a
removing animation for smoother effect.
2013-08-30 01:39:51 -04:00
0e017374b7
change default text to "No Show"
2013-08-30 01:30:23 -04:00
53c326b320
pagination buttons look better if they can fit on the same line.
2013-08-30 01:23:35 -04:00
7b54d3b6ce
fixing colour to go back to default theme
2013-08-30 01:08:49 -04:00
2c88d1e0a0
formating the date start/end of each show in the accordian.
2013-08-30 01:06:59 -04:00
15e27f8166
history records for a show have times validated within show range.
2013-08-30 00:43:43 -04:00
5a8957273f
removing choice for show instance if in shows tab.
2013-08-29 18:52:40 -04:00
0f0958ee6b
changing the query to only filter by instance id not starts/ends if instance id is set.
2013-08-29 18:32:42 -04:00
d50cdd16c2
starting association of a show instance.
2013-08-29 17:40:08 -04:00
f97069bd0b
displaying show list in proper time zone.
2013-08-29 15:58:24 -04:00
91d4d1224e
redoing accordian properly.
2013-08-29 15:52:24 -04:00
8208f8596b
ordering by show start time
2013-08-29 15:37:33 -04:00
ec31fd50c9
deleteing items from the show table.
2013-08-29 15:34:34 -04:00
5780eb5bbe
show tables filtering by instance id.
2013-08-29 15:17:24 -04:00
803409f151
creating a show table beginning
2013-08-29 11:01:03 -04:00
a4c97479b6
using an accordian to display per show logs.
2013-08-28 23:30:15 -04:00
429cdeeffb
filtering by a host's show so they can edit their own playout history.
2013-08-28 19:37:46 -04:00
653a6384b9
creating a separate controller for playouthistory templates.
2013-08-28 18:25:46 -04:00
5aa983be36
adding an instance id to the playout history table.
2013-08-28 17:15:36 -04:00
5fbc3867f8
removing default button after pressing.
2013-08-28 15:57:29 -04:00
e6b09308a5
IM-932 : File Metadata Distinction/Template Design
2013-08-28 15:40:10 -04:00
3769f5e5db
IM-933 : datepicker switch/design
2013-08-28 14:54:44 -04:00
05054fa823
IM-931 : Icon Overlap
2013-08-28 14:48:35 -04:00
f08a732c11
reinitialize form after error check.
2013-08-28 13:42:33 -04:00
969889859b
improper naming of propel tables in php caused cc_mount_name to not get any generated files, double declaration of some variables for cc_timestamp.
2013-08-28 13:07:55 -04:00
6d5531f341
CC-5310 : Playlist -> Crash happens on draging a song after a webstream into a playlist
2013-08-27 19:30:17 -04:00
b1e71e5adf
added optional parameter number_of_days for getting schedule information
2013-08-26 11:26:09 +12:00
c2b9bb01ac
crlf
2013-08-23 15:53:18 -04:00
dbe160c5d9
beginning of displaying form errors, need to keep working on this.
2013-08-23 15:52:49 -04:00
12a62a3827
CC-5309:Calendar-> Recording Show: Fail to open context menu
...
Better error msg, also add more information in show-record.log
2013-08-23 14:23:47 -04:00
b2828d466d
need delegation with delayed initialization.
2013-08-23 13:38:20 -04:00
f1b1352077
matching selected row colours to the library table.
2013-08-23 13:31:37 -04:00
59ba938334
implementing select all/none etc
2013-08-23 13:18:17 -04:00
63ce35b38d
initializing only when viewed. fixes flash buttons, saves load time.
2013-08-23 12:28:37 -04:00
dd0115f573
proper showTimeFirst file
2013-08-23 11:53:31 -04:00
5ec8665aec
adding datetimepicker with showTimeFirst option
2013-08-23 11:48:26 -04:00
fb37f371e2
changing enddate at all times now, problem with setting time otherwise.
2013-08-22 22:21:08 -04:00
3e8f49c00d
only automatically set the end date if it is blank.
2013-08-22 21:46:17 -04:00
af822bb5b9
showing time first for endtime box.
2013-08-22 21:39:46 -04:00
48e6ddbb04
set the end time to be the starttime on change.
2013-08-22 20:48:00 -04:00
01370c2124
reverting back to the bootstrap datetime picker since it's nicer to use.
2013-08-22 20:23:17 -04:00
ec7f4fa1ef
default display length is 25.
2013-08-22 15:45:09 -04:00
8ed3e23195
output columns are only the sortable columns (everything except checkbox pretty much)
...
pdf output is default landscape now.
2013-08-22 15:19:38 -04:00
f7531d5da2
remove sizing of history content div in JS. CSS to fix width and containing box problems.
2013-08-22 14:50:58 -04:00
5c0ba2e79b
clearing custom Label name after adding
2013-08-22 14:23:07 -04:00
fa6de28bcf
not allowing double file metadata to be added to avoid query problems.
2013-08-22 14:15:40 -04:00
17abb4ad9a
need a better random field name generator to avoid problems
2013-08-21 21:44:52 -04:00
84efdfd64a
crlf
2013-08-20 17:23:48 -04:00
007a7ee7ef
casting non mandatory types from "", to avoid database query problems.
2013-08-20 17:23:15 -04:00
2e572c652c
creating a random string for field names to work for all languages.
2013-08-20 15:31:13 -04:00
6d5febe4f7
getting rid of characters from a field name that may cause problems.
2013-08-20 15:18:05 -04:00
10ef55b083
context menu just in the client now. works for both tables.
2013-08-20 14:58:22 -04:00
3ea2b920a6
crlf
2013-08-19 23:20:26 -04:00
09693ef174
changing to context menu single edit/delete.
2013-08-19 23:19:13 -04:00
9b45b9dc72
converting to a jquery UI based datepicker.
2013-08-16 15:12:00 -04:00
7230b3ef58
removing tabletools from schedule page.
2013-08-16 12:57:04 -04:00
50d5685199
CC-5270: looping on InvalidContentType
2013-08-14 17:43:14 -04:00
7cf654551d
crlf
2013-08-14 16:39:50 -04:00
673c422015
replacing booleans in table with checkbox + column title
2013-08-14 16:38:59 -04:00
5f588afdd5
CC-5293: Calendar page cannot be loaded sometimes
2013-08-14 13:07:06 -04:00
c48f556b7d
CC-5303: Interface freezes sometimes when using smart blocks
2013-08-13 16:41:32 -04:00
033693721e
CC-5302: Undefined variable in zend log
2013-08-13 16:36:04 -04:00
c3c64e6fb1
crlf
2013-08-12 18:18:58 -04:00
fdf18ec3ce
upgrading table tools to version 2.1.5
2013-08-12 18:18:33 -04:00
b65007868a
crlf fix
2013-08-12 15:08:09 -04:00
d83c004fb9
subclassing the template types, files summary table is now fully configurable form wise.
2013-08-12 15:06:26 -04:00
5676decd2d
Using local copy of jquery UI 1.8.24
2013-08-09 17:11:34 -04:00
557b7b641c
downgrading UI to a version that still supports our custom CSS (not enough time to upgrade further)
2013-08-09 16:02:07 -04:00
d201efbe49
crlf
2013-08-09 15:52:50 -04:00
333ee7453e
downgrading full calendar (too much to do the necessary updates at the moment) but still an upgrade from 2.4.x
2013-08-09 15:52:22 -04:00
5bdc1a1e4b
Update jplayer to 2.4.0
2013-08-09 13:04:33 -04:00
a2bba67679
Merge branch '2.4.x'
2013-08-09 13:02:33 -04:00
27b079ace9
adding a label to the form fields (Datatables column headers)
2013-08-07 17:55:18 -04:00
aaf2e5c2f6
better casting on form checkbox, setting populate flag properly based on if id is set (for create/update)
2013-08-05 15:05:26 -04:00
31c604d09c
can update an existing history item entry. Form is pre-populated.
2013-08-02 18:16:23 -04:00
590837a357
crlf
2013-08-02 16:16:04 -04:00
e047c2f71d
can configure the file summary template as well now.
2013-08-02 16:15:32 -04:00
774027c9bd
crlf
2013-08-02 15:30:35 -04:00
c110b4b4df
file summary table now starting to work with templates.need to change query around to be configurable still.
2013-08-02 15:29:39 -04:00
b480a5ae18
crlf
2013-08-02 11:19:46 -04:00
6e43094d10
pagination working properly (but not with filtering, have removed serach for now anyways.)
2013-08-02 11:18:15 -04:00
8ba95b3587
CC-5262: PHP error happens when creating shows
...
SAAS only because there is no recording show form
2013-08-02 11:03:14 -04:00
35f552361e
more informative names
2013-08-01 17:50:10 -04:00
af38d3cb02
CRLF
2013-08-01 17:10:04 -04:00
2341b7b68c
can order data in the item table
2013-08-01 17:09:42 -04:00
557b3f9c9b
CRLF
2013-08-01 16:37:10 -04:00
a5a99da21e
Editing templates, strictly typing metadata for datatables (for unions)
2013-08-01 16:36:18 -04:00
06f5f2f5a7
CC-5283: Calendar gets messy, possibly after upgrade
2013-08-01 15:38:34 -04:00
b33f33964a
crlf
2013-07-31 17:39:45 -04:00
7ca28fe81d
history item datatable is set up with configurable columns now.
...
should add a field when configuring template field for "display name"
2013-07-31 17:38:48 -04:00
0c9c0c16e8
working on sql for custom templates
2013-07-30 20:04:10 -04:00
07819d895d
fix added to avoid a blank row in aggregate view
2013-07-30 19:32:31 -04:00
a170ee7308
crlf
2013-07-30 19:25:06 -04:00
7ca3048f36
can add a new list item using the template.
...
set a default item template
working on sql to get a table with unified columns for file md and manually entered metadata without a file.
2013-07-30 19:24:05 -04:00
06e21029d0
saving a template to the DB.
2013-07-29 17:35:07 -04:00
a2d4af5449
CRLF
2013-07-29 17:22:44 -04:00
8eecbb18c0
propel rename done for template fields, template name input.
2013-07-29 17:21:46 -04:00
db4e025c05
CRLF fix
2013-07-29 16:32:05 -04:00
16581088d9
working on configuring an item template UI.
...
modified db to have fields concept for templates.
2013-07-29 16:31:01 -04:00
7d70a5ed28
Deleting show code improvement.
2013-07-29 15:13:47 -04:00
ff557ec75f
CC-5283: Calendar gets messy, possibly after upgrade
2013-07-29 15:10:24 -04:00
1046a0916d
CC-5289: Exception about linked show in zendphp.log
2013-07-29 14:13:56 -04:00
c0206ff8f4
CRLF
2013-07-29 08:59:04 -04:00
7183396da5
needed to update jquery, fullcalendar needed updating for the new JS.
...
working on configuring a template.
2013-07-29 08:57:31 -04:00
46ecdf393d
dynamic form rendering for template
...
bootstrap datetime widget.
jquery update is needed, testing with hosted jquery first.
2013-07-26 17:33:17 -04:00
c7b5592fa9
starting to populate with the template.
2013-07-26 11:36:58 -04:00
4cbbd1145b
CC-5285: API Request: Get ON AIR light status
2013-07-24 15:30:49 -04:00
d9859ff006
CC-5285: API Request: Get ON AIR light status
2013-07-24 15:17:10 -04:00
ecb2f81211
creating an new row for edit/delete links in the datatable
...
working on creating/editing records.
2013-07-23 18:01:43 -04:00
c2f2a541c7
CC-5285: API Request: Get ON AIR light status
2013-07-23 17:39:38 -04:00
69afc715d1
creating templates for validation.
2013-07-22 18:11:44 -04:00
19ba788bae
CLRF
2013-07-22 10:47:11 -04:00
634eb40a0c
creating an entry.
2013-07-22 10:45:39 -04:00
f76bb5209e
CC-5222: Calendar: Ends time of show is missed in Weekly view
2013-07-19 12:46:04 -04:00
ec44b81f6a
clrf
2013-07-18 01:37:39 -04:00
29c8570ade
editing in progress
2013-07-18 01:31:20 -04:00
c744d88f23
IM-784 : Create Editing Abilities For History
2013-07-08 18:00:02 -04:00
1abbe85d6d
IM-733 Create Development timetable for Airtime Development
...
IM-777
Database structure for new History Feature
dos2unix fix
2013-07-03 16:02:17 -04:00
e63518f2da
IM-733 Create Development timetable for Airtime Development
...
IM-777
Database structure for new History Feature
moving original functionality into the service.
2013-07-03 16:00:48 -04:00
9f7e85b273
IM-733 Create Development timetable for Airtime Development
...
IM-777
Database structure for new History Feature
2013-07-03 15:20:40 -04:00
328c1f3cac
IM-733 Create Development timetable for Airtime Development
...
IM-777
Database structure for new History Feature
2013-07-03 15:19:05 -04:00
e0d2de642d
CC-5254 : Listener Status for SHOUTcast doesn't work
...
clrf
2013-06-24 17:26:20 -04:00
c5221aae6a
CC-5254 : Listener Status for SHOUTcast doesn't work
2013-06-24 17:24:43 -04:00
3858371b16
CC-5251 : clrf
2013-06-24 11:15:09 -04:00
a680421281
CC-5251 : Playlist length is not shown in Library
2013-06-24 11:09:03 -04:00
bec56e5f4b
CC-5247 : Single file audition pop-up has non-functional forward and reverse buttons
2013-06-24 10:19:10 -04:00
c2e9f90eb9
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-06-20 15:22:00 -04:00
f82cb364c1
CC-5246: Calendar: ON AIR show has an incorrect context menu
2013-06-20 15:21:33 -04:00
39d108ffb3
Merge branch '2.4.x' of https://github.com/bitdevil/Airtime into 2.4.x
2013-06-20 14:12:42 -04:00
157f66bb74
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-06-20 14:03:56 -04:00
6b0ab535e5
CC-5244 : Exception when creating Smartblock
2013-06-20 14:03:13 -04:00
3f9e756912
CC-5245: It's able to edit contents for current ON AIR linked show
2013-06-20 12:56:05 -04:00
bc16ac0793
Updated ko_KR po file. Thanks James Moon!
2013-06-19 10:46:28 -04:00
28d73264da
CC-5240: Overnight Linked Shows, newly generated not getting content
2013-06-19 01:17:32 -04:00
b95a0d7c4a
CC-5241: deleting a linked show, show comes back in the schedule
2013-06-18 16:56:16 -04:00
c90aa2f7db
update de_DE .po file
...
merged and revised version (de_DE, de_AT)
2013-06-15 19:48:10 +02:00
2a0c9769aa
Merge branch '2.4.x'
...
Conflicts:
airtime_mvc/public/js/airtime/showbuilder/builder.js
python_apps/pypo/liquidsoap_scripts/fdkaac.liq
python_apps/pypo/schedule/pypofetch.py
python_apps/pypo/schedule/telnetliquidsoap.py
2013-06-14 16:45:52 -04:00
3f43fc9e8a
Merge branch '2.4.x' of https://github.com/danielhjames/Airtime into 2.4.x
2013-06-13 13:38:15 -04:00
a7576009fa
Updated Greek localization, thanks Kat!
2013-06-13 17:08:20 +01:00
204ee94535
Update airtime.po
...
finished :)
2013-06-13 17:18:41 +02:00
440163f199
CC-5225 : Library: Fail to open Metadata Editor
2013-06-12 13:05:58 -04:00
4d0f93270d
Added new string to all English localizations
2013-06-11 17:16:15 +01:00
3391aa90c5
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-06-10 15:57:21 -04:00
93192853d5
CC-5221
...
Don't refresh Calendar after closing add/remove popup
2013-06-10 15:57:08 -04:00
deecc9db7b
CC-5220
...
Cancelled show still appears on Dashboard
2013-06-10 15:55:57 -04:00
fe0b0b9a65
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-06-10 15:54:32 -04:00
ee1cf64515
CC-4504 : Double scrollbars in Library view
2013-06-10 15:52:46 -04:00
01f835c4c4
CC-4504 : Double scrollbars in Library view
2013-06-10 15:50:33 -04:00
af595e0c8a
CC-5217
...
Calendar: "NaN..." appears at date field sometimes
fixed
2013-06-10 14:52:43 -04:00
b18495a79e
CC-5210: "Linked" Icon is missing after adding contents into linked show
...
-fixed
2013-06-07 15:15:52 -04:00
311e0c103d
small fix
2013-06-07 14:44:21 -04:00
8bc93fcba7
CC-5218: Provide show id and linked flag to calendar events
...
Prefixed attribute names with "data"
2013-06-07 14:36:52 -04:00
3b353b47b1
CC-5216: Library length does not consider cue points
2013-06-07 14:19:46 -04:00
ede618b3ad
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-06-07 13:58:00 -04:00
ee41e13fe1
CC-5218: Provide show id and linked flag to calendar events
2013-06-07 13:57:48 -04:00
fb4118208e
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-06-07 13:52:40 -04:00
ade1890acd
CC-5210:
...
"Linked" Icon is missing after adding contents into linked show
-fixed
2013-06-07 13:52:13 -04:00
3f1c47b764
CC-5215: Linked shows sometimes lose crossfades
2013-06-07 13:47:12 -04:00
c9b7deba52
CC-5213: Crossfades aren't properly applied in schedule table sometimes
2013-06-07 13:07:08 -04:00
eaf337f317
CC-5209: Calendar -> Repeat by 5th day of the week problem
2013-06-07 11:30:24 -04:00
66af5cddd9
Trying things
2013-06-07 11:30:13 -04:00
f4aba1a189
CC-5209: Calendar -> Repeat by 5th day of the week problem
2013-06-07 11:29:45 -04:00
02ca82f85e
CC-5209: Calendar -> Repeat by 5th day of the week problem
2013-06-07 11:17:35 -04:00
bef2dc190e
Trying things
2013-06-07 11:17:35 -04:00
ccb3da3192
CC-5209: Calendar -> Repeat by 5th day of the week problem
2013-06-07 11:17:35 -04:00
59c68569ab
CC-5208: DJ can try to edit show not assign to him
2013-06-07 11:17:35 -04:00
12221844e0
CC-5206:
...
Calender: "Empty show" icon doesn't change after filling contents unless manually refresh page
fixed
2013-06-07 11:17:35 -04:00
9f3e1d61d1
Use proper unit conventions for Kilo
2013-06-07 11:17:35 -04:00
eeb73b7206
CC-5199
...
aacencplus encoder is very low quality
2013-06-07 11:17:35 -04:00
99cc75ef51
users can open the current show to schedule and also rebroadcast shows.
2013-06-07 11:17:35 -04:00
6498f43dad
CC-5211:
...
Php Exception: Set large number as year in tracks Metadata
fixed
2013-06-06 17:02:01 -04:00
046039ece1
CC-5207:
...
media-monitor restart will reset the cuein/cueout value
-fixed
2013-06-05 16:14:14 -04:00
bad5b12472
CC-5208: DJ can try to edit show not assign to him
2013-06-05 12:05:41 -04:00
86f3985c03
CC-5206:
...
Calender: "Empty show" icon doesn't change after filling contents unless manually refresh page
fixed
2013-06-04 14:52:26 -04:00
92bb9874a6
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-31 15:59:27 -04:00
905dd08ed5
Use proper unit conventions for Kilo
2013-05-31 15:59:20 -04:00
82a71fdb61
CC-5199
...
aacencplus encoder is very low quality
2013-05-31 15:59:04 -04:00
926cf40c22
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-31 11:43:01 -04:00
12302aa1dc
users can open the current show to schedule and also rebroadcast shows.
2013-05-31 11:42:35 -04:00
f28ab12281
Fixed typo.
2013-05-31 09:40:23 -04:00
a563bc07ec
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-31 09:28:39 -04:00
26c6a7659e
Update to de_DE .po file
2013-05-31 09:28:25 -04:00
2c35a0416a
clrf fix
2013-05-30 16:53:03 -04:00
61427647d6
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-30 16:52:17 -04:00
891cc80069
CC-5190 : Playlist: Copy playlist will lost cue in/out setting
2013-05-30 16:52:03 -04:00
afda0c140b
CC-5196: L10N: Smartblock only generate 1 file even multiple files are qualified, no matter which limitation is set.
2013-05-30 15:50:35 -04:00
4728a90ce5
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-30 15:43:49 -04:00
c1c90a4b9a
Smart block fix
2013-05-30 15:43:31 -04:00
5fbae77c1f
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-30 15:38:34 -04:00
1fa0ee49d6
CC-5190 : Playlist: Copy playlist will lost cue in/out setting
2013-05-30 15:36:55 -04:00
527b1eaf1d
CC-5191: I18N: "items" is not translated when expanding dynamic Smartblock in playlist
2013-05-30 15:05:57 -04:00
4d2a569cb1
Fixed de_AT .po file encoding
2013-05-30 13:36:03 -04:00
046c543fae
CC-5189: Typo: Stream type's tooltip
2013-05-30 13:31:06 -04:00
21ea3d2aac
Fixed typo in fr_FR .po file
2013-05-30 11:59:09 -04:00
4261c48a53
Fixed fr_FR .po file encoding
2013-05-30 11:56:54 -04:00
28ddde3523
Updated version number in all .po files
...
Updated fr_FR and de_AT .po files with completed translations
2013-05-30 11:28:09 -04:00
67e50354e9
CC-5189: Typo: Stream type's tooltip
2013-05-30 11:14:46 -04:00
df893af96b
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-30 11:06:57 -04:00
3f97b071fe
CC-5187: Edit show -> disable linking option if show is currently playing
2013-05-30 11:06:45 -04:00
5d168ef7de
Little correction about Chinese translation
2013-05-30 11:02:52 -04:00
adc52d7ff5
Update Chinese mo and po files.
...
Update Chinese mo and po files.
2013-05-30 10:54:28 -04:00
f9645980a4
Updating .po files with new string added
2013-05-29 15:28:26 -04:00
91ea1f2240
CC-5184: Timeline -> Filter by show option doesn't work
2013-05-29 15:00:35 -04:00
59d1b1e968
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-29 14:24:41 -04:00
e2810606ab
CC-5186: Edit current playing show throws exception sometimes
2013-05-29 14:24:29 -04:00
2a2fd45567
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-29 13:48:01 -04:00
362eba60d5
CC-5181
...
Library -> Edit Metadata:Exception in zendphp.log if trying to set a really large number as track number
-fixed
2013-05-29 13:47:55 -04:00
d3355a527a
Removed commented out code
2013-05-29 13:18:37 -04:00
90e235350f
Small fix
2013-05-29 13:16:14 -04:00
4c2de70256
CC-5185: Liquidsoap: Sometimes the 1st track ends early when crossfading is set
2013-05-29 13:14:44 -04:00
4a7a08a119
CC-5185: Liquidsoap: Sometimes the 1st track ends early when crossfading is set
...
Crossfades were not getting applied to the track end time
2013-05-29 12:49:48 -04:00
d00f8392bb
CC-5183: Use of undefined variable
2013-05-29 12:34:00 -04:00
0d436d323c
CC-5179: Now Playing: Schedule will be incorrect after insert action
...
Was not accounting for crossfade value when adjusting schedule times after insert
2013-05-29 11:42:02 -04:00
be59810810
CC-5180: Now Playing: No crossfading effects if inserting tracks one by one
2013-05-29 09:41:06 -04:00
50ece038c2
fix errors reported by Facebook's scheck
...
-controller dir
2013-05-28 17:45:09 -04:00
4ed7c4ccd3
fix errors reported by Facebook's scheck
2013-05-28 17:30:48 -04:00
6520211b4d
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-28 16:19:30 -04:00
9545d8aacb
Removed dropping and recreating cc_schedule table index before inserting into this table.
...
We thought it would be a significant performance booster but it isn't
2013-05-28 16:19:17 -04:00
c5550d31fd
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-28 14:28:28 -04:00
4d1a15b7ca
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2013-05-28 14:27:59 -04:00
8f418fb34c
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-28 14:18:38 -04:00
950cc6d6b7
CC-5177: Create "?" icon beside linked show check box
2013-05-28 14:18:26 -04:00
51573d36c9
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2013-05-28 13:30:47 -04:00
96eefee407
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-28 13:12:15 -04:00
5a2b9796ec
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2013-05-28 13:11:47 -04:00
bb5f0c4301
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-28 11:25:50 -04:00
85ee8aa0b2
Fixed bug where schedule start times were not getting calculated properly
2013-05-28 11:25:37 -04:00
c8f0c9505e
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-28 11:07:52 -04:00
951eeb0bbe
CC-5178:
...
Dashboard: Error happens after creating a show
-fixed
2013-05-28 11:07:45 -04:00
bf6437cf09
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-27 17:02:46 -04:00
28f957be92
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2013-05-27 17:02:34 -04:00
84abd78c8f
CC-5109: Fix race-condition when updating cc_pref table
...
-not a race condition..was a logic error.
2013-05-27 15:58:29 -04:00
1c452988cf
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-27 15:35:06 -04:00
90ad62e4f9
CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
...
Refactoring schedule inserts
2013-05-27 15:34:54 -04:00
5ba72d00bc
CC-5109 : Fix race-condition when updating cc_pref table
2013-05-27 15:33:53 -04:00
408ecc530d
CC-3822 : NowPlaying-> Time filter is allowing Start_Time be greater than the End_Time
2013-05-27 14:37:16 -04:00
63b0d4194a
CC-5109:
...
Fix race-condition when updating cc_pref table
-not a race condition..was a logic error.
2013-05-27 12:30:58 -04:00
4c791e573b
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-27 11:57:00 -04:00
9ce3b0c043
small modifications to make the waveform enabled in firefox 21 (playout does not work though)
2013-05-27 11:55:57 -04:00
cee74b59f9
CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
...
Calculate crossfades during insert instead of after
2013-05-27 10:39:31 -04:00
f23fc472ef
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-24 17:01:15 -04:00
69f6295553
CC-5108 : Waveform Editor UI
...
error check for if both tracks cannot be decoded.
2013-05-24 11:27:56 -04:00
f5e03db9fe
CC-5108 : Waveform Editor UI
...
making sure the correct li is activated when a track has a decoding error.
2013-05-24 11:23:08 -04:00
46cc2d00b8
Removed CRLF
2013-05-24 10:30:37 -04:00
0e9c9e3946
Updating de_DE datatables and plupload language files. Thanks to Silvio Mende
2013-05-24 10:29:07 -04:00
84dfe127b6
Updating de_DE .po file. Thanks to Silvio Mende
2013-05-24 10:27:02 -04:00
96ac9cb534
CC-5174: Linked Show: Update a regular show to linked show will move the whole scheduled time forward.
2013-05-24 09:43:03 -04:00
daa310ac18
CC-5175:
...
Now Playing: SQL syntax error happens when removing and add contents to current show.
-fixed
2013-05-23 18:37:30 -04:00
06fbbe89f2
CLRF fix.
2013-05-23 18:34:35 -04:00
6110d47941
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-23 18:33:53 -04:00
75e6f21ce0
CC-5108 : Waveform Editor UI
...
putting on the timescale for time reference.
fade editor now has cursor playback info.
2013-05-23 18:33:40 -04:00
e104146b9a
CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
...
Removed propel from calculateCrossfades function and used prepared statements instead
2013-05-23 16:10:00 -04:00
c57de650e8
CC-5172 : errors from setting cues in waveform editor not handled properly
...
Conflicts:
airtime_mvc/application/models/Playlist.php
2013-05-23 13:01:38 -04:00
02292569f9
CC-5172 : errors from setting cues in waveform editor not handled properly
...
Conflicts:
airtime_mvc/application/models/Playlist.php
2013-05-23 13:00:37 -04:00
0107f36206
Changed propel to prepared statements
2013-05-23 12:49:15 -04:00
792366e1f5
CC-5100: Now Playing: Editing schedule on-the-fly will cause 2 tracks mixed at the same time.
2013-05-23 11:35:56 -04:00
dd28c8ae31
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-22 16:03:35 -04:00
8e990e2bf9
CC-5170:
...
Sometimes the dashboard does not show the current playing file
-fixed
2013-05-22 16:03:24 -04:00
d82725cb54
CLRF fix
2013-05-22 15:35:59 -04:00
eda21307ff
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-22 15:34:16 -04:00
a569d2f3f5
CC-5163 : Waveform - Hard coded api path will cause fail to open file when airtime is put under subfolder
2013-05-22 15:33:49 -04:00
18a1c7ad98
Localization updates for fixes in CC-5166 and CC-5168
2013-05-22 10:55:14 +01:00
2e970bfc8a
Fixes date format in Smart Block tooltip (CC-5618)
2013-05-22 10:25:43 +01:00
7ec664823d
Fixes whitespace to the left of 'Open Media Builder' button (CC-5166)
2013-05-22 10:23:42 +01:00
717cda984a
Fixed 'steam' typo in stream settings tooltip
2013-05-22 10:21:27 +01:00
3ad7c868e2
Merge branch 'SAAS-317-datatables-reorder' into 2.4.x
2013-05-21 17:44:25 -04:00
b720086a4b
SAAS-317 : http://ryerson.airtime.pro/ is having issues with show/hide column in their library
...
missing single quote problem, updating column visible plugin.
2013-05-21 17:40:52 -04:00
fb605ccb71
Renamed 'Open Playlist Editor' button to 'Open Media Builder' on Library page
2013-05-21 09:30:35 -04:00
0f1a94532e
CC-5157: [Beta user reported]Linked Show: Multiple warnings after multiple check/uncheck action
...
Fixed. Also had to prepare the warning message for localization.
2013-05-17 14:47:34 -04:00
2f6e2e7de6
Merged in new string into updated de_DE .po file
2013-05-17 14:13:01 -04:00
abd3a37970
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-17 14:09:32 -04:00
29225a8ea3
Updating de_DE .po file. Thanks Silvio Mende!
2013-05-17 14:09:19 -04:00
01d16348db
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-17 13:20:40 -04:00
ae41a4f9ff
more persistent links (won't be invalid if title changes)
2013-05-17 13:20:28 -04:00
d57836c42b
CC-5159: Repeating Shows doesn't populate correct dates sometimes
2013-05-17 13:10:15 -04:00
5bf91d513d
CC-5127: Library -> Scheduled and Playlist columns needs better icon
...
Changed icon
Renamed Playlist to Playlist / Block
2013-05-17 11:42:48 -04:00
dc664ad9ff
CC-5156: Hungarian language is shown in strange font on login page
2013-05-17 11:05:38 -04:00
9133384789
is_scheduled flag was not getting updated when shows were deleted
2013-05-16 15:03:10 -04:00
3d09747990
CC-5150: Calendar->Add/Remove Show contents: Exception happens when try to adding contents for show
2013-05-16 13:42:06 -04:00
f4d313a67c
Hungarian translation locale option
2013-05-16 12:50:12 -04:00
3010d014b4
Hungarian translation
2013-05-16 12:47:40 -04:00
3208ab0fd1
Merge branch 'patch-2' of git://github.com/picizse/Airtime into picizse-patch-2
2013-05-16 12:28:23 -04:00
70b734c940
Update Chinese po file
2013-05-16 11:16:36 -04:00
ca6442f7f0
ensure we are parsing in base 10
2013-05-15 17:18:52 -04:00
05dc0b7dbc
added comments, remove deprecated code, better var names...
2013-05-15 16:44:36 -04:00
018c88d12a
CC-5063:
...
"Nothing Scheduled" appears between 2 scheduled tracks
-fixed
2013-05-15 16:43:58 -04:00
148e1b9e46
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-15 15:48:04 -04:00
5a86bd9ac4
CC-5149: Linked show: Regular show will be treat as linked show in some case
...
A new form was not getting sent to the user properly after a show creation
2013-05-15 15:47:45 -04:00
10154ae724
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-15 15:39:07 -04:00
b0cdc606f8
CC-5096 : Add "i" (info) icon to stream output type
2013-05-15 15:38:46 -04:00
491ea6a32c
CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
...
Made some small optimizations. Still needs more work.
2013-05-15 15:32:29 -04:00
f3edc2bee6
CC-5151: Calendar -> Remove all content -> Does not update scheduled flag in library
...
Fixed so it doesn't update files that are scheduled in other shows
2013-05-15 12:38:48 -04:00
254ebb709e
CC-5151: Calendar -> Remove all content -> Does not update scheduled flag in library
2013-05-15 11:25:30 -04:00
b2c8cb0f9d
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 19:18:51 -04:00
5080807a21
IM-629
...
-fix minor SQL syntax error
2013-05-14 19:18:41 -04:00
b287409bfb
IM-629
...
-not using show_instnace_filter POST param correctly
2013-05-14 19:18:30 -04:00
bb36556bb9
IM-629
...
-filter by using instance id instead of show id
Conflicts:
airtime_mvc/application/models/Schedule.php
2013-05-14 19:18:08 -04:00
393c8abb95
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 18:14:51 -04:00
7d5177d77d
CC-5096 : Add "i" (info) icon to stream output type
2013-05-14 18:14:38 -04:00
af7b2d5347
IM-629
...
-fix using instance id instead of show id
2013-05-14 17:18:20 -04:00
992e3c37ef
IM-629
...
-add missing POST parameter
2013-05-14 17:18:11 -04:00
22a12dd1a9
IM-629
...
-show only single show at a time
2013-05-14 17:18:03 -04:00
43e825fe49
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 16:57:28 -04:00
78187a72ac
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 16:52:24 -04:00
74c0e390b6
CC-5147 : check builder feed on now playing page updating when not needed
...
wrong timestamp used when changing to prepared statement.
2013-05-14 16:51:34 -04:00
70a8d3d5dd
CC-5146:
...
Output Stream Settings: Please disable options opus and aac when streaming server is SHOUTcast
-fixed
2013-05-14 16:16:58 -04:00
8901d6b4d9
Committing new compiled .po files
2013-05-14 16:14:19 -04:00
ec87a8ff88
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 16:09:22 -04:00
e1d0dc9b95
Updated .po files
2013-05-14 16:08:21 -04:00
809d5a35b9
CC-5108 : Waveform Editor UI
...
changing colour to be less dark. can better see highlights/drawn fades.
2013-05-14 15:49:13 -04:00
0dd8138c2b
CC-5131 : Please give user a message that Browser other than Chrome can't use waveform
2013-05-14 14:15:54 -04:00
2d09ba3a16
CC-4863: I18N:System -> Listener status: string is not translated
2013-05-14 11:50:01 -04:00
4ee7724149
CC-4864: I18N: Password reset page is not translated
2013-05-14 11:32:21 -04:00
c173744929
CC-5090: Unscheduled tracks are still marked at Scheduled in linked show
2013-05-14 10:58:06 -04:00
bfd525395a
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 08:59:30 -04:00
9377e21293
Removed unnecessary function call when editing a show
2013-05-14 08:59:21 -04:00
d9b6a15fb6
CC-5139 : WaveForm: Click save will cause problem when setting crossfading between track and Smart block
2013-05-13 18:21:24 -04:00
872f68505b
CC-5108 Waveform Editor UI
2013-05-13 16:01:06 -04:00
2ba743a436
CC-5132 : Playlist Editor: Add file before Smart Block will cause exception
2013-05-13 12:23:05 -04:00
bd2462170b
CC-5121 : fix some SQL statements not being escaped/prepared
2013-05-13 11:42:11 -04:00
6b560eede1
Deleted unused functions in Show.php
2013-05-13 09:55:17 -04:00
741507fab1
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-13 09:22:50 -04:00
ba82e3b3ae
Added missing localization files for en_GB, and de_AT
2013-05-13 09:22:40 -04:00
82945038d5
CRLF fix
2013-05-10 17:44:50 -04:00
da46757e28
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 17:36:18 -04:00
b0018083c7
CC-5121 : fix some SQL statements not being escaped/prepared
2013-05-10 17:14:10 -04:00
27b79c2e91
CC-5128: Library -> Do not auto sort by scheduled
2013-05-10 16:17:30 -04:00
a9d0b53954
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 16:08:07 -04:00
79bc927a30
CC-5130: Calendar -> Linked icon disappears if show is full
2013-05-10 16:07:54 -04:00
ab13acba84
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 15:24:56 -04:00
6e0a3ffc60
CC-5102:
...
Cross Fading: No cross fading effect
-fixed start/end calculations
2013-05-10 15:24:43 -04:00
a3eda62bb2
CC-5113: Preferences -> Mail Server Config: Error present will cause web form read-only
2013-05-10 15:18:54 -04:00
7b8a37065a
CC-5080: Calendar -> Warn user a show cannot be linked again once it has been unlinked
2013-05-10 14:53:01 -04:00
414348dd11
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 14:18:03 -04:00
13458ad687
CC-5122: Calendar -> linked show: Change the repeating weekday will lost all the contents
2013-05-10 14:17:54 -04:00
0c4691f3ea
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 13:20:07 -04:00
2250d89cbd
CC-5013:
...
Re-Added watched folder wont update
-fixed
2013-05-10 13:19:56 -04:00
c36333ae07
code cleanup
...
-user proper method for checking null
-reduce line length to 80 chars
2013-05-10 12:37:25 -04:00
987537fbdc
CC-5121 :fix some SQL statements not being escaped/prepared
2013-05-10 12:35:08 -04:00
d5e7185789
Merge branch 'sql-changes'
...
Conflicts:
airtime_mvc/application/models/StreamSetting.php
airtime_mvc/application/models/Subjects.php
2013-05-10 12:23:57 -04:00
5666b688a0
CC-5112 : Listen Status: Please clean obsoleted mount point from status report page
...
CRLF
2013-05-10 12:03:33 -04:00
263b89295f
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 11:59:49 -04:00
115af29f2e
Merge branch 'CC-5112-status-page'
2013-05-10 11:59:37 -04:00
8f31dd3069
CC-5112 : Listen Status: Please clean obsoleted mount point from status report page
2013-05-10 11:56:20 -04:00
f5fa033207
better flow in dispatchMetadata function
2013-05-09 17:37:23 -04:00
3948964e8d
remove useless log
2013-05-09 16:58:50 -04:00
afb24c37ab
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 16:07:34 -04:00
8cd8d0922f
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 16:05:04 -04:00
b7337d0df3
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-09 15:53:24 -04:00
40eb51b892
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 15:53:12 -04:00
9c05511613
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 15:08:47 -04:00
21df9013ee
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 14:43:59 -04:00
3ed106af56
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-09 13:29:00 -04:00
92c7c9c951
should constants instead of literals - only in function for now...
2013-05-09 13:28:26 -04:00
540e817101
fixing sql to be prepared statements.
2013-05-09 13:28:22 -04:00
fedf564090
CC-5081: Calendar -> Add a linked show icon
2013-05-09 12:14:49 -04:00
9c8935af47
CC-5114: Calendar: User from different timezone will see the same start/end time when editing show
2013-05-09 09:35:27 -04:00
d06b2f3f94
CC-5116:
...
Please add opus into the file name filter
-fixed
2013-05-08 17:06:50 -04:00
2e69b35d75
CC-5086: Calendar: Update show pops up instead of Add show after clicking a cell
2013-05-08 16:28:45 -04:00
8344f3f3d5
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-08 15:09:10 -04:00
fe88e6249a
CC-5093: Please disable link option for recording show
2013-05-08 15:08:56 -04:00
35c8e80f6b
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-08 14:21:55 -04:00
a18fc87d97
CC-5065 : Playlist length is not built on actual cue in/out value
2013-05-08 14:19:22 -04:00
9dbec4636a
CC-5106: Calendar: Context menu "Show contents" is missing for past shows
2013-05-08 13:43:27 -04:00
b4dc17f7e8
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-08 12:06:00 -04:00
d8ba15fac4
CC-5091: Linked Show: Cannot change the start time ahead
2013-05-08 12:05:45 -04:00
299dfdc18a
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-08 11:44:50 -04:00
fe916ec043
CC-2301 : adding in crossfade durations to smart blocks.
2013-05-08 11:43:53 -04:00
62d666ea4d
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-07 16:21:50 -04:00
9f6a1033ea
CC-5109: Fix race-condition when updating cc_pref table
2013-05-07 16:21:34 -04:00
80cdd3f2e2
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-07 16:16:45 -04:00
22b74126f9
CC-5087: Repeating show -> Same day by Month: Time slot of repeating instances aren't correct
2013-05-07 16:16:32 -04:00
ad82b4ff98
throw exception if we get unexpected numbers of results in cc_pref
2013-05-07 15:36:21 -04:00
0efe914352
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-07 14:49:38 -04:00
92f6ec029f
CC-5079: Timeline -> Moving items in linked shows doesn't work
2013-05-07 14:49:24 -04:00
f64e99176e
CC-510: Cue Editor: Please enable to preview the current cue in/out settings.
2013-05-07 12:46:44 -04:00
3a74bb7ca5
CC-2301 : removing shift buttons since it's disabled for this release.
2013-05-06 17:47:35 -04:00
6bdc2caaec
Merge branch 'CC-2301'
2013-05-03 16:15:39 -04:00
ce81691743
CC-2301 : not allowing any sliding with only global crossfade durations.
2013-05-03 15:32:07 -04:00
75e4e0c9b6
CC-2301 : only showing waveform buttons if the browser supports the audio api.
2013-05-03 14:42:42 -04:00
denise
Albert Santoni
Naomi
drigato
Daniel James
cliff.wang
Jamie Connor
Silvio M.
Martin Konecny
picizse