Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,961 Commits 18 Branches 28 Tags 437 MiB
Commit Graph

277 Commits

Author SHA1 Message Date
martin 2346be671e -initial changes for CC-1944 2011-03-03 20:13:55 -05:00
Paul Baranowski 7b58f3563f Cleaned up conf.php to make it more obvious what a user should change and what they shouldnt. 
Removed old code that isnt used anymore.

Changed the login screen to use config variables for AIRTIME_VERSION.
 2011-03-03 18:08:51 -05:00
martin 9759efc6cf -restore point... 2011-03-03 14:35:27 -05:00
Naomi b3e111b0a0 tested deleting files, will unlink file from stor folder, will delete file from all playlists if not scheduled 2011-03-02 11:47:07 -05:00
naomiaro 810aa3845b Merge branch 'airtime-1.6.1' of dev.sourcefabric.org:campcaster into airtime-1.6.1 2011-02-24 11:06:49 -05:00
naomiaro 860c70b21e fix for file metadata form. 2011-02-24 11:06:19 -05:00
martin dab39f391e -interface is now notified when a song starts playing. ON-AIR graphic only turns red after this notification. 2011-02-23 17:03:27 -05:00
martin 23e533aa67 -CC-1736: install/airtime-user.php script needs to be updated for the new Zend Framework 2011-02-22 19:01:33 -05:00
martin a20e279840 Merge branch 'master' of dev.sourcefabric.org:airtime 
Conflicts:
	application/configs/conf.php
	install/airtime-install.php
 2011-02-22 16:32:04 -05:00
martin 8ad5d23ee6 -api_key autogeneration and usage implemented 2011-02-22 16:16:37 -05:00
paul.baranowski 7e8f61549e Merged Naomi's change for CC-1955 2011-02-22 18:26:51 +01:00
paul.baranowski 15153727c1 CC-1971 
Remove "?>" from the end of pure-PHP files to prevent "HEADERS ALREADY SENT"
 2011-02-22 18:22:31 +01:00
Naomi 92545b53a6 CC-1955 2011-02-22 11:59:55 -05:00
martin 416c6ceb10 -fixed bug where a song would appear as current song and next song simultaneously. 
-show background color switching on the list-view should now be instant.
 2011-02-13 15:35:41 -05:00
martin 1d30c208f8 -fixed regression in day-view 2011-02-13 14:04:38 -05:00
martin a5fd68c252 -fixed UI freeze on some very special occasions 
-fixed some php errors related to php shipped with debian
-playlist.js no longer active on login page
 2011-02-13 13:29:16 -05:00
naomiaro 7093ebd23f modified to avoid sql error when searching. 2011-02-12 23:07:28 -05:00
naomiaro bd2d560c1b ordering by login 2011-02-12 23:02:44 -05:00
naomiaro ddddcc9375 can make show as many hours long in duration as wanted. 2011-02-12 18:40:17 -05:00
naomiaro 54398b8c32 playlists with no content will be filtered in the schedule show dialog. 2011-02-12 17:26:02 -05:00
naomiaro a83a4b6bae show cancelling available (needed for repeating shows) 2011-02-12 17:21:37 -05:00
martin 6cf4310c24 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-02-11 18:13:38 -05:00
martin 43f7f8e103 -added help page 
-added additional user info
 2011-02-11 18:13:26 -05:00
Naomi f8d3a38b2e default fade setting for songs. 2011-02-11 17:46:55 -05:00
Naomi e38d825896 check if is an array for hosts. 2011-02-11 11:52:11 -05:00
Naomi da175e0702 admin users are hosts by default, host selection is no longer required, any admin user can schedule/maniuplate all shows. 2011-02-11 11:43:03 -05:00
Naomi 85ab11dc56 CC-1897 defaults to day of the week of start date. 2011-02-10 19:36:39 -05:00
Naomi d210a36358 new add show html. 2011-02-09 18:10:46 -05:00
mkonecny a447839745 -UI changes. 
-Blank row now displays start and end time
-Changed default playlist name
 2011-02-09 17:02:32 -05:00
