Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12400 commits 3 branches 0 tags 405 MiB
Commit graph

5162 commits

Author SHA1 Message Date
dpsommer
9a21b99fdf Merge pull request #70 from RobertElder/more-tokens 
More tokens
 2014-10-07 10:10:14 -04:00
dpsommer
159ab47857 Merge pull request #69 from RobertElder/tokens 
Add form tokens to several forms.
 2014-10-07 10:05:59 -04:00
dpsommer
e803676d1b Merge pull request #67 from RobertElder/2.5.x 
PHP ini settings for cookies.
 2014-10-07 10:04:13 -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
Robert Elder
185d84dc01 Increase the time token is valid for in case of long uploads. 2014-10-03 02:18:04 +00:00
Robert Elder
feff7f4343 tokens for multipart data upload. 2014-10-02 02:04:03 +00:00
Robert Elder
5c69eda010 Tokens for Stream Settings page. 2014-10-01 20:55:07 +00:00
Robert Elder
29b05343bd Tokens for add User. 2014-10-01 19:36:36 +00:00
Robert Elder
dbed915469 Tokens for preferences form. 2014-10-01 19:36:17 +00:00
Robert Elder
2be4a5f9d0 Add form tokens to several forms. 2014-09-30 23:09:27 +00:00
Robert Elder
78cc43d33d Regenerate session ids. 2014-09-29 22:48:52 +00:00
Robert Elder
f0397bbc59 PHP ini settings for cookies. 2014-09-29 18:22:10 +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
drigato
3c797c044a Undoing make API on by default for now. This needs to be done in the db 2014-09-19 15:41:55 -04:00
drigato
66b97158b7 Make API on by default - fix 2014-09-19 15:30:06 -04:00
drigato
28399b70cc Make API on by default 2014-09-19 14:57:43 -04:00
localizer
e5e350dfe4 updated translation resources 2014-09-17 23:49:10 +00:00
drigato
8379862016 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-09-16 16:52:59 -04:00
drigato
afa9a27bb9 Japanese Plupload i18n file 2014-09-16 16:51:53 -04:00
localizer
66e73cac57 updated translation resources 2014-09-16 00:12:10 +00:00
drigato
2729202dc4 Corrected japanese locale from ja to ja_JP 2014-09-12 16:29:47 -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
f7b6e3379e Enable Japanese locale 2014-09-08 20:49:08 -04:00
drigato
a21b4f177d Fixed a bug where we weren't checking if a variable was empty before using it 2014-09-08 13:14:23 -04:00
drigato
2670bfae7a Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-09-08 13:12:30 -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
Albert Santoni
4c1e6d3fe3 Fixed base URL 
Conflicts:
	airtime_mvc/application/controllers/LocaleController.php
 2014-09-04 17:09:09 -04:00
drigato
0ccc7e7dc9 SAAS-470: Zend Rest module doesn't work on Ubuntu 14.04 
The Bootstrap.php in the modules directory didn't like
short php tags.
 2014-08-28 16:52:47 -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
Albert Santoni
716cc5a754 Disable the APC cache for Ubuntu 14.04. APC is deprecated now so we need a better solution anyways. 2014-08-27 18:51:06 -04:00
localizer
6843b528b6 updated translation resources 2014-08-27 01:20:18 +00:00
Albert Santoni
d1971b6d2b Remove cc_locale table and add Selenium running script 
* Fixes CC-5906
 2014-08-26 13:32:35 -04:00
drigato
871ddb47d8 Removed database test that confirms the is_linkable is set to false after a show is un-linked. 
Since we removed this behaviour from Airtime, and a show can be linked and unlinked as many
times as the user wants, this test is deprecated.
 2014-08-25 18:33:41 -04:00
drigato
20a5649dbe Removed unused code. 
Changed linked show warning message in the edit show form.
 2014-08-25 18:33:29 -04:00
drigato
10cb5484fe Removed unused function. 
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
 2014-08-25 18:33:15 -04:00
Albert Santoni
32e06a7456 Clean up and simplifcation of linked show filling 2014-08-25 18:33:00 -04:00
drigato
e3596dfed3 Added comments and removed some unused code 2014-08-25 18:32:41 -04:00
drigato
29c07f2438 Removed old comments 2014-08-25 18:32:27 -04:00
drigato
d81de5c6eb Better way of getting the linked show schedule and moved that into its own function. 
Store the ids of the new, created show instances so we can pass them to the
fillNewLinkedInstances function
 2014-08-25 18:32:08 -04:00
drigato
57c1e76dc7 Added criteria parameter to CcShow->getFutureInstanceIds so we can retrieve results from database instead of cache 2014-08-25 18:31:58 -04:00
drigato
08e82cb32e CC-5904: New linked show instances may get an old copy of the schedule 
Change the way get the show stamp
 2014-08-25 18:31:45 -04:00
drigato
9a6e617f7c CC-5904: New linked show instances may get an old copy of the schedule 
Better way of getting show stamp
Renamed variables
 2014-08-25 18:31:33 -04:00
drigato
81357bc51f CC-5904: New linked show instances may get an old copy of the schedule 2014-08-25 18:31:20 -04:00
drigato
ee52c7692c CC-5902: Linked Shows -> Replace content check assumes content of shows have the same number of tracks 
Conflicts:
	airtime_mvc/application/services/SchedulerService.php
 2014-08-25 18:30:27 -04:00