Commit graph

415 commits

Author SHA1 Message Date
James
3f495e7532 CC-2795: Give option to set download flag of recorded shows uploaded
to Soundcloud by default

- changed function name
- changed database flag name
2011-10-04 17:38:21 -04:00
martin
7dd14efe27 CC-2750: Ability to query health status for pypo,
liquidsoap, media monitor, and recorder
2011-10-04 15:49:02 -04:00
martin
d54066fca8 -undo weird automerge by git. 2011-10-04 14:11:20 -04:00
martin
5190a0c24c Merge branch '1.9.1' into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/MusicDir.php
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
2011-10-04 13:59:27 -04:00
James
b4d4c54c31 CC-2795: Give option to set download flag of recorded shows uploaded
to Soundcloud by default

- fixed name of Soundcloud Model class
2011-10-03 18:02:01 -04:00
James
3ac50b0183 CC-2904: Space missing between two boxes on "Playlist Builder"
- fixed
- extra change: bug on flag name change
2011-10-03 15:25:55 -04:00
James
83e8a610df Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-03 14:13:15 -04:00
martin
1bdcff1119 CC-2750: Ability to query health status for pypo,
liquidsoap, media monitor, and recorder

-renamed CcComponent to CcServiceRegister
2011-09-30 14:08:15 -04:00
Paul Baranowski
44481d2776 SAAS-41: Changed name of boolean value from disable-stream-conf to
enable-stream-conf for easier logic.
2011-09-29 18:11:22 -04:00
James
7e3d25eeaa CC-2795: Give option to set download flag of recorded shows
uploaded to Soundcloud by default

- done
2011-09-29 17:10:17 -04:00
James
bf15b4cf0d Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-09-29 15:22:40 -04:00
James
3775e5f4a7 CC-2882: Airtime cannot delete watched folder when is been renamed
- done
2011-09-29 15:02:34 -04:00
James
46146d1216 cc-2882: Airtime cannot delete watched folder when is been renamed
- initial commit

Conflicts:

	airtime_mvc/application/models/MusicDir.php
2011-09-29 15:02:30 -04:00
James
89a4c2e1e3 - Changing -3 to PHP constant 2011-09-29 14:47:07 -04:00
James
28f1d885f2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-28 13:46:10 -04:00
James
d1542b0d89 CC-2882: Airtime cannot delete watched folder when is been renamed
- done
2011-09-28 13:45:21 -04:00
martin
3dbedc3a56 CC-2724: Play Stream Icon + jPlayer popup styling
-#of streams and stream bitrates now fetched from database.
2011-09-27 15:26:40 -04:00
James
b1fa8901ca cc-2882: Airtime cannot delete watched folder when is been renamed
- initial commit
2011-09-27 14:49:03 -04:00
martin
685cc87951 CC-2833: Use ClassLoaders for PHP Files
-temporarily reenable some files from being always loaded
2011-09-26 15:32:56 -04:00
martin
9e6a1ebf44 CC-2833: Use ClassLoaders for PHP Files
-autoload DateHelper class
2011-09-26 15:29:12 -04:00
martin
b8838a5bda CC-2833: Use ClassLoaders for PHP Files
-autoload AtSoundcloud class
2011-09-26 15:25:03 -04:00
martin
dfe43c98bb CC-2833: Use ClassLoaders for PHP Files
-autoload RabbitMq class
2011-09-26 15:19:23 -04:00
martin
5cc7de95ee CC-2833: Use ClassLoaders for PHP Files
-Done for class User
2011-09-23 17:00:55 -04:00
martin
1e9a8a28fe CC-2833: Use ClassLoaders for PHP Files
-Done for class Schedule and ScheduleGroup
2011-09-23 16:50:00 -04:00
martin
cd95170b06 CC-2807: Remove AIRTIME_VERSION from constants.php and use the value in the database instead
-done
2011-09-23 16:26:19 -04:00
martin
e60db9e031 CC-2860: When recording a show, UTC time is displayed on the
text field of right progress bar.
2011-09-23 15:37:45 -04:00
martin
1dd78d0584 CC-2833: Use ClassLoaders for PHP Files
-Found out ClassLoaders only want one class per file. Moved
 ShowInstance class to its own .php file.
-Merged Show_DAL class into Show class
2011-09-23 12:33:28 -04:00
martin
693c72c396 -change Shows.php to Show.php 2011-09-23 10:56:12 -04:00
martin
9bb901945e CC-2833: Use ClassLoaders for PHP Files
-shows.php
2011-09-23 10:54:20 -04:00
martin
7bb9e92ac9 cc-2864: upgrade from 1.7 broken
-fixed
2011-09-22 17:30:05 -04:00
Paul Baranowski
48b08893f0 CC-2306: Uploading a file that already exist error message does not have styling
Tweaked message to the user.
2011-09-22 15:31:21 -04:00
James
965a649d0e CC-2591: Change function name
- done
- extra fix: fix was needed due to class name change
2011-09-22 14:01:05 -04:00
martin
c84690adaa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
2011-09-22 12:25:30 -04:00
martin
2be0960ed5 CC-2833: Use ClassLoaders for PHP Files
-made MusicDir, Playlist and StoredFile autoload
2011-09-22 12:24:17 -04:00
James
b3654c62bc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-22 11:48:07 -04:00
James
73dc4b851d CC-2591: Allow upload of any audio clip to Soundcloud
- done
- need more styling
- note there were changes in style.css
2011-09-22 11:47:24 -04:00
martin
046f98db8f CC-2363: Diagnostic screen in Web UI
-everything working
2011-09-22 10:45:43 -04:00
martin
19d61ad780 CC-2363: Diagnostic screen in Web UI
-working with ajax now!
2011-09-19 17:55:26 -04:00
martin
a11dba1469 CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder 2011-09-19 15:46:15 -04:00
martin
62f0d1c7b2 Merge branch '1.9.1' into devel 2011-09-17 12:37:15 -04:00
martin
d824eb7622 CC-2837: Invalid SQL statement
-fixed
2011-09-17 12:36:35 -04:00
martin
9861587dec -CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder 2011-09-16 22:05:52 -04:00
martin
e1e34d297c -CC-2750: Ability to query health status for pypo, liquidsoap,
media monitor, and recorder
2011-09-16 21:30:50 -04:00
martin
3485b5a39f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-16 17:53:37 -04:00
martin
659e412eb7 CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder
-progress being made
2011-09-16 17:51:28 -04:00
James
7c94734277 CC-2810: More chmnod fixes for scripts
- removed shebang from .py files
- removed cron folder and its content as we don't use them
- .js files are from 3rd party(datatable) so we should leave them as they are
2011-09-16 14:01:23 -04:00
martin
583a5faf72 CC-2750: Ability to query health status for pypo, liquidsoap,
media monitor, and recorder
2011-09-13 18:43:16 -04:00
martin
9fc2932be6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-13 14:56:48 -04:00
martin
2c2bb86698 CC-2750: Ability to query health status for pypo,
liquidsoap, media monitor, and recorder

-fixed rabbitmq not delivering messages
2011-09-13 14:56:24 -04:00
James
f25304bcb7 CC-2789: Prevent brue-force password guessing attacks
- add recaptcha on login page
2011-09-13 14:16:16 -04:00