mkonecny 28f3a77246 -day view now highlights current show 2011-02-09 15:45:45 -05:00
mkonecny c0d5cc4809 -list view updated 2011-02-09 14:09:42 -05:00
mkonecny 50054befd6 Merge branch 'master' of dev.sourcefabric.org:campcaster 
Conflicts:
	.zfproject.xml
	application/configs/airtime-conf.php
	build/build.properties
	public/css/styles.css
 2011-02-09 13:07:36 -05:00
mkonecny 3b4fa1cc1a -added new users management screen 2011-02-09 13:03:46 -05:00
Naomi 3d3515812a added monthly show option, bit more javascript to show/hide info when not needed in add show tabs. 2011-02-08 18:22:51 -05:00
Naomi bdad3b34e0 CC-1862 playlist builder playlist fadein/out 2011-02-08 16:10:48 -05:00
Naomi 424c6f0193 CC-1887 shows are now resized properly with delta day. schedule dialog includes end day since shows can be longer than 1 day now, playlist search must look for an interval given the time increase. 2011-02-08 15:06:31 -05:00
mkonecny 16bdfb7611 Merge branch 'master' of dev.sourcefabric.org:campcaster 
Conflicts:
	public/css/styles.css
 2011-02-07 19:06:06 -05:00
mkonecny bc5b9efb4b -changes to list view. Framework so that we may change selected day 
-changes to add-user. Started implementing Vladimirs design.
 2011-02-07 19:03:14 -05:00
naomiaro 8f8c4716cc first version of playlist builder with cues/fades. need to do some work to display errors, look to see if I can position the cursor better on the contenteditable spans within the lis because jQuery sortable is interfering with normal operation. don't have a fade in/out for theplaylist overall yet. 2011-02-07 18:44:42 -05:00
martin b6d2b0f942 -fixed potential bug for incorrect return value type. 2011-02-07 00:26:16 -05:00
naomiaro 0152514ef3 removed cc_show_schedule table. 2011-02-06 22:07:17 -05:00
martin fae1401568 -further fixes for naomis new layout 2011-02-06 20:12:56 -05:00
martin 8396e12df1 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-02-06 19:28:49 -05:00
martin 993b302f6b initial patch to fix problems with new tables schema. 2011-02-06 19:28:39 -05:00
naomiaro f04d03aef1 SCHEDULE TABLE ID CHANGE 2011-02-06 18:38:55 -05:00
naomiaro a5e4056555 missing check for shows in the middle. 2011-02-06 17:37:23 -05:00
naomiaro 75eea94641 changed back to old schedule id to test if playback works now. 2011-02-06 15:31:36 -05:00
naomiaro ebb43857f6 modified cc_schedule table, added foreign key to show instance id for easy clean up when show needs to be cleared/deleted. replaced primary key with a standard auto incrementing key for efficiency since the other key had no use. 2011-02-06 01:10:07 -05:00
naomiaro 14c71a3f39 getting tired.... 2011-02-05 23:50:43 -05:00
naomiaro 76b2f6e80b order by didn't work for full calendar 2011-02-05 23:49:27 -05:00
naomiaro aef4654a3f CC-1770 clear the days chosen if the show doesn't repeat. 2011-02-05 23:42:57 -05:00
naomiaro 13847e738b adding bi-weekly show option. new structure allows for different repeat types to be specified. 
new playlist builder css/images.
 2011-02-05 23:21:52 -05:00
