0c3395289d
Merge pull request #78 from Robbt/realtime-smart-blocks
...
Added sort tracks by upload time to smart blocks criteria
2015-01-19 15:36:28 -05:00
c5a60d2f09
Last updates before 2.5.2 RC, mainly small fixes for Ubuntu Precise
2015-01-19 15:05:13 -05:00
c03dd38c00
Merge branch '2.5.x' into 2.5.x-installer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Show.php
2015-01-16 17:27:52 -05:00
44018b2cbf
Changed status page to use config-check (tentative) and removed time-intensive check in index routing
2015-01-16 16:15:16 -05:00
7c28b66ce9
Merge branch '2.5.x-albertenhancements' into saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/Preferences.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-15 16:32:29 -05:00
f9bf71a349
Moved the Station Logo field to GeneralPreferences, and stopped using
...
AJAX on the general prefs form
2015-01-15 16:28:18 -05:00
5e22f929c7
Reverted commit mistakenly changing file modifiers to 755
2015-01-14 20:45:03 -05:00
d5b969f94f
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-13 21:31:57 -05:00
c4d3a8fa62
Massive simplification of the GeneralPreferences dialog
...
* The purpose of this was so that we can use Zend_Form_Element
decorators, which I need.
2015-01-13 20:51:46 -05:00
f4c5cf1353
Added virtualenv back into install process
2015-01-05 16:41:03 -05:00
f08535cc10
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2014-11-26 10:35:48 -05:00
fcbb1c2ee7
String updates
2014-11-14 10:01:06 -05:00
af8c6c2f48
Merged 2.5.x into saas
2014-11-10 09:08:03 -05:00
795e239ff3
Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls.
2014-11-06 18:39:48 -05:00
5275669211
Updated i18n to use multiple domains
2014-11-04 17:03:52 -05:00
1a90184a69
Merging 2.5.x into saas
2014-10-27 16:27:45 -04:00
275ca5eed6
Resolved differences merging 2.5.x into saas
2014-10-27 16:25:42 -04:00
fe291cdc8c
Added sort tracks by upload time to smart blocks criteria
2014-10-19 23:02:40 -04:00
9fb35c448e
Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.
2014-10-10 19:57:22 +00:00
c4692cc0d7
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/controllers/PluploadController.php
airtime_mvc/application/views/scripts/plupload/index.phtml
2014-10-08 11:46:08 -04:00
9a21b99fdf
Merge pull request #70 from RobertElder/more-tokens
...
More tokens
2014-10-07 10:10:14 -04:00
feff7f4343
tokens for multipart data upload.
2014-10-02 02:04:03 +00:00
5c69eda010
Tokens for Stream Settings page.
2014-10-01 20:55:07 +00:00
dbed915469
Tokens for preferences form.
2014-10-01 19:36:17 +00:00
2be4a5f9d0
Add form tokens to several forms.
2014-09-30 23:09:27 +00:00
3be8e10691
Removed unneccessary upload-image view
2014-09-16 18:16:28 -04:00
5434311f7d
More work on show image uploads
2014-09-16 18:03:14 -04:00
2cc7557cb7
Remove php short tag for better compatibility
2014-08-29 17:10:55 -04:00
1c676dee6d
Fix user settings again for Super Admins, also Zend routing tweak
...
* Better fix for language and interface settings not being able to change for Super Admins
* Fixes Zend routing on Trusty, for whatever reason
2014-08-01 12:50:02 -04:00
d320651735
SAAS-461: Re-enable timezone and language settings for Super Admins
2014-07-28 12:37:40 -04:00
e759b8969b
Fix undefined variable
2014-07-25 15:18:17 -04:00
b8a9d72da6
Give Submit Order button an ID for GTM
2014-07-11 16:37:48 -04:00
52b8f3af87
Show plan updated confirmation on invoices page
2014-07-09 14:06:51 -04:00
0b41cd1d38
Validate VAT every time the Account Plans page loads
2014-07-07 15:20:41 -04:00
3c88f66162
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 17:13:06 -04:00
64d3cb7b1b
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 17:12:50 -04:00
63113b4e75
Fix for Chrome radio button disabling
2014-07-03 17:12:33 -04:00
e18a281991
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 16:53:11 -04:00
e8bc6a3080
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 16:53:01 -04:00
dea68878f4
Fix for radio button disabling bug in Billing view
2014-07-03 16:51:59 -04:00
cda812dd73
Trialbox: Don't open My Account in new window
2014-07-02 14:49:11 -04:00
523bb8e7b6
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-02 12:45:44 -04:00
b0cab62e80
More syntax fixes for PHP 5.3
2014-07-02 12:45:17 -04:00
e9cca4c441
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-27 15:50:51 -04:00
3357c1f032
Select current plan and show that correctly
2014-06-27 15:50:05 -04:00
f1610485c3
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
...
Conflicts:
airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
2014-06-26 17:45:48 -04:00
d785d92953
VAT fixes
2014-06-26 17:44:53 -04:00
18c828defd
Finished up VAT validation for Plans page
2014-06-26 17:31:34 -04:00
94bbd3c8a5
Don't open trialbox My Account link in new window
2014-06-25 20:36:08 -04:00
51b7fe9adf
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-25 20:33:10 -04:00
b36967a690
Nicer auto-styling for the Billing Details form
2014-06-25 20:32:41 -04:00
fce6116d60
Made the invoices view nice!
2014-06-25 20:01:14 -04:00
338fd06f81
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
...
Conflicts:
airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
2014-06-25 19:03:13 -04:00
d92e5197e1
Design and overhaul of Account Plans screen
...
* Basically working now except for VAT calculation
* Includes pricing grid, basic total calculation
* Revamped layout
* Implemented getting the service ID in BillingController.php
2014-06-25 18:58:54 -04:00
8c20592423
Start of form customization for billing
2014-06-24 15:52:43 -04:00
f40cdbc8cd
Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-23 10:59:07 -04:00
497841225b
Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
2014-06-20 16:54:41 -04:00
1e1dc1dd03
Validation
...
Refactoring
2014-06-20 16:31:26 -04:00
01bf2883e5
Save client info on upgrade
2014-06-20 15:00:28 -04:00
faa12c8065
Super Admin edit page points to billing now
...
* Also prevent super admin from being deleted
2014-06-20 13:36:06 -04:00
40f2796972
Created an invoice view
...
Some refactoring
Some validation
2014-06-19 16:55:01 -04:00
1f4c8b755d
Created a separate view for upgrades and client info
2014-06-17 12:47:08 -04:00
81ceafbfbd
whmcs client form
2014-06-12 17:54:20 -04:00
267cc78699
'My Account' link on free trial box was broken
2014-06-12 09:37:16 -04:00
fa3c7bd67a
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-09 11:37:06 -04:00
560d1a9b14
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
2014-06-09 11:36:51 -04:00
345c782eb9
Fixed the unit tests and changed ops->zu
2014-06-09 11:34:25 -04:00
446eca057c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
airtime_mvc/locale/template/airtime.po
airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
2014-04-25 00:43:22 -04:00
f536a7b1b4
CC-5814: 'Down for maintenance' page during upgrades
2014-04-24 16:19:55 -04:00
edcf8844e3
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-14 11:25:02 -04:00
4add0f0b7b
CC-5786: Quota Enforcement in the File Upload API
2014-04-14 11:24:39 -04:00
8fb95316f2
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
2014-04-09 15:01:11 -04:00
1e62908e66
CC-5709: Airtime Analyzer
...
* Bounce files with file extensions we don't support in MediaController
* Added translation stuff for Recent Uploads
2014-04-09 11:28:41 -04:00
1c5e2d6205
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/public/index.php
* Reverted some SaaS-only thing Martin did a year ago. Looks benign but
only one way to find out...
2014-03-27 16:38:03 -04:00
878dd11ccc
CC-5709: Airtime Analyzer
...
* Overhauled Add Media screen, now shows state of recent uploads
* Dropped old unused "state" column, added new file_import column to cc_files
* New PluploadController methods
* Save the filename as the track title for unprocessed uploads
* Hide pending files from the library until they've been processed.
* Don't overwrite files with duplicate names, we rename them instead.
2014-03-21 13:22:00 -04:00
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
db62b538dd
CC-4816: Timezones should be a user preference
...
-done
2013-01-09 13:38:38 -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
3de33bc3e3
CC-4811: Move the edit user form to its own page
...
-done
2013-01-08 15:09:35 -05:00
6e241fd3ec
CC-4512: Allow changing stream "Offline" message via Web UI
...
- fixed
2013-01-07 18:14:57 -05:00
771b9b9412
Fixed whitespace in Preferences page between 'Timezone' and colon
2013-01-07 11:41:29 +00:00
c5f1d4a568
Removed bogus extra comma
2013-01-04 17:30:51 +00: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
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
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
1dfe99224c
CC-4754: Replay gain modifier
...
- adding text
2012-12-28 16:18:47 -05:00
cf38e2c596
CC-4754: Replay gain modifier
...
- done
2012-12-27 22:58:41 -05:00
c0665e4748
CC-4754: Replay gain modifier
...
- Initial commit
2012-12-27 00:36:11 -05:00
bd18039785
CC-4744: Edit user form needs styling
...
-done
2012-12-17 14:12:27 -05:00
f12547dfb4
CC-4736: Let non-admin users update their user info
...
new form
2012-12-10 16:56:25 -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
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
1846f17bbc
CC-4731: Cannot save support feedback settings
2012-12-04 16:21:45 -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
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
8acc8fce76
CC-1960: Internationalize Airtime / Support translations
...
- fixed close button on show add form
2012-11-27 15:55:32 -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
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
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
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
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
43a797058c
-extra quote typo
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
e0b19cc2d1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-11-20 11:17:03 -05:00
3f3b939ebe
-extra quote typo
2012-11-15 17:28:18 -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
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
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
1b0b124247
SAAS-290: Hosted SaaS widgets + javascript code generation
...
-working code
2012-11-07 12:49:17 -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
3f7d8a0c7f
Merge branch '2.2.x' into 2.2.x-saas
2012-11-06 16:11:51 -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
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
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
74fe958cad
CC-4661: Listener Statistics
...
- changes for different mount names
2012-11-02 18:25:08 -04:00
3af3cd5870
CC-4661: Listener Statistics
...
- frontend part
2012-11-02 17:00:38 -04:00
Albert Santoni
Duncan Sommerville
Albert Santoni
drigato
Robbt
Robert Elder
Naomi Aro
denise
Martin Konecny
Daniel James
James
james
Rudi Grinberg