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

216 Commits

Author SHA1 Message Date
Rudi Grinberg c28f3af9cf removed unused code. reformatted some comments. 2012-09-07 11:18:10 -04:00
Rudi Grinberg d805995e72 cc-4347: ~~~~PDO~~~~~~ 2012-09-07 11:12:26 -04:00
Rudi Grinberg 33326ec052 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 17:23:58 -04:00
Rudi Grinberg 73ba643563 cc-4347: _-=~^PDO^~=-_ 2012-09-06 17:23:39 -04:00
Martin Konecny 83415cf298 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 16:18:37 -04:00
Martin Konecny fba5d56c76 CC-4364: Show - > On Air button is greyed out although you can hear the playout 
-fixed
 2012-09-06 16:18:28 -04:00
Rudi Grinberg f30507fce6 cc-4347: pdo 2012-09-06 16:17:14 -04:00
Rudi Grinberg 1852843f96 cc-4347: ~~~~PDO~~~~~~ 2012-09-06 15:55:29 -04:00
Rudi Grinberg 0fdf1e5e86 cc-4347: PDO 2012-09-06 15:47:07 -04:00
Rudi Grinberg 3f1d979c67 cc-4347: PDO PDO PDO!! 2012-09-06 14:41:40 -04:00
Rudi Grinberg 264e909d5a cc-4347: PDOOOOOOOOOOOOOOOO 2012-09-06 14:17:24 -04:00
Rudi Grinberg cd9e89560d cc-4347: small correction. 2012-09-06 14:16:10 -04:00
Rudi Grinberg 45729f16e7 cc-4347: PDOOOOOOOOOOOOOOOO 2012-09-06 14:14:05 -04:00
denise 91c74d8995 -fixed syntax error 2012-09-05 16:21:59 -04:00
Martin Konecny bc5cc9ff48 remove cartesian cross-product on some SQL queries 2012-09-05 16:06:10 -04:00
Martin Konecny 27bd22f10c CC-4348: Prepared statements - part 4 
-Syntax error
 2012-09-05 16:02:23 -04:00
Rudi Grinberg f660e1da9f removed useless code 2012-09-04 15:31:09 -04:00
Rudi Grinberg 1d758db42b Sexified some code. PDO'd the shit out of some sql query. 2012-09-04 15:26:12 -04:00
Rudi Grinberg 398215f1d0 Corrected documentation for method. 2012-09-04 15:25:18 -04:00
Rudi Grinberg 8c02b3ec8a removed redundancy 2012-09-04 15:14:56 -04:00
Rudi Grinberg fa5939a72f Added todo to later clean code. 2012-09-04 15:14:26 -04:00
Rudi Grinberg 867fa559a0 Sexified code 2012-09-04 15:10:04 -04:00
Rudi Grinberg c974d3df0c fixored 2012-09-04 15:08:51 -04:00
Rudi Grinberg 0819419b3b fixed typo 2012-09-04 15:03:49 -04:00
Rudi Grinberg 1fcd20fea3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-04 14:55:28 -04:00
Rudi Grinberg 89dcc18724 general cleanups 2012-09-04 14:55:23 -04:00
Martin Konecny 18dd0f232a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-04 14:54:44 -04:00
Martin Konecny 0bdfe3986c CC-4348: Prepared statements - part 4 
-fixed some incorrect usage of PDO.
 2012-09-04 14:54:34 -04:00
Rudi Grinberg ed7d233ca2 Changed execute( array(...) ) to multiple bindParam calls. 2012-09-04 14:45:16 -04:00
Rudi Grinberg c840de0a71 Fix to the fix 2012-09-04 14:05:26 -04:00
Rudi Grinberg 330828fbdd Refactored sql substition into pdo 2012-09-04 13:52:33 -04:00
Rudi Grinberg 27ea00f5d4 Refactored sql substition into pdo 2012-09-04 13:50:13 -04:00
Martin Konecny a731fc147b CC-4348: Prepared statements - part 4 
-fixed Show.php
 2012-09-04 13:34:05 -04:00
Martin Konecny 4848717d4d CC-4090: Make code style PSR compliant - part 4 
-models dir
 2012-08-29 10:58:03 -04:00
denise 5443c1931a CC-4081: Calendar -> Can create overlapping show by dragging a show in "day" view 
-fixed
 2012-08-24 15:27:04 -04:00
Martin Konecny 462542bf68 change Logging::log to Logging::info 2012-08-21 18:41:56 -04:00
Rudi Grinberg 64a36ea21a cc-4240: fixed 2012-08-21 16:33:37 -04:00
James 8b13af2e04 fix bug on widget 2012-08-10 12:14:15 -04:00
Martin Konecny f33485f8ea Merge branch '2.1.x' into devel 2012-08-08 00:09:13 -04:00
denise 550c97a2dc CC-4154L: Indicate whether a show has scheduled content on the calendar page 
-done
 2012-08-07 14:57:04 -04:00
