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 |
|
Duncan Sommerville
|
4d263ce897
|
Merged 2.5.x into saas
|
2014-11-05 17:36:58 -05:00 |
|
localizer
|
6c27606aa7
|
updated translation resources
|
2014-11-05 10:56:11 +00:00 |
|
localizer
|
a67397d0cf
|
updated translation resources
|
2014-11-04 16:44:18 +00:00 |
|
Duncan Sommerville
|
275ca5eed6
|
Resolved differences merging 2.5.x into saas
|
2014-10-27 16:25:42 -04:00 |
|
Robert Elder
|
9fb35c448e
|
Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.
|
2014-10-10 19:57:22 +00:00 |
|
Albert Santoni
|
f439072422
|
Merge branch '2.5.x' into cc-5709-airtime-analyzer
|
2014-10-10 11:21:49 -04:00 |
|
localizer
|
736acda14e
|
updated translation resources
|
2014-10-09 04:27:12 +00:00 |
|
drigato
|
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 |
|
localizer
|
b861375959
|
updated translation resources
|
2014-10-07 13:42:14 +00:00 |
|
localizer
|
cf1d65363c
|
updated translation resources
|
2014-10-03 05:39:12 +00:00 |
|
localizer
|
ff16cefa62
|
updated translation resources
|
2014-09-29 06:43:17 +00:00 |
|
localizer
|
657a47a576
|
updated translation resources
|
2014-09-22 02:46:15 +00:00 |
|
Duncan Sommerville
|
365184c2b1
|
Merging upstream pull
|
2014-09-19 13:15:53 -04:00 |
|
drigato
|
8b20ee459c
|
Merge branch '2.5.x' into saas
|
2014-09-19 11:12:49 -04:00 |
|
localizer
|
e5e350dfe4
|
updated translation resources
|
2014-09-17 23:49:10 +00:00 |
|
Duncan Sommerville
|
63d1bf08f7
|
Merged 2.5.x into saas
|
2014-09-17 13:30:37 -04:00 |
|
Duncan Sommerville
|
0cb6e27306
|
Language updates
|
2014-09-17 13:26:51 -04:00 |
|
drigato
|
646c3b34f5
|
Merge branch '2.5.x' into saas
|
2014-09-16 16:54:28 -04:00 |
|
localizer
|
66e73cac57
|
updated translation resources
|
2014-09-16 00:12:10 +00:00 |
|
drigato
|
ac60a927d4
|
Merge branch '2.5.x' into saas
|
2014-09-12 16:31:58 -04:00 |
|
localizer
|
e1bb017c9a
|
updated translation resources
|
2014-09-12 00:51:07 +00:00 |
|
localizer
|
db49ab3c7f
|
updated translation resources
|
2014-09-11 09:34:10 +00:00 |
|
localizer
|
9e7bffb02a
|
updated translation resources
|
2014-09-09 13:14:14 +00:00 |
|
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 |
|