Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,696 Commits 18 Branches 27 Tags 434 MiB
Commit Graph

191 Commits

Author SHA1 Message Date
Albert Santoni 142060d600 Merge remote-tracking branch 'origin/2.5.x' into saas 2014-09-08 20:47:38 -04:00
localizer fd88fc09aa updated translation resources 2014-09-08 00:38:12 +00:00
localizer 1117984032 updated translation resources 2014-09-05 05:45:12 +00:00
drigato ace883c975 Merge branch 'cc-5709-airtime-analyzer' into saas-fix-modules-bootstrap-14-04 
Conflicts:
	airtime_mvc/application/configs/application.ini
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/application/models/Cache.php
 2014-08-28 17:01:03 -04:00
drigato 52f3ed816e Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
 2014-08-28 12:01:42 -04:00
drigato 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
drigato 46f93c2f8e Merge branch '2.5.x' into saas 2014-08-27 16:54:59 -04:00
localizer 6843b528b6 updated translation resources 2014-08-27 01:20:18 +00:00
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 fb4699433b updated translation resources 2014-08-25 02:35:12 +00:00
localizer 8851efaecf updated translation resources 2014-08-21 14:12:15 +00:00
localizer 3a77931fcd updated translation resources 2014-07-31 10:12:13 +00:00
localizer 606560b187 updated translation resources 2014-07-29 09:56:25 +00:00
localizer 08cc19749b updated translation resources 2014-07-28 13:38:07 +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
localizer a888eb6b00 updated translation resources 2014-07-28 11:02:06 +00:00
localizer f985ff868e updated translation resources 2014-07-28 10:53:06 +00:00
localizer cec7c86ce4 updated translation resources 2014-07-28 10:42:19 +00:00
Albert Santoni 1803e1fd8f Logging::warning bugfix and updated translations 2014-07-25 15:05:35 -04:00
Albert Santoni 490a9c0d06 Merge branch 'cc-5709-airtime-analyzer' into saas 2014-07-15 16:46:20 -04:00
Albert Santoni 1aa99e2896 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
 2014-07-15 16:41:29 -04:00
localizer 3b6b0f8b69 updated translation resources 2014-07-02 12:02:12 +00:00
Albert Santoni 72ef576f03 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-23 15:28:50 -04:00
Albert Santoni 24d842c4a6 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
 2014-06-23 15:26:53 -04:00
localizer f573257dc6 updated translation resources 2014-06-23 12:32:13 +00:00
Albert Santoni fa3c7bd67a Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-09 11:37:06 -04:00
Albert Santoni 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
localizer 3873e510f1 updated translation resources 2014-06-03 09:53:10 +00: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
localizer abe3b79fed updated translation resources 2014-04-11 13:13:12 +00:00
Albert Santoni 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
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 a33c85b38a updated translation resources 2014-04-02 12:25:06 +00:00
localizer 4d480f613a updated translation resources 2014-04-02 12:15:06 +00:00
localizer ce8ab2edcd updated translation resources 2014-04-02 12:14:06 +00:00
localizer 09ae38914b updated translation resources 2014-04-02 12:13:06 +00:00
localizer f893f74221 updated translation resources 2014-04-02 10:51:07 +00:00
localizer 505b3a9878 updated translation resources 2014-04-02 10:50:06 +00:00
localizer 168af47e9f updated translation resources 2014-04-02 10:48:06 +00:00
localizer 53eb4d3130 updated translation resources 2014-04-02 09:55:14 +00:00
Albert Santoni 6e6d20d3fc Merge branch '2.5.x-serbian-croatian' of https://github.com/danielhjames/Airtime into 2.5.x 
Conflicts:
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
 2014-04-01 10:30:00 -04:00
localizer 5dca00c593 updated translation resources 2014-03-13 16:49:36 +00:00
localizer e0386f9752 updated translation resources 2014-03-12 09:34:44 +00:00
localizer 9a803b1da5 updated translation resources 2014-03-12 09:30:20 +00:00