Martin Konecny e20289e5cf Merge branch '2.1.x' into devel 2012-08-06 17:17:05 -04:00
Martin Konecny 975abbaf10 Remove unecessary information being sent from API 2012-08-06 17:16:43 -04:00
Martin Konecny 48a1bf3f02 Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
 2012-08-06 17:10:46 -04:00
Martin Konecny 40023d9086 CC-4152: Widget does not display current show in some modes 
-fixed
 2012-08-06 17:07:18 -04:00
Martin Konecny 255866d240 Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Show.php
 2012-07-22 19:18:53 -04:00
Martin Konecny aaa0c01e01 CC-4120: memory optimizations for calendar page. 
-can now fetch over a year of data at a time
 2012-07-22 19:14:29 -04:00
Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Playlist.php
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
 2012-07-16 14:31:03 -04:00
Martin Konecny 794cf2c845 CC-4090: Make code style PSR compliant 
-run psr-cs-fixer
 2012-07-15 21:17:13 -04:00
Martin Konecny bd51b4db02 CC-4100: Make number of shows displayed in widget customizable 
-fixed
 2012-07-11 19:31:24 -04:00
Martin Konecny ee3447f903 CC-4090: Make code style PSR compliant 
-User.php
-removed all trailing whitespace
 2012-07-10 18:51:32 -04:00
Martin Konecny 3d243468a7 CC-4090: Make code style PSR compliant 
Subjects.php
 2012-07-10 10:36:53 -04:00
James 63856ea918 CC-4079: Apache error: missing $startDt variable 
- fixed
 2012-07-06 15:40:16 -04:00
Martin Konecny f188eeada2 preparation for 2.1.1 release 2012-06-13 11:35:14 -04:00
Martin Konecny 02b6d04952 CC-3956: PHP script can enter inifinite loop 
-small cleanup
 2012-06-12 20:18:06 -04:00
Martin Konecny b858c34526 CC-3956: PHP script can enter inifinite loop 
-fixed
 2012-06-12 18:51:22 -04:00
James 62eee61d4e CC-3956: PHP script can enter inifinite loop 
- fixed
 2012-06-08 17:58:21 -04:00
James e661f400a4 CC-3950: apache log errors part2 
- fixed
 2012-06-08 15:31:45 -04:00
denise 3566480999 CC-3888: Record Show: ON AIR light and scheduled Play will ON for several seconds when a record show starts 
-fixed
 2012-06-05 11:19:59 -04:00
denise 80998f2eac Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-23 16:19:06 -04:00
denise 28a383e960 - fixed check for currentShow's end boundary to only be greater than current time 2012-05-23 16:18:59 -04:00
James a969599986 CC-3858: Record and Rebroadcast Creation Problem\ 
- fixed
 2012-05-23 14:55:55 -04:00
James 164c158c80 CC-3859: Playout History: Filter out songs that are not played out 
- done
 2012-05-22 17:39:27 -04:00
Naomi Aro 428b13f3d7 CC-3803 : Don't allow editing of a current Record show 2012-05-22 17:51:53 +02:00
denise 42f75634fc CC-3854: Crash on Adding Show 
-fixed
 2012-05-18 18:57:22 -04:00
denise 9967f5451c CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing 
- fixed
- added a 'type' key to distinguish between tracks and shows
 2012-05-17 18:21:58 -04:00
Martin Konecny 6695e3e190 -fix javascript error in widgets 2012-05-15 14:35:01 -04:00
Martin Konecny 4b03a45d46 CC-3757: Widgets: ON AIR show's elapsed and remaining time are wrong 
-fixed
 2012-05-15 14:20:53 -04:00
Naomi Aro a514e3b60a CC-3776 : Current Recorded show is resizeable on the calendar (by dragging) 2012-05-07 18:19:18 +02:00
Naomi Aro d19ed4a97e CC-3730 : Boundary tracks need recalculating when resizing current show on calendar (by dragging) 2012-05-04 17:49:58 +02:00
James 0d5f581e35 CC-3731: Can add a show of zero length 
- fixed
- extra fix: Changed all the duration format so it's consistent
 2012-04-27 14:07:14 -04:00
Martin Konecny 34a1949511 CC-3696: more rebroadcast show instances will be created after change the calendar 
-fixed
 2012-04-25 15:09:58 -04:00
Martin Konecny 63a5f45e9b CC-3690: Able to create repeat show in the past, by editing an already ON AIR show 
-fixed
 2012-04-24 18:22:39 -04:00
Martin Konecny 3bc919affb CC-3696: more rebroadcast show instances will be created after change the calendar 
-fixed
 2012-04-24 17:52:07 -04:00
Martin Konecny 16f3a331bb CC-1927: Remove PEAR DB 
-missed some conflicts :/
 2012-04-19 17:03:13 -04:00
