Albert Santoni
|
b2a2153572
|
Merge branch '2.5.x' into saas
|
2015-02-24 12:04:11 -05:00 |
localizer
|
19851efbe5
|
updated translation resources
|
2015-02-20 11:24:14 +00:00 |
|
Albert Santoni
|
3c064b13a9
|
Merge branch '2.5.x' into saas
Conflicts:
airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
|
2015-02-18 16:03:14 -05:00 |
|
localizer
|
cd994c0928
|
updated translation resources
|
2015-02-05 10:32:16 +00:00 |
drigato
|
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 |
|
localizer
|
c614f4d711
|
updated translation resources
|
2015-01-15 11:12:14 +00:00 |
|
drigato
|
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 |
|
localizer
|
cceddd57d8
|
updated translation resources
|
2014-12-05 10:33:17 +00:00 |
|
Albert Santoni
|
2494e66bb0
|
Merge branch '2.5.x' into saas
|
2014-11-14 11:56:01 -05:00 |
|
localizer
|
ee0d89913b
|
updated translation resources
|
2014-11-14 09:59:25 +00:00 |
|
Albert Santoni
|
0a0e7cb8f3
|
Regenerate the .po files...
|
2014-11-13 14:31:41 -05:00 |
|
Albert Santoni
|
21ea2a2933
|
Merge branch '2.5.x' into saas
Conflicts:
airtime_mvc/application/models/Show.php
|
2014-11-13 14:22:25 -05:00 |
|
localizer
|
9e74b26fc4
|
updated translation resources
|
2014-11-13 19:07:10 +00:00 |
|
Albert Santoni
|
0681e80afd
|
Regenerated the .po files
|
2014-11-13 13:56:47 -05:00 |
|
Albert Santoni
|
a4ae1a7842
|
Translation update, and fixed bad merge in fr_FR
|
2014-11-11 18:19:49 -05:00 |
|
Albert Santoni
|
fbdd3f1dc4
|
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
|
2014-11-10 09:59:51 -05:00 |
|
Albert Santoni
|
3618433792
|
Add separate pro.po file for Airtime Pro strings
|
2014-11-10 09:59:37 -05:00 |
|
localizer
|
a67397d0cf
|
updated translation resources
|
2014-11-04 16:44:18 +00: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 |