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

1823 Commits

Author SHA1 Message Date
drigato f684ce4ab9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-20 14:16:24 -04:00
drigato 4cdd855a21 CC-5855: Output to zendlog when files are deleted from library 2014-05-20 14:15:51 -04:00
drigato 39db3d4aee Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
 2014-05-05 11:21:02 -04:00
drigato e4e5590b9f CC-5802: Upgrade application.ini file 
Remove this upgrade step from the upgrade controller
 2014-05-05 11:19:14 -04:00
drigato 1de58c64d6 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
 2014-04-28 09:44:14 -04:00
drigato 42806b1cbf CC-5802: Upgrade application.ini file 2014-04-28 09:43:21 -04:00
drigato 2fdb8d1deb Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-25 15:00:29 -04:00
drigato 8d9b9c1fb7 Moved deleting the maintenace temporary file flag to very end of upgrade task 2014-04-25 15:00:13 -04:00
drigato f98b03f270 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
 2014-04-25 14:54:47 -04:00
drigato 66000a2847 CC-5802: Upgrade application.ini file 
Changed where we insert new application.ini file lines
 2014-04-25 14:53:58 -04:00
drigato 61df7c1a44 Moved some comments around 2014-04-25 14:20:04 -04:00
drigato 57ad1beaa9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
 2014-04-25 14:18:56 -04:00
drigato f432ea9f75 CC-5802: Upgrade application.ini file 
Execute raw sql upgrade file at the end in case errors occured during the upgrade before it gets executed
 2014-04-25 14:16:18 -04:00
drigato aeec9172f9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
 2014-04-25 11:16:21 -04:00
drigato 1009719e1c Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-25 11:05:51 -04:00
drigato 6890dcc3bc CC-5802: Upgrade application.ini file 
Used a transaction for upgrades. If upgrading the application.ini file fails, the database upgrades will get rolled back.
 2014-04-25 11:05:33 -04:00
drigato 25e484cc2f Delete code that was copied in twice 2014-04-25 10:22:38 -04:00
Albert Santoni 22b9cc3be1 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-25 01:08:24 -04:00
Albert Santoni d9adba117a One more time... 2014-04-25 01:08:08 -04:00
Albert Santoni 7a2f27fe41 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-25 01:03:05 -04:00
Albert Santoni cdc88d25e1 Argh, fixed typo... it's late 2014-04-25 01:02:47 -04:00
Albert Santoni 3e2a165dd2 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-25 00:48:54 -04:00
Albert Santoni e7ea5e5301 Try fixing UpgradeController version check again... 2014-04-25 00:48:13 -04:00
Albert Santoni 446eca057c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/fr_FR/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/it_IT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
	airtime_mvc/locale/template/airtime.po
	airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
 2014-04-25 00:43:22 -04:00
Albert Santoni 54db74f622 Allow upgrades from Airtime 2.5.1 because the version wasn't bumped 
internally to 2.5.2
 2014-04-25 00:40:51 -04:00
drigato 42f3bb17e1 CC-5814: 'Down for maintenance' page during upgrades 2014-04-24 16:23:57 -04:00
drigato f536a7b1b4 CC-5814: 'Down for maintenance' page during upgrades 2014-04-24 16:19:55 -04:00
drigato fcd8ea8ba5 CC-5802: Upgrade application.ini file 2014-04-24 10:22:52 -04:00
drigato 069ebd3991 CC-5802: Upgrade application.ini file 2014-04-24 10:12:24 -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
Albert Santoni 2f8461b2a6 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-23 14:58:36 -04:00
Naomi 3e34f1cf96 fixing up some datatables queries, propel usage. 2014-04-23 12:53:43 -04:00
Albert Santoni 41e2b5d840 Fix the failed uploads view 2014-04-23 11:52:10 -04:00
drigato 1a71a848e1 CC-5802: Upgrade application.ini file 
Attempting to write new lines to application.ini file via the upgrade controller
 2014-04-22 16:11:46 -04:00
drigato d00e390511 Removed last change 2014-04-17 13:58:56 -04:00
drigato 0a6b72ad99 Removing something for testing purposes 2014-04-17 13:56:02 -04:00
drigato c8121f9bc8 CC-5781: Upgrade script for new storage quota implementation 
Was using du wrong. Wasn't returning value in bytes
 2014-04-17 13:53:24 -04:00
drigato 3ebf9e56dd Upgrade script testing 2014-04-16 17:30:44 -04:00
drigato b348286448 Upgrade script testing 2014-04-16 17:28:55 -04:00
drigato 456ac40fe6 Upgrade action testing 2014-04-16 17:27:15 -04:00
drigato cd6c4f7ede Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-16 17:24:56 -04:00
drigato a3be55fd60 CC-5781: Upgrade script for new storage quota implementation 
Changed airtime conf file path so it works for saas or self-hosted users
 2014-04-16 17:24:02 -04:00
drigato 9041801103 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-14 12:09:48 -04:00
drigato 63e2eda64b CC-5786: Quota Enforcement in the File Upload API 
Tweaked this so it will work on self-hosted instances
 2014-04-14 12:09:15 -04:00
drigato edcf8844e3 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-14 11:25:02 -04:00
drigato 4add0f0b7b CC-5786: Quota Enforcement in the File Upload API 2014-04-14 11:24:39 -04:00
drigato 4afccfe225 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-10 15:55:49 -04:00
drigato 7fbd285dd0 Fix typo 2014-04-10 15:55:21 -04:00
drigato 51c80bc033 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-10 15:50:58 -04:00
drigato 819862c37b CC-5781: Upgrade script for new storage quota implementation 
cleaned up upgrade controller
 2014-04-10 10:55:47 -04:00
drigato b9b3e95caa CC-5781: Upgrade script for new storage quota implementation 
Returns error if API key is incorrect
Set the upgrade controller to skip login authentication
 2014-04-10 09:28:23 -04:00
drigato bae0c564d0 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-10 07:12:52 -04:00
drigato 5971f51b53 CC-5781: Upgrade script for new storage quota implementation 
First draft of an upgrade controller
 2014-04-10 07:12:31 -04:00
Albert Santoni 8fb95316f2 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
 2014-04-09 15:01:11 -04:00
Albert Santoni 4fe9fc189a CC-5709: Airtime Analyzer 
* CC-5772: Recent Upload table times should be shown in local time
 2014-04-09 14:57:30 -04:00
Albert Santoni e044187aed Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	python_apps/airtime_analyzer/setup.py
 2014-04-04 19:48:22 -04:00
Albert Santoni 64a95c7c59 CC-5709: Airtime Analyzer 
* Nuked another unused function
 2014-04-03 16:36:42 -04:00
Albert Santoni 95b369c54d CC-5709: Airtime Analyzer 
* Remove awful StoredFile::uploadFile() function
* Massive airtime_analyzer commenting and cleanup
* Cleaned up the upload code
* Temporarily disabled the liquidsoap playability test.
 2014-04-03 16:13:26 -04:00
Albert Santoni 1c5e2d6205 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/public/index.php

* Reverted some SaaS-only thing Martin did a year ago. Looks benign but
  only one way to find out...
 2014-03-27 16:38:03 -04:00
Albert Santoni db2b52a1bf CC-5709: Airtime Analyzer 
* Some cleanup and refactoring for file deletion in the Media REST API
* Fix the refresh timer on the Add Media page when there's pending
  imports.
 2014-03-24 17:14:04 -04:00
