Naomi
13c8e5f146
CC-2301 : showing waveform cue/fade editors inside of a jquery dialog box.
2013-04-16 14:37:08 -04:00
denise
1a2a05c3cf
CC-4961: Show linking
2013-04-12 16:34:36 -04:00
denise
9b4a0ba9c1
CC-4961: Show linking
...
Removed stamp tables
2013-04-12 10:52:13 -04:00
Martin Konecny
d46fef8eda
SAAS-301: Calendar content indicator did not update automatically after adding content to a show
...
-fixed
2013-04-11 15:11:20 -04:00
Martin Konecny
3714f83757
Merge branch '2.3.x'
2013-04-11 15:06:21 -04:00
Martin Konecny
5cd6dd907b
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-04-11 15:04:29 -04:00
Martin Konecny
3000f543d8
SAAS-301:
...
Calendar content indicator did not update automatically after adding content to a show
-fixed
2013-04-11 15:04:16 -04:00
Daniel James
a7cdaa9629
Updated translation files against current strings
2013-04-11 18:20:25 +01:00
Daniel James
1bb5f171a8
Updated Canadian localization, eh? :-)
2013-04-11 17:05:33 +01:00
Daniel James
de6ccd9c72
Updated US English localization
2013-04-11 17:02:53 +01:00
Martin Konecny
0da0e798c6
make password input width same as text input width. Also make everything a little wider.
2013-04-10 18:19:46 -04:00
denise
9b2fb3bece
CC-4961: Show linking
2013-04-09 15:55:18 -04:00
denise
e64f6fb3fd
CC-4961: Show linking
...
-modified db
2013-04-08 14:43:27 -04:00
denise
76bfce21b1
CC-4961: Show linking
...
-modified db
2013-04-08 14:42:37 -04:00
denise
cfee74693b
CC-4961: Show linking
...
moved move-show to calendar service
2013-04-05 17:44:30 -04:00
Martin Konecny
4595aab694
Merge branch '2.3.x'
2013-04-05 15:33:48 -04:00
Martin Konecny
d1f655d79d
CC-5038: Silan error: list index out of range
...
-fixed
2013-04-05 15:32:44 -04:00
denise
62d1b22fcc
CC-4961: Show linking
...
created new cc_show_stamp table
2013-04-05 12:27:54 -04:00
denise
f9d7167638
CC-4961: Show linking
2013-04-04 16:30:33 -04:00
Martin Konecny
fcbac2a044
Merge branch '2.3.x' into devel
2013-04-04 15:15:19 -04:00
Martin Konecny
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
Martin Konecny
d1e72cfeea
Merge branch '2.3.x' into devel
2013-04-03 17:12:28 -04:00
Martin Konecny
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
denise
b40306cb1b
Add comment to schema.xml to indicate what the broadcasted column is of cc_schedule
2013-04-03 16:21:30 -04:00
denise
81dbb17922
CC-4961: Show linking
...
-moved show deletion into show service
2013-04-03 11:46:46 -04:00
Martin Konecny
563f5b64d2
Merge branch '2.3.x' into devel
...
Conflicts:
debian/postinst
2013-04-02 12:31:48 -04:00
Daniel James
860524a873
Added locales for English localizations
2013-04-02 17:19:48 +01:00
Daniel James
ebbb9f1b9c
Added Austrian German localization, thanks Hoerich!
2013-04-02 17:06:16 +01:00
Martin Konecny
5ac51e289d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-04-01 19:15:02 -04:00
Martin Konecny
6ae8da98e4
removing logging
2013-04-01 19:14:55 -04:00
denise
ab10ae68a2
CC-5036: Add back edit show instance functionality
2013-04-01 14:42:35 -04:00
denise
1eba09fc4c
Show linking
2013-03-28 16:19:05 -04:00
denise
d0691b114c
Show linking
2013-03-28 14:25:40 -04:00
denise
731b86b36c
Added back editing a repeating show instance feature
2013-03-27 16:25:39 -04:00
denise
e259639d1a
Removed scheduleController private variable, currentUser
...
Removed showService private variable, currentUser
2013-03-27 09:02:49 -04:00
Martin Konecny
ee617c8a70
Merge branch '2.3.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/UserController.php
2013-03-26 16:34:11 -04:00
Martin Konecny
d9646994e9
remove airtime-demo specific code
2013-03-26 16:33:14 -04:00
Martin Konecny
5dc0a4477b
disable deletion of users
2013-03-26 16:10:42 -04:00
denise
418bf0b5ff
Created calendar service and moved the context menu creation there
2013-03-26 16:03:53 -04:00
Martin Konecny
894887bd62
Merge branch '2.3.x' into devel
2013-03-26 15:02:17 -04:00
denise
230d1a6aa9
Fixed bug where shows weren't populating when moving forward in the calendar
2013-03-26 10:33:06 -04:00
denise
ef8f87df5d
Show linking
2013-03-25 16:28:53 -04:00
denise
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
Martin Konecny
265ac49f2e
remove duplicate cc_config
2013-03-24 23:11:55 -04:00
Martin Konecny
b1160afeab
cleanup
2013-03-22 18:05:49 -04:00
Martin Konecny
d12f793578
remove potential password change exploit in airtime-demo
2013-03-22 18:05:34 -04:00
denise
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
denise
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
denise
6766d208aa
CC-4961: Show linking
...
Removed logic out of edit-show action
Created new SchedulerService
Fixed overlapping show bug
2013-03-21 16:31:05 -04:00
denise
a7601d290f
CC-4961: Show linking
...
Refactored services
Removed ShowDaysService and ShowInstanceService
Combined all show actions into one ShowService
2013-03-21 10:05:11 -04:00
denise
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
denise
4bdd89f747
CC-4961: Show linking
...
Fixed edit show start/end time bug
2013-03-18 12:34:27 -04:00
denise
896e03d76b
CC-4961: Show linking
...
Refactoring all services thus far
2013-03-15 16:56:22 -04:00
denise
5735baf237
CC-4961: Show linking
...
Made progress on ShowInstanceService
2013-03-13 11:08:16 -04:00
denise
f9f4e4f1fb
CC-4961: Show linking
...
Made some progress on show editing
2013-03-12 18:01:12 -04:00
denise
438200425a
CC-4961: Show linking
2013-03-12 11:33:32 -04:00
denise
c721b81a13
CC-4961: Show linking
...
Refactoring
2013-03-12 10:30:31 -04:00
denise
7347be35b1
Created a new service for show days
...
Created a new user service
Started refactoring edit show action
2013-03-11 16:18:40 -04:00
denise
1cc823ef0e
Inital edit show reconfiguration changes
2013-03-08 17:10:35 -05:00
denise
116d98a81b
Removed comment
2013-03-08 16:10:07 -05:00
denise
d8ced29dd0
Refactored adding show forms to the view
2013-03-08 16:08:43 -05:00
denise
8415dfdf6f
Add comments
2013-03-08 12:18:24 -05:00
denise
5111f74494
Created function to set the next populate until date for repeating shows
2013-03-08 12:17:55 -05:00
denise
9be6b82d97
Fixed rebroadcast date bug
2013-03-08 12:06:45 -05:00
denise
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
denise
4a86da5f87
Created function to create repeating show instances
...
Created function to create rebroadcast show instances
2013-03-08 11:19:03 -05:00
Martin Konecny
5ceeb88899
Merge branch '2.3.x' into devel
2013-03-06 13:46:01 -05:00
Martin Konecny
7ca178295f
CC-4993: airtime-check-system reports airtime-liquidsoap as down
...
-fixed
2013-03-06 13:43:22 -05:00
denise
af622eb4b8
CC-4961: Show linking
...
Refactored some more show instance creation functions
2013-03-06 09:58:35 -05:00
denise
c29e11fa0f
Created empty showInstance service.
...
Split populateShowUntil into 2 new functions: getPopulateDateUntil, and getShowDays
2013-03-06 09:58:35 -05:00
denise
d497cfa857
Created show service
2013-03-06 09:58:35 -05:00
denise
99c07272fd
- Moved all form validation to it's own function in schedule service
...
- Moved show creation to it's own function in schedule service
2013-03-06 09:58:35 -05:00
drigato
bdab294fce
Added comments to Schedule Service
2013-03-06 09:58:35 -05:00
denise
d08f6cf3e1
CC-4961: Show linking
...
-initial schedule service experimentation
2013-03-06 09:58:35 -05:00
Martin Konecny
0ef1a5ffda
CC-4976: Cannot select Ogg/Vorbis output stream after selecting SHOUTcast then selecting Icecast
...
-fixed
2013-03-05 18:19:08 -05:00
Martin Konecny
cc69418215
Merge branch '2.3.x' into devel
2013-03-05 16:21:22 -05:00
Martin Konecny
d7d1170ee1
CC-5003:
...
Some tracks are being cut off before fully playout out
-fixed
2013-03-04 18:52:51 -05:00
Martin Konecny
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
Martin Konecny
ae503121d8
CC-4984: Exception for replaygain
...
-fixed
2013-02-28 18:26:15 -05:00
Martin Konecny
943538ed9d
Revert "CC-4980: Create graphic with 4 switches for Airtime Dashboard"
...
This reverts commit baf693d1a9
.
2013-02-27 14:35:35 -05:00
Vladimir
baf693d1a9
CC-4980: Create graphic with 4 switches for Airtime Dashboard
2013-02-27 17:36:43 +01:00
denise
c7203aa40d
CC-4961: Show linking
...
Refactored some more show instance creation functions
2013-02-26 17:41:35 -05:00
denise
8c8a7d11e1
Created empty showInstance service.
...
Split populateShowUntil into 2 new functions: getPopulateDateUntil, and getShowDays
2013-02-26 13:21:39 -05:00
denise
2717c0845b
Created show service
2013-02-26 10:20:02 -05:00
Martin Konecny
e08732fba7
CC-4975: airtime-silan cmd error
...
-fixed
2013-02-25 19:45:26 -05:00
denise
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
drigato
3e49421221
Added comments to Schedule Service
2013-02-25 09:15:03 -05:00
denise
22f52ca195
CC-4961: Show linking
...
-initial schedule service experimentation
2013-02-21 17:57:56 -05:00
denise
176e78632f
Added a comment about referring to the wiki when adding a new datatable column
2013-02-19 16:43:47 -05:00
denise
c8d7d23d62
CC-4963: Add cue in and cue out to smart block criteria list
...
Done
2013-02-19 16:38:58 -05:00
denise
959839e180
Renamed criteriaTypes to libraryColumnTypes for library advanced search
2013-02-19 15:09:24 -05:00
denise
32fc5eb758
CC-4951: Add cue in and cue out to library filter columns
...
Configured advanced search for these columns
2013-02-19 14:44:32 -05:00
denise
8bdf3508b0
CC-4951: Add cue in and cue out to library filter columns
...
Done
2013-02-19 13:38:35 -05:00
denise
49dc3140a8
CC-4962: Library -> Library and playlist editor have different heights sometimes
...
Fixed: needed to set height when we open the playlist editor
2013-02-19 11:59:17 -05:00
denise
9113853e41
Removed logging messages from Library controller, index action
2013-02-19 11:51:26 -05:00
denise
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
denise
14f1d5572f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-02-19 10:59:03 -05:00
denise
d1301ff676
CC-4954: Please make Library page remember the status per user
...
-done
2013-02-19 10:58:48 -05:00
Naomi
542553bbc1
Merge branch '2.3.x' into devel
2013-02-15 17:05:36 -05:00
Naomi
9a2b8af7b1
Revert "CC-4955: Datatables saves its parameters twice on every page load"
...
This reverts commit 39ec07e71c
.
2013-02-15 16:50:43 -05:00
Naomi
f2773fcb01
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-15 16:32:43 -05:00
Naomi
fe611e7c6a
CC-4957 : Replay Gain undefined error, json response not being sent back properly.
2013-02-15 16:32:05 -05:00
Martin Konecny
09baf3a47d
remove unecessary file + better error handling
2013-02-15 14:19:04 -05:00
Martin Konecny
39ec07e71c
CC-4955: Datatables saves its parameters twice on every page load
...
-fixed
2013-02-15 14:18:32 -05:00
Martin Konecny
4f3ea3f406
Update ColReorder Datatables plugin
2013-02-14 17:48:32 -05:00
Martin Konecny
b30f67b24b
CC-4950: builder-feed is called twice on NowPlaying screen load
2013-02-14 15:49:38 -05:00
denise
e2e45b0160
CC-4948: Library -> library loses have its width when window is resized
...
-fixed
2013-02-14 15:34:11 -05:00
denise
1a36953d82
CC-4898: Pressing "Enter" from anywhere on the edit metadata popup should automatically Save and close the popup
...
-fixed
2013-02-14 14:52:48 -05:00
Martin Konecny
58740d6b41
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-14 13:33:27 -05:00
Martin Konecny
b3ab84db2e
add minified datatables.js and upgrade from 1.9.1 to 1.9.4
2013-02-14 13:33:18 -05:00
denise
9e0d14a8a7
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-14 13:31:39 -05:00
denise
1b5b7ae1f7
Stopped refetching calendar events when calendar is resized
2013-02-14 13:31:22 -05:00
Martin Konecny
9086c55281
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-14 12:58:40 -05:00
Martin Konecny
bb7e56e39e
CC-4943: Raspberry Pi optimization: don't create new background AJAX request until the previous one has returned
...
-fixed
2013-02-14 12:58:31 -05:00
Daniel James
06dbcfbcf8
Shorten Greek translation of 'Scheduled Play' (CC-4947)
2013-02-14 17:18:45 +00:00
denise
cd5f1149af
CC-4924: Calendar: "View Recorded File Metadata" for record show still uses old Metadata Editor
...
-fixed
2013-02-14 11:43:29 -05:00
denise
74291cc248
Merge branch 'cc-3627-close-playlist' into devel
2013-02-13 17:57:41 -05:00
denise
ec159131a8
Merge branch '2.3.x' into devel
2013-02-13 16:09:53 -05:00
denise
6bbb603bcd
CC-3627: PlaylistBuilder->Playlist Panel -> it would be very handy to have "Close playlist" functionality
2013-02-13 16:05:11 -05:00
denise
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
denise
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
denise
eb38503d6e
CC-4946: Now Playing -> Apache error when empty show starts
...
-we were trying to update the is_scheduled flag on a non-schedule item
2013-02-13 11:51:25 -05:00
denise
4ff1e8e78a
CC-4932: Library -> Update Scheduled column on 'Cancel current show' action
...
-fixed
2013-02-13 11:29:43 -05:00
denise
50613dd9a8
CC-4907: Library -> Adding items to show doesn't add the correct item sometimes
...
-fixed
2013-02-12 17:21:21 -05:00
denise
30c47df93d
Audio preview wasn't working in Firefox when airtime is not in document root
2013-02-11 15:56:21 -05:00
denise
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
denise
51ade73e85
CC-4941: Dynamic Smart Block ignores the silan check
...
-fixed
2013-02-11 13:45:51 -05:00
denise
3c73535f70
Convert clip length seconds to interval format before inserting into cc_playlistcontents / cc_blockcontents
2013-02-11 12:37:20 -05:00
denise
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
denise
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
denise
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
Daniel James
5f9f342e07
Added strings to Greek localization
2013-02-08 11:14:19 +00:00
Daniel James
192db754ea
Fixed typos in US localization
2013-02-08 11:11:20 +00:00
Daniel James
654cc6233f
Improved British localization
2013-02-08 11:05:48 +00:00
Daniel James
8232244faa
Improved Greek localization with extra strings, thanks Kat!
2013-02-08 10:31:20 +00:00
Daniel James
2c9d208db8
Added bug report address to Greek translation
2013-02-08 10:17:15 +00:00
Daniel James
8bdf50c0e8
Fixed translation of 'Settings'
2013-02-08 10:14:22 +00:00
denise
2315e3473d
CC-4935: Smart Block -> Error when saving sometimes
...
-fixed
2013-02-07 17:33:11 -05:00
denise
9a893aea49
Fixed some typos
2013-02-07 17:13:04 -05:00
denise
93017b8477
Added Greek datatables and plupload language files
...
Added Greek to locale db table
2013-02-07 16:43:24 -05:00
denise
a37e032494
Adding Greek po file
2013-02-07 16:23:20 -05:00
denise
8124d096d0
Removed log message
2013-02-07 15:56:35 -05:00
Martin Konecny
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
denise
525b2dcb33
CC-4895: Remove all json die() statements from code
...
- removed json_encode
2013-02-07 15:41:47 -05:00
denise
969e34aba1
CC-4930: Calendar -> Recorded shows have 'show partially filled' icon
...
-fixed
2013-02-07 12:22:32 -05:00
Daniel James
2935670455
Refined Brazilian Portuguese localization, thanks to Luciano De Fazio!
2013-02-07 10:21:45 +00:00
denise
7cf45afd16
Changed 'Polish' to 'Polski'
2013-02-06 17:03:01 -05:00
denise
532ea09eed
Added Polish datatables and plupload translation files
...
Added Polish to upgrade script and default data
2013-02-06 16:46:12 -05:00
Martin Konecny
d028e00cdb
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-06 16:30:11 -05:00
Martin Konecny
7bc4151741
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-02-06 16:29:41 -05:00
Martin Konecny
3c0d7955b5
Merge branch 'devel' of https://github.com/sematuszewski/Airtime into devel
2013-02-06 16:29:34 -05:00
Martin Konecny
38c75791f2
Merge branch 'devel' of https://github.com/sematuszewski/Airtime into 2.3.x
2013-02-06 16:29:20 -05:00
denise
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
denise
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
denise
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
denise
634a6991ce
CC-4865: Password reset -> Cancel -> url is missing base directory
...
-removed extra '/'
2013-02-06 13:44:10 -05:00
denise
0ed5d18e95
CC-4920: Now Playling js error
...
-fixed
2013-02-06 13:25:48 -05:00
denise
517a58bc43
CC-4919: Library -> Search: Exception happens when switching back to simple search with some illegal input in Advanced Search
...
-fixed
2013-02-06 12:36:04 -05:00
denise
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
denise
909f2c95c4
XSS exploit prevention - audio preview
2013-02-05 17:24:39 -05:00
denise
8db71eac52
CC-4914: Update is_scheduled after tracks play out
...
-done
2013-02-05 16:52:25 -05:00
denise
50bfcb7eb8
XSS exploit prevention
...
- Calendar -> show content
2013-02-05 15:37:00 -05:00
Sebastian Matuszewski
cff865ef55
Polish locale update (full - 100%)
...
Polish locale full version.
2013-02-05 20:02:55 +01:00
denise
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
denise
b5eededd05
New French po file
2013-02-05 11:14:53 -05:00
denise
63439c276d
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-05 10:56:54 -05:00
denise
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
Martin Konecny
60d6f5585b
CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<'
2013-02-04 16:27:09 -05:00
Martin Konecny
e2472f1f5d
CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<'
2013-02-04 16:21:56 -05:00
denise
b45f71e8f9
CC-4897: XSS exploit on library page
2013-02-04 12:44:14 -05:00
denise
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
denise
d63865625d
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-04 11:06:53 -05:00
denise
1f0b9fa5dc
CC-4897: XSS exploit on library page
2013-02-04 11:06:46 -05:00
Marcin Tym-Czarnocki
2ac66e81b0
Polish locale update (full - 100%)
...
Contribution of radioaktywne.pl (Lucy Pałys & Marcin Tym-Czarnocki)
2013-02-03 20:44:20 +01:00
Martin Konecny
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
denise
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
denise
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
Sebastian Matuszewski
0eb6b596ad
Polish locale update (not full - 75%)
2013-02-01 00:02:01 +01:00
denise
d4e89df94e
CC-4895: Remove all json die() statements from code
2013-01-31 14:06:45 -05:00
denise
3bc2876f27
CC-4903: Library -> Show/hide columns -> Status Column needs label
...
-fixed
2013-01-31 11:41:00 -05:00
denise
e1c69ebca2
CC-4902: Library -> Status column does not update when you add a file to a show
...
-fixed
2013-01-31 11:28:54 -05:00
denise
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
denise
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
Martin Konecny
216b580395
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-30 14:40:47 -05:00
Martin Konecny
52d96241da
CC-4754: Replay gain modifier
...
-fix regression
2013-01-30 14:40:29 -05:00
Martin Konecny
cc5acf3c9e
improved logging for boolean vars
2013-01-30 14:34:06 -05:00
denise
595429e6e5
CC-4897: XSS exploit on library page
...
-fixed
2013-01-30 11:51:27 -05:00
denise
043fbd1dfb
CC-4886: Warn if track is part of a playlist when deleting from library.
...
-done
2013-01-30 10:55:24 -05:00
denise
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
denise
9d99b8ae90
CC-4887: Show whether track is scheduled in the future on Library page
2013-01-30 10:33:26 -05:00
denise
d4742577c9
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-30 10:20:27 -05:00
drigato
c45440482a
CC-4887: Show whether track is scheduled in the future on Library page
2013-01-30 08:57:59 -05:00
Martin Konecny
b15c4569eb
CC-4894: Need to filter output for potential XSS exploits
...
-fixed few areas
2013-01-29 15:17:29 -05:00
denise
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
denise
f1215c10fd
CC-4882: Scheduled item does not take into account cue_out - cue_in time
...
-fixed
2013-01-28 14:21:11 -05:00
Martin Konecny
2ef8604c31
remove unnecessary code
2013-01-25 16:23:12 -05:00
denise
d0a4141ae4
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-25 12:44:37 -05:00
denise
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
Martin Konecny
a16e8d05aa
-don't push new schedule until end of request
2013-01-25 12:33:27 -05:00
denise
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