Albert Santoni
|
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 |
localizer
|
606560b187
|
updated translation resources
|
2014-07-29 09:56:25 +00:00 |
|
localizer
|
46e5625444
|
updated translation resources
|
2014-07-28 11:50:20 +00:00 |
|
localizer
|
c2deeb5a5f
|
updated translation resources
|
2014-07-28 11:17:15 +00:00 |
|
Albert Santoni
|
1803e1fd8f
|
Logging::warning bugfix and updated translations
|
2014-07-25 15:05:35 -04:00 |
drigato
|
be69d956aa
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
Conflicts:
airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
|
2014-05-06 14:52:50 -04:00 |
|
drigato
|
bc080a26f7
|
Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
|
2014-05-06 14:50:13 -04:00 |
|
localizer
|
2be889f2af
|
updated translation resources
|
2014-04-25 15:58:16 +00:00 |
|
Albert Santoni
|
571e903871
|
Overwrite locale files with those from 2.5.x
|
2014-04-24 13:13:23 -04:00 |
|
Albert Santoni
|
caa82f2091
|
Regenerate messed up translations
|
2014-04-24 12:53:31 -04:00 |
Naomi
|
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 |
|
Albert Santoni
|
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 |
|
localizer
|
ce819b18e7
|
updated translation resources
|
2014-02-04 11:32:05 +00:00 |