49474ab5c4
Merge branch '2.5.x' into 2.5.x-saas
...
Conflicts:
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/views/scripts/form/preferences.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
2013-12-17 17:20:38 -05:00
f16d8ca2ea
Fixed a bunch of annoying/major graphical issues with the calendar
...
* Fixed a bug where the calendar would keep shrinking smaller and
smaller as you resized the window.
* Fixed the size and alignment of the time span combobox in the corner,
which fixes a bug where the text was cut off.
* Fixed a bug where the schedule header would grow as you flipped
to the next or previous week.
* Dropped javascript from the resizing of the calendar (for the most
part).
2013-12-14 00:05:13 -05:00
55254e88a5
UI text improvements for setting the station/user timezones
...
Added info icon in the add-show form for timezone setting
2013-10-07 14:49:52 -04:00
7b1cd5c908
CC-5354: Remove PHP short open tags for better compatibility
2013-10-04 14:15:23 -04:00
a8a02704f3
Merge branch '2.5.x' into cc-5232-show-timezone
2013-09-25 17:24:44 -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
99669c78a0
Fixed CC-5045 and Now Playing time remaining style improvements
2013-09-25 16:40:20 -04:00
107263ae20
CC-5323: User's Timezone Can Improperly Edit Show
2013-09-25 16:22:30 -04:00
53341d40f7
CC-5334 : Localize Ryerson History Feature
2013-09-24 09:56:04 +02:00
ee45f10aeb
CC-5334 : Localize Ryerson History Feature
2013-09-23 14:42:35 +02: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
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
4fd37a4fa0
Merge branch '2.4.x' into ryerson-history
2013-08-30 16:07:41 -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
d50cdd16c2
starting association of a show instance.
2013-08-29 17:40:08 -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
e6b09308a5
IM-932 : File Metadata Distinction/Template Design
2013-08-28 15:40:10 -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
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
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
033693721e
CC-5302: Undefined variable in zend log
2013-08-13 16:36:04 -04:00
d83c004fb9
subclassing the template types, files summary table is now fully configurable form wise.
2013-08-12 15:06:26 -04:00
27b079ace9
adding a label to the form fields (Datatables column headers)
2013-08-07 17:55:18 -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
35f552361e
more informative names
2013-08-01 17:50:10 -04:00
a5a99da21e
Editing templates, strictly typing metadata for datatables (for unions)
2013-08-01 16:36:18 -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
8eecbb18c0
propel rename done for template fields, template name input.
2013-07-29 17:21:46 -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
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
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
69afc715d1
creating templates for validation.
2013-07-22 18:11:44 -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
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
bec56e5f4b
CC-5247 : Single file audition pop-up has non-functional forward and reverse buttons
2013-06-24 10:19:10 -04:00
905dd08ed5
Use proper unit conventions for Kilo
2013-05-31 15:59:20 -04:00
254d3b8950
Merge branch '2.4.x' into 2.4.x-saas
2013-05-22 16:09:02 -04: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
7d5177d77d
CC-5096 : Add "i" (info) icon to stream output type
2013-05-14 18:14:38 -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
2ba743a436
CC-5132 : Playlist Editor: Add file before Smart Block will cause exception
2013-05-13 12:23:05 -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
75e4e0c9b6
CC-2301 : only showing waveform buttons if the browser supports the audio api.
2013-05-03 14:42:42 -04:00
517bb7557a
CC-2301 : testing default crossfade settings
2013-05-02 16:15:21 -04:00
2b5a8b0d4b
CC-2301 : fixing changed function name after merging with master.
2013-05-01 11:41:07 -04:00
2a1ac0ddb9
CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps.
2013-04-30 16:27:31 -04:00
0db557a570
CC-2301 : fades editor saving offset to database for playlists and smart blocks.
2013-04-30 15:32:43 -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
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
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
04a0d9c54e
CC-2301 : waveform editor
...
current cues being set.
2013-04-17 18:00:16 -04:00
13c8e5f146
CC-2301 : showing waveform cue/fade editors inside of a jquery dialog box.
2013-04-16 14:37:08 -04:00
8bec9dea55
Merge branch '2.3.x' into 2.3.x-saas
2013-02-20 14:41:55 -05:00
d1301ff676
CC-4954: Please make Library page remember the status per user
...
-done
2013-02-19 10:58:48 -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
50bfcb7eb8
XSS exploit prevention
...
- Calendar -> show content
2013-02-05 15:37:00 -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
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
b45f71e8f9
CC-4897: XSS exploit on library page
2013-02-04 12:44:14 -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
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
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
b15c4569eb
CC-4894: Need to filter output for potential XSS exploits
...
-fixed few areas
2013-01-29 15:17:29 -05:00
210336d20a
Merge branch 'devel' into 2.3.x-saas
2013-01-18 17:14:11 -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
f8208a355c
Merge branch 'devel' into 2.3.x-saas
2013-01-18 12:22:45 -05:00
6acc5696f9
Save button on edit user settings was not translating
2013-01-17 14:34:18 -05:00
8b12f692cd
CC-4854: Remove SaaS checking from codebase
...
-fixed
2013-01-16 14:31:43 -05:00
dbaf7d9b4b
Merge branch 'devel' into 2.3.x-saas
2013-01-16 13:41:27 -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
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
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
9603e7c2fd
CC-4830: I18N: System -> Streams: "dB" for Replay Gain Modifier is not translated
...
-fixed
2013-01-14 14:30:59 -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
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
1572955d07
CC-4810: Add language setting to login page
...
-done
2013-01-09 18:03:23 -05:00
Naomi Aro
Albert Santoni
denise
drigato
Martin Konecny
Daniel James
James