Commit Graph

1039 Commits

Author SHA1 Message Date
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
denise 22bfc45497 CC-1960: Internationalize Airtime / Support translations
-defined translations for show builder datatable
2012-11-27 15:51:50 -05:00
denise 0a642fc717 CC-1960: Internationalize Airtime / Support translations 2012-11-27 12:23:16 -05:00
denise d2ed927e65 CC-1960: Internationalize Airtime / Support translations
-playout history datatable was missing translation table
2012-11-27 12:17:59 -05:00
denise b9b387fcd0 CC-1960: Internationalize Airtime / Support translations
-fixed typos
2012-11-27 11:59:55 -05:00
denise b677130a3f CC-1960Internationalize Airtime / Support translations
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
2012-11-23 16:39:41 -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
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 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
James d69faef560 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-20 15:05:20 -05:00
James 4737232b21 CC-2401: Shuffle option in playlists
- add delayed removing of success message
2012-11-20 15:05:09 -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
Martin Konecny fed39077c0 Merge branch '2.2.x' into devel 2012-11-20 11:21:29 -05:00
Martin Konecny d1a22fe7ca CC-4677: Improve Smart block repeat description
-fixed
2012-11-15 11:30:56 -05:00
James 2b2a1db055 CC-2401: Shuffle option in playlists
- done
2012-11-13 17:32:10 -05:00
denise 0a0cf70046 CC-4687: System -> Stream: Cannot expand/shrink Stream 1/2/3 settings after clicking Save
-fixed
2012-11-12 12:06:22 -05:00
denise ef8f8dfa75 CC-4688: System -> Preferences: Please expand the Soundcloud settings if warning for wrong settings exists
-fixed
2012-11-12 11:45:26 -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 ccd6447696 - install failed due to wrong metadata key
- wrong controller action called
2012-11-07 12:05:20 -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
denise bf4f5fd699 CC-4607: Library: Please make the 'Add x items' following mouse's point
-fixed
2012-11-06 16:34:06 -05:00
James 9712e64a69 CC-4661: Listener Statistics
- bug fix and removing unnecessary code
2012-11-06 14:52:35 -05:00
denise a1a7396ec9 CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks
-disabled this button in the library toolbar if dynamic blocks are open
2012-11-06 14:29:26 -05:00
James 2e79e8421c CC-4661: Listener Statistics
- better legend for multiple series of data
- consistant number of ticks on x-axis
2012-11-06 10:54:52 -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
denise a201d6f2da CC-4666: Showbuilder page is dead
-fixed. result of a bad merge
2012-11-05 11:15:26 -05:00
James 74fe958cad CC-4661: Listener Statistics
- changes for different mount names
2012-11-02 18:25:08 -04:00
James 3af3cd5870 CC-4661: Listener Statistics
- frontend part
2012-11-02 17:00:38 -04:00
denise 2854dd40e0 CC-4663: Smart Blocks -> Deleting a track in smart block from library gives error
-fixed
-tracks with undefined mime type were not handled properly
2012-11-02 16:54:49 -04:00
denise 135aadf16b Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 12:28:21 -04:00
denise a937df30ad Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-02 10:48:16 -04:00
denise cc208da2fb CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference
-added labels
2012-11-02 10:48:08 -04:00
James 575400b4c2 CC-4623: Library: Preview button for Flac does not work
- fixed
2012-11-01 16:44:37 -04:00
James d7a5ab4d94 CC-4622: Library: AAC file can be preview but is blocked from playlist and content menu
- fixed
2012-11-01 15:21:56 -04:00
denise dfd52eedf1 CC-4654: Library -> Simple search still has effects even if you are doing an advanced search
-fixed
2012-10-31 15:24:50 -04:00
james 2e4d5ec142 CC-4539: Advanced search: Sample rate searched on Hz, but search results
shown in kHz

- fixed
2012-10-31 12:32:40 -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
denise 00947f9d7e CC-4640: Automatically jump to current song when loading the Now Playing page.
-small fix
2012-10-30 15:34:38 -04:00
denise cabe583a3b CC-4649: Library -> Disable simple search if advanced search fields are open
-done
2012-10-30 15:01:46 -04:00
denise 695c0fa926 CC-4607: Library: Please make the 'Add x items' following mouse's point
-fixed
2012-10-30 11:45:53 -04:00
denise b08f5091b5 CC-4609: Calendar -> Add/Remove contents: Please remove useless buttons: 'Jump to current playing song' and 'Cancel current show'
-done
2012-10-30 11:18:11 -04:00
denise d97afabaea CC-4640: Automatically jump to current song when loading the Now Playing page.
-added check to see if a show is currently playing
2012-10-29 15:40:58 -04:00
denise 332f9993c0 CC-4640: Automatically jump to current song when loading the Now Playing page.
-done
2012-10-29 15:20:16 -04:00
denise fdd889d7a8 - fixed formatting 2012-10-29 12:09:11 -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
James e667a721ad - comment for some code 2012-10-26 16:26:48 -04:00
James 1ee228558a CC-4574: Audio preview fails with certain characters in metadata
- fixed
2012-10-26 16:24:17 -04:00
denise c51fb8a040 CC-4549: Tooltip for source username cannot be shared between input and output settings
-fixed
2012-10-22 16:37:06 -04:00
denise f30d636b17 CC-4581: Confirmation dialog for removing an item from a show refers to deletion 2012-10-19 16:19:32 -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
Martin Konecny f5051cff3a CC-4605: Some AJAX calls are cached
-fixed
2012-10-19 11:22:44 -04:00
Martin Konecny d5c2c37a3e Revert "CC-4605: Some AJAX calls are cached"
This reverts commit ffca5b42a8.
2012-10-19 11:16:42 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
Martin Konecny ffca5b42a8 CC-4605: Some AJAX calls are cached 2012-10-19 11:07:37 -04:00
denise e9815b617b - added comment 2012-10-18 15:21:38 -04:00
denise 67ac4340c4 CC-4596: Too many ajax calls in Calendar page
-fixed
2012-10-18 14:47:19 -04:00
Daniel James 7c799cd3af Fixed formatting of tooltip for smart blocks 2012-10-18 13:01:55 +01:00
James 96da822bc7 CC-4574: Audio preview fails with Zend errors on file with question mark in the title
- fixed
2012-10-16 14:38:24 -04:00
James 67ca0db4c8 CC-4542: Playlists containing dynamic smart blocks cannot be previewed
- fixed
2012-10-16 14:09:34 -04:00
James 7796b23a58 CC-4506: Audio Preview in Playlist doesn't work
- fixed
2012-10-16 12:06:47 -04:00
James 03b32ea986 CC-4563
Library: Exception is found when remove a block by context menu