naomiaro cb3f4dd31e error messages for show moving/resizing displayed in an alert. 2011-02-05 22:02:45 -05:00
naomiaro 55eddb133b fixed schedule content check 2011-02-05 21:54:15 -05:00
naomiaro bb5a2af142 can delete a show instance 2011-02-05 20:39:35 -05:00
naomiaro 5aca6cd8bb incorrectly set starts when not needed. 2011-02-05 20:17:46 -05:00
naomiaro 85a936eb41 can only resize a show if scheduled content allows. 2011-02-05 20:11:45 -05:00
naomiaro 258157d92c reschedules a show's content when it is successfully moved on the schedule. 2011-02-05 20:04:24 -05:00
naomiaro 12cd80fe13 can schedule/remove playlists from a show instance. 2011-02-05 19:42:03 -05:00
naomiaro 51b6a79f6f everything moved to its new class, now just testing, context menu works. 2011-02-05 19:10:34 -05:00
naomiaro bfc1bccfdf beginning of making a separate ShowInstance vs Show class. 2011-02-05 18:20:51 -05:00
naomiaro bc6dd374f4 can't move a show into the past. 2011-02-05 17:19:54 -05:00
naomiaro c45437633b checks for moving/resizing an instance of a show. 2011-02-05 16:34:58 -05:00
naomiaro 78f83f5f6e Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-05 16:00:11 -05:00
naomiaro 89b971b67c changes to how shows are created/stored. 2011-02-05 16:00:05 -05:00
mkonecny 89ae221f4c -re-enabled Now playing bar 2011-02-04 18:32:57 -05:00
mkonecny 27293c6b8f Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-04 18:22:51 -05:00
mkonecny debdefbc96 -list-view implemented 2011-02-04 18:22:15 -05:00
naomiaro d81a84ca9a CC-1172 adding qtip tooltips on library files to show metadata. 2011-02-04 00:15:56 -05:00
mkonecny ae6b97f8f1 -small fix for uninitialized title values. 2011-02-03 19:22:17 -05:00
mkonecny 4698e963c1 -title now stored in session variable. 2011-02-03 19:17:52 -05:00
mkonecny df675bd8c6 -added simple configuration page 
-implemented CC-1830
-issue CC-1850 closed
 2011-02-03 17:51:35 -05:00
mkonecny a99a742bdc -fix http://dev.sourcefabric.org/browse/CC-1838 2011-02-03 13:52:06 -05:00
mkonecny 65cc694a90 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-02 18:25:57 -05:00
mkonecny a5ad30356a -refactoring 
-added gaps in Now PLaying DataTable
-show information and song information now sent as separate data in order.
 2011-02-02 18:25:42 -05:00
Naomi 2cdaf4b413 CC-1809 added a dialog to display show contents, anyone has access to this dialog. made sure only hosts can access schedule/clear/delete options on the context menu for future shows. 2011-02-02 18:08:22 -05:00
Naomi 0bcf69985e working on schedule dialog, reqorked get remaining time function in a show to be better. 2011-02-02 13:39:33 -05:00
Naomi 541c3a0e0e CC-1845 had changed implementation of this and had an incorrect parameter. 2011-02-02 11:38:04 -05:00
mkonecny 4f055788d4 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-01 20:29:03 -05:00
mkonecny 71023a52b3 -fixed bug CC-1837 
-show progress-bar will now update even when an audio item is not playing
 2011-02-01 20:28:38 -05:00
Naomi be6722af9f fix for show with no end. 2011-02-01 18:02:35 -05:00
martin be79b21c37 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-02-01 15:31:38 -05:00
Naomi a9f8a2b5d0 moved menu/styles.css to bootstrap, as well as nowplaying javascript since they should be on everypage almost except for the login screen currently. 2011-02-01 11:43:52 -05:00
martin 755c5a8469 -fixed issue with unix pypo user not being assigned to groups 
-fixed issue with time being incorrect if server was in different timezone
 2011-01-31 16:34:08 -05:00
