Commit Graph

3219 Commits

Author SHA1 Message Date
martin 82e84c2a6e -added .gitignore 2011-01-06 21:55:40 -05:00
martin f7aa3b37ef Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	pypo/tests/airtime-schedule-insert.php
2011-01-06 21:45:49 -05:00
mkonecny 745e4977f4 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-06 17:13:11 -05:00
mkonecny fb7b56b2c3 -synchronize 2011-01-06 17:07:45 -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
mkonecny 7cf9699e37 -redirected errors from propel-install script to log file 2011-01-06 12:11:38 -05:00
naomiaro daf37fa548 quick search string session var 2011-01-06 01:26:48 -05:00
naomiaro 7aac80ed58 renaming for airtime 2011-01-06 01:12:24 -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 7e96572aee -updated to use new database name, login and passwd (all 3 are "airtime"). You may delete old database by typing "dropdb -U campcaster -h localhost campcaster" 2011-01-05 19:05:57 -05:00
mkonecny 4739fd3d18 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-05 17:44:37 -05:00
mkonecny fe87d8957b -check if user=root for propel-install script 2011-01-05 17:44:23 -05:00
Paul Baranowski 4717c2008e Fixed docs for new name. 2011-01-05 17:41:01 -05:00
mkonecny d06956ec5b -changed filenames and documentation from campcaster to airtime 2011-01-05 16:39:32 -05:00
mkonecny 11a30ab37e -changed campcaster to airtime strings in library/ directory 2011-01-05 14:25:58 -05:00
mkonecny 9bda47eff4 -changed file names and comments from campcaster to airtime in utils/ folder 2011-01-05 14:18:03 -05:00
mkonecny dcec6bf4b1 -changed references from campcaster to airtime in pypo/ directory 2011-01-05 12:31:49 -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 f6a56c01a9 buttons part of zend form. 2011-01-03 15:15:00 -05:00
naomiaro 58a25186bb moving add button above. 2011-01-03 14:19:38 -05:00
naomiaro 5836548075 CC-1750 hours needed floor for 5min show. 2011-01-03 14:19:09 -05:00
naomiaro cf4e784129 CC-1749 added pagination to media files display. 2011-01-03 13:29:57 -05:00
naomiaro ba85842fcd Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-03 12:50:06 -05:00
naomiaro 75cd410ba4 search uses pagination 2011-01-03 11:47:21 -05:00
martin 4443d7af66 -fixed problem where cue'd files were not being played. 2011-01-01 22:46:21 -05:00
martin dcda802e48 -changed settings for personal development 2011-01-01 21:45:10 -05:00
martin f6de7e5c31 -added 64-bit system support into the pypo install scripts 2010-12-31 13:51:35 -05:00
martin 9f26a70ca9 -added OGG support as well as cue_in unit tests for mp3 and ogg files 2010-12-31 12:20:17 -05:00
naomiaro c24a152eba Merge branch 'master' of dev.sourcefabric.org:campcaster 2010-12-30 17:27:19 -05:00
mkonecny 85eedfc35d Merge branch 'master' of dev.sourcefabric.org:campcaster 2010-12-30 18:18:57 -05:00
mkonecny 33c2bde880 began adding basic support for OGG files 2010-12-30 18:17:18 -05:00
naomiaro 0cf89713a9 can edit file metadata. 2010-12-30 17:26:44 -05:00
naomiaro 2a37140c4d can edit playlist metadata 2010-12-30 15:10:05 -05:00
naomiaro 41c76e2c7d fix search to remain consistent with library. 2010-12-30 14:38:48 -05:00
naomiaro dc36c972ba close playlist in context menu 2010-12-30 14:29:15 -05:00
naomiaro c4053a1b38 Merge branch 'master' of dev.sourcefabric.org:campcaster 2010-12-30 13:39:51 -05:00
naomiaro 6293eb73c4 back to right click 2010-12-30 13:38:58 -05:00
naomiaro fc2e407ad0 still old context menus for schedule, wondering why they aren't popping up. 2010-12-30 13:32:59 -05:00
mkonecny 1c95a61a2c -renamed some files to better represent their function 2010-12-30 12:02:02 -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
martin ffa508de34 -synchronize 2010-12-30 09:41:52 -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
mkonecny 8404fa4145 -synchronize - broken 2010-12-29 17:01:28 -05:00
martin 4bdcba83e2 -synchronize 2010-12-29 01:26:57 -05:00
Paul Baranowski fa106b1da1 CC-1722 Install audio samples by default
"audio_samples" directory is now imported by default when you install.

CC-1728 	Remove unused files
2010-12-22 18:16:37 -05:00
naomiaro c3a8dbc090 Merge branch 'master' of dev.sourcefabric.org:campcaster 2010-12-22 15:09:12 -05:00