ac295243d4
Smart Playlists: changed success message for 'Save' button
2012-08-09 17:34:47 -04:00
e6ee29f57c
Smart Playlist Options: changed width of fieldset
2012-08-09 17:28:35 -04:00
f75cf5ffe2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 17:24:00 -04:00
e674654cb1
CC-4192: Smart Playlist Builder: make save button save title, description, and criteria
...
-done
2012-08-09 17:23:52 -04:00
618813ebc1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 16:59:33 -04:00
6c721cd68d
CC-4184: Playlist Builder : Error alert for trying to add Web Stream to Smart Playlist
...
- fixed
- extra fix: context menu for webstream
2012-08-09 16:59:18 -04:00
c73328e297
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to preview webstreams inside of playlists
2012-08-09 16:49:20 -04:00
952f18dc3c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 14:39:42 -04:00
b53bc36f4f
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to preview webstreams
2012-08-09 14:39:31 -04:00
1367bde728
CC-4185: Playlist Builder -> Smart Playlist: Able to create Smart Playlist more than 24 hours
...
- fixed
2012-08-09 14:18:15 -04:00
ef0e800c92
CC-4186: Playlist Builder -> Smart Playlist : The static Smart Playlist's length value will be empty if no file meet the criteria.
...
- fixed
2012-08-09 14:12:30 -04:00
825abca61b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 11:44:43 -04:00
685354e000
CC-4189: Playlist Builder -> Smart Playlist: Cannot change the position of manually added tracks
...
- fixed
2012-08-09 11:44:27 -04:00
bad418062e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 11:21:01 -04:00
677d523ef4
CC-4187: Media Library -> Regular Playlist : Use legend instead of label for different elements in context view
...
-done
2012-08-09 11:20:49 -04:00
ae5b6e58d7
CC-4144: Playlist Builder: Adding smart playlist into regular playlist will reset the Fade in/out settings to default value
...
- fixed
2012-08-09 11:03:57 -04:00
d959e4ff11
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 10:47:59 -04:00
cf1178522a
CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error
...
- changes made on phtml were cause some errors. fixed.
2012-08-09 10:47:43 -04:00
c69dac7ab6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-08 23:02:39 -04:00
d0d70db391
remove useless debugging
2012-08-08 23:02:16 -04:00
8f3037c3e4
CC-1665: Scheduled stream rebroadcasting and recording
...
-remove incorrect "no items" warning when a show only contained a webstream
2012-08-08 23:02:08 -04:00
90ec046854
CC-4188: Playlist Builder -> Smart Playlist : sometimes elements do not index properly when add a new criteria row
...
-fixed
2012-08-08 16:27:03 -04:00
b2d3ee0aa4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-08 15:35:44 -04:00
791989faf7
Smart Playlists: changed label 'block' to 'playlist' type
2012-08-08 15:35:28 -04:00
ab19d6f511
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-08 15:29:28 -04:00
d1e6f8178b
CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error
...
- fixed. Not displaying fade setting button if the playst/smartplaylist
is empty.
2012-08-08 15:29:09 -04:00
3a4a827f1f
CC-4180: Smart Playlist Builder: modifier select boxes do not change when criteria changes
...
-fixed
2012-08-08 15:24:47 -04:00
50f9582b95
CC-4179: Media Library -> In brief view of Dynamic Smart Playlist, 'does not contain' will be broken to 2 lines
...
-fixed
2012-08-08 13:24:53 -04:00
67a8457889
Smart Playlists: modifier buttons appear incorrectly when editing
2012-08-08 13:16:02 -04:00
5c3701c064
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-08 13:07:12 -04:00
85259e5bba
CC-4170: Smart Playlist Builder: elements don't organize properly after deleting a row
...
-fixed
2012-08-08 13:07:00 -04:00
83917ed894
CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error
...
- fixed
2012-08-08 12:23:07 -04:00
fd1628f971
CC-4117: Smart Playlist: radio_station_name criteria doesnot take effect
...
- removing radio_station_name from criteria list
2012-08-08 12:01:10 -04:00
61e38381af
CC-4176: Smart Playlist: Set implicit item limit when user uses time as a limit
...
- done
2012-08-08 11:46:48 -04:00
f33485f8ea
Merge branch '2.1.x' into devel
2012-08-08 00:09:13 -04:00
333c8ec211
slightly improved PHP logging format
2012-08-08 00:08:46 -04:00
18ca6b22cb
CC-1665: Scheduled stream rebroadcasting and recording
...
-add placeholder icons for smart playlists/webstreams
2012-08-07 23:44:21 -04:00
230c3399ef
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix newlines appearing in playlist/webstream title
-disable autosave of playlist/webstream title
2012-08-07 20:48:58 -04:00
db36870aec
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix creator id on another SQL query
2012-08-07 20:38:36 -04:00
8876b312fb
CC-4167: Create new playlist doesn't work
...
-fixed
2012-08-07 19:49:59 -04:00
1dddaa0ba2
CC-1665: Scheduled stream rebroadcasting and recording
...
-refresh library to show new stream after save
2012-08-07 19:49:26 -04:00
47ae223a1c
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix SQL error
2012-08-07 19:23:42 -04:00
9b805f0a01
CC-4159: Playlist Builder -> Smart Playlist : "+" for modifier disappears if 3 or more Criteria
...
-fixed
2012-08-07 17:40:47 -04:00
4ee232944d
CC-4169: Playlist Builder: Smart Playlist time validates even if time isn't given
...
-fixed
2012-08-07 16:27:18 -04:00
9c678c0429
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-07 16:18:00 -04:00
97943a6af8
CC-4157: Playlist Builder -> Smart Playlist -> Wrong warning msg if trying to input 0000-00-00 into Upload criteria
...
-fixed
2012-08-07 16:17:24 -04:00
0fe501508e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-07 15:54:42 -04:00
171825e19a
CC-4148: Playlist Builder: Please add a 'Processing' for generating Smart playlist
...
- added processing box
2012-08-07 15:54:16 -04:00
f6dffc95c8
CC-4158: Playlist Builder -> Smart Playlist: Warning msg field is a little bit longer
...
-fixed
2012-08-07 15:22:32 -04:00
152a97917d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-07 15:20:32 -04:00
823ab1dd41
CC-4162: Smart Playlist Builder: extra space in between limit and error message
...
-fixed
2012-08-07 15:20:12 -04:00
550c97a2dc
CC-4154L: Indicate whether a show has scheduled content on the calendar page
...
-done
2012-08-07 14:57:04 -04:00
2f8d0b77fa
CC-4149: Playlist Builder: Fail to generate Smart Playlist with 5000 items
...
- set the items limit to 500
2012-08-07 14:53:07 -04:00
d05661afff
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-07 11:08:34 -04:00
2c0f7bf03b
CC-4145: Playlist Builder: Alert pops up when clicking 'Add to playlist' in context menu of Smart Playlist to add it into regular playlist
...
-fixed
2012-08-07 11:08:00 -04:00
e20289e5cf
Merge branch '2.1.x' into devel
2012-08-06 17:17:05 -04:00
975abbaf10
Remove unecessary information being sent from API
2012-08-06 17:16:43 -04:00
48a1bf3f02
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/Show.php
2012-08-06 17:10:46 -04:00
40023d9086
CC-4152: Widget does not display current show in some modes
...
-fixed
2012-08-06 17:07:18 -04:00
688051b59e
CC-1665: Scheduled stream rebroadcasting and recording
...
-Remove sX_name from being inserted into DB
2012-08-03 18:45:43 -04:00
f901e13a84
CC-1665: Scheduled stream rebroadcasting and recording
...
-Make playlist builder show creator name instead of creator id
2012-08-03 18:06:47 -04:00
b23b9a0cbd
CC-1665: Scheduled stream rebroadcasting and recording
...
-allow to filter by webstream only
2012-08-03 16:33:58 -04:00
183937b8e9
CC-1665: Scheduled stream rebroadcasting and recording
...
-when editing string should hav 00h 00m format.
2012-08-03 16:18:45 -04:00
0ea66fc33f
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to edit playlists
2012-08-03 15:59:34 -04:00
d18acfdc75
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-02 17:17:52 -04:00
2a7c5eef64
CC-84: Smart Playlists
...
- added no-wrap class to qtip
2012-08-02 17:17:44 -04:00
8e67ecff0a
CC-84: Smart Playlists
...
- added a no-wrap class to qtip
2012-08-02 17:17:13 -04:00
82970c6e73
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-02 17:04:49 -04:00
af939469d3
CC-84: Smart Playlists
...
- fixed bug on expanding block
- fixed text bug
2012-08-02 17:03:54 -04:00
361e681a59
CC-84: Smart Playlists
...
- remove 'add to playlist' option on showbuilder screen
2012-08-02 16:50:35 -04:00
ef994aa449
CC-84: Smart Playlists
...
- block options scroll for small screens
2012-08-02 16:40:32 -04:00
028e089c82
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/Block.php
2012-08-02 16:37:12 -04:00
0d2d8218bf
CC-84: Smart Playlists
...
- audio preview on playlist
- cleaning up some code
2012-08-02 16:36:12 -04:00
a146fdcd37
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-02 16:27:00 -04:00
9cc152c0ae
CC-1665: Scheduled stream rebroadcasting and recording
...
-validate form fields of new webstream
2012-08-02 15:45:15 -04:00
4fca33c5fc
CC-84: Smart Playlists
...
- removed block from right side if it gets deleted from context menu
2012-08-02 12:59:00 -04:00
997b5c31c3
CC-84: Smart Playlists
...
- fixed dragging tracks into playlists (smart and dumb)
- display alert when dragging into dynamic block
- display alert when dragging playlist into block
2012-08-02 11:52:11 -04:00
6e71a6bb92
CC-84: Smart Playlists
...
- dynamic block length display
2012-08-02 11:17:10 -04:00
9479aeb3dd
CC-84: Smart Playlists
...
- fixed db column mapping for radio station name and track title
2012-08-01 17:10:56 -04:00
ddd6016b28
CC-84: Smart Playlists
...
- qtip cleanup
2012-08-01 16:36:12 -04:00
bf0dcc9035
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-01 16:26:14 -04:00
483ffdf6af
CC-84: Smart Playlists
...
- increased size of criteria column
- it was too smallf for some fields
2012-08-01 16:25:59 -04:00
2ef4fd314c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-01 15:37:58 -04:00
b9bb87f69d
CC-1665: Scheduled stream rebroadcasting and recording
...
-clicking save now show's webstream save was successful
2012-08-01 15:37:50 -04:00
bcab41cb86
- 'New User' button text was wrapping onto two lines
2012-08-01 15:30:35 -04:00
40ebeb7fb4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-01 15:00:54 -04:00
13bb036bad
CC-84: Smart Playlists
...
-on criteria qtip limit was displaying more than once
-fixed
2012-08-01 15:00:41 -04:00
e6a3877c1e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-01 14:52:29 -04:00
63b89043b6
CC-1665: Scheduled stream rebroadcasting and recording
...
on-air light works with streams now
2012-08-01 14:51:56 -04:00
7d788c51b2
CC-84: Smart Playlists
...
- added scrolling on qtip
2012-08-01 14:43:52 -04:00
0f681d7c25
CC-84: Smart Playlists
...
-fixed undefined offset apache warnings
2012-08-01 14:07:38 -04:00
8f063367cc
CC-84: Smart Playlists
...
- qtip cleanup for dynamic playlists
2012-08-01 13:49:16 -04:00
c9afac239a
CC-84: Smart Playlists
...
- add qtip for smart playlists
- modified qtip content for regular playlists that contain smart playlists
2012-08-01 12:04:48 -04:00
9d51222dae
CC-84: Smart Playlists
...
- Length calculation for dynamic blocks and playlist that contains
dynamic blocks
2012-07-31 17:46:37 -04:00
1b0cd6b01b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-31 11:01:34 -04:00
b312b2bd45
CC-84: Smart Playlists
...
- fixed db query part for static smart playlist generate
2012-07-31 11:01:19 -04:00
45a77e90a8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-31 11:00:26 -04:00
92e34b12f7
CC-1665: Scheduled stream rebroadcasting and recording
...
-cancel button has effect now :)
2012-07-31 11:00:15 -04:00
b83be1a922
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix incorrectly named column
2012-07-31 11:00:01 -04:00
eb2a8c1009
CC-84: Smart Playlists
...
- renamed Smart Blocks to Smart Playlists in library filter
2012-07-31 10:17:48 -04:00
527b43e8ba
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix incorrectly named column
2012-07-31 10:13:41 -04:00
cbbdd5a1fd
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-31 10:05:50 -04:00
1b1b7e11d0
CC-84: Smart Playlists
...
-fixed spacing of modifier '+' button
2012-07-31 10:05:38 -04:00
ab85ab59d9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-30 21:48:25 -04:00
7e433b61fb
CC-1665: Scheduled stream rebroadcasting and recording
...
-improve working with "webstreams"
2012-07-30 21:48:04 -04:00
ecd926ae90
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-30 18:53:57 -04:00
ff62769d6c
CC-84: Smart Playlists
...
-UI cleanup
2012-07-30 18:53:50 -04:00
27017c7903
CC-84: Smart Playlists
...
- fixed getCriteria() to non static function
2012-07-30 18:21:27 -04:00
b9739b022d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-30 17:55:39 -04:00
019d13b4c9
CC-84: Smart Playlists
...
- backend implementation
- UI for blocks within playlist
2012-07-30 17:55:22 -04:00
142aa214b3
CC-84: Smart Playlists
...
-dos2unix
2012-07-30 17:31:54 -04:00
d169f4aa31
CC-84: Smart Playlists
...
- improved validation to not allow multiple criteria fields
2012-07-30 17:03:01 -04:00
f91be9468f
CC-84: Smart Playlists
...
-UI cleanup
2012-07-30 16:42:37 -04:00
e04273c335
CC-84: Smart Playlists
...
- created function that returns an array of block criteria
- fixed form so it displays modifier rows properly
2012-07-29 15:47:42 -04:00
c2aea7490f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-27 17:30:35 -04:00
55b8b08508
CC-84: Smart Playlists
...
-fixed how the modifier rows are parsed when saving to db
2012-07-27 17:30:21 -04:00
648b8ae296
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-27 14:47:26 -04:00
f0f9e8e215
CC-1665: Scheduled stream rebroadcasting and recording
...
-minor fixes
2012-07-27 14:47:15 -04:00
2083d04107
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-27 14:32:39 -04:00
d7cf50b2f4
CC-84: Smart Playlists
...
- changed error handling and criteria saving to handle same criteria rows
2012-07-27 14:32:31 -04:00
4e022c407d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-27 11:52:08 -04:00
5becd70ab1
CC-84: Smart Playlists
...
- drag and drop playlist that contains block
- audio preview of playlist that contains static block
2012-07-27 11:51:50 -04:00
ebed110429
CC-1665: Scheduled stream rebroadcasting and recording
...
-code cleanup
2012-07-26 17:51:47 -04:00
7cde4ba2ba
CC-84: Smart Playlists
...
- merging code
2012-07-26 16:16:07 -04:00
8755500d30
CC-84: Smart Playlists
...
- some minor fix
2012-07-26 15:30:49 -04:00
8f2339f109
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/airtime/map/CcPlaylistcontentsTableMap.php
airtime_mvc/build/schema.xml
airtime_mvc/build/sql/schema.sql
2012-07-26 14:54:47 -04:00
a51b04e422
CC-84: Smart Playlists
...
- db schema change for type column on playlistcontents
2012-07-26 14:49:42 -04:00
eb4c23b0b6
CC-1665: Scheduled stream rebroadcasting and recording
...
-Fix scheduled streams mixed with scheduled files
2012-07-26 14:49:32 -04:00
ccdc06786d
CC-1665: Scheduled stream rebroadcasting and recording
...
-remove some hardcoded webstream values
-fix some broken problems from devel
2012-07-26 14:49:32 -04:00
fbc5b72f14
CC-1665: Scheduled stream rebroadcasting and recording
...
-webstreams now start and stop at the correct time.
2012-07-26 14:49:32 -04:00
c90495d2d3
CC-1665: Scheduled stream rebroadcasting and recording
...
-getting closer to being able to schedule a webstream
2012-07-26 14:49:32 -04:00
3735579378
-remove cc_access table and gunid usage
2012-07-26 14:49:32 -04:00
b283b5b55e
CC-1665: Scheduled stream rebroadcasting and recording
...
-remove unused function
2012-07-26 14:49:32 -04:00
be8262b67c
CC-1665: Scheduled stream rebroadcasting and recording
...
-fixed web stream length not showing up correctly
2012-07-26 14:49:32 -04:00
8b2facaa96
CC-1665: Scheduled stream rebroadcasting and recording
...
-playlists load contents now correctly identify tracks vs streams
2012-07-26 14:49:32 -04:00
a16a1f5033
CC-1665: Scheduled stream rebroadcasting and recording
...
-Webstreams now appearing in the library
2012-07-26 14:49:31 -04:00
31176f525e
CC-1665: Scheduled stream rebroadcasting and recording
...
-started working on UI
2012-07-26 14:41:40 -04:00
ed54e882a3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-26 14:41:22 -04:00
3f41835e12
re-add getCurrentShowAction
2012-07-26 14:36:21 -04:00
a828c46d32
CC-84: Smart Playlists
...
- changed name of 'block' to 'smart playlist' on UI only
2012-07-26 13:16:29 -04:00
3df0f2d26e
CC-84: Smart Playlists
...
- added 'add' option to smart playlist context menu
2012-07-26 12:45:31 -04:00
40bd33df11
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-26 10:49:38 -04:00
9bd823ee2c
CC-84: Smart Playlists
...
- fixed the issue where block length wasn't updated on spl section
2012-07-26 10:49:23 -04:00
077cc735d7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-25 18:42:59 -04:00
275efb254a
fix improperly renamed functions
2012-07-25 18:42:46 -04:00
bef9ba1eea
CC-84: Smart Playlists
...
- added 'Smart Block' filter in datatable
- added block files to library datatable
2012-07-25 17:08:22 -04:00
1f3cbd8aba
CC-84: Smart Playlists
...
- introducing smart-block
2012-07-25 12:44:37 -04:00
722e470f6f
CC-84: Smart Playlists
...
- changed playlist controller to also handle Blocks
- created new view for smart blocks
2012-07-25 11:00:46 -04:00
c79110644d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-24 12:14:02 -04:00
754187a2b7
CC-84: Smart Playlists
...
- remove subform and combined back into one form
2012-07-24 12:13:51 -04:00
c82ea30809
CC-84: Smart Playlists
...
- removed criteria subform and reverted back to original criteria options design
2012-07-24 12:12:47 -04:00
64185dac95
CC-84: Smart Playlists
...
- subforms now open and close on the click event
- fixed add and remove criteria to work with new subforms
2012-07-23 12:42:00 -04:00
32f431c584
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/Playlist.php
2012-07-23 11:03:29 -04:00
952a584f10
CC-84: Smart Playlists
...
- form cleanup
2012-07-23 10:45:17 -04:00
30b64f81fd
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-23 10:41:09 -04:00
c99e1b892c
CC-84: Smart Playlists
...
-divided criteria into sub form to handle multiple sets
2012-07-23 10:40:53 -04:00
255866d240
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Show.php
2012-07-22 19:18:53 -04:00
aaa0c01e01
CC-4120: memory optimizations for calendar page.
...
-can now fetch over a year of data at a time
2012-07-22 19:14:29 -04:00
ef64ce2b73
CC-4112: Smart Playlist: Cannot search Long string
...
- added length validator
- extra fix: Due to lazy loading, aggregated field on playlist was not
updated properly.
2012-07-20 15:32:46 -04:00
9bdb4a40e0
CC-84: Smart Playlists
...
-fixed playlist type spacing on UI
2012-07-20 12:32:18 -04:00
a67b2fa300
CC-84: Smart Playlists
...
- removed soundcloud_id criteria
- added last_played criteria
2012-07-20 11:25:54 -04:00
d801139a12
CC-84: Smart Playlists
...
- utime and mtime in library were displaying in UTC
2012-07-19 19:11:42 -04:00
14712d4d78
CC-84: Smart Playlists
...
- fixed undefined index warnings
2012-07-19 19:09:51 -04:00
624986e973
- removed unnecessary logging line
2012-07-19 18:11:31 -04:00
8e60aec601
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-19 18:07:55 -04:00
647de9ed39
CC-84: Smart Playlists
...
- started storing last played time in cc_files
- db column (lptime) already existed but was not being used before this
- will use this as a criteria for smart playlists
2012-07-19 18:07:39 -04:00
2e7cf68777
CC-4110: Smart Playlist: some search criteria don't work
...
- added bunch of validation
- fixed a bug with range modifier not working correctly
2012-07-19 16:57:24 -04:00
9fcc851523
CC-84: Smart Playlists
...
-hides playlist content if dynamic instead of disabling
-show the user how many files match specified criteria
2012-07-19 14:52:39 -04:00
0322e6b0c6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-19 14:45:34 -04:00
82f087c84d
CC-84: Smart Playlists
...
- changed db query so it's lazy loading
2012-07-19 14:45:15 -04:00
1f603bb75b
cc-4105 : merge devel into my branch
2012-07-19 10:51:04 -04:00
6fc41ee4bf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-18 16:12:20 -04:00
266d86d9e4
CC-84: Smart Playlists
...
- fixed a bug
- change LIKE to ILIKE
2012-07-18 16:12:06 -04:00
2d8a9188eb
CC-84: Smart Playlists
...
- qtip wasn't showing up on 'new' and 'edit' events
- changed 'Artist' to 'Creator' to be consistent with library
2012-07-18 15:48:15 -04:00
9516771099
Merge branch 'cc-84-smart-playlist' into devel
...
Conflicts:
airtime_mvc/application/controllers/PlaylistController.php
airtime_mvc/application/models/Scheduler.php
2012-07-18 12:23:57 -04:00
7c5291fe0c
CC-84: Smart Playlists
...
- ui cleanup
2012-07-18 11:55:29 -04:00
2a38527161
CC-84: Smart Playlists
...
- propel usage chage
- cleaning up code
- some js changes
2012-07-18 11:52:09 -04:00
c23023bcd9
Removed irrelevant comment
2012-07-17 16:43:04 -04:00
25d3028fb1
cc-4105: added testing support for api client and ApiController
2012-07-17 16:43:04 -04:00
531dfe2b5e
cc-4105: fixed up python media monitor request parameter for recorded shows\n.Added more input validation in php controller
2012-07-17 16:43:04 -04:00
0ddc8497c3
cc-4105: small improvement in reloadMetadataGroupAction. We give more detailed responses and log bad requests in a little more detail as well
2012-07-17 16:43:04 -04:00
f348652f0e
cc-4105: reloadMetadataGroupAction seems to be ready for production.\nSet the parameter correctly after finishing the debugging from the python side
2012-07-17 16:43:04 -04:00
fdf921bbaf
cc-4105: Made reloadMetadataGroupAction safer by validating input
2012-07-17 16:43:04 -04:00
01448d42df
cc-4105: added some comments to describe development
2012-07-17 16:43:04 -04:00
b0f5b722db
cc-4105: fixed typo.\nadded some error checking in case bad parameters are given to dispatchMetadataAction
2012-07-17 16:43:04 -04:00
98b4e3c47b
cc-4105: Tweaked php method to have more consistent return values
2012-07-17 16:43:04 -04:00
aa298453b7
cc-4105: removed useless comments
2012-07-17 16:43:04 -04:00
eb00b5cbb3
cc-4105: renamed controller action and method to correct name
2012-07-17 16:43:04 -04:00
0aae7c75ae
CC-84: Smart Playlists
...
- added shuffle button
- moved all callbacks into one function
2012-07-17 15:32:26 -04:00
1bd07eeaca
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/models/ServiceRegister.php
2012-07-17 15:00:53 -04:00
eba4b688c4
User Patch: If a callback is not given, then just provide the raw JSON.
...
Submitted by Ross Masters <ross@rossmasters.com>
2012-07-17 14:47:13 -04:00
a8ca9accdb
CC-84: Smart Playlists
...
- added remove button to all rows unless only one row is enabled
- disabled playlist contents if type switches from static to dynamic
and vice versa
2012-07-17 14:40:52 -04:00
1e76845e9c
more sophisticated remote_addr determining
2012-07-17 13:34:48 -04:00
7c07bf146c
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-17 11:07:38 -04:00
a4ba776b0f
CC-84: Smart Playlists
...
- save playlist type to db
- on edit type is loaded
2012-07-17 11:07:16 -04:00
e0a674a96c
CC-84: Smart Playlists
...
-added save button for static playlists
2012-07-16 18:24:46 -04:00
20e32b98ba
Merge branch 'devel' into mediamonitor2
...
Conflicts:
python_apps/api_clients/api_client.py
2012-07-16 17:41:36 -04:00
1804531e84
removed comment
2012-07-16 17:19:11 -04:00
fc09baacd7
CC-84: Smart Playlists
...
- static playlist is done.
2012-07-16 17:18:37 -04:00
a1c205edff
cc-4105: Removed wrong error handling from api_client. Split up controller action to make it reusable through other actions
2012-07-16 16:43:48 -04:00
1c084a3101
moved misplaced docstring
2012-07-16 15:47:44 -04:00
d08b62dd39
cc-4105: removed dead code path
2012-07-16 15:25:45 -04:00
723e6356bc
Merge branch 'mediamonitor2' of dev.sourcefabric.org:airtime into mediamonitor2
2012-07-16 14:58:34 -04:00
a9f6bb3b5c
cc-4105: changed error handling from returning none to throwing exception
2012-07-16 14:58:23 -04:00
1bb97c8603
CC-84: Smart Playlists
...
- ui clean-up
2012-07-16 14:44:50 -04:00
4ebcb1b1f9
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/PlaylistController.php
airtime_mvc/application/models/Playlist.php
python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-07-16 14:31:03 -04:00
312f35ae48
CC-430: Audio normalization (Replaygain Support)
...
-change default database value to null
2012-07-16 12:10:42 -04:00
2dae5f30f7
CC-84: Smart Playlists
...
- code cleanup
- adds 'Add' button to last row, always
2012-07-16 11:01:34 -04:00
3e24b71436
removed wrong comments
2012-07-16 10:31:00 -04:00
ce1a63f47d
CC-430: Audio normalization (Replaygain Support)
...
-small bug fixes
2012-07-15 22:55:52 -04:00
583695f98c
CC-430: Audio normalization (Replaygain Support)
...
-values are now written through to database
2012-07-15 22:22:42 -04:00
39760f8494
CC-4090: Make code style PSR compliant
2012-07-15 22:22:07 -04:00
632f039977
CC-430: Audio normalization (Replaygain Support)
...
-values are now written through to database
2012-07-15 22:19:55 -04:00
b4f1cc13c0
CC-430: Audio normalization (Replaygain Support)
...
make code simpler (don't download database to file)
2012-07-15 22:19:16 -04:00
71dc7d99b4
cc-4105: added a method in API client corresponding to chunked requests.\nAlso add prepared corresponding apicontroller method
2012-07-15 22:17:36 -04:00
44d91f7798
cc-4105: clean up url construction in api client
2012-07-15 22:17:36 -04:00
0fd6c4adbf
fixed typo
2012-07-15 22:17:36 -04:00
9f1ec3c05c
created a new controller action for chunked requests from media monitor
2012-07-15 22:16:58 -04:00
794cf2c845
CC-4090: Make code style PSR compliant
...
-run psr-cs-fixer
2012-07-15 21:17:13 -04:00
5661872034
checkAuth in init() function
2012-07-15 21:07:34 -04:00
8340079b95
cc-4105: added a method in API client corresponding to chunked requests.\nAlso add prepared corresponding apicontroller method
2012-07-13 17:57:18 -04:00
47893865cc
cc-4105: clean up url construction in api client
2012-07-13 16:32:17 -04:00
601263b7a0
CC-84: Smart Playlists
...
- adding propel files for playlistcriteria table
2012-07-13 16:16:07 -04:00
46294c3f40
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
...
Conflicts:
airtime_mvc/application/forms/SmartPlaylistCriteria.php
2012-07-13 16:00:02 -04:00
ae9442d7f5
CC-84: Smart Playlists
...
- editing playlist
2012-07-13 15:58:23 -04:00
b48fb49947
CC-84: Smart Playlists
...
-fixed add/remove behaviour
2012-07-13 15:15:11 -04:00
3b708fae6a
fixed typo
2012-07-13 14:54:04 -04:00
a6d51bea8d
created a new controller action for chunked requests from media monitor
2012-07-13 14:51:43 -04:00
971b4cf7cf
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-13 14:32:31 -04:00
bf46605ea1
CC-84: Smart Playlists
...
- changing field name in backend
- diabled loading criteria on edit temporarly
2012-07-13 14:32:05 -04:00
fcc4c1f9af
CC-84: Smart Playlists
...
-fixed merge conflict
2012-07-13 14:26:17 -04:00
207582eb7e
CC-84: Smart Playlists
...
- temp commit
2012-07-13 14:23:30 -04:00
8dcb1f8f3d
CC-4101Calendar displays white on white for certain show names, making shows invisible
2012-07-13 10:28:50 -04:00
55fd4e5d50
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-12 17:59:04 -04:00
3bce6b4999
CC-84: Smart Playlists
...
- db inserting into cc_playlistcriteria
- error validations
2012-07-12 17:58:44 -04:00
f0f033b4fb
CC-430: Audio normalization (Replaygain Support)
2012-07-12 17:58:29 -04:00
7dc0229770
CC-84: Smart Playlists
...
- error msgs were not deleting from a removed row
- fixed
2012-07-12 17:33:40 -04:00
e7e4aa41dd
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-12 17:20:01 -04:00
d81253cccc
CC-84: Smart Playlists
...
- send playlist id on generate/save action
- fixed some small UI bugs
2012-07-12 17:19:53 -04:00
a8f4148373
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-12 15:30:31 -04:00
64857410a6
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-12 15:28:11 -04:00
f0134ba3fa
CC-84: Smart Playlists
...
- validation on server side
- getting list of files from db which satisfies criteria
2012-07-12 15:27:51 -04:00
31bb07b4f0
CC-84: Smart Playlists
...
- removed modifier array list from form and populate in javascript
- fixed remove functionality to handle the extra criteria value used
for 'is in the range' modifier
- moved 'add' button to last row
2012-07-12 13:02:02 -04:00
470fef80ba
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-12 12:05:51 -04:00
8f6d6058a2
CC-4100: Make number of shows displayed in widget customizable
...
-removed Logging message
2012-07-11 19:33:19 -04:00
bd51b4db02
CC-4100: Make number of shows displayed in widget customizable
...
-fixed
2012-07-11 19:31:24 -04:00
e8a2f23856
CC-84: Smart Playlists
...
- dynamically change modifier list depending on criteria type
- added extra text box for 'is in the range' modifier
2012-07-11 18:53:28 -04:00
765a739b58
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-11 17:10:08 -04:00
393495433f
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-11 16:17:22 -04:00
c27b886817
CC-84: Smart Playlists
...
-0-indexed form elements
2012-07-11 16:15:44 -04:00
d52c079606
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-11 16:14:59 -04:00
93b34bb079
CC-84: Smart Playlists
...
- controller skeleton
- playlist model dummy functions
2012-07-11 16:14:11 -04:00
4842f1a5a1
CC-84: Smart Playlists
...
-removed limit checkbox
2012-07-11 15:52:46 -04:00
ce755d409b
cc-84: smart playlist
...
-added new database table defs
2012-07-11 15:48:11 -04:00
7358b00c81
CC-84: Smart Playlists
...
-disabled non-visible form elements
2012-07-11 15:18:47 -04:00
5fb0364f2d
CC-84: Smart Playlists
...
-switched action names for static/dynamic
2012-07-11 11:57:13 -04:00
fe75ba0e93
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-11 11:50:52 -04:00
1afe1e4d32
CC-84: Smart Playlists
...
-added in save/generate functionality in the UI
2012-07-11 11:50:40 -04:00
646e028037
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-11 10:47:14 -04:00
4bed5e647e
CC-84: Smart Playlists
...
-moved smart_playlistbuilder.js into playlist folder
2012-07-11 10:45:24 -04:00
a1ceb4bfa0
CC-84: Smart Playlists
...
-added in 'Add' and 'Remove' form elements functionality on the UI
2012-07-11 10:42:51 -04:00
b7cd90bc28
CC-84: Smart Playlists
...
-created form and view script
2012-07-11 10:42:51 -04:00
7ce4934cdc
CC-4090: Make code style PSR compliant
...
-removed all trailing whitespace in forms directory
-replace all tabs with 4 spaces
2012-07-10 18:55:44 -04:00
d9cde230cd
CC-4090: Make code style PSR compliant
...
-removed all trailing whitespace
2012-07-10 18:53:06 -04:00
ee3447f903
CC-4090: Make code style PSR compliant
...
-User.php
-removed all trailing whitespace
2012-07-10 18:51:32 -04:00
4301a221b7
CC-84: Smart Playlists
...
-added in 'Add' and 'Remove' form elements functionality on the UI
2012-07-10 18:20:23 -04:00
24a90700a1
CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
...
others on some situation.
2012-07-10 17:24:57 -04:00
f174a2bcf3
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-07-10 17:09:46 -04:00
39506740eb
CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
...
others on some situation.
- fixed
2012-07-10 17:09:21 -04:00
f072be5d0e
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-07-10 16:41:48 -04:00
6d98cca9c3
SAAS-270: Apache2 errors on SaaS
...
-no reason to pass $pl since it is not even used. Fixed
2012-07-10 16:41:30 -04:00
72dd48e33e
CC-84: Smart Playlists
...
-created form and view script
2012-07-10 15:25:29 -04:00
d90d83200e
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-07-10 15:12:27 -04:00
62b0fec595
CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
...
others on some situation.
- fixed
2012-07-10 15:11:59 -04:00
69bbc53b98
CC-4037: Remove SaaS specific code from Airtime codebase
...
-removed live chat popup
2012-07-10 15:09:28 -04:00
0171212e9b
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-07-10 13:19:19 -04:00
81eb751c9f
- shortened height on Add/Remove content dialog window
2012-07-10 13:19:03 -04:00
78acd4f805
CC-4093: Timeline -> Alert for deleting track(s) appears twice by clicking
...
context menu
- fixed
2012-07-10 13:08:36 -04:00
3d243468a7
CC-4090: Make code style PSR compliant
...
Subjects.php
2012-07-10 10:36:53 -04:00
dc2b4fed0a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-10 10:19:35 -04:00
00a2a19833
CC-4090: Make code style PSR compliant
...
Subjects.php
2012-07-09 23:41:00 -04:00
e91c96b90e
CC-4090: Make code style PSR compliant
...
StreamSetting.php
2012-07-09 23:32:21 -04:00
6369c85ed1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-09 14:50:49 -04:00
c6c0a70152
CC-4075: Calendar -> Can create overlapping show by repeating show
...
-fixed
2012-07-09 14:50:35 -04:00
c279e008d0
Merge branch '2.1.x' into devel
2012-07-06 15:52:09 -04:00
63856ea918
CC-4079: Apache error: missing $startDt variable
...
- fixed
2012-07-06 15:40:16 -04:00
e4fb42cbd0
CC-4027: In the Calendar view, please have a little play icon indicating the currently playing show.
...
-done
2012-07-06 15:26:51 -04:00
24349e64d8
CC-430: Audio normalization (Replaygain Support)
...
-some minor fixes for default value (should be 0 dB not 1dB)
2012-07-05 23:30:53 -04:00
5c1af49252
CC-430: Audio normalization (Replaygain Support)
...
-Added support on Liquidsoap side
2012-07-05 23:24:34 -04:00
ce698d4123
CC-430: Audio normalization (Replaygain Support)
...
-Added support on server side
2012-07-05 22:37:40 -04:00
31f1d5879e
CC-4076: Library: make doubleclick trigger adding files to playlist/timeline
...
- done
2012-07-05 18:24:07 -04:00
f3fbaf89f5
CC-4076: Library: make doubleclick trigger adding files to playlist/timeline
...
- done
2012-07-05 18:23:34 -04:00
9bc1c66fe3
CC-2747: If the file contains '\' in its meta title, airtime doesn't
...
detect duplicate
- fixed
- extra fix: there was also problem with web UI upload and it's fixed
see the comment on the ticket for more detail.
2012-07-05 15:27:49 -04:00
1cbb0345b3
improved error message for overlapping shows
2012-07-05 11:33:03 -04:00
4441bf18b7
CC-4072: Improve the check overlapping shows function
...
-done
2012-07-05 11:24:49 -04:00
771974433b
CC-4071: Prevent shows from overlapping on drag and drop in calendar
...
-done
2012-07-05 11:01:48 -04:00
1fa3da5bd0
CC-4069: Edit Show -> cannot edit show
...
-fixed
2012-07-04 18:58:22 -04:00
cbf026412c
CC-4056: Add Show -> Prevent shows from overlapping
...
-done
2012-07-04 11:34:18 -04:00
bc93119adc
Merge branch '2.1.x' into devel
2012-07-04 09:46:30 -04:00
87afea63bf
CC-4065: Timeline -> Cursor will disappear after a track is finished sometimes
...
-fixed
2012-07-03 18:22:48 -04:00
598bf8942c
Merge branch '2.1.x' into devel
2012-07-03 14:57:16 -04:00
8a394f752b
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-07-03 14:52:53 -04:00
f6d79b1f54
CC-4063: Timeline -> Add a track to a show will cause another show's cursor to be selected
...
-fixed
2012-07-03 14:52:27 -04:00
4384c978b0
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-07-03 13:33:26 -04:00
7342ea4d4b
CC-4053: Widget not showing correct day on Sunday
...
- fixed weekly widget
- also fixed today's show widget
2012-07-03 13:17:48 -04:00
2bf6d0e54e
Merge branch '2.1.x' into devel
2012-07-03 12:57:25 -04:00
e11fe8a2b8
CC-4058: Timeline -> Cannot add song twice if last cursor is selected
...
-fixed
2012-07-03 12:42:53 -04:00
bc569462ee
CC-4057: Calendar -> Add/Remove contents: Lost cursor after add contents to a show
...
-fixed
2012-07-03 11:48:57 -04:00
3e75b28c9d
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
2012-07-03 10:42:29 -04:00
46604fdf59
CC-4046: Timeline -> cannot drag and drog song into the posion between song's name and "show empty"
...
-fixed
2012-06-29 16:59:03 -04:00
7ea106e0d3
CC-4051: Library -> First character gets cut off of file name when downloading a track from a watched folder
...
-fixed
2012-06-29 16:02:27 -04:00
68420a898f
CC-4044: Timeline -> Cursor keeps highlight even if the song is played
...
-fixed
2012-06-29 15:49:22 -04:00
6d823d01ab
CC-4042: Media Library -> Non-admin user cannot see "File import in progress"
...
- fixed
2012-06-29 12:49:59 -04:00
b425fbd894
CC-4045: Logging: add file name and line number on logging function
...
- done
2012-06-29 12:47:14 -04:00
001f0790f9
Merge branch '2.1.x' into devel
2012-06-29 12:26:45 -04:00
335dd1516b
Merge branch '2.1.x' into devel
...
Conflicts:
python_apps/pypo/liquidsoap_scripts/ls_script.liq
2012-06-29 10:57:14 -04:00
0b069c2f54
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-29 10:56:55 -04:00
a8792a7b97
CC-4042: Media Library -> Non-admin user cannot see "File import in progress"
...
- fixed. See the comment for more detail.
2012-06-29 10:55:19 -04:00
38cb439f53
CC-4036: Timeline -> A new Cursor will be selected when there are 2 shows and we add/delete items in timeline view
...
-fixed
2012-06-28 17:55:17 -04:00
79513de1ba
CC-4035: Timeline -> Filter by show: please let the setting automatically takes effect without clicking the button out of the 'box'
...
-also added this functionality for the 'All my shows' checkbox
2012-06-28 17:07:01 -04:00
61fc269b13
CC-4035: Timeline -> Filter by show: please let the setting automatically takes effect without clicking the button out of the 'box'
...
-done
2012-06-28 16:55:43 -04:00
a603d67397
fixed indentation on schedule.js
2012-06-28 15:44:55 -04:00
69eb80c5ac
CC-4000: Calendar -> Add/remove content -> Show / hide columns: the selector window will pop up at background sometimes
...
-fixed
2012-06-28 15:43:48 -04:00
5427fbc083
CC-4033: Record show icon gets covered with soundcloud icons (soundcloud, progress, and error)
...
-done
2012-06-28 15:23:21 -04:00
47040a57dd
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-28 14:03:14 -04:00
abc5b04045
fixed indentation
2012-06-28 14:02:57 -04:00
6c83633933
CC-4008: Inconsistent button labels for Play/Preview in Now Playing page
...
- changed everyting to "Preview"
2012-06-28 13:33:01 -04:00
d13ade977a
CC-4034: Files on Watched folder shouldn't be deleted physically.
...
- fixed
2012-06-28 13:28:45 -04:00
0bc825947e
CC-3995: Media Library -> it takes too long time to switch page or select all from this page if set as displaying 100 item in Media Library.
...
-done
2012-06-28 11:44:30 -04:00
c4480a46b1
CC-4025: Suggest show colour in calendar automatically, based on show name
...
- done
2012-06-27 23:03:50 -04:00
443537b2db
CC-4020: Apache error found: Undefined variable: switch_start
...
- fixed
2012-06-27 22:50:46 -04:00
9fb9fb3219
CC-4021: Media Library -> "+" button wont take effect if uncheck one and check another
...
-fixed
2012-06-27 17:19:55 -04:00
12bf42d2f1
CC-4031: Timeline cursor vanishes when every once in a while
...
-fixed
2012-06-27 15:50:56 -04:00
8141dec3b5
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-added comment
2012-06-27 15:13:03 -04:00
d5a5bdd310
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-added comment
2012-06-27 14:57:47 -04:00
1c345f2d36
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-27 13:13:33 -04:00
bdaa64d4d1
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-fixed (originally scheduled for 2.2 - adding for 2.1.3)
2012-06-27 13:13:07 -04:00
1300593e8b
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-fixed
2012-06-27 13:03:22 -04:00
0a0e873ef9
CC-4019: Library: When "Add content" is clicked, "Proccessing" image …
...
-fix small comment typo
2012-06-27 11:50:31 -04:00
4015949d2a
CC-3933: Replace Airtime version number in source code with a hash of the version + uniqueId.
...
-done
2012-06-27 10:27:53 -04:00
31d643cee1
CC-3997: Now Playing -> Time Line: different behaviour between 'delete'
...
button and 'delete' menu items
- added confirm box on clicking delete button on now playing table
- also added confirm box on library delete button as well
2012-06-26 17:43:15 -04:00
576c13963d
CC-3998: Now Playing -> Time Line: confirm message for user 'delete'
...
track by context menu is misleading
- fixed
2012-06-26 17:35:07 -04:00
c2cc4253b3
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-26 16:56:01 -04:00
9a14051f0b
CC-4019: Library: When "Add content" is clicked, "Proccessing" image is keep
...
flickering
- fixed
2012-06-26 16:55:43 -04:00
d892a4b5ae
CC-4009: Calendar icon cannot be clicked twice without clicking another icon first
...
-fixed
2012-06-26 16:43:36 -04:00
ca3d554c07
CC-3983: Timeline cursor in Now Playing vanishes after adding a file to a show
...
-empty cursorId array after every callback
2012-06-26 15:49:17 -04:00
4cb872f615
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-26 15:37:04 -04:00
05fa673e42
CC-3983: Timeline cursor in Now Playing vanishes after adding a file to a show
...
-done
2012-06-26 15:36:45 -04:00
a63b765621
CC-4011: System -> Media Folders: Changing page will stop removing a watched folder with lots of files (50,000)
...
-Changed doing 50,000 database calls to 1.
2012-06-25 23:40:07 -04:00
84f867a00f
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-25 18:31:07 -04:00
b8c559db58
add time to our version so cache is never used in dev branch
2012-06-25 18:30:33 -04:00
8005049bdc
CC-3996: Undefined offset: 0 in StoredFile.php (Apache error)
...
-fixed
2012-06-25 12:22:34 -04:00
ffb7f2ff65
CC-3933: Replace Airtime version number in source code with a hash of the version + uniqueId.
...
-done
2012-06-22 18:01:00 -04:00
c669d3cb47
CC-3969: Reset Password: specifying wrong e-mail keeps you on the same page
...
without possibility to navigate back gracefully
- done
2012-06-20 18:02:46 -04:00
2480639e58
CC-3980: Excel export button in Playout History does not really export
...
Excel format
- removed xls option
2012-06-20 17:42:49 -04:00
10fc5038c8
CC-3965: Clarify input/output stream settings by addding appropriate labels
...
- fixed
2012-06-20 17:39:52 -04:00
5c43fa5a7b
CC-3978: Playout History table says Artist when it should say Creator
...
- fixed
2012-06-20 16:51:34 -04:00
3a32e7240a
CC-3984: Now Playing scissor and trashcan buttons are incorrectly labelled in
...
tooltips
- fixed
2012-06-20 16:49:41 -04:00
e40d9731a2
CC-3979: Playout History export should include date range in file and/or
...
filename
- fix
2012-06-20 16:47:11 -04:00
6a75fd6c76
CC-3979: Playout History export should include date range in file and/or
...
filename
- done
2012-06-20 16:35:34 -04:00
f029124447
Merge branch '2.1.x' into devel
2012-06-19 17:57:27 -04:00
9ac024fa72
CC-3993: Validate that reporting stats are correct on Airtime PRO instances
...
-done
-if no log data for the past 24 hours, update current record with current date, and delete old records
2012-06-19 16:59:59 -04:00
b742033647
- Add Media: fix to accept audio files with ID3 tags liquidsoap complains about
2012-06-18 12:24:13 -04:00
f3d0f06397
- Add Media: reverted change to testing audo file with liquidsoap (will fix in 2.1.x)
2012-06-18 12:00:54 -04:00
186b8ef1c2
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-fixed
2012-06-15 16:48:51 -04:00
b0e93005e5
Merge branch '2.1.x' into devel
2012-06-15 15:04:18 -04:00
bb54a9041f
CC-3986: 'Add User' does not convert email address to lowercase
...
-done
2012-06-15 15:03:48 -04:00
87faf47c94
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-15 14:42:37 -04:00
d02607ed94
CC-3561: Add button to automatically rescan watched folders.
...
-done
2012-06-15 12:16:19 -04:00
81fb7699a4
CC-3985: Email field on User creation should be required.
...
- done
2012-06-14 16:11:14 -04:00
73a7a76078
Merge branch 'CC-3963' into 2.1.x
...
Conflicts:
airtime_mvc/public/js/airtime/preferences/streamsetting.js
2012-06-14 16:06:53 -04:00
70bfe031ef
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/models/Email.php
2012-06-14 15:30:33 -04:00
6b990f8712
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into devel
2012-06-14 13:45:14 -04:00
295a8ea5fe
CC-3561: Add button to automatically rescan watched folders.
...
-done
2012-06-14 13:44:56 -04:00
f433fd89fe
CC-3970: Password Reset: No UI error msg for no mail server founded
...
-done
2012-06-13 16:04:57 -04:00
b07b83f740
CC-3981: Record Show: Change streams settings during recording will
...
cause record fail
- added warning message
2012-06-13 14:44:38 -04:00
9cabd4d32c
CC-3921: Add mobile phone number field to user record
...
-done
2012-06-13 13:39:54 -04:00
4077858c8e
CC-3927: Should automatically switch back to Master/Show stream if there
...
is a connection interruption
- chaning label and description text
2012-06-13 12:46:26 -04:00
f188eeada2
preparation for 2.1.1 release
2012-06-13 11:35:14 -04:00
9b31a6daac
Merge branch '2.1.x' into devel
2012-06-13 10:10:05 -04:00
02b6d04952
CC-3956: PHP script can enter inifinite loop
...
-small cleanup
2012-06-12 20:18:06 -04:00
d1c224321b
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-12 18:51:31 -04:00
b858c34526
CC-3956: PHP script can enter inifinite loop
...
-fixed
2012-06-12 18:51:22 -04:00
776e35dfa9
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-12 17:49:52 -04:00
548a6ce16a
CC-3957: Make Schedule Widgets show future Sunday instead of past Sunday
...
- bug fix
2012-06-12 17:49:34 -04:00
f3b925daa2
CC-3412: Icecast stream name not defined
...
-done
2012-06-12 17:08:36 -04:00
032637049d
CC-3952: Calendar: Create/Edit Show's End time manually and keep date picker
...
open, the change will not take effect
- fixed
2012-06-12 17:07:24 -04:00
8b2353ede0
Merge branch '2.1.x' into devel
2012-06-12 15:49:18 -04:00
55634ddd46
CC-3928: Use liquidsoap to test whether file is playable on upload.
...
-done
-tests return value and output
2012-06-12 15:41:10 -04:00
57397312f2
CC-3963: If DJ is scheduled to broadcast for show, then automatically
...
enable source when DJ connects.
- done
2012-06-12 15:38:03 -04:00
df518fb03f
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-12 14:58:51 -04:00
8a63478c73
CC-3972: it is not possible to select tracks in Now Playing tab
...
-fixed
2012-06-12 14:58:33 -04:00
b588b3b9a4
CC-3849: PlaylistLibrary->Edit Metadata: The deletion of metadata entries has no effect after saving
...
-set track_number as a required field on form
2012-06-12 14:40:18 -04:00
22453f3820
CC-3968: Cannot preview file as * .MP3
...
-fixed
2012-06-12 11:31:10 -04:00
d66ba4074c
Merge branch '2.1.x' into devel
2012-06-11 18:11:09 -04:00
d8a1a17f19
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-11 18:08:47 -04:00
81c7eb7763
CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked
...
-fixed
2012-06-11 18:08:36 -04:00
2ebf149a65
CC-3949: On edit empty show, time_filled becomes null
...
fix method of checking null
2012-06-11 17:08:17 -04:00
1b057c8954
Merge branch '2.1.x' into devel
2012-06-11 16:49:03 -04:00
0d770e55ef
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-11 16:43:35 -04:00
ebaff793be
CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings
...
-fixed (had to apply custom changes to new version of fullcalendar.js)
2012-06-11 16:43:24 -04:00
06d90c53aa
CC-3957: Make Schedule Widgets show future Sunday instead of past Sunday
...
- fixed
2012-06-11 16:42:12 -04:00
6316c23b25
CC-3954: apache log errors part3
...
- bug fix
2012-06-11 16:10:51 -04:00
31000afbf3
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-11 15:52:58 -04:00
c78ba0faf6
CC-3954: apache log errors part3
...
- fixed
2012-06-11 15:52:39 -04:00
5b9add360c
CC-3718: Please enable user to input the mail server settings
...
-fixed soundcloud settings from collapsing if there are form input errors
2012-06-11 15:18:12 -04:00
d498c51814
Merge branch '2.1.x' into devel
2012-06-11 15:10:33 -04:00
d348d21c10
CC-3960: Day of week text is missing from monthly Calendar view
...
-fixed
2012-06-11 15:08:02 -04:00
16b6f09420
CC-3959: Make default username "source" for master and show inputs
...
-done (just added tooltip)
2012-06-11 14:55:26 -04:00
ca8187c9c2
CC-3718: Please enable user to input the mail server settings
...
-done
2012-06-11 12:53:09 -04:00
62eee61d4e
CC-3956: PHP script can enter inifinite loop
...
- fixed
2012-06-08 17:58:21 -04:00
0bae3f9038
CC-3949: On edit empty show, time_filled becomes null
...
- fixed
2012-06-08 16:18:27 -04:00
e661f400a4
CC-3950: apache log errors part2
...
- fixed
2012-06-08 15:31:45 -04:00
628f1518a7
CC-3906: PlaylistLibrary-> user can not delete track which has been already
...
played even after cancelling the show.
- fixed
2012-06-08 15:24:37 -04:00
1625cc6a25
CC-3948: Dashboard -> Source Info panel: Cannot turn off source if
...
source is disconnect.
- fixed
2012-06-08 15:14:30 -04:00
7d4851573f
CC-3951: Password Reset: You can still reset password even after system email for Password Reset disabled
...
-fixed
2012-06-08 13:09:14 -04:00
e6336044ed
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-08 12:14:26 -04:00
cf32096d9c
CC-3942: Canceling a storage folder change does not blank the Import Folder field
...
-fixed
2012-06-08 12:14:16 -04:00
e1dec544ad
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-08 12:07:07 -04:00
0416c05f9c
add reason why Propel connection failed
2012-06-08 12:06:54 -04:00
33f77c8c28
CC-3923: Show Timefilter - Even If the time filter is scheduled for yesterday it displays the Show played today
...
-fixed
2012-06-08 12:03:23 -04:00
b586d69d09
CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show.
...
-fixed
2012-06-08 11:39:04 -04:00
76c598c05b
CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings
...
-committing diff between original fullcalendar.js and changes made to it
2012-06-08 10:55:13 -04:00
951bd3c9b5
CC-3933: Remove version number and date strings from login page footer, add robots.txt
...
-done
2012-06-08 10:51:10 -04:00
5b56f258a4
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-08 10:33:27 -04:00
3b9f6f12de
CC-3834: System -> Stream Settings: click "save" will cause some errors in
...
zendphp.log
- removed logging
2012-06-08 10:33:06 -04:00
8fae454db6
CC-3901: DJ not assigned to Show, Guest: selection dialog populated upon clicking on "Select All" button in Now Playing
...
-fixed
2012-06-07 17:04:31 -04:00
24f4e589a4
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-07 16:10:04 -04:00
da7e44a78c
CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings
...
-fixed
2012-06-07 16:09:51 -04:00
7228dc9eb0
CC-3869: Source Streams: Please give Guest and DJ user clear error message
...
when they try to shut off Scheduled Play stream
- fixed
2012-06-07 14:27:12 -04:00
fb48184629
CC-3875: Dashboard: User shouldn't be able to set currently playing shows end time in the past
...
- fixed
2012-06-07 12:25:21 -04:00
3c7f3d52e1
CC-3864: Calendar -> Edit show: Can edit the start time of current playing show
...
- bug fix. In case of this error, we should maintain the original start time.
2012-06-07 12:14:22 -04:00
dc4597e526
CC-3910: NowPlaying-> preview dialog is greyed for files uploaded to Soundcloud
...
- fixed
2012-06-07 11:26:35 -04:00
be02906565
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-07 10:33:14 -04:00
a0a078db2b
CC-3925: Media Library: Please keep staying current page after editing or searching items instead of switching to first page.
...
-fixed to keep current page after deleting an item
2012-06-07 10:33:00 -04:00
2bf6408d90
CC-3864: Calendar -> Edit show: Can edit the start time of current playing show
...
- fixed
2012-06-06 18:23:27 -04:00
ec6ff4c9e6
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-06 17:32:10 -04:00
e5d5f44813
CC-3905: Playlist Library -> the delete tracks button is enabled for DJ
...
users and PM's
- done
- PM should have full control on the library
- DJ is only allowed to edit/delete playlist that they created.
no action on files except play or add to their own playlist
2012-06-06 17:31:51 -04:00
d8a75cf5c6
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-06 17:06:54 -04:00
fda04295a6
CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked
...
-fixed
2012-06-06 17:06:46 -04:00
e35692e588
CC-3939: Media Library -> Edit Metadata: click 'Cancel' will keep in editing
...
page after error message appears
- fixed
2012-06-06 16:28:41 -04:00
fb533bed07
CC-3855: System -> Support Feedback: Cannot uncheck 'Promote my station
...
on Sourcefabric.org' if it's checked then saved.
- fixed
2012-06-06 14:26:23 -04:00
bcf3f0014f
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-06 14:19:15 -04:00
0ca45e343b
CC-3878: Recorded media file's track number is changed after restarting media-monitor
...
- fixed
2012-06-06 14:18:54 -04:00
532b2710f0
CC-3932: Master/Source Source Connection URL should be in non-editable box
...
-done
2012-06-06 13:10:57 -04:00
f57d316b6c
CC-3920: Phone home stats: explain to the user the benefits to them to clicking YES
...
-changed support feedback message
-fixed whitespace in register-dialog.phtml
2012-06-06 11:10:29 -04:00
8e0c886350
CC-3896: Playlist Builder: Using "select this page" to add songs to playlist, those songs will be added in by opposite order, like a stack
...
-fixed whitespace in library.js
2012-06-06 10:45:27 -04:00
226ef262ba
CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show.
...
-retreived hours and minutes via preg_match()
2012-06-06 10:31:49 -04:00
68deba81d9
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-05 22:30:50 -04:00
d4b1fc711e
CC-3928: Use liquidsoap to test whether file is playable on upload.
...
-change to wording
2012-06-05 22:30:17 -04:00
b23e3d0a54
CC-3927: Should automatically switch back to Master/Show stream if there is a
...
connection interruption
- done
2012-06-05 16:41:41 -04:00
4bcf904f92
CC-3932: Master/Source Source Connection URL should be in non-editable box
...
-done
2012-06-05 15:13:04 -04:00
8b71ed6078
CC-3850: Use qTip instead of custom tooltips
...
-removed description from cb_airtime_auth and cb_custom_auth
-description is no longer needed since we use qtips
2012-06-05 14:49:31 -04:00
5966c7feda
fixed merge conflit
2012-06-05 14:47:11 -04:00
35be145043
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-05 14:41:19 -04:00
df3a74b501
CC-3850: Use qTip instead of custom tooltips
...
-removed description from icecast_vorbis_metadata element
2012-06-05 14:40:40 -04:00
51227b4cad
CC-3934: Master and Show stream override need to be disabled on airtime-demo
...
- done
2012-06-05 12:18:59 -04:00
af71a03982
CC-3925: Media Library: Please keep staying current page after editing or searching items instead of switching to first page.
...
-maintains current page after edit metadata
2012-06-05 11:27:17 -04:00
74e9f70506
CC-3928: Use liquidsoap to test whether file is playable on upload.
...
-done
2012-06-05 11:24:40 -04:00
a3754be31a
CC-3850: Use qTip instead of custom tooltips
...
-done
2012-06-05 11:24:40 -04:00
e3bacba39b
CC-3920: Phone home stats: explain to the user the benefits to them to clicking YES
...
-done
2012-06-05 11:20:00 -04:00
9c89d263db
CC-3880: NowPlaying-> there is no tooltip for the removed files available
...
-done
2012-06-05 11:20:00 -04:00
c554190faf
-fixed indentation
2012-06-05 11:20:00 -04:00
990dea12a4
CC-3895: Sometimes Media Monitor will not update the length of tracks with the same title but different contents.
...
-fixed
2012-06-05 11:20:00 -04:00
c18704aa4d
CC-3900: Show Builder boxes remain checked even when the item is no longer visible
...
-fixed playlist builder "Dragging <x> items" message so <x> is amount of visible items only
2012-06-05 11:20:00 -04:00
1b540626ed
CC-3900: Show Builder boxes remain checked even when the item is no longer visible
...
-only visible tracks can be added/deleted
2012-06-05 11:20:00 -04:00
5e894f7351
CC-3893: Add Media: Red underline appears on the bottom
...
-fixed
2012-06-05 11:19:59 -04:00
05378f52d3
CC-3896: Playlist Builder: Using "select this page" to add songs to playlist, those songs will be added in by opposite order, like a stack
...
-fixed
2012-06-05 11:19:59 -04:00
c1976162cb
CC-3793: "Star time" check will block updating shows when error found in colour settings
...
-fixed
2012-06-05 11:19:59 -04:00
19d5655779
CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show.
...
-fixed to only allow 24h or less
2012-06-05 11:19:59 -04:00
25ff2b3c3a
CC-3873: "Reset e-mail" procedure leads to a certain page with no ability to navigate back from it
...
-added "Back to login screen" link
2012-06-05 11:19:59 -04:00
3566480999
CC-3888: Record Show: ON AIR light and scheduled Play will ON for several seconds when a record show starts
...
-fixed
2012-06-05 11:19:59 -04:00
b6446442ba
CC-3917: record_date field in recorded shows causing problem
...
-fixed
2012-06-04 11:43:41 -04:00
43f57c0f8b
CC-3902: Help -> Getting Started: Step 2 is optional now
...
-fixed
2012-06-03 22:55:49 -04:00
54d741972a
CC-3903: Help -> Getting Started: the link "user manual" is different from the menu item "Help -> User Manual"
...
-fixed
2012-06-03 22:51:23 -04:00
89c0583849
CC-3926: System -> Stream setting: input ' into "Name/Description" will cause PDOException
2012-06-03 22:39:42 -04:00
b76d602561
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-30 14:12:28 -04:00
33e97e7b40
- changed trial-end-date box to have a fixed position
2012-05-30 14:12:18 -04:00
4fec2d3982
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-30 13:59:34 -04:00
81fb81af74
CC-3904: Help -> about: Year 2011 should be 2012
...
Fixed.
2012-05-30 13:59:06 -04:00
e1a86d50f6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-30 12:46:30 -04:00
e48b2f2a84
CC-3913: Live Stream: When master switch is turned on, it turns off show switch
...
- fixed
2012-05-30 12:46:05 -04:00
1a49173d2f
CC-3860 : Timeline: Can knock a current playing song out of place with drag and drop if current playing song has checkbox selected
2012-05-30 17:46:24 +02:00
3277a81221
- moved calcAdditionalShowData call before currentShow and nextShow get assigned
2012-05-29 14:19:31 -04:00
f23582612a
SAAS-247: Stream settings wipes out master/show source settings if is a SAAS instance
...
-fixed
2012-05-28 15:41:59 -04:00
396795e70e
CC-3879 : Now Playing-> Guest's clicking on Preview pops up error window
2012-05-28 17:59:26 +02:00
561934c8ef
SAAS-244: Live chat box appears in stream-player and preview windows
...
-fixed
2012-05-25 16:23:33 -04:00
925f98e3d0
SAAS-242: Livechat window obscures trial end date graphic
...
-fixed
2012-05-25 15:48:27 -04:00
f35f561f67
CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent
...
- removed 'SAAS'
2012-05-25 10:49:40 -04:00
d91850b1ca
CC-3877 : Now Playing-> Show manipulation buttons should be disabled for guest user and DJ's who are not assigned to the show
2012-05-24 18:10:36 +02:00
8b4c876c5b
CC-3884 : UI constantly refreshes when filtered by a show in a timerange
2012-05-24 17:33:15 +02:00
1b115178d3
CC-3877 : Now Playing-> Show manipulation buttons should be disabled for guest user and DJ's who are not assigned to the show
2012-05-24 15:50:29 +02:00
6b8adff769
CC-3876 : "open the library to schedule files" button should be disabled for 'guest' users and DJ's not assigned to this show
2012-05-24 15:08:54 +02:00
eb4207dd1d
CC-3863: Stats should not send version number with extra characters
...
-fixed
2012-05-23 17:25:16 -04:00
b28a700005
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-23 17:17:00 -04:00
a6dc2adb78
CC-3874: after 3 unsuccessful attempts to login no RE-CAPTCHA is shown and
...
you can't even login as admin user
- fixed
2012-05-23 17:14:59 -04:00
80998f2eac
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-23 16:19:06 -04:00
28a383e960
- fixed check for currentShow's end boundary to only be greater than current time
2012-05-23 16:18:59 -04:00
1edfb097da
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-23 16:17:37 -04:00
01439663d9
CC-3863: Stats should not send version number with extra characters
...
- fixed
2012-05-23 15:06:22 -04:00
4c317d1891
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-23 14:56:05 -04:00
a969599986
CC-3858: Record and Rebroadcast Creation Problem\
...
- fixed
2012-05-23 14:55:55 -04:00
bf614dd729
CC-3870 : Now playing -> "Add n items" displays wrong "n" when drag and drop tracks to Time Line
2012-05-23 17:40:56 +02:00
0c233c3346
CC-3860 : Timeline: Can knock a current playing song out of place with drag and drop if current playing song has checkbox selected
2012-05-23 17:06:04 +02:00
0b84dec86f
CC-3862 : Now playing -> Time Line: Left clicking and "Select cursor" won't enable to add current selected track from Media Library
2012-05-23 12:18:51 +02:00
4608f04140
remove useless logging
2012-05-23 00:43:05 -04:00
773693f636
- fixed spelling mistake on variable 'songElapsedTime' in dashboard.js
2012-05-22 17:47:46 -04:00
164c158c80
CC-3859: Playout History: Filter out songs that are not played out
...
- done
2012-05-22 17:39:27 -04:00
453b343284
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
- fixed setting end_time
2012-05-22 16:53:04 -04:00
b2f39ae66b
CC-3810: NowPlaying Bar during a recorded show looks scary in 2.1 (much nicer in 2.0.3 and earlier)
...
-introduced small problem, now fixed
2012-05-22 16:33:18 -04:00
c7a551fe84
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-22 16:13:11 -04:00
6da923ace1
CC-3859: Playout History: Filter out songs that are not played out
...
- db change and upgrade.
2012-05-22 16:11:25 -04:00
6b44792c11
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-22 12:22:11 -04:00
bbd694eb10
CC-3810: NowPlaying Bar during a recorded show looks scary in 2.1 (much nicer in 2.0.3 and earlier)
...
-introduced small problem, now fixed
2012-05-22 12:22:03 -04:00
c460670486
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-22 17:58:09 +02:00
6d88b21a8f
CC-3846: changed CSS for info icon, it should fix the positioning issue
2012-05-22 17:53:51 +02:00
2658b39585
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-22 17:52:04 +02:00
428b13f3d7
CC-3803 : Don't allow editing of a current Record show
2012-05-22 17:51:53 +02:00
8720aabc27
CC-3857: Chmod fixes for files which should not be executable
...
-fixed
2012-05-22 11:22:43 -04:00
438bc93133
CC-3851 : Preview Player: does not expand on Chrome, too big on Firefox
2012-05-22 15:03:34 +02:00
95003c3571
CC-3712 : Trial end date overlaps with Airtime Clock
2012-05-22 12:45:42 +02:00
78fe946e57
CC-3712 : Trial end date overlaps with Airtime Clock
2012-05-22 12:40:08 +02:00
d47514c4db
CC-3845 : General UI cleanup
2012-05-21 18:28:19 +02:00
4fe80194b6
CC-3845 : General UI cleanup
2012-05-21 17:07:34 +02:00
f485b9b601
CC-3804: The title of the record show's media will be changed after Media Monitor restart
...
-removed re-setting the track_title. It was causing problems, and it seems to no
longer have a reason to be here (you cannot rename a recorded show after it
has started)
2012-05-21 02:23:34 -04:00
bbc101bde8
CC-3810: NowPlaying Bar during a recorded show looks scary in 2.1 (much nicer in 2.0.3 and earlier)
...
-fixed
2012-05-20 23:30:03 -04:00
d0211aaca9
SAAS-208: airtime-system: create a option which can set the live stream connection setting
...
-done
2012-05-18 19:08:50 -04:00
42f75634fc
CC-3854: Crash on Adding Show
...
-fixed
2012-05-18 18:57:22 -04:00
f3840f6eac
CC-3796: If you change the show's start and end time, the length of content will be displayed as ".00"
...
-refactored empty check on $time
2012-05-18 17:54:58 -04:00
d7eb9a9d95
SAAS-238: Password reset: hide these options in the preferences, allow them to be set using airtime-system command
...
- changed "Airtime System Email" label on System->Preferences form
2012-05-18 14:50:42 -04:00
8710c00970
SAAS-238: Password reset: hide these options in the preferences, allow them to be set using airtime-system command
...
-these options are hidden is instance is saas
2012-05-18 12:58:09 -04:00
766f897dfe
CC-3845 : General UI cleanup
2012-05-18 16:20:33 +02:00
bb084f5a85
CC-3845 : General UI cleanup
2012-05-18 16:11:22 +02:00
560b9da239
CC-3845 : General UI cleanup
2012-05-18 16:01:24 +02:00
466e30895c
CC-3845 : General UI cleanup
2012-05-18 16:00:36 +02:00
ff1327881a
CC-3845 : General UI cleanup
2012-05-18 15:40:22 +02:00
5d3382a3d9
CC-3845 : General UI cleanup
...
changing eye icon to play for the preview option in a context menu.
2012-05-18 12:29:37 +02:00
8ad336858e
CC-3747: Metadata popup should also show the filepath of the track
...
- fixed 'File Path' from breaking into 2 lines in Chrome
2012-05-17 18:53:40 -04:00
3ba4551ed3
- increased amount of time is allowed to pass before ON-AIR light is turned off
2012-05-17 18:49:06 -04:00
8ed2efe770
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-17 18:27:06 -04:00
9967f5451c
CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
...
- fixed
- added a 'type' key to distinguish between tracks and shows
2012-05-17 18:21:58 -04:00
6d75b4fc06
The fix for long connection strings in "Add Show" form caused the tooltips to
...
be displayed incorrectly (hidden). Reverted that change.
Fixed display of "Stream URL" in the stream settings.
2012-05-17 18:07:41 -04:00
869eb77ca4
CC-3611: Show Form: "Repeats" font is wrong, info images in the wrong place
...
Fixed both of these issues.
Fixed issue with connection URLs in "Add Show" and in "Stream Prefs" where
the text was unstyled.
Fixed issue with long connection URLS causing display problems
in "Add Show" and in "Stream Prefs". Now a scrollbar will appear if the
connection URL is too long.
Fixed bug in Stream Prefs where zooming out caused the page to be formatted
differently.
Fixed bug in Stream Prefs where the labels "Master Source Connection URL" and
"Show Source Connection URL" wrapped on multiple lines.
Fixed help text for Add Show -> Live Stream authication settings, the
instructions were wrong and there were misspelled words.
2012-05-17 17:33:50 -04:00
228f699943
CC-3609: Stream settings page layout works better now, the two panels
...
are now placed next to each other.
2012-05-17 15:06:14 -04:00
fd0d82a873
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-17 17:53:23 +02:00
45ef2af142
CC-3420 : Custom UI for jplayer from CC-3395
2012-05-17 17:53:01 +02:00
8abb57c402
CC-3842: Next scheduled show gets registered as next scheduled song
...
- removed case where light stays on for first 5 seconds of track
- also removed function calls no longer in use (notifySongStart(), and notifyShowStart())
- removed nowplayingdatagrid.js since it is no longer in use
2012-05-17 11:23:24 -04:00
ccbe4f1998
CC-3420 : Custom UI for jplayer from CC-3395
...
creating new stylesheet for our audio previews based from jplayer blue monday.
2012-05-17 16:20:40 +02:00
1629f41a8d
CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
...
-fixed
2012-05-16 12:54:02 -04:00
c5b1e23486
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-15 17:13:20 -04:00
denise
James
Martin Konecny
Rudi Grinberg
Vladimir
james
Paul Baranowski
Naomi Aro
Vladimir