- fixed
2012-10-16 10:37:42 -04:00
Daniel James a103c76378 CC-4558: Make button in Now Playing consistent with same action in Calendar 2012-10-15 12:27:16 +01:00
denise 5f35336fd0 CC-2295 Improvements to playlist builder beha...CC-2303 Cue-in Cue-out inconsistency with time values:
-fixed
2012-10-11 11:49:04 -04:00
Daniel James 395d25158f CC-4545: Fix tooltip for Auto Switch On feature 2012-10-10 16:26:32 +01:00
denise c9ac675a10 CC-4529: Playlist Builder: The panel of 'Adding n items' will be bigger than usual if there is a item in Playlist has expanded cue in/out setting
-fixed
2012-10-09 14:39:29 -04:00
denise 0d35056cd4 CC-4486: Library -> Advanced Search: Alignment is off sometimes
-added placeholders to input tags for format examples
2012-10-04 12:16:57 -04:00
denise eadde1c498 CC-4519: Advanced Search Option: Please use text search instead of scope search from Mime's type
-fixed
2012-10-03 11:29:16 -04:00
denise 3dd7e9767b CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes
-validation was missing for Encoded By filter
2012-10-02 13:57:36 -04:00
Martin Konecny 9df90414fc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 17:22:13 -04:00
Martin Konecny 5a8510b909 remove gap on right side of show builder: part 3 2012-09-19 17:22:04 -04:00
denise e926b62915 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 17:00:15 -04:00
denise f909ab9da2 CC-4490: Calendar: Empty show icon should have a tooltip
-done
2012-09-19 16:59:45 -04:00
Martin Konecny 40c122fafa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 16:56:04 -04:00
Martin Konecny 84ed03ffac remove gap on right side of show builder: part 2 2012-09-19 16:55:44 -04:00
denise f2e495cbd8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 16:40:05 -04:00
denise 2afc4183bb CC-4496: Library -> Contents-feed does not work if advanced search data is invalid
-fixed
2012-09-19 16:39:56 -04:00
Martin Konecny a3b53ee3d3 remove gap on right side of show builder 2012-09-19 16:19:02 -04:00
denise b4277f1f17 CC-4495: Library -> Advanced Search: Some fields with ranges do not get validated
-fixed
2012-09-19 15:46:03 -04:00
denise 4b2d6caf0e CC-4485: Library -> Advanced Search -> Tooltip needed for invalid input
-done
2012-09-19 15:35:45 -04:00
Martin Konecny f717efd7fb Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 13:23:14 -04:00
Martin Konecny ca0fb969b7 fix jplayer errors for mp3 and firefox (flash) 2012-09-19 13:23:06 -04:00
denise 81620d4f94 CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes
-fixed
2012-09-19 12:41:54 -04:00
denise dc95ab1d00 CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-changed null values to empty strings
2012-09-19 11:05:17 -04:00
denise 281e7d1092 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 10:49:52 -04:00
denise 0c823af660 CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-done
2012-09-19 10:49:17 -04:00
Martin Konecny 7036036a86 CC-4476: Make all green notification boxes fade out after 5 seconds
-fixed
2012-09-18 21:29:02 -04:00
denise 5003e86eac - changed smart block qtip text 2012-09-18 17:37:38 -04:00
denise 1d699fe0b8 CC-4479: Buttons in dialog windows are not styled
-done
2012-09-18 17:22:24 -04:00
denise b77429164b CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
-removed setInterval function
2012-09-18 16:55:46 -04:00
denise 54ab58a9c7 CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
-removed (commented out) code for this ticket
-postponing for now
2012-09-18 16:49:45 -04:00
denise 8cae11d588 CC-4478: Library: audio preview check should be skipped if file does not exist
-fixed
2012-09-18 15:52:11 -04:00
denise 09b117999e CC-4475: Register form button doesn't have any styling
-fixed
2012-09-18 15:28:38 -04:00
denise e676cf856f -remove console.log 2012-09-18 15:16:54 -04:00