mkonecny 42490d53aa -timezone now correct on now playing bar 2011-01-31 11:47:52 -05:00
naomiaro 556292e623 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-30 21:43:07 -05:00
martin eeaa7da6f5 -all songs of the current show are now highlighted in the now playing datatable. 2011-01-30 20:12:07 -05:00
naomiaro 092b36c346 checks on dates, UI work mostly done 2011-01-30 20:11:18 -05:00
Naomi 10d9d13993 some basic form work, need to lear more about custom form validation/rendering. 2011-01-28 17:37:31 -05:00
Naomi 7bd96a7bf4 merge fixes 2011-01-28 11:34:57 -05:00
martin c673b12046 -began adding basic foundation for show list-view. 2011-01-28 11:18:12 -05:00
martin 844baeeae6 -started adding show list-view 2011-01-28 00:23:39 -05:00
Naomi f18f500e1e everything is implemented backend wise for schedule dialog, just need to add html/css changes 2011-01-27 18:38:02 -05:00
martin 0f786c5290 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-01-26 17:09:39 -05:00
martin 5b11025b31 -added listen to icecast stream through browser option. Fixed various bugs in now playing screen. added fade support to liquidsoap script 2011-01-26 17:08:30 -05:00
Naomi de3c95bd36 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-26 14:18:18 -05:00
Naomi f6d270616a full functionality of media library now available using datatables, advanced search is not done. 2011-01-26 14:17:52 -05:00
naomiaro c3085c8edf bug fix for deleting repeating shows. 2011-01-26 00:12:13 -05:00
naomiaro a607951ed9 adding autocomplete from backend source into add show page. 2011-01-25 23:14:35 -05:00
Naomi a0ecbecf3b datatable supports offset/limit server side fetching of table data. js events are added onto each row. need to fix ordering, searching. 2011-01-25 18:41:59 -05:00
mkonecny c109fb5f01 -improved now-playing page 2011-01-25 18:41:59 -05:00
mkonecny e8d7b59127 -datagrid now highlights current song playing 2011-01-25 15:25:24 -05:00
mkonecny 51f77dba50 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-24 19:20:06 -05:00
mkonecny c8b7cffdc6 -changes to now playing bar 2011-01-24 19:19:51 -05:00
Naomi 1e6f25f148 adding autocomplete from backend source to add shows. 2011-01-24 18:44:28 -05:00
mkonecny 5173674714 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-21 18:15:13 -05:00
mkonecny 6553663051 -begin adding datagrids 2011-01-21 18:14:59 -05:00
Naomi b3ccd6ab1c can change the colors of shows if set in add show dialog, otherwise takes default from css style sheet. 2011-01-21 14:43:38 -05:00
Naomi 7bdfd60ea9 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-21 13:25:34 -05:00
Naomi c83244fb3a add show form is broken up into tabs. 2011-01-21 13:25:12 -05:00
mkonecny 8d5aea0d14 -basic now playing bar 2011-01-20 17:14:14 -05:00
naomiaro 2ff9765fdf fixed bug when generating shows for calendar. 2011-01-19 16:50:30 -05:00
Naomi e27c42fef6 deleting repeating shows only deletes shows in the future, but having problems with full calendar caching results or something so display on calendar can be incorrect. 2011-01-19 15:21:11 -05:00
naomiaro 70f7cb6edc Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-17 10:40:28 -05:00
mkonecny 0d2314cf32 fixed schedule.php warning 2011-01-17 02:32:51 -05:00
naomiaro 8887ce24d1 can get cues/fades to display in new playlist builder. 
cannot change them yet.
 2011-01-16 19:31:10 -05:00