Albert Santoni 61c2c90b7e CC-5709: Airtime Analyzer 
* Remove the "hidden" field from the REST blacklist, the analyzer needs to set it.
* Added import_status column messages in the recent uploads table
* Auto-refresh the recent uploads table while imports are pending
* Moved the file moving stuff to its own analyzer in airtime_analyzer
* Basic error reporting to the REST API in airtime_analyzer, needs
  hardeneing though
* Fixed a bug with the number of recent uploads
* Prevent airtime_analyzer from running if media_monitor is running
 2014-03-22 02:12:03 -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
Albert Santoni f120caa093 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-03-21 13:26:47 -04:00
Albert Santoni 878dd11ccc CC-5709: Airtime Analyzer 
* Overhauled Add Media screen, now shows state of recent uploads
* Dropped old unused "state" column, added new file_import column to cc_files
* New PluploadController methods
* Save the filename as the track title for unprocessed uploads
* Hide pending files from the library until they've been processed.
* Don't overwrite files with duplicate names, we rename them instead.
 2014-03-21 13:22:00 -04:00
drigato 7800cb1e15 SAAS-382: Reimplement Storage Quota 
Storing disk usage in cc_pref
Add/subtract filesize to/from disk usage total when a file is uploaded or deleted
TODO: Hook this into the ftp server
 2014-03-21 09:50:03 -04:00
Albert Santoni 2a783f3825 Merge branch '2.5.x' into 2.5.x-saas 2014-03-17 15:41:14 -04:00
Albert Santoni e6cbbdff33 CC-5709: Airtime Analyzer 
* Added session auth to the Media API (if you're logged in)
* Started reworking our Plupload interaction with the server to be less
  awkward.
* Basic uploading works with the Add Media page again, but messages
  aren't dispatched to airtime_analyzer yet (coming next...)
 2014-03-13 11:14:30 -04:00
Naomi 97989953c8 CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats) 
need to modify these to user timezone strings to match the new changes.
 2014-03-12 18:00:01 -04:00
Naomi f8935a312f CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats) 
fixing listener stat search
 2014-03-11 13:24:22 -04:00
Naomi 8d2926aeed CC-5727 : History search range using incorrect timezone offset (also Nowplaying) 
sending the timestamp string back for nowplaying as well.
added error class to history page if end is < start.
 2014-03-10 18:33:07 -04:00
Naomi 5f3199b4bb CC-5727 : History search range using incorrect timezone offset 2014-03-10 17:39:17 -04:00
Albert Santoni 6d7117f670 CC-5709: Airtime Analyzer 
* Added MetadataAnalyzer unit tests and test data
* Improved debug logging and squashed pika logging
* Implemented file moving
* Extract the track number/total
* Fixed mapping of mutagen to Airtime fields in a few spots. The mapping
  matches the DB column names now.
* Fixed the bin/airtime_analyzer binary
* Started work on PluploadController to make it work with the new File
  API
 2014-03-10 16:32:23 -04:00
drigato 64c1dd2c1e CC-5701: Airtime File API 
Beginnings of fil rest api
index, get, post actions working without authentication
 2014-02-27 17:11:17 -05:00
Albert Santoni 86dafaf61c SAAS-404: Separate the Airtime API version from the Airtime version 
* Airtime PHP side can be version bumped without pypo freaking out now
 2014-02-14 16:22:15 -05:00
drigato acb3b9b179 Merge branch '2.5.x' into 2.5.x-saas 2014-02-11 10:29:50 -05:00
drigato 3b9608a8df CC-5693: API call to notify-item-start-playing fails because an invalid schedule id is sent 
Temporary fix for this bug. Throw an exception if no schedule item is found.
 2014-02-10 16:19:26 -05:00
Naomi Aro 49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
 2013-12-17 17:20:38 -05:00
Naomi 424de61a11 CC-5619 : Browser caching can produce unexpected behaviour in the 'Listen Now' window. 
upgrading to jPlayer 2.5.0
 2013-12-16 17:14:00 -05:00
drigato 1dfcfd3e34 CC-5639: Repeating show's instances will vanish when editing single instance with overlapping warning 
The wrong action was getting set when there were errors in the show form
 2013-12-13 14:20:43 -05:00
drigato d841f11de3 CC-5638: Shows become unlinked when moving the end time back 
Disabled linked checkbox field in show form while the show is playing
Added a warning message if the user attempts to change this value
Update .po and .mo files with the warning message string
 2013-12-13 13:06:14 -05:00
drigato d0474f4247 Changed function title when editing a repeating instance 
Removed a function call we don't need when editing a repeating instance
 2013-12-12 16:47:55 -05:00
Albert Santoni 1577b7c41e CC-5627: Check all Application_Common_DateHelper calculations that use 
timezone.

* Use the user timezone in eventFeedAction(), will fix a bug where
  shows at the edge of a week can disappear from the calendar if
  the user timezone is not the same as the station timezone.
 2013-12-12 16:39:20 -05:00
Albert Santoni a96c2551ef CC-5627 : Check all Application_Common_DateHelper calculations that use 
timezone.

