Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,517 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

208 Commits

Author SHA1 Message Date
Albert Santoni 230cdcccb4 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	CREDITS
 2015-01-22 11:29:38 -05:00
localizer 974d419951 updated translation resources 2015-01-19 13:52:08 +00:00
localizer 5980f599e7 updated translation resources 2015-01-19 13:02:11 +00:00
localizer c614f4d711 updated translation resources 2015-01-15 11:12:14 +00:00
drigato e5c806f658 Merge branch '2.5.x' into cc-5709-airtime-analyzer 2015-01-07 14:13:36 -05:00
localizer 59d7c23450 updated translation resources 2014-12-23 10:10:38 +00:00
localizer cceddd57d8 updated translation resources 2014-12-05 10:33:17 +00:00
localizer 37e358630d updated translation resources 2014-11-27 14:57:16 +00:00
drigato f08535cc10 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
 2014-11-26 10:35:48 -05:00
localizer b5575d9953 updated translation resources 2014-11-14 10:53:06 +00:00
localizer 9d29b84081 updated translation resources 2014-11-14 10:49:07 +00: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
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
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
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
localizer e5e350dfe4 updated translation resources 2014-09-17 23:49:10 +00:00
localizer 66e73cac57 updated translation resources 2014-09-16 00:12:10 +00: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
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 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
localizer 6843b528b6 updated translation resources 2014-08-27 01:20: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
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 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 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 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