Martin Konecny cba253439a CC-1927: Remove PEAR DB 
-various fixes
 2012-04-19 16:54:38 -04:00
paul.baranowski 7f78a7f663 CC-1927: Remove PEAR DB 
First pass through the model classes to remove use of $CC_DBC.
Web application is working.
There are still other parts of the app that use PEAR DB.
 2012-04-19 16:33:05 -04:00
paul.baranowski f69a172ee1 Commented out a bunch of Logging debug lines. There was a lot of output 
being logged in the Zend log file.
 2012-04-19 16:16:56 -04:00
James 45fa1efc2d CC-3603: Calendar->Once you update the rebroadcasted show it disappears 
- fixed
 2012-04-19 12:56:15 -04:00
James 897b61b357 CC-3479: Calendar->Drag and Drop show has some inconsistencies with hours 
- fixed
 2012-04-18 14:00:40 -04:00
James 000f7d549c CC-3652: Can't edit current show if it's a single instance 
when the timezone is in CEST(prague timezone)

- fixed a bug where variable name wasn't changed
 2012-04-18 12:25:10 -04:00
James a91785ff42 CC-3652: Can't edit current show if it's a single instance 
when the timezone is in CEST(prague timezone)

- The bug was that it was using local timestamp for the current time.
- removed some unnecessary code
- changed a variable name to more understandable name.
 2012-04-17 15:43:18 -04:00
James 9aa814212a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-16 14:58:03 -04:00
James df3acb5590 CC-3654: Cannot resize current (non-repeating) show on the calendar 
- fixed
 2012-04-16 14:57:53 -04:00
Naomi Aro 7e3112e3d7 CC-3610 : Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW 2012-04-16 18:31:15 +02:00
James ffc17ba705 CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format 
- DateHelper.php is moved from model to common folder
- created OsPath.php file which contains normpath()
- normpath() is used instead of realpath()
 2012-04-13 17:45:28 -04:00
James 6e1bf50009 CC-3638: Dashboard: On Air and Current playing show wasn't displaying correctly 
- fixed
 2012-04-12 18:49:24 -04:00
James 954fa2bceb CC-3444: Ability to edit currently playing show (end time and permissions) 
- handling in better way. we created separate action for this.
 2012-04-05 16:01:27 -04:00
Naomi Aro 4904a16ebb CC-3534 : Check Scheduling Edge Cases 
extracting out error checking in scheduling, added created column to cc_showinstances
 2012-03-28 14:23:25 +02:00
Martin Konecny 22cc362f1c CC-3448: Cancel show shouldn't send "cancel show" msg to pypo anymore 
-done
 2012-03-17 23:51:58 -04:00
Daniel 8a34023336 CC-3465: Now playing should show tracks over shows for previous and next 
- added logic to include previous and next show in schedule query so the now playing bar will show the tracks from the show instead of the show itself.
 2012-03-16 14:02:53 -04:00
James 540f262a77 CC-3224: "On-the-fly" stream rebroadcasting 
- removed "Allow override" checkbox from show live stream section.
- removed "auto enable live stream" checkbox from stream setting page.
- implemented authentication functionality of live dj source connection.
 2012-03-14 14:43:10 -04:00
James 128a497059 CC-3224: "On-the-fly" stream rebroadcasting 
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
 2012-03-14 14:41:00 -04:00
James 48bb19d758 CC-3224: "On-the-fly" stream rebroadcasting 
- web interface
- auth script for liquidsoap
- DB changes
 2012-03-14 14:41:00 -04:00
Daniel a65ea6d058 CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table 
- updated the code to remove the empty declaration of $results
- updated parameters so the name has p_ prepended to it
- fixed a weird bug where $con was not sent to updateScheduleStatus
- modified previous element logic so I only store the index and after the loop test if it was set and then do the formating.
 2012-03-13 17:46:13 -04:00
Daniel 1e4d34447a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/Schedule.php
 2012-03-13 10:23:44 -04:00
Daniel cbaeda1d6b CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table 
- Updated the logic in GetPlayOrderRange now I get the previous, current and next shows and tracks to be played.
- This information is then sent back to the caller.
	- if the previous track is null the previous show is sent back as an example of the algorithm.
 2012-03-13 10:21:01 -04:00
Martin Konecny 6f270bfb3d Merge branch '2.0.x' into devel 
Conflicts:
	VERSION
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
	install_minimal/include/airtime-constants.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypocli.py
	python_apps/pypo/pypofetch.py
 2012-03-12 17:52:17 -04:00
Naomi Aro 41a46b3144 CC-3174 : showbuilder 2012-03-12 15:02:34 +01:00
Naomi Aro 53b8eb2724 CC-733 : export broadcast logs 
exporting stats based on czech law
 2012-03-08 18:30:56 +01:00
Naomi Aro e9627bca07 CC-3174 : showbuilder 
only updating the timeline view if it is needed.
 2012-03-07 12:20:30 +01:00