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
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
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
53341d40f7
CC-5334 : Localize Ryerson History Feature
2013-09-24 09:56:04 +02: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
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
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
682a37894b
Merge branch 'ryerson-history' into 2.5.x-saas
...
Conflicts:
airtime_mvc/application/views/scripts/menu.phtml
2013-09-02 15:52:43 -04:00
60bf334aeb
Merge branch '2.4.x' into 2.4.x-saas
2013-09-02 15:46:25 -04: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
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
0c379ef840
a working show instance select.
2013-08-30 15:03:43 -04:00
0e017374b7
change default text to "No Show"
2013-08-30 01:30:23 -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
8208f8596b
ordering by show start time
2013-08-29 15:37:33 -04:00
5780eb5bbe
show tables filtering by instance id.
2013-08-29 15:17:24 -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
e6b09308a5
IM-932 : File Metadata Distinction/Template Design
2013-08-28 15:40:10 -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
af822bb5b9
showing time first for endtime box.
2013-08-22 21:39:46 -04:00
01370c2124
reverting back to the bootstrap datetime picker since it's nicer to use.
2013-08-22 20:23:17 -04:00
fa6de28bcf
not allowing double file metadata to be added to avoid query problems.
2013-08-22 14:15:40 -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
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
59721ccb51
Merge branch '2.4.x' into 2.4.x-saas
2013-07-29 16:01:06 -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
b77b12c508
Merge branch '2.4.x' into 2.4.x-saas
2013-07-24 15:32:16 -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
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
f2d5fa96da
Merge branch '2.4.x' into 2.4.x-saas
...
Conflicts:
python_apps/pypo/liquidsoap_scripts/ls_script.liq
utils/phone_home_stat.php
2013-06-26 01:25:26 -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
6b0ab535e5
CC-5244 : Exception when creating Smartblock
2013-06-20 14:03:13 -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
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
440163f199
CC-5225 : Library: Fail to open Metadata Editor
2013-06-12 13:05:58 -04:00
3b353b47b1
CC-5216: Library length does not consider cue points
2013-06-07 14:19:46 -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
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
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
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
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
67e50354e9
CC-5189: Typo: Stream type's tooltip
2013-05-30 11:14:46 -04:00
3f97b071fe
CC-5187: Edit show -> disable linking option if show is currently playing
2013-05-30 11:06:45 -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
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
85ee8aa0b2
Fixed bug where schedule start times were not getting calculated properly
2013-05-28 11:25:37 -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
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
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
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
5c11f5fc72
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
...
Conflicts:
python_apps/pypo/liquidsoap_scripts/ls_script.liq
2013-05-22 18:08:14 -04:00
bb5889e6a5
CC-5172 : errors from setting cues in waveform editor not handled properly
2013-05-22 17:52:02 -04:00
0bfcd32554
CC-5172 : errors from setting cues in waveform editor not handled properly
2013-05-22 17:50:34 -04:00
254d3b8950
Merge branch '2.4.x' into 2.4.x-saas
2013-05-22 16:09:02 -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
2e970bfc8a
Fixes date format in Smart Block tooltip (CC-5618)
2013-05-22 10:25:43 +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
3b9b23a7dd
Merge branch '2.3.x-saas' into 2.4.x-saas
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/models/Schedule.php
python_apps/pypo/airtime-playout
2013-05-21 16:40:10 -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
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
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
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
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
7d5177d77d
CC-5096 : Add "i" (info) icon to stream output type
2013-05-14 18:14:38 -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
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
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
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
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
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
75e4e0c9b6
CC-2301 : only showing waveform buttons if the browser supports the audio api.
2013-05-03 14:42:42 -04:00
f3dce46a5a
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-03 11:37:28 -04:00
fac96996e3
CC-5084: Repeating show edited to linked doesn't add content to repeat instances
...
Fixed. If the each repeating instance has different content, we replace it
with the first instance's content
2013-05-03 11:37:11 -04:00
3fc6a0fbae
Merge branch 'master' into CC-2301
2013-05-02 18:02:09 -04:00
d902d38429
revert jsonEncode change not supported by older zend versions
2013-05-02 17:50:36 -04:00
bd1c1fa32f
Merge branch 'master' into CC-2301
2013-05-02 16:59:47 -04:00
ca22a25827
fix silly mistake with echoing json twice
2013-05-02 16:57:07 -04:00
435bb83588
CC-2301 : dos2unix being run
2013-05-02 16:52:30 -04:00
3e320f1e2e
Merge branch 'master' into CC-2301
2013-05-02 16:15:58 -04:00
517bb7557a
CC-2301 : testing default crossfade settings
2013-05-02 16:15:21 -04:00
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
ea73d98c49
CC-5075: Future bi-weekly linked shows don't get filled with content sometimes
2013-05-02 11:40:56 -04:00
09754b20cc
CC-5082: Repeating shows "disappear" when switching calendar to next month
...
This was caused by the calendar trying to re-create single instance shows.
We needed to exclude non-repeating shows when populating the calendar with repeat events
2013-05-01 15:20:55 -04:00
3d61a18261
CC-5082: Repeating shows "disappear" when switching calendar to next month
...
Small fix. Was treating object as an array
2013-05-01 14:42:53 -04:00
ded8ceb86b
CC-5082: Repeating shows "disappear" when switching calendar to next month
...
We were trying to call a function on an object that was not set
2013-05-01 14:40:33 -04:00
2b5a8b0d4b
CC-2301 : fixing changed function name after merging with master.
2013-05-01 11:41:07 -04:00
5ba5864d8c
CC-5078: Wrong start time if dragging dynamic smart block into a show
2013-05-01 11:29:32 -04:00
92ef0608d6
Merge branch 'master' into CC-2301
2013-05-01 11:04:14 -04:00
0362f24a4e
CC-5076: Calendar -> Context menu -> Remove all content doesn't remove content from linked instances
2013-05-01 10:30:51 -04:00
2a1ac0ddb9
CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps.
2013-04-30 16:27:31 -04:00
ff2fde0173
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-04-30 15:54:20 -04:00
ec2f36efa8
CC-5077: Calendar -> Context menu -> Show Content -> shows incorrect time filled on edited repeat instances
...
- We weren't updating the time_filled column in cc_show_instances when creating the new show
2013-04-30 15:54:04 -04:00
2462e4f144
CC-2301 : CRLF fix.
2013-04-30 15:34:20 -04:00
0db557a570
CC-2301 : fades editor saving offset to database for playlists and smart blocks.
2013-04-30 15:32:43 -04:00
decb12f6b8
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-04-30 15:00:45 -04:00
de4934a317
ensure that uploaded file is UTF-8 encoded
2013-04-30 15:00:31 -04:00
4ca60ca676
CC-5074: Editing a linked instance sets incorrect schedule start times
2013-04-30 13:58:03 -04:00
2e03e1982f
CC-2301 : changing more CRLF files
2013-04-29 18:11:11 -04:00
b2a490ac47
CC-2301 : working on creating a crossfade method for waveforms.
2013-04-29 18:09:12 -04:00
58957cc919
CC-2301 : running dos2unix on 3 files.
2013-04-29 17:01:08 -04:00
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
1384c5d39d
Function call was missing an argument
2013-04-29 15:57:59 -04:00
71526a94cc
Merge branch 'cc-4961-show-linking'
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
2013-04-29 15:35:16 -04:00
de8f7b0ff7
CC-4961: Show linking
2013-04-29 15:27:14 -04:00
acfc72f422
use sendJson, instead of manually disabling layouts + encoding data
2013-04-26 18:06:07 -04:00
3a931f27bf
CC-4417: Opus codec support
2013-04-26 17:54:29 -04:00
a5264aac1e
CC-4961: Show linking
2013-04-26 16:10:01 -04:00
a4731d4af2
CC-2301 : automatically updating the fadein/fadeout for a track in the fadein/fadeout states.
...
Can enable states on a per track basis.
2013-04-26 15:57:02 -04:00
52655ab375
CC-4961: Show linking
2013-04-26 13:43:30 -04:00
8fea97d580
CC-2301 : fade editor now loads currently set fades. Fixing some bugs in the waveform editor.
2013-04-25 17:10:37 -04:00
0f1383d541
CC-4961: Show linking
2013-04-25 09:00:37 -04:00
0e3b4da52f
clear unused function
2013-04-24 15:17:06 -04:00
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
956bcccd24
CC-2301 : creating different states for the fade editor:
...
cursor, fadein, fadeout.
2013-04-23 16:36:35 -04:00
8f6b583fcb
CC-5061:
...
Use propel transactions for StoredFile class
2013-04-19 20:40:31 -04:00
243dda60f8
remove useless comment
2013-04-19 20:25:26 -04:00
fd78ad29bf
cleanup of function names
2013-04-19 20:24:05 -04:00
923f4ee180
CC-5062:
...
Add "error" logging level
-done
2013-04-19 20:11:33 -04:00
f39f9329cc
CC-4992:
...
Decouple pypo from Airtime install
-first commit
2013-04-19 20:10:51 -04:00
018ec9231e
don't print out anything extra after printing json
2013-04-18 16:20:34 -04:00
a9b5d00d87
CC-4961: Show linking
2013-04-18 16:12:26 -04:00
479e69de12
CC-5009:
...
Use Silan to silently update track length in the background
-done
2013-04-18 15:40:33 -04:00
04a0d9c54e
CC-2301 : waveform editor
...
current cues being set.
2013-04-17 18:00:16 -04:00
0d3c0912ba
CC-2301 : Waveform Editor
...
Cue editor can save values to the playlist.
2013-04-17 17:17:39 -04:00
0385285741
CC-2301 : waveform editors are now in their own separate pop up. controls working for fades/cues. should add more specific states for fade editor.
2013-04-16 17:24:30 -04:00
13c8e5f146
CC-2301 : showing waveform cue/fade editors inside of a jquery dialog box.
2013-04-16 14:37:08 -04:00
1a2a05c3cf
CC-4961: Show linking
2013-04-12 16:34:36 -04:00
9b4a0ba9c1
CC-4961: Show linking
...
Removed stamp tables
2013-04-12 10:52:13 -04:00
9b2fb3bece
CC-4961: Show linking
2013-04-09 15:55:18 -04:00
e64f6fb3fd
CC-4961: Show linking
...
-modified db
2013-04-08 14:43:27 -04:00
76bfce21b1
CC-4961: Show linking
...
-modified db
2013-04-08 14:42:37 -04:00
cfee74693b
CC-4961: Show linking
...
moved move-show to calendar service
2013-04-05 17:44:30 -04:00
92d0a6178e
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 15:34:04 -04:00
4595aab694
Merge branch '2.3.x'
2013-04-05 15:33:48 -04:00
d1f655d79d
CC-5038: Silan error: list index out of range
...
-fixed
2013-04-05 15:32:44 -04:00
62d1b22fcc
CC-4961: Show linking
...
created new cc_show_stamp table
2013-04-05 12:27:54 -04:00
f9d7167638
CC-4961: Show linking
2013-04-04 16:30:33 -04:00
fcbac2a044
Merge branch '2.3.x' into devel
2013-04-04 15:15:19 -04:00
a061464ffb
Merge branch '2.3.x' into 2.3.x-saas
2013-04-04 15:14:04 -04:00
301115c035
CC-5039: Encoded forward slash causing lots of apache error logs
...
-fixed: data should have been sent as POST rather than GET
2013-04-04 15:12:52 -04:00
d1e72cfeea
Merge branch '2.3.x' into devel
2013-04-03 17:12:28 -04:00
eb3fda8423
Merge branch '2.3.x' into 2.3.x-saas
2013-04-03 17:12:14 -04:00
a748b05125
CC-5040:
...
All API actions need to have consistent return value
-temp fix. Correct fix will require ensuring api_client always sends
XmlHttpRequest
2013-04-03 17:11:36 -04:00
81dbb17922
CC-4961: Show linking
...
-moved show deletion into show service
2013-04-03 11:46:46 -04:00
5ac51e289d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-04-01 19:15:02 -04:00
6ae8da98e4
removing logging
2013-04-01 19:14:55 -04:00
ab10ae68a2
CC-5036: Add back edit show instance functionality
2013-04-01 14:42:35 -04:00
1eba09fc4c
Show linking
2013-03-28 16:19:05 -04:00
d0691b114c
Show linking
2013-03-28 14:25:40 -04:00
731b86b36c
Added back editing a repeating show instance feature
2013-03-27 16:25:39 -04:00
e259639d1a
Removed scheduleController private variable, currentUser
...
Removed showService private variable, currentUser
2013-03-27 09:02:49 -04:00
863c2c11cc
Merge branch '2.3.x' into 2.3.x-saas
2013-03-26 16:34:28 -04:00
ee617c8a70
Merge branch '2.3.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/UserController.php
2013-03-26 16:34:11 -04:00
d9646994e9
remove airtime-demo specific code
2013-03-26 16:33:14 -04:00
5dc0a4477b
disable deletion of users
2013-03-26 16:10:42 -04:00
418bf0b5ff
Created calendar service and moved the context menu creation there
2013-03-26 16:03:53 -04:00
01cca88c58
Merge branch '2.3.x' into 2.3.x-saas
2013-03-26 15:02:43 -04:00
894887bd62
Merge branch '2.3.x' into devel
2013-03-26 15:02:17 -04:00
230d1a6aa9
Fixed bug where shows weren't populating when moving forward in the calendar
2013-03-26 10:33:06 -04:00
ef8f87df5d
Show linking
2013-03-25 16:28:53 -04:00
5b69761833
CC-4961: Show linking
...
Populate repeat show form correctly when a show is repeating monthly
on the same day of the week
2013-03-25 13:48:11 -04:00
265ac49f2e
remove duplicate cc_config
2013-03-24 23:11:55 -04:00
b1160afeab
cleanup
2013-03-22 18:05:49 -04:00
d12f793578
remove potential password change exploit in airtime-demo
2013-03-22 18:05:34 -04:00
327d0dd6c9
CC-4961: Show linking
...
Add front-end for creating a show with monthly repeats on same day of week
2013-03-22 15:57:15 -04:00
187e49e4b2
CC-4961: Show linking
...
Added back-end functionality for creating monthly repeating shows on
the same day of the week
2013-03-22 14:57:02 -04:00
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
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
bae9f1202a
CC-4961: Show linking
...
Removed unused schedule controller actions
Fix bug where changing a show to repeat deletes the original show's content
2013-03-19 10:09:28 -04:00
4bdd89f747
CC-4961: Show linking
...
Fixed edit show start/end time bug
2013-03-18 12:34:27 -04:00
896e03d76b
CC-4961: Show linking
...
Refactoring all services thus far
2013-03-15 16:56:22 -04:00
5735baf237
CC-4961: Show linking
...
Made progress on ShowInstanceService
2013-03-13 11:08:16 -04:00
f9f4e4f1fb
CC-4961: Show linking
...
Made some progress on show editing
2013-03-12 18:01:12 -04:00
438200425a
CC-4961: Show linking
2013-03-12 11:33:32 -04:00
c721b81a13
CC-4961: Show linking
...
Refactoring
2013-03-12 10:30:31 -04:00
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
1cc823ef0e
Inital edit show reconfiguration changes
2013-03-08 17:10:35 -05:00
116d98a81b
Removed comment
2013-03-08 16:10:07 -05:00
d8ced29dd0
Refactored adding show forms to the view
2013-03-08 16:08:43 -05:00
8415dfdf6f
Add comments
2013-03-08 12:18:24 -05:00
5111f74494
Created function to set the next populate until date for repeating shows
2013-03-08 12:17:55 -05:00
9be6b82d97
Fixed rebroadcast date bug
2013-03-08 12:06:45 -05:00
846e940f82
Merge branch 'cc-4961-show-linking' of dev.sourcefabric.org:airtime into cc-4961-show-linking
...
Conflicts:
airtime_mvc/application/services/ScheduleService.php
airtime_mvc/application/services/ShowInstanceService.php
airtime_mvc/application/services/ShowService.php
2013-03-08 11:24:54 -05:00
4a86da5f87
Created function to create repeating show instances
...
Created function to create rebroadcast show instances
2013-03-08 11:19:03 -05:00
43ffa2aece
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/SystemstatusController.php
2013-03-06 13:47:21 -05:00
5ceeb88899
Merge branch '2.3.x' into devel
2013-03-06 13:46:01 -05:00
7ca178295f
CC-4993: airtime-check-system reports airtime-liquidsoap as down
...
-fixed
2013-03-06 13:43:22 -05:00
af622eb4b8
CC-4961: Show linking
...
Refactored some more show instance creation functions
2013-03-06 09:58:35 -05:00
c29e11fa0f
Created empty showInstance service.
...
Split populateShowUntil into 2 new functions: getPopulateDateUntil, and getShowDays
2013-03-06 09:58:35 -05:00
d497cfa857
Created show service
2013-03-06 09:58:35 -05:00
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
bdab294fce
Added comments to Schedule Service
2013-03-06 09:58:35 -05:00
d08f6cf3e1
CC-4961: Show linking
...
-initial schedule service experimentation
2013-03-06 09:58:35 -05:00
1c80701488
Merge branch '2.3.x' into 2.3.x-saas
2013-03-05 16:21:47 -05:00
cc69418215
Merge branch '2.3.x' into devel
2013-03-05 16:21:22 -05:00
d7d1170ee1
CC-5003:
...
Some tracks are being cut off before fully playout out
-fixed
2013-03-04 18:52:51 -05:00
00d577fd5b
CC-4985: Ensure files deleted via the UI are deleted from stor directory.
...
-temporary fix. We know rabbitmq received the message, but we don't know
if media-monitor actually acted on it.
2013-03-04 15:22:09 -05:00
3f7ccf6967
fix missing closing parentheses
2013-03-04 11:41:42 -05:00
b744ab74ee
Merge branch '2.3.x' into 2.3.x-saas
2013-03-01 18:22:12 -05:00
ae503121d8
CC-4984: Exception for replaygain
...
-fixed
2013-02-28 18:26:15 -05:00
c7203aa40d
CC-4961: Show linking
...
Refactored some more show instance creation functions
2013-02-26 17:41:35 -05:00
8c8a7d11e1
Created empty showInstance service.
...
Split populateShowUntil into 2 new functions: getPopulateDateUntil, and getShowDays
2013-02-26 13:21:39 -05:00
2717c0845b
Created show service
2013-02-26 10:20:02 -05:00
e08732fba7
CC-4975: airtime-silan cmd error
...
-fixed
2013-02-25 19:45:26 -05:00
9f0baba4f8
- Moved all form validation to it's own function in schedule service
...
- Moved show creation to it's own function in schedule service
2013-02-25 17:31:43 -05:00
3e49421221
Added comments to Schedule Service
2013-02-25 09:15:03 -05:00
22f52ca195
CC-4961: Show linking
...
-initial schedule service experimentation
2013-02-21 17:57:56 -05:00
8bec9dea55
Merge branch '2.3.x' into 2.3.x-saas
2013-02-20 14:41:55 -05:00
c8d7d23d62
CC-4963: Add cue in and cue out to smart block criteria list
...
Done
2013-02-19 16:38:58 -05:00
8bdf3508b0
CC-4951: Add cue in and cue out to library filter columns
...
Done
2013-02-19 13:38:35 -05:00
9113853e41
Removed logging messages from Library controller, index action
2013-02-19 11:51:26 -05:00
c0c6ac5d75
CC-4954: Please make Library page remember the status per user
...
- it was only working if there was a playlist object set
- fixed so it works even if there isnt
2013-02-19 11:37:22 -05:00
14f1d5572f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-02-19 10:59:03 -05:00
d1301ff676
CC-4954: Please make Library page remember the status per user
...
-done
2013-02-19 10:58:48 -05:00
542553bbc1
Merge branch '2.3.x' into devel
2013-02-15 17:05:36 -05:00
f2773fcb01
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-15 16:32:43 -05:00
fe611e7c6a
CC-4957 : Replay Gain undefined error, json response not being sent back properly.
2013-02-15 16:32:05 -05:00
74291cc248
Merge branch 'cc-3627-close-playlist' into devel
2013-02-13 17:57:41 -05:00
ec159131a8
Merge branch '2.3.x' into devel
2013-02-13 16:09:53 -05:00
6bbb603bcd
CC-3627: PlaylistBuilder->Playlist Panel -> it would be very handy to have "Close playlist" functionality
2013-02-13 16:05:11 -05:00
04ed640756
CC-3885: Deleted open playlist is not closed until a new item is added to it
...
-fixed
2013-02-13 15:44:52 -05:00
76cb04e296
CC-4538: Cannot edit title or change time of repeating show if first instance has ended
...
- fixed by populating the edit show form with the next repeating show that is not in the past
2013-02-13 11:55:27 -05:00
4ff1e8e78a
CC-4932: Library -> Update Scheduled column on 'Cancel current show' action
...
-fixed
2013-02-13 11:29:43 -05:00
50613dd9a8
CC-4907: Library -> Adding items to show doesn't add the correct item sometimes
...
-fixed
2013-02-12 17:21:21 -05:00
2c1fa283da
CC-4941: Dynamic Smart Block ignores the silan check
...
-fixed for playlists that contain dynamic blocks
2013-02-11 14:17:18 -05:00
51ade73e85
CC-4941: Dynamic Smart Block ignores the silan check
...
-fixed
2013-02-11 13:45:51 -05:00
3c73535f70
Convert clip length seconds to interval format before inserting into cc_playlistcontents / cc_blockcontents
2013-02-11 12:37:20 -05:00
6071dea839
CC-4940: Playlist editor in Library ignores cue points set by silence detection when displaying item time
...
-small fix on where to set clip length
2013-02-11 12:32:20 -05:00
69054806c4
CC-4940: Playlist editor in Library ignores cue points set by silence detection when displaying item time
...
- fixed by setting length to cue_out - cue_in when tracks get added to playlist/block
2013-02-11 12:24:06 -05:00
e8bde50909
CC-4939: All webstreams in a playlist will have 0 length in Schedule
...
- set cuein and cueout of playlist item if it is a webstream
2013-02-11 11:17:00 -05:00
8124d096d0
Removed log message
2013-02-07 15:56:35 -05:00
c39b99da6c
CC-4839: Nginx doesn't allow liquidsoap to check uploaded file, which blocks uploading any file
...
-fixed
2013-02-07 15:42:06 -05:00
525b2dcb33
CC-4895: Remove all json die() statements from code
...
- removed json_encode
2013-02-07 15:41:47 -05:00
ad334d9e74
CC-4926: System-> Preference: Please limit the default fade value less than 60
...
- added a range validator of 0 - 59.9 on default fade
2013-02-06 15:44:52 -05:00
ba4cb16171
CC-4925: Changing User permissions to a higher level ends up with show editing problems
...
-typo
2013-02-06 14:35:39 -05:00
55970a4b20
CC-4925: Changing User permissions to a higher level ends up with show editing problems
...
- added check to ensure user is not an admin before assigning the 'dj-edit-show' action
2013-02-06 14:32:13 -05:00
8e82db1bc7
CC-4921: Now Playing: Cannot insert items into current playing show
...
-filler time in cc_schedule was not setting cue_in and cue_out
-since we made those colunns not null and removed a default value, we always have to set a value
2013-02-05 17:57:21 -05:00
909f2c95c4
XSS exploit prevention - audio preview
2013-02-05 17:24:39 -05:00
8db71eac52
CC-4914: Update is_scheduled after tracks play out
...
-done
2013-02-05 16:52:25 -05:00
50bfcb7eb8
XSS exploit prevention
...
- Calendar -> show content
2013-02-05 15:37:00 -05:00
23c29455d9
Modified schema.xml - made cue_in and cue_out required columns in cc_scheuled and removed default values
2013-02-05 13:18:25 -05:00
63439c276d
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-05 10:56:54 -05:00
74bc485b4b
XSS exploit prevention
...
- Calendar - Show Contents
- Playlist tooltip in Library page
- Adding track to a show
- Widgets
- Playlist/Webstream title and description
- Smart block expansion
2013-02-05 10:56:38 -05:00
103ad6fe6d
CC-4909: php warning
...
-fixed
2013-02-04 16:32:03 -05:00
60d6f5585b
CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<'
2013-02-04 16:27:09 -05:00
c398ce930b
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
2013-02-04 16:22:35 -05:00
e2472f1f5d
CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<'
2013-02-04 16:21:56 -05:00
b45f71e8f9
CC-4897: XSS exploit on library page
2013-02-04 12:44:14 -05:00
20a3f674b4
CC-4897: XSS exploit on library page
...
-fixed where this was happening on Calendar - show content
2013-02-04 12:12:57 -05:00
d63865625d
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-04 11:06:53 -05:00
1f0b9fa5dc
CC-4897: XSS exploit on library page
2013-02-04 11:06:46 -05:00
93ec4c001b
Merge branch '2.3.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/models/StoredFile.php
2013-02-02 21:07:34 -05:00
8309593a0f
CC-4904: Library -> Sort by status doesn't work
...
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
2013-02-01 17:47:07 -05:00
384298f680
CC-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist
2013-02-01 12:06:01 -05:00
d4e89df94e
CC-4895: Remove all json die() statements from code
2013-01-31 14:06:45 -05:00
0a198ae424
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/models/User.php
2013-01-30 18:31:45 -05:00
cf2ed25bfb
CC-4900: Indicate in the library if a webstream is scheduled in the future or belongs to a playlist
...
-done
2013-01-30 16:53:59 -05:00
4f5d7869d8
Removed html from Library/contents-feed and StoredFile model
...
Added new Library column to indicate if a file is scheduled in the future or belongs to a playlist/smart block
2013-01-30 15:38:25 -05:00
216b580395
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-30 14:40:47 -05:00
52d96241da
CC-4754: Replay gain modifier
...
-fix regression
2013-01-30 14:40:29 -05:00
cc5acf3c9e
improved logging for boolean vars
2013-01-30 14:34:06 -05:00
595429e6e5
CC-4897: XSS exploit on library page
...
-fixed
2013-01-30 11:51:27 -05:00
043fbd1dfb
CC-4886: Warn if track is part of a playlist when deleting from library.
...
-done
2013-01-30 10:55:24 -05:00
694c54f272
Merge branch 'cc-4887-show-whether-track-is-scheduled-in-the-future-on-Library-page' into devel
2013-01-30 10:35:29 -05:00
d4742577c9
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-30 10:20:27 -05:00
c45440482a
CC-4887: Show whether track is scheduled in the future on Library page
2013-01-30 08:57:59 -05:00
b15c4569eb
CC-4894: Need to filter output for potential XSS exploits
...
-fixed few areas
2013-01-29 15:17:29 -05:00
5f3f2cd97c
CC-4881: Cue in time can be greater than Cue out time in some situations
...
-fixed
2013-01-28 16:46:11 -05:00
f1215c10fd
CC-4882: Scheduled item does not take into account cue_out - cue_in time
...
-fixed
2013-01-28 14:21:11 -05:00
d47469be25
read num bytes used from file instead of calculating manually
2013-01-25 16:36:57 -05:00
2ef8604c31
remove unnecessary code
2013-01-25 16:23:12 -05:00
c6493f9d74
remove unecessary saas code
2013-01-25 16:22:08 -05:00
22aafda2a8
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 14:17:23 -05:00
d0a4141ae4
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-25 12:44:37 -05:00
a6f4805e1a
CC-4879: Pop-up HTML Audio Player still seems to be changing spaces to %20 and so on...
...
-fixed
2013-01-25 12:44:20 -05:00
20d8bf3bc7
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 12:33:50 -05:00
a16e8d05aa
-don't push new schedule until end of request
2013-01-25 12:33:27 -05:00
9d6f2ebdf4
remove unecessary code
2013-01-25 12:32:37 -05:00
5b04b2d82a
Merge branch '2.3.x-saas' of dev.sourcefabric.org:airtime into 2.3.x-saas
2013-01-25 12:12:35 -05:00
7c327e4c75
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 12:12:21 -05:00
0cf8526f87
CC-4878"Send support feedback" button at initial login tries to load " http://showbuilder " and was missing the local host IP.
...
-fixed
2013-01-25 11:51:56 -05:00
7bea2df8bd
Live chat was in audio preview and listen popup windows
2013-01-25 11:38:15 -05:00
1873022a13
CC-4876: Default interface language setting does not appear to affect text or drop-down menu on login page?
...
-fixed
2013-01-25 11:21:34 -05:00
6f5ffdc1e7
Merge branch '2.3.x' into 2.3.x-saas
2013-01-24 17:49:08 -05:00
c3f2bf57de
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
-further optimization by looking at the preferred time scale
2013-01-24 14:02:50 -05:00
2f3a30b580
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
-we know what month will be the initial view for the user.
-Provide this data ahead of time via ajax request
2013-01-24 12:52:24 -05:00
ef806b8357
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-24 12:14:12 -05:00
091f5ff49f
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
-we know what month will be the initial view for the user.
-Provide this data ahead of time.
2013-01-24 12:13:55 -05:00
f4f6f9043a
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-24 12:00:47 -05:00
1e336fa2d7
CC-4875: use a reference when iterating over show events
2013-01-24 12:00:31 -05:00
548b73db42
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
-remove an unnecessary roundtrip to server
2013-01-23 18:31:45 -05:00
78f617cacb
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
- put makeFullCalendarEvent inline with loop
- removed unnecessary epoch time conversion
2013-01-23 17:33:34 -05:00
adaab6ba96
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
-added a 5 second grace period for checking if shows are partially filled
2013-01-23 16:31:20 -05:00
9714b44d7f
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
2013-01-23 16:27:26 -05:00
9fd3b43bb2
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
Made improvement by accessing db just once to determine if each show instance is full or not
2013-01-23 16:12:16 -05:00
77b0c21192
Small refactor
2013-01-22 10:39:20 -05:00
ac6c279bef
Removed extra '/' is audio preview url
2013-01-21 20:20:29 -05:00
c0ca6b381f
merge conflict cleanup
2013-01-18 17:48:13 -05:00
909e290bd3
Merge branch 'devel' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
2013-01-18 17:38:48 -05:00
dfa392d914
CC-4868: Replay gain modifier is not setting the correct value
...
- fixed
2013-01-18 17:29:38 -05:00
b9c7ea1184
CC-4869: Default fades greater than 99 seconds won't allow you to drag item into block/playlist
...
-fixed
2013-01-18 17:22:54 -05:00
210336d20a
Merge branch 'devel' into 2.3.x-saas
2013-01-18 17:14:11 -05:00
e0efaea0c9
CC-4867: Library -> Audio preview doesnt work with airtime in subdirectory
...
-fixed
2013-01-18 17:10:52 -05:00
280c4a81ad
CC-4859: I18N: "AND" and "OR" for Smartblock's criteria need to be translated.
...
-fixed
2013-01-18 17:04:39 -05:00
c1941fea2b
Merge branch 'devel' into 2.3.x-saas
2013-01-18 14:45:55 -05:00
ad0879996d
CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect.
...
-use existing function to convert seconds to time format
2013-01-18 14:35:17 -05:00
22ecc3f1fc
CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect.
...
-fixed
2013-01-18 14:28:45 -05:00
f8208a355c
Merge branch 'devel' into 2.3.x-saas
2013-01-18 12:22:45 -05:00
ed7b22118c
Merge branch 'silan-script' into devel
2013-01-18 11:54:10 -05:00
f70ca93b53
CC-4841: Silan script
...
done
2013-01-18 11:53:26 -05:00
e2b83a0c8c
CC-4857: Playlist length will increase every time I duplicate it.
...
- fixed
2013-01-17 22:20:28 -05:00
4a7b345649
fix exception on support settings page
2013-01-17 17:35:16 -05:00
94a87a0b2e
Smart block tooltip content breaks when language setting is not english
2013-01-17 16:19:35 -05:00
6acc5696f9
Save button on edit user settings was not translating
2013-01-17 14:34:18 -05:00
57629b4eac
Changed path to locale directory from absolute to relative
2013-01-17 14:31:40 -05:00
796099b413
CC-4860: Library -> Context Menu -> Can't download files
...
-fixed
2013-01-17 13:37:32 -05:00
784cb390d3
Merge branch 'devel' into 2.3.x-saas
2013-01-17 10:56:18 -05:00
e4c2f43d9e
CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect.
...
-fixed
2013-01-16 15:40:50 -05:00
6640c1ea4b
CC-4856: 2.3.x-saas: Overwriting metadata doesn't take effect
...
-fixed
2013-01-16 14:45:14 -05:00
f7e8fd33fd
CC-4848: Streaming server passwords should be hidden with dots, once entered
...
-fixed
2013-01-16 14:36:56 -05:00
8b12f692cd
CC-4854: Remove SaaS checking from codebase
...
-fixed
2013-01-16 14:31:43 -05:00
9d8c9149fd
remove code that will never be executed on SaaS branch
2013-01-16 14:06:04 -05:00
dbaf7d9b4b
Merge branch 'devel' into 2.3.x-saas
2013-01-16 13:41:27 -05:00
ab83029b2f
CC-4852: 2.3.x-saas: Exception happens when updating System -> Preferences
...
-fixed
2013-01-16 12:44:26 -05:00
9cb4633823
CC-4850: Upgrade Scripts -> Add default timezone and locale for each user in cc_pref
...
-fallback to default settings if user setting is not set
2013-01-16 12:42:58 -05:00
bd3d12bd26
CC-4849: 2.3.x-saas: Empty page for Support feedback
...
-fixed
2013-01-16 12:34:20 -05:00
712df8b12d
Removed extra style element
2013-01-16 11:10:23 -05:00
5f12bc713d
Bumped copyright date to 2013
2013-01-16 12:24:45 +00:00
e98d6e92bb
Merge branch 'devel' into 2.3.x-saas
2013-01-15 15:38:27 -05:00
973a415164
-fix installation error
2013-01-15 15:37:26 -05:00
c57e19983c
-fix merge mistakes from devel
2013-01-15 14:06:02 -05:00
8cd6bd9aa4
Merge branch 'devel' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/forms/SoundcloudPreferences.php
airtime_mvc/application/forms/SupportSettings.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
airtime_mvc/public/js/airtime/preferences/preferences.js
python_apps/api_clients/api_client.py
python_apps/pypo/listenerstat.py
2013-01-15 13:44:44 -05:00
bb2f9316af
CC-4841: Silan script
...
- temp commit
2013-01-15 11:16:50 -05:00
175dbcbabc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 17:09:03 -05:00
ea70357920
- remove logging
2013-01-14 17:08:47 -05:00
a85b394d63
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 17:02:05 -05:00
692c1a1c9e
CC-4838: I18N: HTML contents of Print preview for Playout History need to be translated
...
-fixed
2013-01-14 17:01:50 -05:00
8c19384d32
- CRLF fix
2013-01-14 16:21:02 -05:00
9ae3559305
Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2013-01-14 16:19:51 -05:00
5a97fb69f2
CC-4384: Remove annoying usage of $CC_CONFIG
...
- done
2013-01-14 16:16:14 -05:00
0dfd8acf7a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 16:00:46 -05:00
fae3f3a03f
CC-2184: Hardcoded CSS path should be relative path instead
...
-Make '/' the default root
2013-01-14 16:00:38 -05:00
a55bc9973c
- temp commit
2013-01-14 14:43:02 -05:00
9603e7c2fd
CC-4830: I18N: System -> Streams: "dB" for Replay Gain Modifier is not translated
...
-fixed
2013-01-14 14:30:59 -05:00
7b4693e5f9
CC-4831: I18N: Error message of background settings when creating a show is not translated
...
-fixed
2013-01-14 14:13:32 -05:00
8ea3aca3a0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 14:07:55 -05:00
cf09175ff1
CC-4796: Listener Stat: Authentication exception happens but no warning message on UI.
...
- done
2013-01-14 13:57:32 -05:00
891e993cd1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 13:56:24 -05:00
d4124f916d
CC-4796: Listener Stat: Authentication exception happens but no warning message on UI.
...
- done
2013-01-14 13:56:00 -05:00
2c3e79e842
CC-4832: I18N: Tool tip for show is partially filled in Calendar page is not translated
...
-fixed
2013-01-14 13:53:27 -05:00
1e6b0fe6ae
CC-4833: I18N: Alert message "Please select a cursor posion from timeline." in Now playing page is not translated
...
-fixed
2013-01-14 13:47:41 -05:00
83be01d0d0
CC-4835: I18N: "Copy of ..." from Duplicating playlist would better be translated
...
-fixed
2013-01-14 13:42:17 -05:00
f067b952db
CC-4829: Password Verify does not work on Lucid
...
-code cleanup
2013-01-14 12:17:33 -05:00
83a450565e
CC-4829: Password Verify does not work on Lucid
...
-fixed
2013-01-14 12:07:17 -05:00
1666a04451
CC-4826: Please re-push the liquidsoap queue if updating Replay Gain settings
...
- done
2013-01-14 11:28:48 -05:00
8362860904
Block expansion ajax url was missing baseUrl
2013-01-11 14:11:01 -05:00
89274e43b3
fix spelling mistake
2013-01-11 13:17:08 -05:00
dcf3526000
CC-4384: Remove annoying usage of $CC_CONFIG
...
- done
2013-01-10 18:09:00 -05:00
a129b0b081
CC-4472: User password verify or clear text display.
...
-done with password verify
2013-01-10 17:51:25 -05:00
55fa8b8dc1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-10 14:52:45 -05:00
9f857433fa
CC-4817: I18N: "Playlist Shuffled" is not listed for translation
...
-fixed
2013-01-10 14:22:25 -05:00
a0be1c647e
CC-4786: Refresh page when language setting changes
...
-configure localization and reinitiliaze edit user form after the user locale is set
2013-01-10 14:01:03 -05:00
dffe932223
Added missing base directory to urls
2013-01-10 13:58:11 -05:00
2797809c74
CC-4786: Refresh page when language setting changes
...
-done
2013-01-10 13:55:52 -05:00
048ee05030
CC-4821: Add option to disable ReplayGain
...
- done
2013-01-10 13:49:41 -05:00
c20ed7ebad
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-10 12:04:44 -05:00
690a6d2654
Removed user id from cc_pref keystr value
2013-01-10 12:04:27 -05:00
4bf9ab60d9
CC-4819: Tracks length in Scheduler is 0.0 all the time
...
- fixed in better way
2013-01-10 11:49:02 -05:00
0aeea61006
CC-4822: Cannot preview playlist
...
-fixed
2013-01-10 10:52:39 -05:00
594a38da16
CC-4770: Playlist's length doesn't counts Webstream and Smartblock in
...
- the bug was introduced by CC-4668
- fixed
2013-01-09 22:53:29 -05:00
3a72302a3c
CC-4819: Tracks length in Scheduler is 0.0 all the time
...
- fixed
2013-01-09 22:19:39 -05:00
1572955d07
CC-4810: Add language setting to login page
...
-done
2013-01-09 18:03:23 -05:00
db62b538dd
CC-4816: Timezones should be a user preference
...
-done
2013-01-09 13:38:38 -05:00
f887ca3d8d
CC-4813: Users -> Do not save username on User Management page
...
-fixed
2013-01-09 13:25:18 -05:00
03da2aee80
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 17:51:58 -05:00
3b2b275c30
CC-4809: Listen popup UI breaks with localization
...
-fixed
2013-01-08 17:51:42 -05:00
6e7f45e615
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 17:32:39 -05:00
1263c04621
CC-4796: Listener Stat: Authentication exception happens but no warning message on UI
...
- done
2013-01-08 17:32:27 -05:00
22e4811b22
Add gettext wrapper function to string missing it
2013-01-08 16:51:11 -05:00
9755ea6a20
CC-4814: System->Streams: Tool tips' content of output stream's admin user field is not listed in airtime.po file
...
-fixed
2013-01-08 16:47:00 -05:00
87bfc81ca0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 15:53:33 -05:00
6097196dd7
CC-4813: Users -> Do not save username on User Management page
...
-fixed
2013-01-08 15:52:56 -05:00
6d48e1faf0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 15:52:33 -05:00
adda497bbb
CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start
...
- fixed
2013-01-08 15:52:11 -05:00
1ee90ed9b9
CC-4790: Media Monitor: Re-added files won't show up in Library
...
-fixed
2013-01-08 15:42:35 -05:00
0612a595c9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 15:14:42 -05:00
178abcfada
CC-4785: Zend errors on page not found
...
-partially fixed
2013-01-08 15:14:33 -05:00
a7992c291e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 15:09:55 -05:00
3de33bc3e3
CC-4811: Move the edit user form to its own page
...
-done
2013-01-08 15:09:35 -05:00
45e3fccae2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 12:31:22 -05:00
b580a7be73
CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start
...
- fixed
2013-01-08 12:31:14 -05:00
f308305df8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-07 18:18:59 -05:00
a65e72941f
CC-4805: Localization -> Changing default language changes datatables and add media language setting
...
-fixed
2013-01-07 18:18:40 -05:00
6e241fd3ec
CC-4512: Allow changing stream "Offline" message via Web UI
...
- fixed
2013-01-07 18:14:57 -05:00
51425d451f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-07 13:49:09 -05:00
ecbff94f11
CC-4795: Library -> Playlist: Cannot add Smart Block into Playlist
...
- fixed
2013-01-07 13:48:51 -05:00
19e1c9bd9e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-07 12:41:45 -05:00
82da4dcfe8
CC-4599: Calendar: Add an icon to indicate show is not fully booked
...
-done but a new icon is needed
2013-01-07 12:41:28 -05:00
0542e713ed
CC-4794: Library: Please disable "Duplicate playlist" option for Smart Block's context menu
...
- fixed
2013-01-07 12:20:07 -05:00
771b9b9412
Fixed whitespace in Preferences page between 'Timezone' and colon
2013-01-07 11:41:29 +00:00
a2c1b9c699
Clarify label on default interface language preference
2013-01-07 11:05:38 +00:00
053418d7ac
Added missing colon to the end of 'Language'
2013-01-07 10:42:16 +00:00
c5f1d4a568
Removed bogus extra comma
2013-01-04 17:30:51 +00:00
02ac909430
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-04 11:39:04 -05:00
cf860bfe3c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-04 11:40:40 -05:00
10efbee530
CC-4784: Load CSS before javascript
...
-fixed
2013-01-04 11:40:32 -05:00
32fd92c892
CC-4787: Edit User: Don't save username field
...
-fixed
2013-01-04 11:38:49 -05:00
63c847080f
CC-4732: Ask for admin username + password in Stream Settings page
...
- CRLF
2013-01-03 18:02:19 -05:00
5d76bb2d17
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-03 18:00:33 -05:00
ae7b6fe092
CC-4732: Ask for admin username + password in Stream Settings page
...
- done
2013-01-03 17:58:50 -05:00
64116c7bff
CC-4779: Library -> Metadata tooltip -> Some words get wrapped in different languages
...
-fixed
2013-01-03 16:56:04 -05:00
7ea649e063
CC-4783: Username on the edit user form should be readonly
...
-done
2013-01-03 16:27:05 -05:00
c11032111e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-03 16:19:20 -05:00
e2c87ed8b6
CC-4781: Store localization settings on a per-user basis
...
-done
2013-01-03 16:19:02 -05:00
1f7e0ce042
CC-4782: Replay Gain modifier adds horizontal scroll bar when set to +10dB
...
- fixed
2013-01-03 14:58:29 -05:00
a1837366be
Merge branch 'cc-3018-silence-detection' into devel
2013-01-03 14:08:21 -05:00
b8f80866cf
CC-3018: Automatically strip out silence from audio tracks
...
- done
2013-01-03 14:02:06 -05:00
59f3826055
CC-4725: Have a "share" button on the popup player
...
-done
2013-01-03 13:13:27 -05:00
cd252d357d
CC-4777: Edit Metadata: Remove second title
...
-done
2013-01-02 16:27:35 -05:00
25df87d2e5
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-02 16:09:39 -05:00
d6eb043899
CC-4765: Webstream of AAC type can't be previewed
...
-fixed
2013-01-02 16:09:32 -05:00
88f2f1e4a7
CC-4773: L10N: Some strings is not listed in airtime.po
...
-fixed
2013-01-02 16:04:19 -05:00
dcdbc3160d
CC-4769: Duplicate Playlist: Fade in/out setting doesn't get copied correctly
...
- fixed
2013-01-02 11:41:33 -05:00
1dfe99224c
CC-4754: Replay gain modifier
...
- adding text
2012-12-28 16:18:47 -05:00
f26778ee72
CC-4757: Duplicate playlist
...
- done
- we still need a icon for context menu
2012-12-28 16:17:58 -05:00
4aae3ba51b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-12-27 22:59:05 -05:00
cf38e2c596
CC-4754: Replay gain modifier
...
- done
2012-12-27 22:58:41 -05:00
17e66f5537
Merge branch 'cc-4759-add-aac-stream-in-support' into 2.2.x-saas
2012-12-27 17:30:10 -05:00
0596d1c391
Merge branch 'cc-4759-add-aac-stream-in-support' into devel
...
Conflicts:
python_apps/media-monitor2/media/monitor/pure.py
2012-12-27 17:29:25 -05:00
ee8dde07c8
add support for AAC input streams
2012-12-27 17:18:47 -05:00
c0665e4748
CC-4754: Replay gain modifier
...
- Initial commit
2012-12-27 00:36:11 -05:00
274b1f7562
CC-4743: Make user rights description localizable
2012-12-17 16:53:43 -05:00
adae81bffa
CC-4747: Add User page -> Typo on form labels
2012-12-17 16:53:18 -05:00
bd18039785
CC-4744: Edit user form needs styling
...
-done
2012-12-17 14:12:27 -05:00
076a1c56cb
CC-2258: Describe rights for each user type on the user page
2012-12-13 12:29:02 -05:00
f12547dfb4
CC-4736: Let non-admin users update their user info
...
new form
2012-12-10 16:56:25 -05:00
dd5882984e
CC-4736: Let non-admin users update their user info
...
-done but needs design
2012-12-10 16:55:44 -05:00
efa5f6ff6c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-12-05 13:29:48 -05:00
e1e8160e53
CC-4737: Listener stats should take up the full screen
...
- fixed
2012-12-05 13:29:29 -05:00
adb966a734
CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page
...
-cancel button does not reload the page anymore
2012-12-05 13:21:18 -05:00
062740ef81
CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page
...
-done
2012-12-05 13:16:25 -05:00
3086bde17e
-cleanup parsing for form elements that weren't provided by the client in our SaaS implementation
2012-12-04 16:22:03 -05:00
1846f17bbc
CC-4731: Cannot save support feedback settings
2012-12-04 16:21:45 -05:00
844246df3a
CC-4730: Support Feedback: Errors are displayed when they shouldn't be
2012-12-04 15:30:56 -05:00
ee086fe43a
CC-4730: Support Feedback: Errors are displayed when they shouldn't be
2012-12-04 14:46:06 -05:00
fde74105de
CC-4729: Register dialog is missing title
2012-12-04 14:33:45 -05:00
89e0458500
CC-4728: Support Feedback save action does not use ajax
...
-done
2012-12-03 17:15:47 -05:00
ab55bb73bb
CC-4683: System -> Preference: Save button is old style
...
-support feedback form also had old button style
2012-12-03 14:51:21 -05:00
155f1eae11
CC-4683: System -> Preference: Save button is old style
...
-done
2012-12-03 11:57:01 -05:00
127d0187b7
CC-4706: Calendar -> Context menu -> Show content does not work
...
-fixed
2012-12-03 11:45:06 -05:00
b2699fa914
merge from devel
2012-12-03 11:06:56 -05:00
2f0c6b702a
CC-1960: Internationalize Airtime / Support translations
...
- created locale table
- create locale model
- set default locale in pref table
2012-11-29 18:21:03 -05:00
858f03c9ad
-remove rebroadcast code
2012-11-29 15:58:29 -05:00
542434d9f0
CC-1960: Internationalize Airtime / Support translations
...
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
2012-11-28 16:16:39 -05:00
4983721565
Merge branch '2.2.x' into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/forms/LiveStreamingPreferences.php
2012-11-28 16:10:33 -05:00
9689c75bed
CC-1960: Internationalize Airtime / Support translations
...
-added i18n to serverbrowser.js
-fixed small typo in SmartBlockCriteria.php
2012-11-28 11:54:22 -05:00
e475c2e99e
CC-1960: Internationalize Airtime / Support translations
...
-overwrote zend from stringLength validator
2012-11-27 17:28:27 -05:00
ac0e1d07be
Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime
2012-11-27 17:11:43 -05:00
9acfb6c181
CC-1960: Internationalize Airtime / Support translations
...
- overwrote default zend form error messages
2012-11-27 17:11:29 -05:00
8acc8fce76
CC-1960: Internationalize Airtime / Support translations
...
- fixed close button on show add form
2012-11-27 15:55:32 -05:00
42d535a922
CC-1960: Internationalize Airtime / Support translations
...
-unlocalized some strings
2012-11-27 12:33:43 -05:00
c4062f7770
CC-1960: Internationalize Airtime / Support translations
...
-fixed javascript strings
2012-11-27 12:31:21 -05:00
36c6edcff1
CC-1960: Internationalize Airtime / Support translations
...
-addded gettext wrapper to string missing it
2012-11-27 12:10:32 -05:00
f86cd7d474
CC-1960: Internationalize Airtime / Support translations
...
-fixed typos
2012-11-27 12:03:38 -05:00
b9b387fcd0
CC-1960: Internationalize Airtime / Support translations
...
-fixed typos
2012-11-27 11:59:55 -05:00
3b124e6f5d
CC-4668: Blocks/Playlists: Length includes deleted tracks
...
-saving block length was including files that do not exist
2012-11-26 15:05:27 -05:00
b677130a3f
CC-1960Internationalize Airtime / Support translations
...
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
2012-11-23 16:39:41 -05:00
5ba964c783
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-23 14:03:51 -05:00
75adf9b6a1
CC-4701: same webstream played twice in a row does not work.
...
-fixed
2012-11-23 14:03:31 -05:00
c6a5db4a78
CC-1960: Internationalize Airtime / Support translations
...
-dashboard was missing a translation - fixed
2012-11-23 10:48:44 -05:00
4804685dfd
CC-1960: Internationalize Airtime / Support translations
...
-navigation bar was not showing localized text -fixed
2012-11-22 18:15:54 -05:00
dd0e71efcc
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
2012-11-22 17:32:24 -05:00
87d0383533
CC-4703: Now Playing duration column ignores any cue point set
...
- fixed
2012-11-22 14:37:57 -05:00
96b87d23e0
CC-1960: Internationalize Airtime / Support translations
...
-added i18n for plupload
2012-11-22 14:37:54 -05:00
3a1945a818
CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule
...
-fixed
2012-11-22 11:40:44 -05:00
8483439551
CC-4709:
...
Exception happens when DJ try to click a Webstream not belongs to himself
- fixed
2012-11-22 10:29:40 -05:00
c0e49b69e2
Merge branch 'devel' into cc-1960-internationalize-airtime
2012-11-21 17:17:53 -05:00
2172ee82d3
Merge branch '2.2.x' into devel
2012-11-21 17:17:32 -05:00
993d3fda7b
CC-1960: Internationalize Airtime / Support translations
...
-set locale based on user's preference
2012-11-21 16:41:54 -05:00
2a4e4c6405
CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.
...
-fixed
2012-11-21 14:17:46 -05:00
7a9f01458c
CC-1960: Internationalize Airtime / Support translations
...
-fixed langauge label on preferences page
2012-11-21 12:46:52 -05:00
25ddd083bc
CC-1960: Internationalize Airtime / Support translations
...
-added language option in preferences
2012-11-21 12:44:50 -05:00
c344282e4d
CC-1960: Internationalize Airtime / Support translations
...
-rescan watched folder button was missing
2012-11-21 11:57:41 -05:00
10b6dd202e
Merge branch 'devel' into cc-1960-internationalize-airtime
...
Conflicts:
airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
2012-11-21 11:44:40 -05:00
f88a7bdb31
Merge branch '2.2.x' into devel
2012-11-21 10:54:17 -05:00
df6d199b60
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-11-21 10:52:52 -05:00
48253b8d14
CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.
...
-fixed
2012-11-21 10:19:21 -05:00
10cd31fa56
CC-1960: Internationalize Airtime / Support translations
...
- channged all js strings with embedded variables to use sprintf
2012-11-20 17:42:26 -05:00
9762511693
Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LocaleController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/application/views/scripts/playlist/playlist.phtml
airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
2012-11-20 16:56:18 -05:00
f40d1f8dd4
CC-1960: Internationalize Airtime / Support translations
...
-enabled i18n for datatables, colVis, columnFilter, and fullCalendar
-fixed typos in full-calendar-functions.js
2012-11-20 16:40:02 -05:00
8d9fa1976e
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-20 16:39:04 -05:00
3c1f80de68
CC-4658: Smart Block: Unable to drag songs into block directly
...
- fixed
2012-11-20 16:38:43 -05:00
fe44d23b74
CC-4715: Better management of tracks that are shorter than they claim to be.
2012-11-20 16:31:27 -05:00
3a682aeada
cc-4585: fixed + added logging
2012-11-20 15:25:41 -05:00
7124cbe04d
fixed bug where hidden files would be shown in library
2012-11-20 15:18:41 -05:00
20855c73b5
refactoring + fix typo
2012-11-20 15:10:38 -05:00
57fdab0ddf
CC-1960: Internationalize Airtime / Support translations
...
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
2012-11-20 11:33:37 -05:00
b801235c99
CC-1960: Internationalize Airtime / Support translations
...
-added gettext function to strings in layout/scripts
2012-11-20 11:33:37 -05:00
43a797058c
-extra quote typo
2012-11-20 11:33:37 -05:00
a76b9b305f
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper to all strings in models
2012-11-20 11:33:37 -05:00
2ce530c5bd
CC-1960: Internationalize Airtime / Support translations
...
- fix to some controller strings
2012-11-20 11:33:37 -05:00
9958d8da9f
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper function to all strings in layout, and common
2012-11-20 11:33:37 -05:00
8338152876
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper function to all navigation strings
2012-11-20 11:33:37 -05:00
5adadc2e91
CC-1960: Internationalize Airtime / Support translations
...
- added gettext wrapper function to all strings in controllers
2012-11-20 11:33:37 -05:00
e5f67c8b05
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper functions for all strings in view/scripts, and forms
2012-11-20 11:33:37 -05:00
a69ff167d4
mass string change to _
2012-11-20 11:33:37 -05:00
15741bdfa9
renamed links
2012-11-20 11:29:56 -05:00
fed39077c0
Merge branch '2.2.x' into devel
2012-11-20 11:21:29 -05:00
e0b19cc2d1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-11-20 11:17:03 -05:00
8c49540d3d
CC-1960: Internationalize Airtime / Support translations
...
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
2012-11-20 11:16:10 -05:00
9c612d17a3
CC-4694: Apache/Zend error only specific to some users
2012-11-19 18:41:31 -05:00
97e94269c5
CC-1960: Internationalize Airtime / Support translations
...
-added gettext function to strings in layout/scripts
2012-11-16 13:59:51 -05:00
3f3b939ebe
-extra quote typo
2012-11-15 17:28:18 -05:00
7efa7169ca
CC-4700: Return mime type of streams instead of null
...
-fixed
2012-11-15 16:41:46 -05:00
ef626a71b1
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper to all strings in models
2012-11-15 15:52:51 -05:00
d7495c6937
CC-1960: Internationalize Airtime / Support translations
...
- fix to some controller strings
2012-11-15 14:05:36 -05:00
4f40efa376
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper function to all strings in layout, and common
2012-11-15 13:49:44 -05:00
5ba9df9e90
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper function to all navigation strings
2012-11-15 13:24:30 -05:00
105325994f
CC-1960: Internationalize Airtime / Support translations
...
- added gettext wrapper function to all strings in controllers
2012-11-15 12:55:45 -05:00
d83a96a8ec
CC-4699: Library -> 'File Import in Progress' is missing loading icon
...
-fixed
2012-11-15 12:14:25 -05:00
b173b6dda4
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper functions for all strings in view/scripts, and forms
2012-11-15 10:59:06 -05:00
2b2a1db055
CC-2401: Shuffle option in playlists
...
- done
2012-11-13 17:32:10 -05:00
d8165cbf44
- haproxy support subdomain name with '.'
2012-11-13 16:32:36 -05:00
f0e2d5d295
mass string change to _
2012-11-13 15:37:24 -05:00
925afcc64c
renamed links
2012-11-13 15:10:07 -05:00
33e4d6154d
CC-4693: Preferences: Bottom save button is not aligned
...
-fixed
2012-11-12 14:43:44 -05:00
a727f2bb1e
CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on
...
-fixed
2012-11-12 14:28:50 -05:00
c0e54c64cd
CC-4685: System -> User: Unique username error
...
-fixed
2012-11-12 12:29:07 -05:00
6145f9bcad
Merge branch '2.2.x' into devel
2012-11-08 17:28:23 -05:00
f657ee4f20
Merge branch '2.2.x' into 2.2.x-saas
2012-11-08 17:27:51 -05:00
33b2520c14
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-08 17:27:28 -05:00
628e6bed37
CC-4689: Live Stream: The 1st song of a show won't play if there is another show have live stream assigned and finished right before
...
- fixed
2012-11-08 17:26:55 -05:00
ed7aba83bf
Merge branch 'cc-4661-listener-statistics' into 2.2.x-saas
2012-11-07 17:22:36 -05:00
7300b608cf
Merge branch 'cc-4661-listener-statistics' into devel
...
Conflicts:
python_apps/api_clients/api_client.py
2012-11-07 17:20:12 -05:00
9112a8d0b1
CC-4661: Listener Statistics
...
- enhancement on flot
- data point reduction
2012-11-07 16:26:31 -05:00
4b09b289ce
SAAS-290: Hosted SaaS widgets + javascript code generation
...
Slight improvements to description as well as element
positioning
2012-11-07 15:44:22 -05:00
bd482a0a75
CC-4583: Use AJAX calls instead of refreshing entire page
...
-fixed
2012-11-07 15:17:47 -05:00
1b0b124247
SAAS-290: Hosted SaaS widgets + javascript code generation
...
-working code
2012-11-07 12:49:17 -05:00
ccd6447696
- install failed due to wrong metadata key
...
- wrong controller action called
2012-11-07 12:05:20 -05:00
b817684972
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/public/js/bootstrap/bootstrap.js
2012-11-07 11:21:36 -05:00
27d40ef4df
SAAS-290: Hosted SaaS widgets + javascript code generation
2012-11-06 18:10:53 -05:00
272e428fa7
Merge branch '2.2.x' into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/forms/EmailServerPreferences.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/forms/Preferences.php
airtime_mvc/application/forms/SupportSettings.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/menu.phtml
airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
2012-11-06 17:23:32 -05:00
fd3305bc4c
SAAS-289: Remove all isSaaS checks
...
-done
2012-11-06 17:10:47 -05:00
29c7e58643
CC-4679: Library: Deleting Webstream leaves the SAVE button
...
-fixed
2012-11-06 16:49:36 -05:00
38d28d3346
SAAS-289: Remove all isSaaS checks
2012-11-06 16:48:34 -05:00
504d9968f1
CC-4639:
...
Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit
- fixed the bug where airtime hangs when repeat is checked but 0 files that
meet criteria
- fixed dynamic block bug where it didn't generate correct list
2012-11-06 16:32:00 -05:00
3f7d8a0c7f
Merge branch '2.2.x' into 2.2.x-saas
2012-11-06 16:11:51 -05:00
9712e64a69
CC-4661: Listener Statistics
...
- bug fix and removing unnecessary code
2012-11-06 14:52:35 -05:00
c605c97268
CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks
...
-disabled this option from context menu
2012-11-06 14:33:34 -05:00
e262d48eec
CC-4675: Preferences: Error messages are hidden
...
-fixed
2012-11-06 12:17:45 -05:00
de89686d48
CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference
...
-added comments
2012-11-06 12:03:49 -05:00
2cbba60037
CC-4673: Smart Block: Exception happens when create a smart block with 5 criteria
...
-fixed
2012-11-06 11:54:24 -05:00
a99191f4bd
CC-4669: Smart Blocks: Dynamic length of less than 1 hour shows 0.0
...
-fixed
2012-11-06 11:14:40 -05:00
8e69e50eea
Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics
...
Conflicts:
airtime_mvc/application/models/ListenerStat.php
2012-11-06 11:06:58 -05:00
6ef646124e
CC-4668: Blocks/Playlists: Length includes deleted tracks
...
-fixed
2012-11-06 10:58:25 -05:00
2e79e8421c
CC-4661: Listener Statistics
...
- better legend for multiple series of data
- consistant number of ticks on x-axis
2012-11-06 10:54:52 -05:00
41cb6b2b0b
Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas
2012-11-05 17:08:49 -05:00
3b58ee1f48
CC-4651: Apache log errors part 1
...
-fixed
-saas doesn't have rebroadcast shows so we don't need to check if they overlap
2012-11-05 17:08:41 -05:00
4218a7f30d
CC-4661: Listener Statistics
...
-factor out mountname into it's own table
2012-11-05 15:48:56 -05:00
080c3ec944
CC-4661: Listener Statistics
...
-factor out mountname into it's own table
2012-11-05 15:38:35 -05:00
90a93e9a6c
CC-4664: Playlist/Block preview: Tracks deleted from library still get played
...
-fixed
2012-11-05 13:58:11 -05:00
d467abe509
Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel
2012-11-05 11:27:34 -05:00
bd3cf543bf
made param useless in listAllFiles since its now safe to pass all files to MM
2012-11-05 11:11:05 -05:00
1c628bd831
renamed displayable to visible
2012-11-05 10:57:18 -05:00
acf954f637
changed hidden check to displayable check
2012-11-05 10:55:54 -05:00
6e89fdab30
changed file existence checks to displayable
2012-11-05 10:14:49 -05:00
b6341e44b3
removed pointless code duplication
2012-11-05 10:12:03 -05:00
34248921fc
refactored code to use displayable
2012-11-05 10:09:34 -05:00
aa9a6691f2
added a single test for checking if a file should be shown or not
2012-11-05 10:08:29 -05:00
311c88a8a2
added check for hidden in buildEntry
2012-11-05 09:54:00 -05:00
a62e64969d
Removed commented method
2012-11-05 09:49:49 -05:00
00a4e45491
added check for hidden in buildEntry
2012-11-05 09:47:16 -05:00
800f8b9ded
added criteria to remmove hidden files in blocks
2012-11-05 09:40:58 -05:00
4522fa94b2
added clause to exclude hidden files from getShowListContent
2012-11-05 09:30:21 -05:00
e01a61208d
Merge remote-tracking branch 'sf/2.2.x' into cc-4585
2012-11-05 09:19:20 -05:00
7e03333496
changed deletion by the user to be setting the file to be hidden instead
2012-11-03 01:33:13 -04:00
9c4f2e3298
refactored addWatchedDir to use early return style
2012-11-03 01:16:57 -04:00
5d3aa68c72
written method to unhide all files in a music dir
2012-11-03 01:09:36 -04:00
12009e95fc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 20:18:33 -04:00
9609a4e220
Merge branch 'cc-4652' of https://github.com/rgrinberg/Airtime into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 20:16:54 -04:00
a93b588a09
Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics
2012-11-02 18:25:23 -04:00
74fe958cad
CC-4661: Listener Statistics
...
- changes for different mount names
2012-11-02 18:25:08 -04:00
34d0ee5954
CC-4661: Listener Statistics
...
-add mount point names
2012-11-02 18:04:32 -04:00
6438b54a5f
CC-4661: Listener Statistics
...
-backend part working
2012-11-02 17:50:43 -04:00
106b18bf30
CC-4637: Media Library: Item will be removed from Playlist if it's removed from Library
...
-fixed
2012-11-02 17:49:32 -04:00
8b70136dd6
CC-4661: Listener Statistics
...
- db change commit
2012-11-02 17:44:06 -04:00
3af3cd5870
CC-4661: Listener Statistics
...
- frontend part
2012-11-02 17:00:38 -04:00
7f27e5ff3f
- ListenerStat Model
2012-11-02 16:28:13 -04:00
2ae3c0ac03
Line wrapping
2012-11-02 16:06:12 -04:00
1111fd8163
align
2012-11-02 16:04:47 -04:00
ac9b47f5e2
made rescanWatchDirectoryAction more concise
2012-11-02 16:02:05 -04:00
5cb83909d8
Merge remote-tracking branch 'sf/2.2.x' into cc-4585
2012-11-02 16:00:09 -04:00
796274e4ef
CC-4642: Default Fade preference should be in seconds and tenths, rather than millionths
...
-fixed
2012-11-02 15:51:36 -04:00
aec11feba5
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-11-02 14:59:02 -04:00
ba1f6ed054
CC-4374: Nowplayling page: Cannot remove tracks from recording show
...
-fixed by disallowing dragging into recording shows
2012-11-02 13:24:47 -04:00
135aadf16b
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/public/js/airtime/showbuilder/builder.js
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 12:28:21 -04:00
3478797744
cc-4661: new database tables for listener stats
2012-11-02 11:32:02 -04:00
a937df30ad
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-02 10:48:16 -04:00
cc208da2fb
CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference
...
-added labels
2012-11-02 10:48:08 -04:00
feb6c9d6f5
CC-4636: Exception happens when trying to remove user that have created some smart block
...
- doing delete cascade on cc_block on deleting users
2012-11-01 17:45:28 -04:00
575400b4c2
CC-4623: Library: Preview button for Flac does not work
...
- fixed
2012-11-01 16:44:37 -04:00
270eb97128
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into cc-4585
2012-11-01 15:14:53 -04:00
226bdbf738
added todo
2012-10-31 17:41:50 -04:00
5b14c4fe88
CC-4656: Library -> No error message when a dj tries to delete smart blocks and webstreams they do not own
...
-fixed
2012-10-31 17:19:27 -04:00
2507e0f8a4
CC-4655: DJ's can delete files that they do not own
...
-fixed
2012-10-31 16:51:29 -04:00
4cca80fe44
Added schema changes
2012-10-31 16:23:12 -04:00
fc613aa597
CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files
...
-fixed
2012-10-31 16:01:17 -04:00
cc40dfdf4e
CC-4641: Now Playing: Extending show's length won't change the overbooked track's style
...
-added comment
2012-10-31 14:16:16 -04:00
71be2b2bd1
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-31 12:36:56 -04:00
fd0e1c3c95
CC-4641: Now Playing: Extending show's length won't change the overbooked track's style
...
-fixed
2012-10-31 12:36:45 -04:00
2e4d5ec142
CC-4539: Advanced search: Sample rate searched on Hz, but search results
...
shown in kHz
- fixed
2012-10-31 12:32:40 -04:00
9293a26738
CC-4639: Give an option to allow smart blocks to reuse tracks if not enough
...
tracks meet the time limit
- code optimazation
2012-10-31 12:05:17 -04:00
1899d588ee
- CRLF fix
2012-10-30 18:03:03 -04:00
cbee9422ec
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-30 17:58:16 -04:00
9d495ebc03
CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit.
...
- done
2012-10-30 17:57:58 -04:00
9b77007e03
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-30 17:19:51 -04:00
8c90c1a12f
CC-4645: Add support for x-scpls playlist types
...
-fixed
2012-10-30 17:19:40 -04:00
ef68680868
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-30 13:23:23 -04:00
3e60ac4393
remove \r line endings
2012-10-30 13:23:09 -04:00
acc3ccca22
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-30 13:03:05 -04:00
b8039e315a
CC-4577: Webstream UI: little improvement about 'SAVE' button and input boxes for URL and length
...
-done
2012-10-30 13:02:55 -04:00
bba7975882
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-30 12:36:59 -04:00
5061dfa05d
CC-4647: apache error log entries
...
- fixed
2012-10-30 12:36:50 -04:00
71291b14f0
CC-4646: Library: Make advanced search options hidden by default
...
-done
2012-10-30 11:59:52 -04:00
5651dbce56
CC-4644: Exception from zendphp.log
...
- fixed
2012-10-29 16:37:27 -04:00
a937aa0e28
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-29 16:19:39 -04:00
4861397872
CC-4644: Exception from zendphp.log
...
- fixed
2012-10-29 16:19:23 -04:00
8ac0f41987
CC-4590: New smart block says 'Empty playlist'
...
-fixed
2012-10-29 11:57:20 -04:00
dc00528cd5
Merged baseUrl related conflicts
2012-10-29 11:56:20 -04:00
d6a4f2f713
Cleaned up soundcloud
2012-10-26 18:45:27 -04:00
3a7700eaac
CC-4583: Use AJAX calls instead of refreshing entire page
...
-done
2012-10-26 18:09:30 -04:00
0ab1353564
CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on
...
-fixed
2012-10-26 18:00:48 -04:00
f14320a769
CC-4603: Dynamic Smart Blocks: adding to multiple shows at once generates the same content
...
- fixed
2012-10-26 17:15:39 -04:00
dc361c1136
Aligned constants
2012-10-26 13:10:08 -04:00
c1b2978fba
disable rabbitmq status on SaaS
2012-10-25 17:50:43 -04:00
bec021fcb6
- live chat was appearing in smart block preview window
2012-10-24 10:46:34 -04:00
6231998cc0
Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas
2012-10-23 18:47:44 -04:00
b8d6132b52
- saas patch #1
2012-10-23 18:47:15 -04:00
1ed8d37e12
Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas
2012-10-23 17:53:43 -04:00
4daaa776e2
CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table
...
-fixed
2012-10-23 17:45:55 -04:00
a4d91a5d48
CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table
...
-small fix
2012-10-23 17:44:06 -04:00
9cd389d16b
Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas
2012-10-23 16:50:36 -04:00
70ed5548b9
-chat box was appearing in playlist-preview window
2012-10-23 16:50:25 -04:00
3c61b39daa
Merge branch '2.2.x' into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2012-10-23 16:09:55 -04:00
2d6be404d4
cc-4304: fixed ticket by deleting playlists when user is deleted. also removed useless index on file_exists
...
-regen propel files
2012-10-23 13:45:15 -04:00
dff5bb4e2b
CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table
...
- fixed
2012-10-23 12:24:38 -04:00
9ddd54ec12
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-22 16:37:19 -04:00
c51fb8a040
CC-4549: Tooltip for source username cannot be shared between input and output settings
...
-fixed
2012-10-22 16:37:06 -04:00
abf4319d67
Removed logging
2012-10-22 15:55:24 -04:00
feac48a003
cc-4613: fixed
2012-10-22 15:34:33 -04:00
e0402c88cf
cc-4613: fixed
2012-10-22 15:20:03 -04:00
0084f8ce93
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 17:48:47 -04:00
a9df8cd7f2
CC-4610: Creating recording show will generate lots of exception in zendphp.log
...
- fixed
2012-10-19 17:30:54 -04:00
2bab46a12e
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 16:40:49 -04:00
58535bef88
CC-4580: No contents in rebroadcast show
...
- fixed
2012-10-19 16:40:32 -04:00
b4264f83e8
CC-4608: Chat Box is gone on sourcefabric.airtime.pro
2012-10-19 15:45:14 -04:00
d23ba12aaa
CC-4608: Chat Box is gone on sourcefabric.airtime.pro
...
-fixed
2012-10-19 15:42:09 -04:00
9dfee6aa68
CC-4564: Webstream: Book same webstream twice in Scheduler, the 2nd one doesn't get played
...
-fixed
2012-10-19 15:39:45 -04:00
2527fa2e1a
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 14:42:01 -04:00
3ecde35b7c
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 14:28:14 -04:00
1146e1f269
CC-4215: Smart Playlist: Exception happens when generate with criteria Length is 2012-08-10 14:00:00
...
- fixed
2012-10-19 14:27:57 -04:00
96ff440435
Removed space
2012-10-19 14:18:34 -04:00
7356d4fe89
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 13:42:41 -04:00
8f998fd2c8
CC-4595: Fade in/out setting doesn't work
...
-fixed
2012-10-19 13:42:24 -04:00
671802d658
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 13:24:14 -04:00
57ef1c20ac
Removed trailing whitespace
2012-10-19 13:24:06 -04:00
a1e653b41f
Deep optimization
2012-10-19 13:22:00 -04:00
7d8079f770
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ShowbuilderController.php
airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
airtime_mvc/public/js/airtime/common/common.js
2012-10-19 12:50:36 -04:00
a51c3174e0
SAAS-282: Overlap detection prevents creation of a repeating show
...
-fixed
2012-10-19 12:33:12 -04:00
3b5ec6fbe0
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 11:46:18 -04:00
6d1b8fe586
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 11:32:42 -04:00
8d56c03fe3
deep voodoo magic to optimize schedule
2012-10-19 11:32:35 -04:00
f5051cff3a
CC-4605: Some AJAX calls are cached
...
-fixed
2012-10-19 11:22:44 -04:00
d32495d100
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 11:09:34 -04:00
58d00cb9b9
Formatting sql
2012-10-19 11:05:12 -04:00
6727bce328
CC-4598: Smart block: cannot save dynamic block with 0.5 hours
...
-fixed
2012-10-18 15:03:59 -04:00
4ad8ee2472
- removing a line for saas
2012-10-18 14:32:56 -04:00
6c8c7aa285
CC-4592: Library: Changing fades does not save microseconds
...
-fixed
2012-10-18 12:09:48 -04:00
887a86c6a1
CC-4591: Calendar: Cannot change start time for repeating show
...
-fixed
2012-10-18 10:51:24 -04:00
7123230eea
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-17 15:28:15 -04:00
5fc72d9e51
add function necessary for saas
2012-10-17 15:28:05 -04:00
45801e5dc4
- fix spelling of some function name
2012-10-17 15:16:03 -04:00
c1745145e8
- CRLF fix
2012-10-16 16:25:56 -04:00
35c8fe55b4
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-16 16:24:12 -04:00
3f1df49221
CC-4572: Adding a playlist to a show in Now Playing page fails, interface greys out
...
- bug with php 5.3.2 with DateTime::createFromFormat()
- fixed with workaround
2012-10-16 16:22:44 -04:00
2b1db835dd
CC-4571: Now Playing delete action does not delete, should be labelled 'Remove from show'
...
-done
2012-10-16 16:01:05 -04:00
819dcf70fd
CC-4579: Edit Metadata: Track number defaults to 0 if it is deleted
...
-fixed
2012-10-16 15:56:03 -04:00
5d1d68d96b
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-16 15:29:18 -04:00
25c28da761
CC-4550: Track should not be a required field in metadata editor
...
-fixed
2012-10-16 15:29:05 -04:00
562c509939
CC-4570: blockId and blockIndex are visible at top of smart block preview pop-up
...
- fixed
2012-10-16 14:51:14 -04:00
e41145b54e
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-16 14:33:56 -04:00
846af50543
CC-4567: Calendar: Exception in zendphp.log when setting a wrong rebroadcast time from repeating show
...
-fixed
2012-10-16 14:33:45 -04:00
67ca0db4c8
CC-4542: Playlists containing dynamic smart blocks cannot be previewed
...
- fixed
2012-10-16 14:09:34 -04:00
fe1d8d51a9
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-16 12:05:24 -04:00
b061573d23
CC-4554: Playout History search sticks on 'Processing' message
...
-fixed
2012-10-16 12:04:52 -04:00
8a93717415
CC-4568: Show preview broken in Now Playing page
...
- fixed
2012-10-16 11:06:01 -04:00
9d3271c03d
CC-4562: Calendar: Add Show button is removed after editing a show from regular show to repeating show
...
-fixed
2012-10-15 15:36:38 -04:00
5ff89eeba2
CC-4561: Can create overlapping shows when rebroadcasting a repeating show
...
-fixed
2012-10-15 14:19:52 -04:00
095c2c7cc6
CC-4559: More useful tooltip for Find Shows button in Now Playing page
2012-10-15 12:41:39 +01:00
a103c76378
CC-4558: Make button in Now Playing consistent with same action in Calendar
2012-10-15 12:27:16 +01:00
b79e190d3c
-small comment change
2012-10-12 15:42:51 -04:00
e60a23aab4
CC-4555: Can create overlapping shows with a repeating show if another show is on the last repeating day
...
-fixed
2012-10-12 15:34:42 -04:00
8f5830757f
CC-4553: Calendar: Can create overlapping show by repeat show's instances
...
-fixed
2012-10-12 14:26:54 -04:00
1613353be8
Fix inconsistent label which does not match tooltip
2012-10-12 17:15:57 +01:00
f77ec31a8d
CC-4552: Small formatting improvement
2012-10-11 17:44:08 +01:00
03e4bb15c7
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-11 12:12:06 -04:00
5c0bdfa2db
CC-4544: Playlist/Smart Blocks: Add cue format helper
...
-done
2012-10-11 12:11:53 -04:00
93fde28cfe
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-11 17:04:07 +01:00
843a456b3b
CC-4552: Fixed various errors in Support Feedback page
2012-10-11 17:03:09 +01:00
5f35336fd0
CC-2295 Improvements to playlist builder beha...CC-2303 Cue-in Cue-out inconsistency with time values:
...
-fixed
2012-10-11 11:49:04 -04:00
c95050c04c
CC-4546: Library->Context view for playlist: It only displays "..." instead of Static smart block's name
...
-fixed
2012-10-10 15:06:30 -04:00
2fbd8e868b
CC-4547: Calendar: Create record & rebroadcast show will be blocked by "overlapping error"
...
-fixed
2012-10-10 14:22:09 -04:00
d4fa24a9af
CC-4543: Fixed colour code labels in playlist preview pop-up
2012-10-10 11:17:09 +01:00
dc410f4289
CC-4528: Calendar: Can drag and drop current show into past (it's forbidden to set it by editing show)
...
-fixed
2012-10-09 14:20:00 -04:00
2f447d24a5
Fixed typo in password restore message
2012-10-09 14:21:58 +01:00
5a0df2b6d5
Adde TODO's
2012-10-03 12:01:24 -04:00
9dc8707c40
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-03 11:59:05 -04:00
1ae7784331
Added TODO
2012-10-03 11:59:02 -04:00
2deceaa5fb
comment formatting
2012-10-03 11:58:21 -04:00
317bb7de69
CC-4479: Buttons in dialog windows are not styled
...
-done
2012-10-03 11:40:40 -04:00
f94c4cd96a
CC-4515: Calendar: Errors for editing recording show
...
-fixed
2012-10-03 11:13:41 -04:00
1b0dd13eac
CC-4521: Playlist Builder: Cannot set fades
...
-fixed
2012-10-02 15:38:05 -04:00
aede8e8efa
CC-4520: Playlist Builder: Cannot set cue in
...
-fixed
2012-10-02 15:35:49 -04:00
968c719fa1
CC-4172: Smart Playlist creator requires full HD monitor to avoid buttons being hidden
...
-done
2012-10-02 14:12:22 -04:00
4ff267ee8a
removed z
2012-09-19 17:45:03 -04:00
7bb1eadf03
formatting
2012-09-19 17:39:30 -04:00
cde8c60afc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 17:38:00 -04:00
36d454184d
formatted
2012-09-19 17:37:49 -04:00
29347527cf
CC-4471: Library -> Remove extra top margin in playlist builder
...
-done
2012-09-19 17:14:22 -04:00
abd58c25a1
removed duplicated comment
2012-09-19 17:12:18 -04:00
253a31b1ea
-datatables small fix
2012-09-19 17:05:20 -04:00
cdcb1f0ef9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 17:04:45 -04:00
b66f00ff07
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 16:59:21 -04:00
2afc4183bb
CC-4496: Library -> Contents-feed does not work if advanced search data is invalid
...
-fixed
2012-09-19 16:39:56 -04:00
89ed6925df
removed benchmarking
2012-09-19 16:36:04 -04:00
e5085f0df3
Cleaned up code.
2012-09-19 16:34:46 -04:00
dc4e12a0ae
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 15:03:29 -04:00
d70951a334
CC-4494: Calendar: Cannot resize show
...
-fixed
2012-09-19 15:03:16 -04:00
f717efd7fb
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 13:23:14 -04:00
ca0fb969b7
fix jplayer errors for mp3 and firefox (flash)
2012-09-19 13:23:06 -04:00
51bcf04803
CC-4491: Calendar -> Add /Remove contents: Cannot expand/collapse Advanced Search Options
...
- fixed
2012-09-19 13:11:08 -04:00
b2e452acbb
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 12:51:13 -04:00
8652681eda
CC-4306: Watch folder: rescan watch directory and remove watch directory tooltips should be shifted depending on the path length
...
- fixed
2012-09-19 12:51:03 -04:00
f801fcb81e
empty space
2012-09-19 11:20:26 -04:00
014da73eed
heredoc sql
2012-09-19 11:17:32 -04:00
ecb5c93ddf
Removed methods again...
2012-09-19 11:14:59 -04:00
7dac1c6561
Added them back because not sure
2012-09-19 11:14:26 -04:00
99b28cca82
Removed unused methods
2012-09-19 11:11:50 -04:00
20b79374e2
Removed empty method
2012-09-19 10:25:29 -04:00
58620203cf
line wrap
2012-09-19 10:24:45 -04:00
fb4f7c1cb5
psr
2012-09-19 10:23:54 -04:00
33be48e9e3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 18:21:00 -04:00
a9eefe21fa
cc-4304: Add call to save after each file reassignment
2012-09-18 18:20:33 -04:00
92b40bea0c
CC-4484: Some js files do not have the airtime version appended
...
-fixed
2012-09-18 17:43:13 -04:00
b69f3288d3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 17:22:22 -04:00
6420e6a830
remove trailing whitespace
2012-09-18 17:22:14 -04:00
3ecbab3259
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 16:50:57 -04:00
8433ec5445
CC-4482: Smart Blocks -> tracks with empty "Album" name are NOT filtered in
...
- fixed
2012-09-18 16:50:42 -04:00
d55915d649
naming convention fix
2012-09-18 16:40:23 -04:00
608fff090c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 15:52:26 -04:00
7a958ec8b6
formatting
2012-09-18 15:52:16 -04:00
be214ac126
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 15:47:48 -04:00
eecc90547d
CC-4461: Now Playing: Timeline does not reflect the changes on Show start time (which is changed from Calendar->Edit Show)
...
- fixed
2012-09-18 15:47:37 -04:00
da11dc077e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 15:27:35 -04:00
4c58c4c9a9
CC-4473: On Air button greys out when one out of two same Webstreams is cancelled
...
-fixed
2012-09-18 15:27:27 -04:00
72e6ee35fa
cc-4304: Temporarily fixed
2012-09-18 15:26:43 -04:00
2cfb0c85d5
Formatted sql
2012-09-18 15:04:22 -04:00
3a60d729fd
added todo
2012-09-18 15:02:07 -04:00
b069b1254e
Aligned
2012-09-18 12:56:01 -04:00
90d3494576
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 12:48:55 -04:00
6ac241b1fc
Added todo
2012-09-18 12:48:45 -04:00
09bc686d99
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 12:41:30 -04:00
b0f2176329
fix some TODO's in webstream.php
2012-09-18 12:40:44 -04:00
a22ba39de1
formatting
2012-09-18 12:26:07 -04:00
d2f43058c2
fixed comment
2012-09-18 12:09:28 -04:00
f9319b869a
Corrected comments
2012-09-18 12:08:30 -04:00
bc873a3ece
Added extension handling for file path
2012-09-18 12:04:54 -04:00
8657a80459
removed return ''
2012-09-18 11:51:13 -04:00
6fc0d50c9f
lined up
2012-09-18 11:46:35 -04:00
018b50d316
added better logging
2012-09-18 11:45:10 -04:00
0a83b33a5a
Removed extra logging statements
2012-09-18 11:10:54 -04:00
6481556f9b
Showbuilder formatting
2012-09-18 11:07:32 -04:00
49e1b29bc9
Removed instances of getLine and getFile
2012-09-18 11:04:33 -04:00
2e0e0849c5
More clean up
2012-09-18 11:03:34 -04:00
d90559fdf8
Cleaned up ShowbuilderController
2012-09-18 11:02:41 -04:00
96f138a9fe
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 10:55:55 -04:00
9249bf8cd0
Big formatting changes.
2012-09-18 10:55:42 -04:00
f50fccaf5f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 16:28:36 -07:00
bb3ffce071
CC-3944 : Now Playing -> Time Line view: Cannot cancel record show, cancel button is disabled
2012-09-17 16:28:28 -07:00
542c5c857f
alignment
2012-09-17 17:54:10 -04:00
53c6d77821
Formatting
2012-09-17 17:52:56 -04:00
095a5cce4f
Added better debugging
2012-09-17 17:51:50 -04:00
69756f60ca
formatting
2012-09-17 17:49:25 -04:00
ff22b80dfc
formatting
2012-09-17 17:49:16 -04:00
3ba3df07f8
better logging
2012-09-17 17:39:41 -04:00
5a37777cfd
formatting
2012-09-17 17:04:49 -04:00
9c5ebdc4c0
Removed old commented code
2012-09-17 17:02:59 -04:00
1c736d6366
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 16:47:45 -04:00
d0e67d8475
cc-4462: Bandaided, marked as hack
2012-09-17 16:47:33 -04:00
117f11ef97
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 16:46:57 -04:00
75620be761
remove all mosty carriage return characters
2012-09-17 16:46:51 -04:00
81c72b8344
cc-4462: Bandaided
2012-09-17 16:46:49 -04:00
56eb2dff92
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 16:40:37 -04:00
c310cecf40
CC-4463: do we need getFileExtension()?
2012-09-17 16:40:27 -04:00
ae1ae80d36
in_array -> array_key_exists
2012-09-17 16:40:22 -04:00
c2b2ea1d16
Fixed formatting
2012-09-17 16:27:10 -04:00
8b445486b1
CC-4427: Listen button does not work
...
fixed
2012-09-17 16:17:53 -04:00
efc0ace49c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 16:06:30 -04:00
182bdd0cf6
-added border to smart block expansion
2012-09-17 15:57:41 -04:00
0e82083ba1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 15:55:53 -04:00
1a29499bb8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 15:48:09 -04:00
c9b7fa7073
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 15:41:40 -04:00
54b6b12ec0
CC-4094: Dashboard -> Source Info panel: DJ assigned to current show can turn off the Master Resouce but cannot disconnect it.
...
- fixed
2012-09-17 15:41:27 -04:00
43c336eb6d
CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
...
-implemented css changes
-formatted playlist_builder.css
2012-09-17 15:41:22 -04:00
4f576afc00
cc-4396. Initial fix problem was a module was not being included in the soundcloud upload script.
2012-09-17 15:24:02 -04:00
Naomi
Albert Santoni
denise
Daniel James
Jamie Connor
cliff.wang
drigato
Martin Konecny
James
james
martin
Martin Konecny
Rudi Grinberg
Rudi Grinberg
James
Martin Konecny