Commit Graph

13 Commits

Author SHA1 Message Date
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
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
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 09ae38914b updated translation resources 2014-04-02 12:13:06 +00:00
localizer 505b3a9878 updated translation resources 2014-04-02 10:50:06 +00:00
localizer 53eb4d3130 updated translation resources 2014-04-02 09:55:14 +00:00
localizer 93eb5ff1de updated translation resources 2014-02-04 14:07:13 +00:00
Daniel James eb35dcac5f Added Serbian Cyrillic, Serbian Latin and Croatian, thanks Zsolt! 2014-01-29 17:54:28 +00:00