ca9750f415
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/ACL.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/build/sql/schema.sql
2015-01-23 11:32:45 -05:00
230cdcccb4
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
CREDITS
2015-01-22 11:29:38 -05:00
c614f4d711
updated translation resources
2015-01-15 11:12:14 +00:00
ad16683858
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-07 14:17:02 -05:00
e5c806f658
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2015-01-07 14:13:36 -05:00
59d7c23450
updated translation resources
2014-12-23 10:10:38 +00:00
cf9eabbc74
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-12-03 13:35:32 -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
2494e66bb0
Merge branch '2.5.x' into saas
2014-11-14 11:56:01 -05:00
ee0d89913b
updated translation resources
2014-11-14 09:59:25 +00:00
0a0e7cb8f3
Regenerate the .po files...
2014-11-13 14:31:41 -05:00
21ea2a2933
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/models/Show.php
2014-11-13 14:22:25 -05:00
9e74b26fc4
updated translation resources
2014-11-13 19:07:10 +00:00
0681e80afd
Regenerated the .po files
2014-11-13 13:56:47 -05:00
a4ae1a7842
Translation update, and fixed bad merge in fr_FR
2014-11-11 18:19:49 -05:00
3618433792
Add separate pro.po file for Airtime Pro strings
2014-11-10 09:59:37 -05: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
b861375959
updated translation resources
2014-10-07 13:42:14 +00:00
63d1bf08f7
Merged 2.5.x into saas
2014-09-17 13:30:37 -04:00
0cb6e27306
Language updates
2014-09-17 13:26:51 -04:00
db49ab3c7f
updated translation resources
2014-09-11 09:34:10 +00:00
9e7bffb02a
updated translation resources
2014-09-09 13:14:14 +00:00
9fe0830dfd
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 11:59:41 -04:00
d438587ddc
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/airtime/CcShow.php
airtime_mvc/application/services/SchedulerService.php
airtime_mvc/application/services/ShowService.php
2014-08-25 18:09:51 -04:00
606560b187
updated translation resources
2014-07-29 09:56:25 +00:00
46e5625444
updated translation resources
2014-07-28 11:50:20 +00:00
c2deeb5a5f
updated translation resources
2014-07-28 11:17:15 +00:00
1803e1fd8f
Logging::warning bugfix and updated translations
2014-07-25 15:05:35 -04:00
571e903871
Overwrite locale files with those from 2.5.x
2014-04-24 13:13:23 -04:00
caa82f2091
Regenerate messed up translations
2014-04-24 12:53:31 -04:00
fe20cc7f63
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
airtime_mvc/locale/es_ES/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/sr_RS/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
2014-04-23 15:58:39 -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
3f15bf6e80
updated translation resources
2014-01-30 17:06:38 +00:00
d841f11de3
CC-5638: Shows become unlinked when moving the end time back
...
Disabled linked checkbox field in show form while the show is playing
Added a warning message if the user attempts to change this value
Update .po and .mo files with the warning message string
2013-12-13 13:06:14 -05:00
bd36b13d23
Updated French localization for 2.5.0, thanks Albert!
2013-10-10 14:30:01 +01:00
2165000f82
Update airtime version in po files
2013-10-08 12:06:50 -04:00
1b3adcd375
i18n - Update mo files
2013-10-08 11:56:25 -04:00
38634810a3
Update .po files
2013-10-08 11:48:24 -04:00
59f6578e2e
CC-5334 : Localize Ryerson History Feature
...
adding string "New log sheet template"
2013-09-24 09:58:53 +02:00
9ec6156c92
CC-5334 : Localize Ryerson History Feature
2013-09-23 14:57:44 +02:00
21ea3d2aac
Fixed typo in fr_FR .po file
2013-05-30 11:59:09 -04:00
4261c48a53
Fixed fr_FR .po file encoding
2013-05-30 11:56:54 -04:00
28ddde3523
Updated version number in all .po files
...
Updated fr_FR and de_AT .po files with completed translations
2013-05-30 11:28:09 -04:00
67e50354e9
CC-5189: Typo: Stream type's tooltip
2013-05-30 11:14:46 -04:00
f9645980a4
Updating .po files with new string added
2013-05-29 15:28:26 -04:00
18a1c7ad98
Localization updates for fixes in CC-5166 and CC-5168
2013-05-22 10:55:14 +01: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
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
drigato
Albert Santoni
localizer
Robert Elder
Duncan Sommerville
Naomi
root
Daniel James
denise