* Fixed GetPlayOrderRange to be consistently return everything in UTC.
* ApiController liveInfoAction now returns everything consistently in
  the station timezone. This fixes negative remaining time that could
  occur in the embeddable JS Airtime widgets if you were logged in to
  Airtime while you viewed your website. (The widgets display in
  the browser's local time.)
* ScheduleController getCurrentPlaylistAction() returns everything
  consistently in the user timezone now.
 2013-12-12 13:28:51 -05:00
Naomi b13d12eaac CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-11 15:20:19 -05:00
Naomi 3d1f0b0d0e CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-10 17:41:59 -05:00
Naomi 3a2f9a24b5 CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 
working on getting widgets to work properly returning station local time.
 2013-12-10 16:45:05 -05:00
Naomi a1a9ec34cc CC-5594 : Remove all date_default_timezone_get() 
moving var serverTimezoneOffset to bootstrap,
also creating a var for userTimezoneOffset.
Utilities.js uses the userTimezoneOffset to calculate time in forms.
 2013-12-06 18:17:30 -05:00
Naomi 39063aaadb CC-5594 : Remove all date_default_timezone_get() 
using the user selected timezone in the form to calculate duration.
 2013-12-05 15:12:01 -05:00
Naomi 8f1e73edf5 CC-5594 : Remove all date_default_timezone_get() 
fixing up controllers
 2013-12-04 16:26:11 -05:00
Naomi 20b32bab80 CC-5594 : Remove all date_default_timezone_get() 
simplifying code, removing unnecessary calculations.
 2013-12-04 16:05:18 -05:00
drigato a465b5a770 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 
Create a new cc_show_day rule instead of a new cc_show
 2013-12-04 09:00:43 -05:00
Naomi 0bae60138f CC-5555 : Implement simple caching for preferences 
forgot to get rid of user id here.
 2013-11-11 16:50:35 -05:00
Naomi 06323a40fd CC-5555 : Implement simple caching for preferences 
fixing up code so user id is never passed in manually to a preference getter.
 2013-11-11 16:20:51 -05:00
Naomi 2ef95db747 CC-5371 : Fail to extend/shrink show by drag 
window rezie event was triggered when resizing the show, caused problem.
Using the windowResize callback provided by fullcalendar now.
 2013-10-10 17:38:49 -04:00
denise 256ec9292d CC-5388: Calendar won't load 2013-10-09 16:20:43 -04:00
denise 38634810a3 Update .po files 2013-10-08 11:48:24 -04:00
denise c687b6ad24 Merge branch 'master' of https://github.com/jamieconnor/Airtime 
Conflicts:
	airtime_mvc/application/services/ShowService.php
 2013-10-08 11:16:25 -04:00
denise 7c2e92f6e5 CC-5293: Calendar page cannot be loaded sometimes 2013-10-07 17:16:52 -04:00
Naomi faa6c7210c Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-02 11:25:08 -04:00
Naomi 4d01e3b11f CC-5347 : isScheduled doesn't work for webstreams 2013-10-02 11:24:48 -04:00
denise 3d9bc85fa0 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-01 08:49:10 -04:00
Naomi 1fa13eed13 CRLF 2013-09-30 13:59:08 -04: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
denise 6aa6d576cd CC-5323: User's Timezone Can Improperly Edit Show 
-made localizeDate a static function in ShowFormService
 2013-09-25 16:22:30 -04:00
denise 8ddb2974f1 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
denise 107263ae20 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
Naomi Aro 24861545ce crlf fix 2013-09-24 12:24:13 +02:00
Naomi Aro 7e96828cdd CC-5317 : Guest user can't see Now playing page 
removed the library module completely from page if the user does not have permission to view it.
 2013-09-24 12:21:04 +02:00
Naomi Aro 9de8b6634c CC-5334 : Localize Ryerson History Feature 
crlf
 2013-09-23 14:58:56 +02:00
Naomi Aro 9ec6156c92 CC-5334 : Localize Ryerson History Feature 2013-09-23 14:57:44 +02:00
Naomi Aro ee45f10aeb CC-5334 : Localize Ryerson History Feature 2013-09-23 14:42:35 +02:00
Jamie Connor 1c6d7725ca Modified weekInfo from ApiController to display current week and next, changed widget to display extra days. 2013-09-18 17:35:32 +12:00
Jamie Connor 6da9b6bf42 Removed repeated code 2013-09-07 14:52:45 +12:00
Naomi Aro 682a37894b Merge branch 'ryerson-history' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/views/scripts/menu.phtml
 2013-09-02 15:52:43 -04:00
Naomi Aro 60bf334aeb Merge branch '2.4.x' into 2.4.x-saas 2013-09-02 15:46:25 -04:00
Naomi 4fd37a4fa0 Merge branch '2.4.x' into ryerson-history 2013-08-30 16:07:41 -04:00
Naomi Aro 15e27f8166 history records for a show have times validated within show range. 2013-08-30 00:43:43 -04:00
Naomi Aro a4c97479b6 using an accordian to display per show logs. 2013-08-28 23:30:15 -04:00
Naomi 429cdeeffb filtering by a host's show so they can edit their own playout history. 2013-08-28 19:37:46 -04:00
Naomi 653a6384b9 creating a separate controller for playouthistory templates. 2013-08-28 18:25:46 -04:00
Jamie Connor b1e71e5adf added optional parameter number_of_days for getting schedule information 2013-08-26 11:26:09 +12:00
Naomi c2b9bb01ac crlf 2013-08-23 15:53:18 -04:00
Naomi dbe160c5d9 beginning of displaying form errors, need to keep working on this. 2013-08-23 15:52:49 -04:00
Naomi Aro af822bb5b9 showing time first for endtime box. 2013-08-22 21:39:46 -04:00
Naomi Aro 01370c2124 reverting back to the bootstrap datetime picker since it's nicer to use. 2013-08-22 20:23:17 -04:00
Naomi 84efdfd64a crlf 2013-08-20 17:23:48 -04:00
Naomi 007a7ee7ef casting non mandatory types from "", to avoid database query problems. 2013-08-20 17:23:15 -04:00
Naomi 6d5febe4f7 getting rid of characters from a field name that may cause problems. 2013-08-20 15:18:05 -04:00
Naomi 10ef55b083 context menu just in the client now. works for both tables. 2013-08-20 14:58:22 -04:00
Naomi Aro 3ea2b920a6 crlf 2013-08-19 23:20:26 -04:00
Naomi Aro 09693ef174 changing to context menu single edit/delete. 2013-08-19 23:19:13 -04:00
Naomi Aro 9b45b9dc72 converting to a jquery UI based datepicker. 2013-08-16 15:12:00 -04:00
Naomi Aro 7230b3ef58 removing tabletools from schedule page. 2013-08-16 12:57:04 -04:00
denise 50d5685199 CC-5270: looping on InvalidContentType 2013-08-14 17:43:14 -04:00
denise 5f588afdd5 CC-5293: Calendar page cannot be loaded sometimes 2013-08-14 13:07:06 -04:00
Naomi fdf18ec3ce upgrading table tools to version 2.1.5 2013-08-12 18:18:33 -04:00
Naomi d83c004fb9 subclassing the template types, files summary table is now fully configurable form wise. 2013-08-12 15:06:26 -04:00
Naomi aaf2e5c2f6 better casting on form checkbox, setting populate flag properly based on if id is set (for create/update) 2013-08-05 15:05:26 -04:00
Naomi 31c604d09c can update an existing history item entry. Form is pre-populated. 2013-08-02 18:16:23 -04:00
Naomi 590837a357 crlf 2013-08-02 16:16:04 -04:00
Naomi e047c2f71d can configure the file summary template as well now. 2013-08-02 16:15:32 -04:00
Naomi 774027c9bd crlf 2013-08-02 15:30:35 -04:00
Naomi c110b4b4df file summary table now starting to work with templates.need to change query around to be configurable still. 2013-08-02 15:29:39 -04:00
Naomi 557b3f9c9b CRLF 2013-08-01 16:37:10 -04:00
Naomi a5a99da21e Editing templates, strictly typing metadata for datatables (for unions) 2013-08-01 16:36:18 -04:00
Naomi b33f33964a crlf 2013-07-31 17:39:45 -04:00
Naomi 7ca28fe81d history item datatable is set up with configurable columns now. 
should add a field when configuring template field for "display name"
 2013-07-31 17:38:48 -04:00
Naomi a170ee7308 crlf 2013-07-30 19:25:06 -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 a2d4af5449 CRLF 2013-07-29 17:22:44 -04:00
Naomi 8eecbb18c0 propel rename done for template fields, template name input. 2013-07-29 17:21:46 -04:00
Naomi db4e025c05 CRLF fix 2013-07-29 16:32: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 Aro c0206ff8f4 CRLF 2013-07-29 08:59:04 -04:00
Naomi Aro 7183396da5 needed to update jquery, fullcalendar needed updating for the new JS. 
working on configuring a template.
 2013-07-29 08:57:31 -04:00
Naomi 46ecdf393d dynamic form rendering for template 
bootstrap datetime widget.

jquery update is needed, testing with hosted jquery first.
 2013-07-26 17:33:17 -04:00
drigato b77b12c508 Merge branch '2.4.x' into 2.4.x-saas 2013-07-24 15:32:16 -04:00
drigato 4cbbd1145b CC-5285: API Request: Get ON AIR light status 2013-07-24 15:30:49 -04:00
drigato d9859ff006 CC-5285: API Request: Get ON AIR light status 2013-07-24 15:17:10 -04:00
Naomi ecb2f81211 creating an new row for edit/delete links in the datatable 
working on creating/editing records.
 2013-07-23 18:01:43 -04:00
denise c2f2a541c7 CC-5285: API Request: Get ON AIR light status 2013-07-23 17:39:38 -04:00
Naomi 69afc715d1 creating templates for validation. 2013-07-22 18:11:44 -04:00
Naomi Aro 19ba788bae CLRF 2013-07-22 10:47:11 -04:00
Naomi Aro 634eb40a0c creating an entry. 2013-07-22 10:45:39 -04:00
Naomi Aro ec44b81f6a clrf 2013-07-18 01:37:39 -04:00
Naomi Aro 29c8570ade editing in progress 2013-07-18 01:31:20 -04:00
Naomi c744d88f23 IM-784 : Create Editing Abilities For History 2013-07-08 18:00:02 -04:00
Naomi 1abbe85d6d IM-733 Create Development timetable for Airtime Development 
IM-777
Database structure for new History Feature

dos2unix fix
 2013-07-03 16:02:17 -04:00
Naomi e63518f2da IM-733 Create Development timetable for Airtime Development 
IM-777
Database structure for new History Feature

moving original functionality into the service.
 2013-07-03 16:00:48 -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
Naomi Aro f2d5fa96da Merge branch '2.4.x' into 2.4.x-saas 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
	utils/phone_home_stat.php
 2013-06-26 01:25:26 -04:00
Naomi Aro c5221aae6a CC-5254 : Listener Status for SHOUTcast doesn't work 2013-06-24 17:24:43 -04:00
Martin Konecny 6498f43dad CC-5211: 
Php Exception: Set large number as year in tracks Metadata

fixed
 2013-06-06 17:02:01 -04:00
Martin Konecny 046039ece1 CC-5207: 
media-monitor restart will reset the cuein/cueout value

-fixed
 2013-06-05 16:14:14 -04:00
Martin Konecny 905dd08ed5 Use proper unit conventions for Kilo 2013-05-31 15:59:20 -04:00
Martin Konecny 82a71fdb61 CC-5199 
aacencplus encoder is very low quality
 2013-05-31 15:59:04 -04:00
Naomi 1fa0ee49d6 CC-5190 : Playlist: Copy playlist will lost cue in/out setting 2013-05-30 15:36:55 -04:00
denise 67e50354e9 CC-5189: Typo: Stream type's tooltip 2013-05-30 11:14:46 -04:00
denise f9645980a4 Updating .po files with new string added 2013-05-29 15:28:26 -04:00
Martin Konecny 50ece038c2 fix errors reported by Facebook's scheck 
-controller dir
 2013-05-28 17:45:09 -04:00
Naomi c57de650e8 CC-5172 : errors from setting cues in waveform editor not handled properly 
Conflicts:
	airtime_mvc/application/models/Playlist.php
 2013-05-23 13:01:38 -04:00
Martin Konecny 5c11f5fc72 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
 2013-05-22 18:08:14 -04:00
Naomi 0bfcd32554 CC-5172 : errors from setting cues in waveform editor not handled properly 2013-05-22 17:50:34 -04:00
Martin Konecny 3b9b23a7dd Merge branch '2.3.x-saas' into 2.4.x-saas 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/airtime-playout
 2013-05-21 16:40:10 -04:00
denise fb605ccb71 Renamed 'Open Playlist Editor' button to 'Open Media Builder' on Library page 2013-05-21 09:30:35 -04:00
denise 0f1a94532e CC-5157: [Beta user reported]Linked Show: Multiple warnings after multiple check/uncheck action 
Fixed. Also had to prepare the warning message for localization.
 2013-05-17 14:47:34 -04:00
denise 5bf91d513d CC-5127: Library -> Scheduled and Playlist columns needs better icon 
Changed icon
Renamed Playlist to Playlist / Block
 2013-05-17 11:42:48 -04:00
denise 5a86bd9ac4 CC-5149: Linked show: Regular show will be treat as linked show in some case 
A new form was not getting sent to the user properly after a show creation
 2013-05-15 15:47:45 -04:00
Martin Konecny b2c8cb0f9d Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 19:18:51 -04:00
Martin Konecny b287409bfb IM-629 
-not using show_instnace_filter POST param correctly
 2013-05-14 19:18:30 -04:00
Martin Konecny bb36556bb9 IM-629 
-filter by using instance id instead of show id

Conflicts:
	airtime_mvc/application/models/Schedule.php
 2013-05-14 19:18:08 -04:00
Naomi 7d5177d77d CC-5096 : Add "i" (info) icon to stream output type 2013-05-14 18:14:38 -04:00
denise e1d0dc9b95 Updated .po files 2013-05-14 16:08:21 -04:00
Naomi 0dd8138c2b CC-5131 : Please give user a message that Browser other than Chrome can't use waveform 2013-05-14 14:15:54 -04:00
denise 4ee7724149 CC-4864: I18N: Password reset page is not translated 2013-05-14 11:32:21 -04:00
Naomi d9b6a15fb6 CC-5139 : WaveForm: Click save will cause problem when setting crossfading between track and Smart block 2013-05-13 18:21:24 -04:00
Naomi 872f68505b CC-5108 Waveform Editor UI 2013-05-13 16:01:06 -04:00
Martin Konecny 2250d89cbd CC-5013: 
Re-Added watched folder wont update

-fixed
 2013-05-10 13:19:56 -04:00
Martin Konecny f5fa033207 better flow in dispatchMetadata function 2013-05-09 17:37:23 -04:00
denise 2e69b35d75 CC-5086: Calendar: Update show pops up instead of Add show after clicking a cell 2013-05-08 16:28:45 -04:00
Naomi 3fc6a0fbae Merge branch 'master' into CC-2301 2013-05-02 18:02:09 -04:00
Martin Konecny d902d38429 revert jsonEncode change not supported by older zend versions 2013-05-02 17:50:36 -04:00
Naomi bd1c1fa32f Merge branch 'master' into CC-2301 2013-05-02 16:59:47 -04:00
Martin Konecny ca22a25827 fix silly mistake with echoing json twice 2013-05-02 16:57:07 -04:00
Naomi 517bb7557a CC-2301 : testing default crossfade settings 2013-05-02 16:15:21 -04:00
Naomi 92ef0608d6 Merge branch 'master' into CC-2301 2013-05-01 11:04:14 -04:00
denise 0362f24a4e CC-5076: Calendar -> Context menu -> Remove all content doesn't remove content from linked instances 2013-05-01 10:30:51 -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 2e03e1982f CC-2301 : changing more CRLF files 2013-04-29 18:11:11 -04:00
Naomi b2a490ac47 CC-2301 : working on creating a crossfade method for waveforms. 2013-04-29 18:09:12 -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
denise de8f7b0ff7 CC-4961: Show linking 2013-04-29 15:27:14 -04:00
Martin Konecny acfc72f422 use sendJson, instead of manually disabling layouts + encoding data 2013-04-26 18:06:07 -04:00
Martin Konecny 3a931f27bf CC-4417: Opus codec support 2013-04-26 17:54:29 -04:00
denise 0f1383d541 CC-4961: Show linking 2013-04-25 09:00:37 -04:00
Martin Konecny 0e3b4da52f clear unused function 2013-04-24 15:17:06 -04:00
Martin Konecny 243dda60f8 remove useless comment 2013-04-19 20:25:26 -04:00
Martin Konecny fd78ad29bf cleanup of function names 2013-04-19 20:24:05 -04:00
Martin Konecny f39f9329cc CC-4992: 
Decouple pypo from Airtime install

-first commit
 2013-04-19 20:10:51 -04:00
Martin Konecny 018ec9231e don't print out anything extra after printing json 2013-04-18 16:20:34 -04:00
Martin Konecny 479e69de12 CC-5009: 
Use Silan to silently update track length in the background

-done
 2013-04-18 15:40:33 -04:00
Naomi 13c8e5f146 CC-2301 : showing waveform cue/fade editors inside of a jquery dialog box. 2013-04-16 14:37:08 -04:00
denise cfee74693b CC-4961: Show linking 
moved move-show to calendar service
 2013-04-05 17:44:30 -04:00
Martin Konecny 92d0a6178e Merge branch '2.3.x' into 2.3.x-saas 2013-04-05 15:34:04 -04:00
Martin Konecny 4595aab694 Merge branch '2.3.x' 2013-04-05 15:33:48 -04:00
Martin Konecny d1f655d79d CC-5038: Silan error: list index out of range 
-fixed
 2013-04-05 15:32:44 -04:00
Martin Konecny fcbac2a044 Merge branch '2.3.x' into devel 2013-04-04 15:15:19 -04:00
Martin Konecny a061464ffb Merge branch '2.3.x' into 2.3.x-saas 2013-04-04 15:14:04 -04:00
Martin Konecny 301115c035 CC-5039: Encoded forward slash causing lots of apache error logs 
-fixed: data should have been sent as POST rather than GET
 2013-04-04 15:12:52 -04:00
Martin Konecny d1e72cfeea Merge branch '2.3.x' into devel 2013-04-03 17:12:28 -04:00
Martin Konecny eb3fda8423 Merge branch '2.3.x' into 2.3.x-saas 2013-04-03 17:12:14 -04:00
Martin Konecny a748b05125 CC-5040: 
All API actions need to have consistent return value

-temp fix. Correct fix will require ensuring api_client always sends
XmlHttpRequest
 2013-04-03 17:11:36 -04:00
denise 81dbb17922 CC-4961: Show linking 
-moved show deletion into show service
 2013-04-03 11:46:46 -04:00
denise ab10ae68a2 CC-5036: Add back edit show instance functionality 2013-04-01 14:42:35 -04:00
denise 731b86b36c Added back editing a repeating show instance feature 2013-03-27 16:25:39 -04:00
denise e259639d1a Removed scheduleController private variable, currentUser 
Removed showService private variable, currentUser
 2013-03-27 09:02:49 -04:00
Martin Konecny 863c2c11cc Merge branch '2.3.x' into 2.3.x-saas 2013-03-26 16:34:28 -04:00
Martin Konecny ee617c8a70 Merge branch '2.3.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/UserController.php
 2013-03-26 16:34:11 -04:00
Martin Konecny d9646994e9 remove airtime-demo specific code 2013-03-26 16:33:14 -04:00
Martin Konecny 5dc0a4477b disable deletion of users 2013-03-26 16:10:42 -04:00
denise 418bf0b5ff Created calendar service and moved the context menu creation there 2013-03-26 16:03:53 -04:00
Martin Konecny b1160afeab cleanup 2013-03-22 18:05:49 -04:00
Martin Konecny d12f793578 remove potential password change exploit in airtime-demo 2013-03-22 18:05:34 -04:00
denise 6766d208aa CC-4961: Show linking 
Removed logic out of edit-show action
Created new SchedulerService
Fixed overlapping show bug
 2013-03-21 16:31:05 -04:00
denise a7601d290f CC-4961: Show linking 
Refactored services
Removed ShowDaysService and ShowInstanceService
Combined all show actions into one ShowService
 2013-03-21 10:05:11 -04:00
denise bae9f1202a CC-4961: Show linking 
Removed unused schedule controller actions
Fix bug where changing a show to repeat deletes the original show's content
 2013-03-19 10:09:28 -04:00
denise 896e03d76b CC-4961: Show linking 
Refactoring all services thus far
 2013-03-15 16:56:22 -04:00
denise c721b81a13 CC-4961: Show linking 
Refactoring
 2013-03-12 10:30:31 -04:00
denise 7347be35b1 Created a new service for show days 
Created a new user service
Started refactoring edit show action
 2013-03-11 16:18:40 -04:00
denise 1cc823ef0e Inital edit show reconfiguration changes 2013-03-08 17:10:35 -05:00
denise 116d98a81b Removed comment 2013-03-08 16:10:07 -05:00
denise d8ced29dd0 Refactored adding show forms to the view 2013-03-08 16:08:43 -05:00
Martin Konecny 43ffa2aece Merge branch '2.3.x' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/SystemstatusController.php
 2013-03-06 13:47:21 -05:00
Martin Konecny 5ceeb88899 Merge branch '2.3.x' into devel 2013-03-06 13:46:01 -05:00
Martin Konecny 7ca178295f CC-4993: airtime-check-system reports airtime-liquidsoap as down 
-fixed
 2013-03-06 13:43:22 -05:00
denise 99c07272fd - Moved all form validation to it's own function in schedule service 
- Moved show creation to it's own function in schedule service
 2013-03-06 09:58:35 -05:00
drigato bdab294fce Added comments to Schedule Service 2013-03-06 09:58:35 -05:00
denise d08f6cf3e1 CC-4961: Show linking 
-initial schedule service experimentation
 2013-03-06 09:58:35 -05:00
Martin Konecny cc69418215 Merge branch '2.3.x' into devel 2013-03-05 16:21:22 -05:00
Martin Konecny b744ab74ee Merge branch '2.3.x' into 2.3.x-saas 2013-03-01 18:22:12 -05:00
Martin Konecny ae503121d8 CC-4984: Exception for replaygain 
-fixed
 2013-02-28 18:26:15 -05:00
Martin Konecny e08732fba7 CC-4975: airtime-silan cmd error 
-fixed
 2013-02-25 19:45:26 -05:00
Martin Konecny 8bec9dea55 Merge branch '2.3.x' into 2.3.x-saas 2013-02-20 14:41:55 -05:00
denise 9113853e41 Removed logging messages from Library controller, index action 2013-02-19 11:51:26 -05:00
denise c0c6ac5d75 CC-4954: Please make Library page remember the status per user 
- it was only working if there was a playlist object set
- fixed so it works even if there isnt
 2013-02-19 11:37:22 -05:00
denise 14f1d5572f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-02-19 10:59:03 -05:00
denise d1301ff676 CC-4954: Please make Library page remember the status per user 
-done
 2013-02-19 10:58:48 -05:00
Naomi 542553bbc1 Merge branch '2.3.x' into devel 2013-02-15 17:05:36 -05:00
Naomi f2773fcb01 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-15 16:32:43 -05:00
Naomi fe611e7c6a CC-4957 : Replay Gain undefined error, json response not being sent back properly. 2013-02-15 16:32:05 -05:00
denise ec159131a8 Merge branch '2.3.x' into devel 2013-02-13 16:09:53 -05:00
denise 04ed640756 CC-3885: Deleted open playlist is not closed until a new item is added to it 
-fixed
 2013-02-13 15:44:52 -05:00
denise 76cb04e296 CC-4538: Cannot edit title or change time of repeating show if first instance has ended 
- fixed by populating the edit show form with the next repeating show that is not in the past
 2013-02-13 11:55:27 -05:00
denise 4ff1e8e78a CC-4932: Library -> Update Scheduled column on 'Cancel current show' action 
-fixed
 2013-02-13 11:29:43 -05:00
denise 8124d096d0 Removed log message 2013-02-07 15:56:35 -05:00
denise 525b2dcb33 CC-4895: Remove all json die() statements from code 
- removed json_encode
 2013-02-07 15:41:47 -05:00
denise ba4cb16171 CC-4925: Changing User permissions to a higher level ends up with show editing problems 
-typo
 2013-02-06 14:35:39 -05:00
denise 55970a4b20 CC-4925: Changing User permissions to a higher level ends up with show editing problems 
- added check to ensure user is not an admin before assigning the 'dj-edit-show' action
 2013-02-06 14:32:13 -05:00
denise 909f2c95c4 XSS exploit prevention - audio preview 2013-02-05 17:24:39 -05:00
denise 63439c276d Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-05 10:56:54 -05:00
denise 74bc485b4b XSS exploit prevention 
- Calendar - Show Contents
- Playlist tooltip in Library page
- Adding track to a show
- Widgets
- Playlist/Webstream title and description
- Smart block expansion
 2013-02-05 10:56:38 -05:00
Martin Konecny c398ce930b Merge branch '2.3.x' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
 2013-02-04 16:22:35 -05:00
Martin Konecny e2472f1f5d CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<' 2013-02-04 16:21:56 -05:00
denise 20a3f674b4 CC-4897: XSS exploit on library page 
-fixed where this was happening on Calendar - show content
 2013-02-04 12:12:57 -05:00
denise d63865625d Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-04 11:06:53 -05:00
denise 1f0b9fa5dc CC-4897: XSS exploit on library page 2013-02-04 11:06:46 -05:00
Martin Konecny 93ec4c001b Merge branch '2.3.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/models/StoredFile.php
 2013-02-02 21:07:34 -05:00
denise 8309593a0f CC-4904: Library -> Sort by status doesn't work 
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
 2013-02-01 17:47:07 -05:00
denise 384298f680 CC-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist 2013-02-01 12:06:01 -05:00
denise d4e89df94e CC-4895: Remove all json die() statements from code 2013-01-31 14:06:45 -05:00
Martin Konecny 0a198ae424 Merge branch '2.3.x' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/models/User.php
 2013-01-30 18:31:45 -05:00
denise 4f5d7869d8 Removed html from Library/contents-feed and StoredFile model 
Added new Library column to indicate if a file is scheduled in the future or belongs to a playlist/smart block
 2013-01-30 15:38:25 -05:00
Martin Konecny 216b580395 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-30 14:40:47 -05:00
Martin Konecny 52d96241da CC-4754: Replay gain modifier 
-fix regression
 2013-01-30 14:40:29 -05:00
denise 595429e6e5 CC-4897: XSS exploit on library page 
-fixed
 2013-01-30 11:51:27 -05:00
Martin Konecny b15c4569eb CC-4894: Need to filter output for potential XSS exploits 
-fixed few areas
 2013-01-29 15:17:29 -05:00
Martin Konecny 22aafda2a8 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 14:17:23 -05:00
denise d0a4141ae4 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-25 12:44:37 -05:00
denise a6f4805e1a CC-4879: Pop-up HTML Audio Player still seems to be changing spaces to %20 and so on... 
-fixed
 2013-01-25 12:44:20 -05:00
Martin Konecny 20d8bf3bc7 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 12:33:50 -05:00
Martin Konecny a16e8d05aa -don't push new schedule until end of request 2013-01-25 12:33:27 -05:00
Martin Konecny 9d6f2ebdf4 remove unecessary code 2013-01-25 12:32:37 -05:00
Martin Konecny 7c327e4c75 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 12:12:21 -05:00
denise 1873022a13 CC-4876: Default interface language setting does not appear to affect text or drop-down menu on login page? 
-fixed
 2013-01-25 11:21:34 -05:00
Martin Konecny 6f5ffdc1e7 Merge branch '2.3.x' into 2.3.x-saas 2013-01-24 17:49:08 -05:00
Martin Konecny c3f2bf57de CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-further optimization by looking at the preferred time scale
 2013-01-24 14:02:50 -05:00
Martin Konecny 2f3a30b580 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-we know what month will be the initial view for the user.
-Provide this data ahead of time via ajax request
 2013-01-24 12:52:24 -05:00
Martin Konecny 091f5ff49f CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-we know what month will be the initial view for the user.
-Provide this data ahead of time.
 2013-01-24 12:13:55 -05:00
Martin Konecny 548b73db42 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-remove an unnecessary roundtrip to server
 2013-01-23 18:31:45 -05:00
Martin Konecny 5d56341757 baseUrl is set incorrectly for previewing tracks 2013-01-21 19:32:00 -05:00
Martin Konecny c0ca6b381f merge conflict cleanup 2013-01-18 17:48:13 -05:00
Martin Konecny 909e290bd3 Merge branch 'devel' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
 2013-01-18 17:38:48 -05:00
James dfa392d914 CC-4868: Replay gain modifier is not setting the correct value 
- fixed
 2013-01-18 17:29:38 -05:00
Martin Konecny 210336d20a Merge branch 'devel' into 2.3.x-saas 2013-01-18 17:14:11 -05:00
denise e0efaea0c9 CC-4867: Library -> Audio preview doesnt work with airtime in subdirectory 
-fixed
 2013-01-18 17:10:52 -05:00
Martin Konecny f8208a355c Merge branch 'devel' into 2.3.x-saas 2013-01-18 12:22:45 -05:00
James ed7b22118c Merge branch 'silan-script' into devel 2013-01-18 11:54:10 -05:00
James f70ca93b53 CC-4841: Silan script 
done
 2013-01-18 11:53:26 -05:00
Martin Konecny 4a7b345649 fix exception on support settings page 2013-01-17 17:35:16 -05:00
denise 94a87a0b2e Smart block tooltip content breaks when language setting is not english 2013-01-17 16:19:35 -05:00
denise 796099b413 CC-4860: Library -> Context Menu -> Can't download files 
-fixed
 2013-01-17 13:37:32 -05:00
Martin Konecny 784cb390d3 Merge branch 'devel' into 2.3.x-saas 2013-01-17 10:56:18 -05:00
Martin Konecny 6640c1ea4b CC-4856: 2.3.x-saas: Overwriting metadata doesn't take effect 
-fixed
 2013-01-16 14:45:14 -05:00
denise f7e8fd33fd CC-4848: Streaming server passwords should be hidden with dots, once entered 
-fixed
 2013-01-16 14:36:56 -05:00
Martin Konecny 8b12f692cd CC-4854: Remove SaaS checking from codebase 
-fixed
 2013-01-16 14:31:43 -05:00
Martin Konecny ab83029b2f CC-4852: 2.3.x-saas: Exception happens when updating System -> Preferences 
-fixed
 2013-01-16 12:44:26 -05:00
Martin Konecny 8cd6bd9aa4 Merge branch 'devel' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/SoundcloudPreferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
	python_apps/api_clients/api_client.py
	python_apps/pypo/listenerstat.py
 2013-01-15 13:44:44 -05:00
denise a85b394d63 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 17:02:05 -05:00
denise 692c1a1c9e CC-4838: I18N: HTML contents of Print preview for Playout History need to be translated 
-fixed
 2013-01-14 17:01:50 -05:00
James 9ae3559305 Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 
Conflicts:
	airtime_mvc/application/Bootstrap.php
 2013-01-14 16:19:51 -05:00
James 5a97fb69f2 CC-4384: Remove annoying usage of $CC_CONFIG 
- done
 2013-01-14 16:16:14 -05:00
Martin Konecny 0dfd8acf7a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 16:00:46 -05:00
Martin Konecny fae3f3a03f CC-2184: Hardcoded CSS path should be relative path instead 
-Make '/' the default root
 2013-01-14 16:00:38 -05:00
denise 8ea3aca3a0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 14:07:55 -05:00
James cf09175ff1 CC-4796: Listener Stat: Authentication exception happens but no warning message on UI. 
- done
 2013-01-14 13:57:32 -05:00
James 891e993cd1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 13:56:24 -05:00
James d4124f916d CC-4796: Listener Stat: Authentication exception happens but no warning message on UI. 
- done
 2013-01-14 13:56:00 -05:00
denise 2c3e79e842 CC-4832: I18N: Tool tip for show is partially filled in Calendar page is not translated 
-fixed
 2013-01-14 13:53:27 -05:00
denise 1e6b0fe6ae CC-4833: I18N: Alert message "Please select a cursor posion from timeline." in Now playing page is not translated 
-fixed
 2013-01-14 13:47:41 -05:00
denise 83be01d0d0 CC-4835: I18N: "Copy of ..." from Duplicating playlist would better be translated 
-fixed
 2013-01-14 13:42:17 -05:00
James 1666a04451 CC-4826: Please re-push the liquidsoap queue if updating Replay Gain settings 
- done
 2013-01-14 11:28:48 -05:00
denise 8362860904 Block expansion ajax url was missing baseUrl 2013-01-11 14:11:01 -05:00
James dcf3526000 CC-4384: Remove annoying usage of $CC_CONFIG 
- done
 2013-01-10 18:09:00 -05:00
James 55fa8b8dc1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 14:52:45 -05:00
denise 9f857433fa CC-4817: I18N: "Playlist Shuffled" is not listed for translation 
-fixed
 2013-01-10 14:22:25 -05:00
denise a0be1c647e CC-4786: Refresh page when language setting changes 
-configure localization and reinitiliaze edit user form after the user locale is set
 2013-01-10 14:01:03 -05:00
denise 2797809c74 CC-4786: Refresh page when language setting changes 
-done
 2013-01-10 13:55:52 -05:00
James 048ee05030 CC-4821: Add option to disable ReplayGain 
- done
 2013-01-10 13:49:41 -05:00
denise 0aeea61006 CC-4822: Cannot preview playlist 
-fixed
 2013-01-10 10:52:39 -05:00
denise 1572955d07 CC-4810: Add language setting to login page 
-done
 2013-01-09 18:03:23 -05:00
denise db62b538dd CC-4816: Timezones should be a user preference 
-done
 2013-01-09 13:38:38 -05:00
denise f887ca3d8d CC-4813: Users -> Do not save username on User Management page 
-fixed
 2013-01-09 13:25:18 -05:00
James 6e7f45e615 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 17:32:39 -05:00
James 1263c04621 CC-4796: Listener Stat: Authentication exception happens but no warning message on UI 
- done
 2013-01-08 17:32:27 -05:00
denise 9755ea6a20 CC-4814: System->Streams: Tool tips' content of output stream's admin user field is not listed in airtime.po file 
-fixed
 2013-01-08 16:47:00 -05:00
denise 87bfc81ca0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 15:53:33 -05:00
denise 6097196dd7 CC-4813: Users -> Do not save username on User Management page 
-fixed
 2013-01-08 15:52:56 -05:00
Martin Konecny 1ee90ed9b9 CC-4790: Media Monitor: Re-added files won't show up in Library 
-fixed
 2013-01-08 15:42:35 -05:00
Martin Konecny 178abcfada CC-4785: Zend errors on page not found 
-partially fixed
 2013-01-08 15:14:33 -05:00
denise f308305df8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 18:18:59 -05:00
denise a65e72941f CC-4805: Localization -> Changing default language changes datatables and add media language setting 
-fixed
 2013-01-07 18:18:40 -05:00
James 6e241fd3ec CC-4512: Allow changing stream "Offline" message via Web UI 
- fixed
 2013-01-07 18:14:57 -05:00
James 0542e713ed CC-4794: Library: Please disable "Duplicate playlist" option for Smart Block's context menu 
- fixed
 2013-01-07 12:20:07 -05:00
denise 32fd92c892 CC-4787: Edit User: Don't save username field 
-fixed
 2013-01-04 11:38:49 -05:00
denise e2c87ed8b6 CC-4781: Store localization settings on a per-user basis 
-done
 2013-01-03 16:19:02 -05:00
James a1837366be Merge branch 'cc-3018-silence-detection' into devel 2013-01-03 14:08:21 -05:00
James b8f80866cf CC-3018: Automatically strip out silence from audio tracks 
- done
 2013-01-03 14:02:06 -05:00
Martin Konecny 25df87d2e5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 16:09:39 -05:00
Martin Konecny d6eb043899 CC-4765: Webstream of AAC type can't be previewed 
-fixed
 2013-01-02 16:09:32 -05:00
denise 88f2f1e4a7 CC-4773: L10N: Some strings is not listed in airtime.po 
-fixed
 2013-01-02 16:04:19 -05:00
James dcdbc3160d CC-4769: Duplicate Playlist: Fade in/out setting doesn't get copied correctly 
- fixed
 2013-01-02 11:41:33 -05:00
James f26778ee72 CC-4757: Duplicate playlist 
- done
- we still need a icon for context menu
 2012-12-28 16:17:58 -05:00
james cf38e2c596 CC-4754: Replay gain modifier 
- done
 2012-12-27 22:58:41 -05:00
james c0665e4748 CC-4754: Replay gain modifier 
- Initial commit
 2012-12-27 00:36:11 -05:00
denise 274b1f7562 CC-4743: Make user rights description localizable 2012-12-17 16:53:43 -05:00
denise dd5882984e CC-4736: Let non-admin users update their user info 
-done but needs design
 2012-12-10 16:55:44 -05:00
denise 062740ef81 CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page 
-done
 2012-12-05 13:16:25 -05:00
Martin Konecny 3086bde17e -cleanup parsing for form elements that weren't provided by the client in our SaaS implementation 2012-12-04 16:22:03 -05:00
denise 1846f17bbc CC-4731: Cannot save support feedback settings 2012-12-04 16:21:45 -05:00
denise ee086fe43a CC-4730: Support Feedback: Errors are displayed when they shouldn't be 2012-12-04 14:46:06 -05:00
denise 89e0458500 CC-4728: Support Feedback save action does not use ajax 
-done
 2012-12-03 17:15:47 -05:00
denise b2699fa914 merge from devel 2012-12-03 11:06:56 -05:00
denise 542434d9f0 CC-1960: Internationalize Airtime / Support translations 
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
 2012-11-28 16:16:39 -05:00
Martin Konecny 4983721565 Merge branch '2.2.x' into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/forms/LiveStreamingPreferences.php
 2012-11-28 16:10:33 -05:00
denise 9689c75bed CC-1960: Internationalize Airtime / Support translations 
-added i18n to serverbrowser.js
-fixed small typo in SmartBlockCriteria.php
 2012-11-28 11:54:22 -05:00
denise c4062f7770 CC-1960: Internationalize Airtime / Support translations 
-fixed javascript strings
 2012-11-27 12:31:21 -05:00
denise c6a5db4a78 CC-1960: Internationalize Airtime / Support translations 
-dashboard was missing a translation - fixed
 2012-11-23 10:48:44 -05:00
denise dd0e71efcc CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
 2012-11-22 17:32:24 -05:00
denise 96b87d23e0 CC-1960: Internationalize Airtime / Support translations 
-added i18n for plupload
 2012-11-22 14:37:54 -05:00
Martin Konecny 3a1945a818 CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 
-fixed
 2012-11-22 11:40:44 -05:00
denise 25ddd083bc CC-1960: Internationalize Airtime / Support translations 
-added language option in preferences
 2012-11-21 12:44:50 -05:00
denise 10b6dd202e Merge branch 'devel' into cc-1960-internationalize-airtime 
Conflicts:
	airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
 2012-11-21 11:44:40 -05:00
denise 10cd31fa56 CC-1960: Internationalize Airtime / Support translations 
- channged all js strings with embedded variables to use sprintf
 2012-11-20 17:42:26 -05:00
denise 9762511693 Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LocaleController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/application/views/scripts/playlist/playlist.phtml
	airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
 2012-11-20 16:56:18 -05:00
denise f40d1f8dd4 CC-1960: Internationalize Airtime / Support translations 
-enabled i18n for datatables, colVis, columnFilter, and fullCalendar
-fixed typos in full-calendar-functions.js
 2012-11-20 16:40:02 -05:00
Rudi Grinberg 7124cbe04d fixed bug where hidden files would be shown in library 2012-11-20 15:18:41 -05:00
Rudi Grinberg 20855c73b5 refactoring + fix typo 2012-11-20 15:10:38 -05:00
denise 57fdab0ddf CC-1960: Internationalize Airtime / Support translations 
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
 2012-11-20 11:33:37 -05:00
denise 2ce530c5bd CC-1960: Internationalize Airtime / Support translations 
- fix to some controller strings
 2012-11-20 11:33:37 -05:00
denise 5adadc2e91 CC-1960: Internationalize Airtime / Support translations 
- added gettext wrapper function to all strings in controllers
 2012-11-20 11:33:37 -05:00
denise 8c49540d3d CC-1960: Internationalize Airtime / Support translations 
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
 2012-11-20 11:16:10 -05:00
denise d7495c6937 CC-1960: Internationalize Airtime / Support translations 
- fix to some controller strings
 2012-11-15 14:05:36 -05:00
denise 105325994f CC-1960: Internationalize Airtime / Support translations 
- added gettext wrapper function to all strings in controllers
 2012-11-15 12:55:45 -05:00
James 2b2a1db055 CC-2401: Shuffle option in playlists 
- done
 2012-11-13 17:32:10 -05:00
James d8165cbf44 - haproxy support subdomain name with '.' 2012-11-13 16:32:36 -05:00
denise c0e54c64cd CC-4685: System -> User: Unique username error 
-fixed
 2012-11-12 12:29:07 -05:00
Martin Konecny ed7aba83bf Merge branch 'cc-4661-listener-statistics' into 2.2.x-saas 2012-11-07 17:22:36 -05:00
James 7300b608cf Merge branch 'cc-4661-listener-statistics' into devel 
Conflicts:
	python_apps/api_clients/api_client.py
 2012-11-07 17:20:12 -05:00
James 9112a8d0b1 CC-4661: Listener Statistics 
- enhancement on flot
- data point reduction
 2012-11-07 16:26:31 -05:00
denise bd482a0a75 CC-4583: Use AJAX calls instead of refreshing entire page 
-fixed
 2012-11-07 15:17:47 -05:00
denise b817684972 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
 2012-11-07 11:21:36 -05:00
Martin Konecny 272e428fa7 Merge branch '2.2.x' into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/EmailServerPreferences.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/menu.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
 2012-11-06 17:23:32 -05:00
Martin Konecny fd3305bc4c SAAS-289: Remove all isSaaS checks 
-done
 2012-11-06 17:10:47 -05:00
Martin Konecny 38d28d3346 SAAS-289: Remove all isSaaS checks 2012-11-06 16:48:34 -05:00
James 504d9968f1 CC-4639: 
Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit

- fixed the bug where airtime hangs when repeat is checked but 0 files that
meet criteria
- fixed dynamic block bug where it didn't generate correct list
 2012-11-06 16:32:00 -05:00
Martin Konecny 3f7d8a0c7f Merge branch '2.2.x' into 2.2.x-saas 2012-11-06 16:11:51 -05:00
James 9712e64a69 CC-4661: Listener Statistics 
- bug fix and removing unnecessary code
 2012-11-06 14:52:35 -05:00
denise c605c97268 CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks 
-disabled this option from context menu
 2012-11-06 14:33:34 -05:00
Martin Konecny d467abe509 Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel 2012-11-05 11:27:34 -05:00
Rudi Grinberg e01a61208d Merge remote-tracking branch 'sf/2.2.x' into cc-4585 2012-11-05 09:19:20 -05:00
Rudi Grinberg 5d3aa68c72 written method to unhide all files in a music dir 2012-11-03 01:09:36 -04:00
Martin Konecny 9609a4e220 Merge branch 'cc-4652' of https://github.com/rgrinberg/Airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
 2012-11-02 20:16:54 -04:00
James a93b588a09 Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics 2012-11-02 18:25:23 -04:00
James 74fe958cad CC-4661: Listener Statistics 
- changes for different mount names
 2012-11-02 18:25:08 -04:00
Martin Konecny 6438b54a5f CC-4661: Listener Statistics 
-backend part working
 2012-11-02 17:50:43 -04:00
denise 106b18bf30 CC-4637: Media Library: Item will be removed from Playlist if it's removed from Library 
-fixed
 2012-11-02 17:49:32 -04:00
James 3af3cd5870 CC-4661: Listener Statistics 
- frontend part
 2012-11-02 17:00:38 -04:00
Rudi Grinberg 2ae3c0ac03 Line wrapping 2012-11-02 16:06:12 -04:00
Rudi Grinberg 1111fd8163 align 2012-11-02 16:04:47 -04:00
Rudi Grinberg ac9b47f5e2 made rescanWatchDirectoryAction more concise 2012-11-02 16:02:05 -04:00
Rudi Grinberg 270eb97128 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into cc-4585 2012-11-01 15:14:53 -04:00
Rudi Grinberg 226bdbf738 added todo 2012-10-31 17:41:50 -04:00
denise 5b14c4fe88 CC-4656: Library -> No error message when a dj tries to delete smart blocks and webstreams they do not own 
-fixed
 2012-10-31 17:19:27 -04:00
denise 2507e0f8a4 CC-4655: DJ's can delete files that they do not own 
-fixed
 2012-10-31 16:51:29 -04:00
denise fc613aa597 CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files 
-fixed
 2012-10-31 16:01:17 -04:00
james 9293a26738 CC-4639: Give an option to allow smart blocks to reuse tracks if not enough 
tracks meet the time limit

- code optimazation
 2012-10-31 12:05:17 -04:00
James 9d495ebc03 CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit. 
- done
 2012-10-30 17:57:58 -04:00
Rudi Grinberg dc00528cd5 Merged baseUrl related conflicts 2012-10-29 11:56:20 -04:00
denise 3a7700eaac CC-4583: Use AJAX calls instead of refreshing entire page 
-done
 2012-10-26 18:09:30 -04:00
Martin Konecny c1b2978fba disable rabbitmq status on SaaS 2012-10-25 17:50:43 -04:00
James b8d6132b52 - saas patch #1 2012-10-23 18:47:15 -04:00
Martin Konecny 3c61b39daa Merge branch '2.2.x' into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/Bootstrap.php
 2012-10-23 16:09:55 -04:00
James 58535bef88 CC-4580: No contents in rebroadcast show 
- fixed
 2012-10-19 16:40:32 -04:00
denise 2527fa2e1a CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 14:42:01 -04:00
denise 7d8079f770 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ShowbuilderController.php
	airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
	airtime_mvc/public/js/airtime/common/common.js
 2012-10-19 12:50:36 -04:00
denise 3b5ec6fbe0 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:46:18 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
James 4ad8ee2472 - removing a line for saas 2012-10-18 14:32:56 -04:00
James 45801e5dc4 - fix spelling of some function name 2012-10-17 15:16:03 -04:00