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

217 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
Albert Santoni
c03dd38c00 Merge branch '2.5.x' into 2.5.x-installer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Show.php
 2015-01-16 17:27:52 -05:00
Albert Santoni
ee9163fa8e 2.5.2: Reorganize upgrade path so that 2.5.2 contains the show art schema changes 
* Also bump the system_version number to 2.5.2. This will be deprecated sooner or later...
 2015-01-15 12:42:36 -05:00
Duncan Sommerville
5e22f929c7 Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Duncan Sommerville
9e90e8af63 Added cc_show image_path and cc_show_instances description fields to schema 2015-01-13 17:07:23 -05:00
Duncan Sommerville
f4c5cf1353 Added virtualenv back into install process 2015-01-05 16:41:03 -05:00
drigato
ff0a685243 Updated propel models 2014-12-16 14:20:28 -05:00
drigato
09c30bde1b Regenerated Propel models because some fields and methods were missing. 2014-12-16 10:53:39 -05:00
drigato
cf9eabbc74 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/models/Schedule.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/build/sql/schema.sql
	python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
 2014-12-03 13:35:32 -05:00
drigato
6cb993cc80 SAAS-504: Store provider in db 2014-11-27 15:44:53 -05:00
drigato
0a45de7fba Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 
Conflicts:
	.gitignore
	airtime_mvc/application/configs/airtime-conf.php
	airtime_mvc/application/configs/classmap-airtime-conf.php
	airtime_mvc/application/models/RabbitMq.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
	airtime_mvc/application/models/airtime/map/CcShowTableMap.php
	airtime_mvc/application/models/airtime/om/BaseCcShow.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
	airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
	airtime_mvc/application/modules/rest/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/build/sql/schema.sql
	airtime_mvc/public/index.php
 2014-11-03 12:29:58 -05:00
Duncan Sommerville
0a0c6911f8 Added description field to cc_show_instances table 2014-09-19 12:56:47 -04:00
Duncan Sommerville
8494f813ee Updated sql schema to include image_path in Cc_Show table 2014-09-16 18:13:46 -04:00
drigato
6fa7ddba9a CC-5896: Store cloud files in separate table, inherited from cc_files 
Added delete on cascade for cloud files
 2014-07-28 16:03:57 -04:00
drigato
41ff0cce67 CC-5896: Store cloud files in separate table, inherited from cc_files 
Using Class Table Inheritance - delegate behaviour, created a cloud_file
table to store cloud files
 2014-07-23 15:22:42 -04:00
drigato
72841de714 CC-5895: Upgrade Propel to 1.7 
Used composer to download Propel 1.7
The Propel library will no longer be stored in the Airtime repo
 2014-07-23 15:03:51 -04:00
drigato
aeb3bb7aa0 SAAS-447: Cloud Storage 
Added resource_id column to cc_files table
 2014-07-04 16:34:00 -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
Naomi
578f758274 CC-5810 : Installation can have race conditions with the cache 
Preferences.php is used to set values since it will save the value to cache there as well.

defaultdata.sql is used where possible.
 2014-04-23 15:41:15 -04:00
drigato
70228a675e Changed default import_status value on cc_files table to 1 (pending) 2014-04-01 11:28:33 -04:00
Albert Santoni
8f7ecafcf6 CC-5709: Airtime Analyzer 
* A bunch of changes that somehow didn't make it into my last commit...
* confused
 2014-03-21 14:03:17 -04:00
Daniel James
eb35dcac5f Added Serbian Cyrillic, Serbian Latin and Croatian, thanks Zsolt! 2014-01-29 17:54:28 +00:00
Naomi
7d739a0f66 CC-5316 : Playout History: Doesn't support webstream 
adding the webstream metadata to the history table.
 2013-09-30 13:56:27 -04:00
Naomi
075342c637 don't delete a history item if a show instance is removed from the database. 2013-08-30 16:43:05 -04:00
Naomi
5aa983be36 adding an instance id to the playout history table. 2013-08-28 17:15:36 -04:00
Naomi
27b079ace9 adding a label to the form fields (Datatables column headers) 2013-08-07 17:55:18 -04:00
Naomi
7ca3048f36 can add a new list item using the template. 
set a default item template

working on sql to get a table with unified columns for file md and manually entered metadata without a file.
 2013-07-30 19:24:05 -04:00
Naomi
16581088d9 working on configuring an item template UI. 
modified db to have fields concept for templates.
 2013-07-29 16:31:01 -04:00
Naomi
69afc715d1 creating templates for validation. 2013-07-22 18:11:44 -04:00
Naomi
328c1f3cac IM-733 Create Development timetable for Airtime Development 
IM-777
Database structure for new History Feature
 2013-07-03 15:19:05 -04:00
denise
dc664ad9ff CC-5156: Hungarian language is shown in strange font on login page 2013-05-17 11:05:38 -04:00
denise
f4d313a67c Hungarian translation locale option 2013-05-16 12:50:12 -04:00
Naomi
92ef0608d6 Merge branch 'master' into CC-2301 2013-05-01 11:04:14 -04:00
Naomi
0db557a570 CC-2301 : fades editor saving offset to database for playlists and smart blocks. 2013-04-30 15:32:43 -04:00
Naomi
410d298272 CC-2301 : creating an offset column to help create crossfades in the playlist. 
changing default fade to be a separate default fade in/out
 2013-04-29 16:55:08 -04:00
denise
71526a94cc Merge branch 'cc-4961-show-linking' 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
 2013-04-29 15:35:16 -04:00
Martin Konecny
3a931f27bf CC-4417: Opus codec support 2013-04-26 17:54:29 -04:00
Martin Konecny
6cc366b100 CC-5069: 
Airtime 2.4 upgrade scripts

-initial commit
 2013-04-26 13:43:40 -04:00
denise
52655ab375 CC-4961: Show linking 2013-04-26 13:43:30 -04:00
denise
9b4a0ba9c1 CC-4961: Show linking 
Removed stamp tables
 2013-04-12 10:52:13 -04:00
denise
9b2fb3bece CC-4961: Show linking 2013-04-09 15:55:18 -04:00
denise
76bfce21b1 CC-4961: Show linking 
-modified db
 2013-04-08 14:42:37 -04:00
denise
f9d7167638 CC-4961: Show linking 2013-04-04 16:30:33 -04:00
Martin Konecny
563f5b64d2 Merge branch '2.3.x' into devel 
Conflicts:
	debian/postinst
 2013-04-02 12:31:48 -04:00
Daniel James
860524a873 Added locales for English localizations 2013-04-02 17:19:48 +01:00
Daniel James
ebbb9f1b9c Added Austrian German localization, thanks Hoerich! 2013-04-02 17:06:16 +01:00
denise
ec159131a8 Merge branch '2.3.x' into devel 2013-02-13 16:09:53 -05:00
denise
93017b8477 Added Greek datatables and plupload language files 
Added Greek to locale db table
 2013-02-07 16:43:24 -05:00
denise
7cf45afd16 Changed 'Polish' to 'Polski' 2013-02-06 17:03:01 -05:00
denise
532ea09eed Added Polish datatables and plupload translation files 
Added Polish to upgrade script and default data
 2013-02-06 16:46:12 -05:00