naomiaro 86a4998e0a shows time filled in show, with progress bar and time. 2011-01-15 18:23:15 -05:00
naomiaro f2560a6aa6 when deleting a group following groups in show update their times. 2011-01-15 13:10:10 -05:00
naomiaro 0ffa232b6d schedule show finds playlists available and returns show content better 2011-01-13 16:24:10 -05:00
naomiaro ad869e0f7f will display in the UI what is scheduled in a show when you add things. 2011-01-12 19:40:05 -05:00
naomiaro 4d8f28f3fd show content returning info in a useful way 2011-01-12 17:52:57 -05:00
naomiaro 1f8ac9719f can add multiple playlists to a show, doesn't check length or update playlists based on time left. GUI is bad. 2011-01-12 15:47:44 -05:00
naomiaro 9c23b86c53 last of changing database name, removing old files 2011-01-10 15:44:13 -05:00
naomiaro aee0b09749 type ahead search in scheduling playlists dialog. 2011-01-10 15:26:11 -05:00
naomiaro 8b2b2d934c database name constant. 2011-01-10 13:26:43 -05:00
naomiaro c1c4c4e598 database changes for name, searching for playlist for a show. 2011-01-10 13:24:21 -05:00
Naomi c7df3c1039 for new cc_show_schedule columns 2011-01-06 16:24:30 -05:00
Naomi 9854834b26 adding fields to allow for multiple playlists scheduled in a show 2011-01-06 16:20:51 -05:00
naomiaro d9e8e1641a Merge branch 'master' of dev.sourcefabric.org:campcaster 
Conflicts:
	application/controllers/LibraryController.php
	application/controllers/SearchController.php
 2011-01-06 01:05:34 -05:00
naomiaro ee0a8310de small problem with order, quicksearch working, code could be better. 2011-01-06 01:00:33 -05:00
naomiaro ff02a42514 quick search is working, with small paginator ajax url hack 2011-01-06 00:23:22 -05:00
mkonecny 20c392343b -changed some references from campcaster to airtime in the documentation / comments 2011-01-05 12:19:58 -05:00
naomiaro 101b6fafa6 searching includes groups for and/or 2011-01-04 19:18:44 -05:00
naomiaro cf4e784129 CC-1749 added pagination to media files display. 2011-01-03 13:29:57 -05:00
naomiaro 75cd410ba4 search uses pagination 2011-01-03 11:47:21 -05:00
naomiaro 0cf89713a9 can edit file metadata. 2010-12-30 17:26:44 -05:00
naomiaro c4053a1b38 Merge branch 'master' of dev.sourcefabric.org:campcaster 2010-12-30 13:39:51 -05:00
mkonecny 4ac347cb65 -currently playing + playlist now available (as a Jquery plugin!). Next step is to improve UI. 2010-12-30 11:42:31 -05:00
naomiaro d2b1bf0622 new jjmenu for dynamic context menus. playlists in library. 
need to work on javascript callback
 2010-12-29 18:43:17 -05:00
martin 4bdcba83e2 -synchronize 2010-12-29 01:26:57 -05:00
naomiaro e768539ea8 search maintains state 2010-12-22 15:08:38 -05:00
naomiaro 8f088abaea close working on side playlist 2010-12-22 12:42:46 -05:00
mkonecny 414219b1cf Merge branch 'master' of dev.sourcefabric.org:campcaster 2010-12-21 18:28:55 -05:00
mkonecny 10218aeeb5 Commit so that I may access project from a different computer. Many things do not work/ are incomplete!!! 
-Added unfinalized API for getting schedule and currently playing item.
 2010-12-21 18:28:17 -05:00
Naomi 8ce870bb95 prefixed everything in cc_files with Db for Propel to be consistent. 2010-12-17 18:05:59 -05:00
Naomi 1fc21819cc simple form for adding a user to the database, only available for admin users. 2010-12-17 17:56:01 -05:00
Naomi 3d952eb1bd auto complete box for hosts. 2010-12-17 15:52:44 -05:00
Naomi ace30e9766 more show overlap checks, still testing. 2010-12-17 11:49:18 -05:00
naomiaro 069119857f fixed percent show filled in event display. 2010-12-17 01:18:42 -05:00
naomiaro 69fa737e9c more overnight show checks. 2010-12-17 01:11:02 -05:00