db3a9357f9
CC-4211: Smart Playlist: length of dynamic block wont be convert to hh:mm:ss if set limit as float number, such as 23.999
...
- fixed
2012-08-13 11:59:28 -04:00
19c90e6688
CC-4204: Dynamic Smart Playlist: Set limit to 500 minutes and click Save will froze the Browser
...
- fixed
2012-08-13 11:42:48 -04:00
1bd94a0757
CC-4212: Smart Playlist: The formats of 'Bit Rate' are not matched between Media Library and Criteria
...
- fixed
2012-08-13 11:32:06 -04:00
8055a9c80b
CC-4214: Smart Playlist -> Criteria about datetime: Please convert the searched value from local time to UTC
...
- fixed
2012-08-13 11:18:15 -04:00
09897064c6
CC-4215: Smart Playlist: Exception happens when generate with criteria Length is 2012-08-10 14:00:00
...
- fixed
2012-08-13 10:59:21 -04:00
028f6636dd
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix right clicking in playlist builder to view metadata causing exception
2012-08-10 14:37:32 -04:00
27025c8ca2
CC-1665: Scheduled stream rebroadcasting and recording
...
-relax domain validator so we can use names like "localhost"
2012-08-10 12:42:56 -04:00
fa749c58f0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-10 12:40:45 -04:00
35e3b3bc02
CC-1665: Scheduled stream rebroadcasting and recording
...
-use mime type so that webstreams can play with invalid filenames
2012-08-10 12:40:28 -04:00
4009ae741f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-10 12:39:45 -04:00
7acd4b362f
bug fix
...
- Length display was wrong
2012-08-10 12:39:33 -04:00
8b13af2e04
fix bug on widget
2012-08-10 12:14:15 -04:00
fe3f4ea678
CC-1665: Scheduled stream rebroadcasting and recording
...
-capture stream mime type and store in db.
2012-08-10 00:57:03 -04:00
037e78730b
CC-4203: Smart Playlist: Please support limit as 0.5 hour
...
-fixed
2012-08-09 18:27:46 -04:00
65cb34db4a
CC-1665: Scheduled stream rebroadcasting and recording
...
-webstream preview on show builder working
2012-08-09 18:14:53 -04:00
4129900858
CC-1665: Scheduled stream rebroadcasting and recording
...
-step 1 of getting stream preview on show builder working
2012-08-09 17:42:25 -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
685354e000
CC-4189: Playlist Builder -> Smart Playlist: Cannot change the position of manually added tracks
...
- fixed
2012-08-09 11:44:27 -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
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
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
18ca6b22cb
CC-1665: Scheduled stream rebroadcasting and recording
...
-add placeholder icons for smart playlists/webstreams
2012-08-07 23:44:21 -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
47ae223a1c
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix SQL error
2012-08-07 19:23:42 -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
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
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
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
af939469d3
CC-84: Smart Playlists
...
- fixed bug on expanding block
- fixed text bug
2012-08-02 17:03:54 -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
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
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
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
0f681d7c25
CC-84: Smart Playlists
...
-fixed undefined offset apache warnings
2012-08-01 14:07:38 -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
b83be1a922
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix incorrectly named column
2012-07-31 11:00:01 -04:00
527b43e8ba
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix incorrectly named column
2012-07-31 10:13:41 -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
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
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
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
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
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
82f087c84d
CC-84: Smart Playlists
...
- changed db query so it's lazy loading
2012-07-19 14:45:15 -04:00
266d86d9e4
CC-84: Smart Playlists
...
- fixed a bug
- change LIKE to ILIKE
2012-07-18 16:12:06 -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
2a38527161
CC-84: Smart Playlists
...
- propel usage chage
- cleaning up code
- some js changes
2012-07-18 11:52:09 -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
1e76845e9c
more sophisticated remote_addr determining
2012-07-17 13:34:48 -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
20e32b98ba
Merge branch 'devel' into mediamonitor2
...
Conflicts:
python_apps/api_clients/api_client.py
2012-07-16 17:41:36 -04:00
fc09baacd7
CC-84: Smart Playlists
...
- static playlist is done.
2012-07-16 17:18:37 -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
583695f98c
CC-430: Audio normalization (Replaygain Support)
...
-values are now written through to database
2012-07-15 22:22:42 -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
794cf2c845
CC-4090: Make code style PSR compliant
...
-run psr-cs-fixer
2012-07-15 21:17:13 -04:00
601263b7a0
CC-84: Smart Playlists
...
- adding propel files for playlistcriteria table
2012-07-13 16:16:07 -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
207582eb7e
CC-84: Smart Playlists
...
- temp commit
2012-07-13 14:23:30 -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
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
bd51b4db02
CC-4100: Make number of shows displayed in widget customizable
...
-fixed
2012-07-11 19:31:24 -04:00
93b34bb079
CC-84: Smart Playlists
...
- controller skeleton
- playlist model dummy functions
2012-07-11 16:14:11 -04:00
ee3447f903
CC-4090: Make code style PSR compliant
...
-User.php
-removed all trailing whitespace
2012-07-10 18:51:32 -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
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
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
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
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
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
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
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
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
d13ade977a
CC-4034: Files on Watched folder shouldn't be deleted physically.
...
- fixed
2012-06-28 13:28:45 -04:00
443537b2db
CC-4020: Apache error found: Undefined variable: switch_start
...
- fixed
2012-06-27 22:50:46 -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
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
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
f433fd89fe
CC-3970: Password Reset: No UI error msg for no mail server founded
...
-done
2012-06-13 16:04:57 -04:00
9cabd4d32c
CC-3921: Add mobile phone number field to user record
...
-done
2012-06-13 13:39:54 -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
f3b925daa2
CC-3412: Icecast stream name not defined
...
-done
2012-06-12 17:08:36 -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
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
6316c23b25
CC-3954: apache log errors part3
...
- bug fix
2012-06-11 16:10:51 -04:00
c78ba0faf6
CC-3954: apache log errors part3
...
- fixed
2012-06-11 15:52:39 -04:00
d498c51814
Merge branch '2.1.x' into devel
2012-06-11 15:10:33 -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
0416c05f9c
add reason why Propel connection failed
2012-06-08 12:06:54 -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
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
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
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
74e9f70506
CC-3928: Use liquidsoap to test whether file is playable on upload.
...
-done
2012-06-05 11:24:40 -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
89c0583849
CC-3926: System -> Stream setting: input ' into "Name/Description" will cause PDOException
2012-06-03 22:39:42 -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
8b4c876c5b
CC-3884 : UI constantly refreshes when filtered by a show in a timerange
2012-05-24 17:33:15 +02:00
eb4207dd1d
CC-3863: Stats should not send version number with extra characters
...
-fixed
2012-05-23 17:25:16 -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
a969599986
CC-3858: Record and Rebroadcast Creation Problem\
...
- fixed
2012-05-23 14:55:55 -04:00
4608f04140
remove useless logging
2012-05-23 00:43:05 -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
428b13f3d7
CC-3803 : Don't allow editing of a current Record show
2012-05-22 17:51:53 +02: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
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
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
821484d81a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-15 15:43:16 -04:00
e0c53afe0b
CC-3796: If you change the show's start and end time, the length of content will be displayed as ".00"
...
-fixed
2012-05-15 15:43:06 -04:00
1921b26943
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-15 15:17:58 -04:00
1245d1e860
CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE
...
-fixed in a better way
2012-05-15 15:17:19 -04:00
61fd560daa
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-15 15:11:04 -04:00
b96f0590b1
CC-3808: No tooltip for preview playlist
...
-done
2012-05-15 15:10:56 -04:00
6695e3e190
-fix javascript error in widgets
2012-05-15 14:35:01 -04:00
4b03a45d46
CC-3757: Widgets: ON AIR show's elapsed and remaining time are wrong
...
-fixed
2012-05-15 14:20:53 -04:00
c4c988b98a
CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent
...
-now shows all keys, null or not, in the list
2012-05-15 11:54:11 -04:00
d2dc02cf9e
CC-3777 : Decide on what should happen with canceling recorded show
2012-05-15 15:07:42 +02:00
07d029b8cc
CC-3777 : Decide on what should happen with canceling recorded show
2012-05-15 14:56:31 +02:00
6a2bab66fa
CC-3825 : Deleting any recorded show cancels the current recording show
2012-05-15 13:02:24 +02:00
6add79268f
CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent
...
- system info from airtime-check-system now displays in "Show Me What I Am Sending"
2012-05-14 18:10:20 -04:00
d2704c4d22
- check if variable exists before using if exlpode() was called
2012-05-14 15:24:53 -04:00
8ff30cf5a1
CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent
...
-fixed
2012-05-14 11:58:07 -04:00
2be64a0067
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2012-05-14 15:08:56 +02:00
ff5aebfd6b
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2012-05-14 15:06:56 +02:00
eb182cf887
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
- added phone_home_stat testing parameter
- fixed problem if missing data in airtime_latest_version file
2012-05-11 17:27:14 -04:00
de372f967d
--removed function no longer in use
2012-05-11 16:09:36 -04:00
746e55de32
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-calculated scheduled broadcasting
2012-05-11 16:09:36 -04:00
195d0d8311
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-calculated scheduled usage
2012-05-11 16:09:36 -04:00
624ba85212
- deleted old broken code from LiveLog.php
2012-05-11 16:09:36 -04:00
de3e5a6e3c
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-fixed inserts into cc_live_log
2012-05-11 16:09:36 -04:00
99738fad30
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-added cc_live_log inserts
2012-05-11 16:09:35 -04:00
e347819c77
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-created cc_live_log table
2012-05-11 16:06:28 -04:00
5620c2b85e
CC-3772: On upgrade, make sure values in cc_files year have correct format
...
removed to_date postgresql function, bad metadata will cause this to fail.
2012-05-10 17:01:22 +02:00
80861bc643
CC-3771: year column in cc_files sometimes has values greater than 2^31-1, which causes postgresql to fail when trying to convert this to a year.
...
-better way to do this...
2012-05-09 01:18:58 -04:00
0a03bba5b7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 15:08:47 -04:00
9a9add9732
SAAS-235: Metrics: "Trial End Date" should be sent to stat server (only for SaaS customers)
...
-done
2012-05-07 15:07:29 -04:00
1d245ed79d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 14:26:00 -04:00
c466b946a0
CC-3770: Make sure files in /srv/airtime/stor have world-readable permissions.
...
-change read permissions on files right after they're uploaded
2012-05-07 13:12:20 -04:00
abd63e736a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 18:19:26 +02:00
a514e3b60a
CC-3776 : Current Recorded show is resizeable on the calendar (by dragging)
2012-05-07 18:19:18 +02:00
bdf314b93a
SAAS-157: Automated metrics: gather info about soundcloud usage
...
- put DB query inside try-catch
2012-05-07 12:12:08 -04:00
3a6a1d8691
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 12:02:15 -04:00
96fa5ac715
SAAS-157: Automated metrics: gather info about soundcloud usage
...
-added soundclound_enabled check
2012-05-07 12:01:36 -04:00
6a93a479f8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 17:49:35 +02:00
df4cdfb07e
CC-3687 : Remove context menus from recorded shows since they are blank.
2012-05-07 17:48:56 +02:00
678e573e7a
SAAS-157: Automated metrics: gather info about soundcloud usage
...
-done
2012-05-07 11:24:40 -04:00
b5db91f0f4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 10:22:41 -04:00
a79514c8ee
CC-3687 : Remove context menus from recorded shows since they are blank.
2012-05-07 15:24:06 +02:00
41e7150462
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 14:29:02 +02:00
a4b949cc2f
CC-3753 : Cannot cancel record show on Timeline view
2012-05-07 14:28:21 +02:00
bd6686a243
CC-3771: year column in cc_files sometimes has values greater than 2^31-1, which causes postgresql to fail when trying to convert this to a year.
...
fixed
2012-05-06 20:45:52 -04:00
6135660d0f
CC-3771: year column in cc_files sometimes has values greater than 2^31-1, which causes postgresql to fail when trying to convert this to a year.
2012-05-06 20:05:14 -04:00
4ad3286db2
CC-3769: PHP 5.3.2 issue with DateTime::createFromFormat and format string "U.u"
2012-05-06 15:34:41 -04:00
1f214747b2
-catch all exceptions in Preference model and make header 503
2012-05-05 22:29:16 -04:00
7c06e27e7f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-04 15:58:14 -04:00
f50d7c3c03
SAAS-157:Automated metrics: gather info about soundcloud usage
...
-added soundcloud_enabled option
2012-05-04 15:58:07 -04:00
9092b7f725
CC-3764: Media Library->Edit Metadata: Throw exception when trying to edit metadata
...
-fixed
2012-05-04 12:47:29 -04:00
22c5da1629
CC-3755: Found Exception in apache's error log
...
-Return error code so that python services automatically retry later.
2012-05-04 12:40:44 -04:00
b4cd429204
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-04 12:06:41 -04:00
65e771d189
CC-3756: Cannot download/preview tracks in Media Library
...
-Fixed
2012-05-04 12:02:42 -04:00
d19ed4a97e
CC-3730 : Boundary tracks need recalculating when resizing current show on calendar (by dragging)
2012-05-04 17:49:58 +02:00
13e147540d
SAAS-214: "--email" being inserted for "city" field in statistics
...
-fixed quote insertion if string is empty
2012-05-03 13:55:55 -04:00
ff6e2a2e5a
CC-3747: Metadata popup should also show the filepath of the track
...
-fixed
2012-05-02 16:52:49 -04:00
0c337fe430
CC-3747: Metadata popup should also show the filepath of the track
...
-done
2012-05-01 12:39:56 -04:00
4477ac02e7
CC-3677: Tooltips improvements
...
-done
2012-04-30 16:20:23 -04:00
0d5f581e35
CC-3731: Can add a show of zero length
...
- fixed
- extra fix: Changed all the duration format so it's consistent
2012-04-27 14:07:14 -04:00
2c84420424
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-26 12:15:31 +02:00
b5863d3d7a
CC-3522 : Now Playing Screen-> Periodical message pops up
2012-04-26 12:14:41 +02:00
34a1949511
CC-3696: more rebroadcast show instances will be created after change the calendar
...
-fixed
2012-04-25 15:09:58 -04:00
d2448b804f
CC-3697 : Only "Recording From Line In" can be added to the Rebroadcast show
2012-04-25 17:09:40 +02:00
b6bed6ce7a
CC-3667 : Preferences pages should have an option to enable/disable password recovery option
2012-04-25 15:22:38 +02:00
7aeddf5bb0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 12:51:00 +02:00
4cdfd33044
CC-3667 : Preferences pages should have an option to enable/disable password recovery option
2012-04-25 11:32:43 +02:00
63a5f45e9b
CC-3690: Able to create repeat show in the past, by editing an already ON AIR show
...
-fixed
2012-04-24 18:22:39 -04:00
3bc919affb
CC-3696: more rebroadcast show instances will be created after change the calendar
...
-fixed
2012-04-24 17:52:07 -04:00
dd72090c3f
CC-3711: Verify Propel hasn't broken anything with its different handling of boolean columns compared to Pear.
...
-fixed in ShowBuilder controller
2012-04-24 16:46:51 -04:00
6e755b000b
CC-3707: copy files to stor, extra forwardslash
...
-fixed
2012-04-24 16:15:22 -04:00
3c4d01aa93
CC-3675: Playlist -> the files from Disconnected Mediafolder can still
...
be previewed (played)
- done
2012-04-24 12:59:07 -04:00
b9ab11ce28
CC-3702: System -> Status: No difference between a service is failed vs a service is not monitor
...
-fixed
2012-04-23 17:18:34 -04:00
5e5ced6fe5
CC-3701: Need to differentiate between a service being down vs not-monitored (airtime-check-system)
...
-fixed
2012-04-22 14:28:02 -04:00
5aa2339a1d
CC-3693: Uninstalling + Reinstall of Airtime + refreshing the page as a non-existant user causes a stack trace.
...
-Fixed
2012-04-20 13:11:28 -04:00
7d6e251adf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-20 11:31:37 -04:00
da8a5296b0
CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
...
-add user type into javascript as a variable so we can check permissions on js side
2012-04-20 11:31:24 -04:00
d5a416be43
CC-3416 : Create password reset form
2012-04-20 16:10:27 +02:00
e242972a78
Merge branch 'CC-3174' into devel
2012-04-20 13:04:38 +02:00
6b4fd7d3bb
CC-3686 : Improve differentiation of a record/rebroadcast show in the timeline
2012-04-20 13:03:50 +02:00
16f3a331bb
CC-1927: Remove PEAR DB
...
-missed some conflicts :/
2012-04-19 17:03:13 -04:00
cba253439a
CC-1927: Remove PEAR DB
...
-various fixes
2012-04-19 16:54:38 -04:00
235997c616
CC-1927 Remove PEAR DB
...
* Removed the DEB package "php-db" from the full install script as it is
no longer needed.
* Missed one call to PEAR::isError()
2012-04-19 16:35:19 -04:00
9ec584e90c
CC-1927 Remove PEAR DB
...
Removed remaining references to $CC_DBC
2012-04-19 16:35:19 -04:00
96b010e7f0
CC-1927 Remove PEAR DB
...
* Removed all traces of PEAR functions.
* Fixed AirtimeInstall::GetVersionInstalled() to return the correct answer
even when it cant connect to the database. Also fixed return value to
be consistent on failure.
* Fixed phone_home_stat.php and soundcloud-uploader.php
2012-04-19 16:35:19 -04:00
7f78a7f663
CC-1927: Remove PEAR DB
...
First pass through the model classes to remove use of $CC_DBC.
Web application is working.
There are still other parts of the app that use PEAR DB.
2012-04-19 16:33:05 -04:00
f69a172ee1
Commented out a bunch of Logging debug lines. There was a lot of output
...
being logged in the Zend log file.
2012-04-19 16:16:56 -04:00
45fa1efc2d
CC-3603: Calendar->Once you update the rebroadcasted show it disappears
...
- fixed
2012-04-19 12:56:15 -04:00
8bd3a35789
CC-3683: Upgraded database not equivalent to fresh install database part 1
...
- fixed
2012-04-19 11:24:30 -04:00
8588857def
CC-3674: Cannot add songs to 'Now Playing' nor Playlists
...
-fixed
2012-04-18 16:49:32 -04:00
7de74f2540
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-18 16:14:04 -04:00
79f3473dfe
CC-3674: Cannot add songs to 'Now Playing' nor Playlists
...
-fixed for Now Playing
2012-04-18 16:13:52 -04:00
58f4727f17
CC-3666: Default Playlist fade in/out time is not zero.
...
- fixed
2012-04-18 16:06:23 -04:00
897b61b357
CC-3479: Calendar->Drag and Drop show has some inconsistencies with hours
...
- fixed
2012-04-18 14:00:40 -04:00
000f7d549c
CC-3652: Can't edit current show if it's a single instance
...
when the timezone is in CEST(prague timezone)
- fixed a bug where variable name wasn't changed
2012-04-18 12:25:10 -04:00
53a85204da
CC-3498: Calendar -> Show Content better representation of duration needed
...
-fixed (check for array length after explode())
2012-04-17 16:52:59 -04:00
5df1fede9f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-17 15:43:39 -04:00
a91785ff42
CC-3652: Can't edit current show if it's a single instance
...
when the timezone is in CEST(prague timezone)
- The bug was that it was using local timestamp for the current time.
- removed some unnecessary code
- changed a variable name to more understandable name.
2012-04-17 15:43:18 -04:00
4732c0ad67
CC-733 : Broadcast Log
2012-04-17 18:59:17 +02:00
2c4df4853a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 18:38:55 -04:00
79b9de203d
-Better attempt at getting at least 3 items
2012-04-16 18:38:48 -04:00
2fc591db2b
CC-3498: Calendar -> Show Content better representation of duration needed
...
-fixed
2012-04-16 17:09:54 -04:00
9aa814212a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 14:58:03 -04:00
df3acb5590
CC-3654: Cannot resize current (non-repeating) show on the calendar
...
- fixed
2012-04-16 14:57:53 -04:00
7e3112e3d7
CC-3610 : Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW
2012-04-16 18:31:15 +02:00
b5f48c7732
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 18:16:33 +02:00
b9d82a579f
CC-3407 : Timeline: Display if tracks are missing on disk
2012-04-16 18:16:24 +02:00
a6c0a1d2d9
-removed erroneous import
2012-04-16 12:04:35 -04:00
a0fb607d30
Merge branch 'CC-3174' into devel
2012-04-16 16:40:02 +02:00
c96c60dc5a
CC-3620 : Calendar -> Unresponsive script warning when trying to add 300 ogg files
...
improving speed of js rendering,
datatables config is loaded from localstorage,
removed aggregate propel behaviour on cc_show_instances time_filled.
2012-04-16 16:33:32 +02:00
ffc17ba705
CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format
...
- DateHelper.php is moved from model to common folder
- created OsPath.php file which contains normpath()
- normpath() is used instead of realpath()
2012-04-13 17:45:28 -04:00
5a2d55ef84
CC-3520: Change default password of monit
...
-currently I allow it to be fixed, but I don't actually change it
from default of airtime:guest
2012-04-13 16:58:12 -04:00
3ae8eb9105
CC-3622: When changing location of the stor directory, the "organize"
...
subfolder is not being created
- fixed
2012-04-13 15:09:59 -04:00
36ca2c29fc
CC-3634: Media Folder: if file was deleted from file system, and the file was
...
scheduled in the future, it wasn't marking the file as deleted
- using propel instead of PEAR DB
2012-04-13 15:03:27 -04:00
1bb04296a9
CC-3639: Preferences-> Fade In is interpreted improperly (it is insanely high)
...
- the regular exp check in model class was wrong
2012-04-13 12:05:59 -04:00
ef908ee894
CC-3626 : Playlist Builder -> you can not add files from Library by using "+" button (if default Fades were changed in Preferences)
2012-04-13 11:09:52 +02:00
6e1bf50009
CC-3638: Dashboard: On Air and Current playing show wasn't displaying correctly
...
- fixed
2012-04-12 18:49:24 -04:00
fd700c225c
CC-3607: MediaFolder->deattaching the MediaFolder does not trigger the files
...
be remover from server
- RecallByMd5() was checking against all cc_files entries which includes
deleted files
2012-04-12 17:37:14 -04:00
c706bc32fd
CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format
...
- fixed
2012-04-12 17:23:26 -04:00
d4533ca545
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 17:19:03 -04:00
c6ad9462af
CC-3634: Media Folder: if file was deleted from file system, and the file
...
was scheduled in the future, it wasn't getting deleted from Airtime
- fixed a bug
2012-04-12 17:18:45 -04:00
62cd704d1c
--added comment
2012-04-12 17:12:43 -04:00
9d4a474521
CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show
...
-fixed
2012-04-12 17:07:27 -04:00
fe68d0fc87
CC-3498: Calendar -> Show Content better representation of duration needed
...
-fixed
2012-04-12 16:25:01 -04:00
f522c7a7af
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 16:17:36 -04:00
53e37ee826
CC-3634: Media Folder: if file was deleted from file system, and the file was
...
scheduled in the future, it wasn't getting deleted from AIrtime
- fixed
2012-04-12 16:17:19 -04:00
c2db20f004
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-cleanup
2012-04-12 15:10:40 -04:00
bfed474b7b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 13:41:18 -04:00
a2fedaa3f1
CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show
...
-fixed
2012-04-12 13:36:45 -04:00
83d78eb0dd
-check if exec function is available before using it
2012-04-12 13:36:36 -04:00
380094b4cc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 13:29:58 -04:00
04718a88ae
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-done
2012-04-12 13:29:49 -04:00
4ef18fb00f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 12:22:36 -04:00
c90a8006cc
CC-3622: When changing location of the stor directory, the "organize"
...
ubfolder is not being created.
- I confirmed that Airtime was creating organize folder upon chaning stor dir
but, still added a code which make sure it create organize folder if it's
missing somehow.
2012-04-12 12:22:20 -04:00
0486d33e27
Merge branch 'CC-3174' into devel
2012-04-12 18:12:01 +02:00
adddd1085c
CC-3592 : Calendar-> Recorded Shows do not get Rebroadcasted at the moment
...
added a flag whether to check user permissions or not.
2012-04-12 18:00:38 +02:00
8303eb728e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 11:54:58 -04:00
5a8df0321e
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-in progress
2012-04-12 11:54:51 -04:00
d06b3573e9
CC-3623: Need to send show name to Liquidsoap. (Currently sending name as "TODO")
...
-fixed
2012-04-11 19:22:47 -04:00
bdd3444acf
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-in progress
2012-04-11 16:45:03 -04:00
f0be7cc995
- comments and removing logging
2012-04-11 16:06:10 -04:00
8f197115ae
CC-3618: Current playing Text Field in Dashboard alternates between "Nothing
...
Scheduled" and "current playing song"
- fixed
2012-04-11 15:54:03 -04:00
13502b4c08
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-11 12:27:54 -04:00
f82aef2a85
CC-3566: Preferences->"Fade In" is not respected when Show starts
...
- millisecond value of fade was sent wrong from php side.
- crossfade() call was removed and it was causing fade in/out not working.
2012-04-11 12:27:41 -04:00
a09a31bc88
CC-3610: Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW
...
-pypo side fixed
2012-04-10 23:13:52 -04:00
428d04d77f
CC-3605 : Create 2.1 upgrades
2012-04-10 18:07:39 +02:00
b998a04c2e
Merge branch 'devel' into CC-3174
2012-04-10 15:57:13 +02:00
1dcced18ac
CC-3605 : Create 2.1 upgrades
2012-04-10 14:45:48 +02:00
954fa2bceb
CC-3444: Ability to edit currently playing show (end time and permissions)
...
- handling in better way. we created separate action for this.
2012-04-05 16:01:27 -04:00
35a89e0308
CC-3174 : timeline
2012-04-05 15:52:16 +02:00
0b3809c379
CC-3110 : Password reset
...
added sender email to preferences form, created db upgrade script.
2012-04-05 14:18:42 +02:00
cde8e07c0b
CC-3581: Calendar->It should not be possible to change the duration for
...
the recorded show
- fixed
2012-04-04 16:26:28 -04:00
5da7d42290
CC-3548: Schedule: Separate repeate show template and single instance on
...
'When' section
- UI portion of the feature
2012-04-04 14:53:26 -04:00
366ea78fce
CC-3532: Now Playing GUI-> Progress bar is still playing after end of show
...
-fixed
2012-04-03 18:29:36 -04:00
edcce7432d
CC-3409: System status page times out if monit is not running.
...
-Fixed
2012-04-03 17:38:59 -04:00
4cb64b0eb1
CC-3569: Update total track metric to only report tracks that exist
...
- fixed
2012-04-03 15:53:55 -04:00
057ca55074
CC-3589 : Send cancel recording message to pypo
2012-04-03 18:43:13 +02:00
711105aade
CC-3588 : Cancelling Empty Show gives "Invalid Request"
2012-04-03 18:26:04 +02:00
d2d45dcae6
CC-3587 : index problem in scheduling.
2012-04-03 17:56:50 +02:00
079862d2f2
CC-3505 : Timeline: Remove repeating date if "end date" is the same as the "Start date"
2012-04-03 16:11:53 +02:00
5dfaa00c25
CC-3542 : When you delete the current show it takes all songs from that show out of the playout history
2012-04-03 11:15:22 +02:00
2e88801dad
CC-3562: NOWPlaying->Overbooked Show1 introduces problems to itself and to the next
...
-fixed
2012-04-02 17:28:05 -04:00
c5b761bff3
CC-3542 : When you delete the current show it takes all songs from that show out of the playout history
2012-04-02 15:31:02 +02:00
eeb7273909
CC-3542 : When you delete the current show it takes all songs from that show out of the playout history
2012-04-02 15:20:13 +02:00
b39db57d0c
CC-3501 : Calendar->Show->Add media files from Library better usability may be proposed
2012-03-30 14:45:30 +02:00
9e9ae11725
CC-3551 : Change Cue Out for currently deleted track
2012-03-30 12:24:55 +02:00
5b65b56b93
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-29 16:57:49 -04:00
7325d51ada
CC-3449: Live Stream: Kick out live dj at the end of the show
...
- fixed so airtime sends series of kick_out events according to
cached_ahead value in cfg file.
2012-03-29 16:57:28 -04:00
cea37774ca
CC-3551 : Change Cue Out for currently deleted track
2012-03-29 19:20:02 +02:00
5a24331ef6
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 17:37:18 +02:00
12b23443db
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 16:27:08 +02:00
0746115d2c
CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time
2012-03-29 11:06:57 +02:00
4f5d7efaa1
CC-3449: Live Stream: Kick out live dj at the end of the show
...
- done
2012-03-28 15:12:01 -04:00
d12ef1c7a2
CC-3536 : Work out ACL with library on NowPlaying when it's a guest User
2012-03-28 18:43:44 +02:00
4904a16ebb
CC-3534 : Check Scheduling Edge Cases
...
extracting out error checking in scheduling, added created column to cc_showinstances
2012-03-28 14:23:25 +02:00
b70773489a
CC-3534 : Check Scheduling Edge Cases
...
not allowing users to add to a show that has ended.
2012-03-28 10:50:02 +02:00
9c52b2ee1f
CC-3174 : showbuilder
...
fixing jplayer preview
2012-03-27 16:27:43 +02:00
296a5c583a
CC-3407 : Timeline: Display if tracks are missing on disk
2012-03-27 15:16:07 +02:00
451b573c52
Merge branch 'CC-3174' into devel
2012-03-27 14:14:58 +02:00
2956009f42
CC-3451 : Ability to delete the currently playing clip
2012-03-27 14:11:36 +02:00
10e4ae781f
CC-3451 : Ability to delete the currently playing clip
2012-03-27 12:44:48 +02:00
3f713ca8dc
CC-3426: apache log errors from plupload
...
-fixed
2012-03-26 19:00:40 -04:00
d7af91f306
CC-3520: Change default password of monit
...
-done
2012-03-26 17:59:44 -04:00
1a4e6c563b
cc-3476: dynamic timeout
2012-03-26 14:33:33 -04:00
c301cd5256
cc-3476: dynamic timeout
2012-03-26 14:33:33 -04:00
275faa1881
CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time
2012-03-26 19:08:52 +02:00
1ccf63ab0b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-22 16:24:38 -04:00
f8d3a8c8bb
CC-3449: Live Stream: Kick out live dj at the end of the show
...
- PHP side implementation
2012-03-22 16:23:59 -04:00
1fdb3cf163
CC-3360 : Timeline Css
...
adding Css to timeline.
2012-03-22 18:04:22 +01:00
6b768c2f99
CC-3483: Live Stream: default fade in/out for live stream transition
...
- done. changing fade value doesn't require LS to restart
2012-03-20 22:16:17 -04:00
d4142f8b8b
CC-3484: Pypo: On bootup, it should grab station name and stream
...
label for liquidsoap
- fixed
- created new function set_bootstrap_variables()
2012-03-20 16:41:15 -04:00
e76cffd8b0
CC-3463 : timeline usability
...
moving multiple files within the timeline.
2012-03-20 17:55:35 +01:00
8105c6571c
CC-3355 : Timeline/Library: Select all in the library, drag to empty show --> nothing is added
...
if something is added after a footer, it will be added to the end of whatever is before the footer.
2012-03-19 14:48:11 +01:00
9509c70595
CC-3453 : Playlist
...
reworking inital playlist events to all use the new "on" delegation in jQuery.
fixing some out of date errors.
2012-03-19 14:09:05 +01:00
22cc362f1c
CC-3448: Cancel show shouldn't send "cancel show" msg to pypo anymore
...
-done
2012-03-17 23:51:58 -04:00
9be6f1bd0e
CC-3464: Playout forward cache should be configurable
...
-Done
2012-03-17 14:53:15 -04:00
77e1c1c0cb
CC-3466: Select statement for Now Playing has 'AND' in statement when no shows scheduled.
...
-added check to make the code do nothing when a previous, current and next show id aren't specified.
2012-03-16 17:13:32 -04:00
8a34023336
CC-3465: Now playing should show tracks over shows for previous and next
...
- added logic to include previous and next show in schedule query so the now playing bar will show the tracks from the show instead of the show itself.
2012-03-16 14:02:53 -04:00
5b953443c6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/public/js/airtime/showbuilder/builder.js
2012-03-15 18:12:15 -04:00
ae0d3c560c
CC-3394: Add play button to timeline table.
...
- added image information to row in ShowBuilder.php to enable audio preview of shows.
- moved around code so the audio preview functionaly is standalone
- fixed the firefox bug for issue CC-3429
2012-03-15 17:56:51 -04:00
4595da9087
CC-3452: Live Stream: DJs assigned to the show and Program Managers should
...
be able to control switches and able to kick out connection
- kickout buttons and switch buttons are now visible to everyone.
- clicking buttons without correct permission will return proper error msg.
2012-03-15 14:29:31 -04:00
79f8eabe2b
CC-3405: Display to users how to connect a live stream to Airtime
...
- Done
2012-03-14 14:43:10 -04:00
540f262a77
CC-3224: "On-the-fly" stream rebroadcasting
...
- removed "Allow override" checkbox from show live stream section.
- removed "auto enable live stream" checkbox from stream setting page.
- implemented authentication functionality of live dj source connection.
2012-03-14 14:43:10 -04:00
f193047a1c
CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream
...
are connected and give user the ability to block those streams
- added stream source switch interface
- backend code
2012-03-14 14:43:10 -04:00
d4a387e113
- adding switch to liquidsoap
2012-03-14 14:41:00 -04:00
dfe87723f0
- bug fix in stream setting
...
- testing lisquidsoap
2012-03-14 14:41:00 -04:00
128a497059
CC-3224: "On-the-fly" stream rebroadcasting
...
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
2012-03-14 14:41:00 -04:00
1ebe3d1812
CC-3224: "On-the-fly" stream rebroadcasting
...
- Live source is created when only both port and mount point are specified
2012-03-14 14:41:00 -04:00
30901aa0d6
CC-3224: "On-the-fly" stream rebroadcasting
...
- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file
2012-03-14 14:41:00 -04:00
48bb19d758
CC-3224: "On-the-fly" stream rebroadcasting
...
- web interface
- auth script for liquidsoap
- DB changes
2012-03-14 14:41:00 -04:00
701ed82f40
CC-3224: "On-the-fly" stream rebroadcasting
...
- interface implementation. subform within the show form.
2012-03-14 14:41:00 -04:00
ca04a7a686
CC-3224: "On-the-fly" stream rebroadcasting
...
- Form in preference section
2012-03-14 14:41:00 -04:00
f399c7adab
CC-3426: apache log errors from plupload
...
- Updated code so the errors in the log are fixed.
- Performed sanity test on large file size that exceed disk space
and normal uploads that are small enough to be copied
2012-03-14 11:14:22 -04:00
a65ea6d058
CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table
...
- updated the code to remove the empty declaration of $results
- updated parameters so the name has p_ prepended to it
- fixed a weird bug where $con was not sent to updateScheduleStatus
- modified previous element logic so I only store the index and after the loop test if it was set and then do the formating.
2012-03-13 17:46:13 -04:00
48c8607d17
CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song
...
-added brackets around other if condition
2012-03-13 11:34:43 -04:00
13e3197ebf
CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song
...
- added brackets to an statement
2012-03-13 11:31:24 -04:00
1e4d34447a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/Schedule.php
2012-03-13 10:23:44 -04:00
cbaeda1d6b
CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table
...
- Updated the logic in GetPlayOrderRange now I get the previous, current and next shows and tracks to be played.
- This information is then sent back to the caller.
- if the previous track is null the previous show is sent back as an example of the algorithm.
2012-03-13 10:21:01 -04:00
6f270bfb3d
Merge branch '2.0.x' into devel
...
Conflicts:
VERSION
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/Show.php
airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
install_minimal/include/airtime-constants.php
python_apps/api_clients/api_client.py
python_apps/pypo/pypocli.py
python_apps/pypo/pypofetch.py
2012-03-12 17:52:17 -04:00
3145c24ba2
CC-3174 : showbuilder
...
changing queries for datatables to use the Datatables model class.
2012-03-12 15:32:24 +01:00
41a46b3144
CC-3174 : showbuilder
2012-03-12 15:02:34 +01:00
3b32a16813
CC-3174 : showbuilder
...
setting a timeout to refresh when the first item on the timeline starts incse there is no "current" item.
2012-03-12 13:25:03 +01:00
20db8d6fdf
CC-733 : broadcast logs
...
adding time range selection for the log history.
2012-03-12 11:47:25 +01:00
c66b55ec17
CC-733 : playout history
...
translating mDataProp values to be able to search table on backend
2012-03-09 11:13:32 +01:00
53b8eb2724
CC-733 : export broadcast logs
...
exporting stats based on czech law
2012-03-08 18:30:56 +01:00
fe3c340a90
CC-3174 : showbuilder
...
making library table only scroll on the table part.
2012-03-07 18:27:32 +01:00
e9627bca07
CC-3174 : showbuilder
...
only updating the timeline view if it is needed.
2012-03-07 12:20:30 +01:00
a4d07b3060
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2012-03-07 10:33:00 +01:00
709e117f41
CC-3391: Audio Preview cannot play tracks with commas in their filename
...
- The content distribution header filename attribute, wasn't properly quoted for inline content. This causes a bug for files with comma names.
- changed the play button in library back to the speaker icon
- removed some dead code preview_player.js
- removed the file name attribute, will need better approch to presenting the user with audio information.
2012-03-06 13:50:07 -05:00
157078b963
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2012-03-06 13:51:37 +01:00
6c5f710329
CC-3174 : showbuilder
...
making each separate widget scrollable (playlist, library, timeline)
2012-03-06 13:19:20 +01:00
c0f83a0e02
CC-3387: Error with accessing database on Now Playing view
...
-fixed
2012-03-06 00:05:06 -05:00
0dfcb77f1a
CC-3386: array access for "media_played" flag is hardcoded to 0
...
-fixed
2012-03-05 23:53:25 -05:00
348011dbc3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-05 19:03:23 -05:00
9715de11f5
CC-3372: Improved pypo cache delete
...
-Done
2012-03-05 19:02:46 -05:00
a09b63b8d0
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- removed javascript from php files
- removed preview.js
- fixed small problems with editor
2012-03-05 19:00:14 -05:00
a246f85a5b
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- Merged with devel, removed js from StoredFile.php
2012-03-05 19:00:14 -05:00
51f004933b
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updated icon in library
2012-03-05 19:00:14 -05:00
2de81c6027
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updated logic removed when doing a rebase with devel
2012-03-05 19:00:14 -05:00
b8452928da
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updated player ui so it matches demo code
- can play any song from the library or playlist builder, but not very usable
2012-03-05 19:00:14 -05:00
1aab682104
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updates to audio preview on library and playlist
2012-03-05 19:00:14 -05:00
0b9ed43e50
Updated library functionality and started with playlist work.
2012-03-05 19:00:14 -05:00
228a9787a8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-05 10:59:43 -05:00
df22ab21a6
CC-3359: Now Playing -> Day view has a bug with supporting UTC time
...
-fixed
2012-03-02 16:32:16 -05:00
29b03c1181
CC-3174 : showbuilder
...
creating smart refresh timeout for now playing.
2012-03-02 16:27:14 +01:00
f61afb0216
CC-3373 : Timeline: only lock the currently playing track and the one after
2012-03-02 14:01:02 +01:00
6c749075ac
CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table
...
chaning column name to playout_status
2012-03-02 12:22:08 +01:00
d03d01bce9
CC-3366: Pypo: Use local files instead of downloading them
...
-done
2012-03-01 18:00:46 -05:00
f8e7d6eae3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-01 15:35:21 -05:00
b68204751e
CC-3174 : showbuilder
...
making sure recorded shows aren't editable.
2012-03-01 17:49:11 +01:00
b813ba1035
CC-3174 : showbuilder
...
making a time filled formatter to take the code out of show builder.
2012-03-01 17:25:37 +01:00
1c43edb40b
CC-3174 : showbuilder
2012-03-01 17:05:50 +01:00
3bfbe036c7
CC-3174 : showbuilder
...
using the new status column in cc_schedule to colour boundary/overbooked tracks.
2012-03-01 15:09:13 +01:00
0f9800a6bd
CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table
2012-03-01 14:59:06 +01:00
f8608f3511
CC-3174 : showbuilder
...
percent calculation for shows was off.
2012-03-01 12:13:21 +01:00
b7e5bfe4aa
CC-3174 : showbuilder
...
changing cues/cliplengths to be interval column type.
2012-03-01 11:48:57 +01:00
99b490129c
CC-3174 : showbuilder
...
making a dialog on the calendar page.
2012-03-01 00:19:59 +01:00
8b540017a5
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-29 14:55:30 -05:00
1deee3cb65
CC-3365: Airtime API returns a non-null value for next item when there is no next item.
...
- Improved check for determining if there is another element in the result set which is used to compute the next value.
2012-02-29 14:54:54 -05:00
a6413f2d1a
CC-3336: Refactor schedule API used by pypo
2012-02-28 22:33:19 -05:00
057e377c5f
Merge branch 'cc-3336-refactor-pypo' into devel
2012-02-28 19:49:48 -05:00
497715df44
Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
...
Conflicts:
airtime_mvc/application/models/Schedule.php
python_apps/pypo/pypofetch.py
python_apps/pypo/pypopush.py
2012-02-28 19:22:13 -05:00
11f31effca
CC-3336: Refactor schedule API used by pypo
2012-02-28 15:04:24 -05:00
4386690b54
CC-3174 : showbuilder
...
prevents scheduling outside a show.
2012-02-28 20:58:06 +01:00
a53d856e8d
CC-3336: Refactor schedule API used by pypo
...
-add comment
2012-02-28 14:56:21 -05:00
99c24ed038
CC-3336: Refactor schedule API used by pypo
...
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-28 14:52:44 -05:00
322d1bfa99
CC-3336: Refactor schedule API used by pypo
...
-initial commit
2012-02-28 14:43:39 -05:00
413d669bbf
Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
...
Conflicts:
airtime_mvc/application/models/Schedule.php
python_apps/pypo/pypofetch.py
python_apps/pypo/pypopush.py
-weird conflict. I must have committed while I had my changes git-stash'ed
2012-02-28 13:58:10 -05:00
15552319aa
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
- updated formating of file, removed tabs in favour of four spaces for some lines.
2012-02-28 13:47:57 -05:00
31abc21aaa
CC-3174 : showbuilder
...
make sure the scheduled item still exists, if not throw an error.
2012-02-28 17:16:43 +01:00
b5f510de85
CC-3174 : showbuilder
...
making sure an item is not added outside of a show.
2012-02-28 16:57:53 +01:00
997782c73c
CC-3354 : playlist drag and drop
...
improving apperance of playlist drag and drop.
2012-02-28 13:13:40 +01:00
4514967ccd
CC-3359: Now Playing -> Day view has a bug with supporting UTC time
...
-fixed
2012-02-27 21:37:23 -05:00
fc2b18923e
CC-3337: Optimize Schedule/get-current-playlist/format/json
...
- I've updated the time interval used to search for the next, current and previously secheduled shows to 24 hours before and after from 1 hour.
2012-02-27 18:09:30 -05:00
20a82abb23
CC-3174 : showbuilder
...
forgot to return value, was getting NOW as the returned time instead.
2012-02-27 22:26:17 +01:00
99d3699e71
CC-3174 : showbuilder
...
fades displayed in seconds.
2012-02-27 21:40:04 +01:00
43d67c921d
CC-3174 : showbuilder
...
adding cue/fade columns to table
fixing schedule fade out
putting default fade between files not in a playlist.
2012-02-27 21:29:02 +01:00
6ecf2f94b0
CC-3356 : Library & Timeline : remove zero prefixes from numbers
2012-02-27 20:26:47 +01:00
e8f329aef1
CC-3336: Refactor schedule API used by pypo
2012-02-27 13:52:35 -05:00
f01a872bea
CC-3174 : showbuilder
...
remove extra ;
2012-02-27 14:59:48 +01:00
318a0345bb
CC-3174 : showbuilder
...
make sure recorded files only display year in the table.
2012-02-27 14:59:16 +01:00
9c248bb34d
CC-3174 : showbuilder
...
fixing scheduling rebroadcasts, show content.
2012-02-27 14:33:56 +01:00
4a02d12600
CC-3174 : showbuilder
...
fixing now playing to remove the playlist part.
2012-02-27 12:53:21 +01:00
36cf8ded18
CC-3174 : showbuilder
...
change columns sample rate and bitrate to be integers so they sort properly in the library.
2012-02-27 12:07:46 +01:00
446233fbd4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-02-24 14:15:06 -05:00
2f689ed583
CC-3346: Recorder: Merge recorder with pypo
...
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
2012-02-24 14:11:35 -05:00
695535ae64
CC-3346: Recorder: Merge recorder with pypo
...
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
2012-02-24 13:12:50 -05:00
4286de7b42
CC-3174 : showbuilder
...
bit rate & sample rate formatters
2012-02-24 18:22:07 +01:00
3ff7d1ac18
CC-3174 : showbuilder
...
forgot to set cueout when scheduling just files.
2012-02-24 16:18:15 +01:00
c6edfc3208
CC-3174 : showbuilder
...
removing columns that no longer should be in cc_schedule.
changing cc_files length column to be of type interval.
adding length formatter to showbuilder.
2012-02-24 16:05:01 +01:00
19d13889af
CC-3351 : Track length should only show to tenths of a second in the library
...
created a length formatter to use in multiple places.
2012-02-24 15:07:04 +01:00
28bb97acfa
CC-3174 : showbuilder
...
allow user to filter library by
files/playlists or all.
2012-02-24 00:55:20 +01:00
c665a3fa03
CC-3333 : showbuilder track colouring
...
tracks coloured if boundry/over.
needs better colour selection.
2012-02-23 22:23:21 +01:00
4631e199cc
CC-3336: Refactor schedule API used by pypo
...
-add comment
2012-02-23 15:20:25 -05:00
c433b08158
CC-3336: Refactor schedule API used by pypo
...
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-23 15:20:25 -05:00
bb300676cf
CC-3336: Refactor schedule API used by pypo
...
-initial commit
2012-02-23 15:20:24 -05:00
753c05ce5b
CC-3335 : Timeline: Drag and drop usability improvements
...
cursor must be used to add tracks to timeline, not check boxes.
2012-02-23 17:46:07 +01:00
da012af6ed
CC-3336: Refactor schedule API used by pypo
...
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-22 20:41:24 -05:00
c5c1dce4d6
CC-3336: Refactor schedule API used by pypo
...
-initial commit
2012-02-22 17:29:49 -05:00
a1e8903a64
CC-3174 : showbuilder
...
fixing some errors found in apache log.
2012-02-22 22:25:14 +01:00
bb49914294
CC-3174 : showbuilder
...
bug fixed in datatables - thanks Allan!
2012-02-22 21:09:24 +01:00
8bbccb6f44
CC-3338: Optimize week display
...
The response time of the calendar varies depending on whether the week/day views filter or the month filter is used because of the additional percentage scheduled calculation per show instance. This added calculation results in more and heavier hits to the database, I've included the time_filled column in the original show query and have used that to calculate percentage and saved the db call.
2012-02-22 14:32:59 -05:00
d4c7b832c9
CC-3174 : showbuilder
...
fixing up library table to include all interesting columns if a user would like to choose to see them.
query is done with propel.
2012-02-22 18:38:33 +01:00
80e33ee533
CC-3337: Optimize Schedule/get-current-playlist/format/json
...
- I've updated the logic to query the cc_schedule table directly for the previous, next, current shows which makes look up time much faster. If that doesn't work then I revert back to the previous logic, incase nothing is scheduled within an hour of the current time.
2012-02-22 11:36:48 -05:00
0ba3049528
CC-3174 : showbuilder
...
removing old scheduling method code to avoid confusion.
2012-02-22 13:19:49 +01:00
a633d69c8d
Merge branch 'CC-3174' into devel
2012-02-20 20:09:49 +01:00
c0f16fac3c
CC-3174 : showbuilder
...
improving playlist functionality/error checking like the showbuilder.
will send last modified ts to make sure user has a current copy of the open playlist.
2012-02-20 18:24:04 +01:00
17c3cdcfb2
CC-3174 : showbuilder
...
fix ordering problem with track column.
2012-02-20 11:41:44 +01:00
664584ec6b
CC-3331 : Optimize "Now Playing" to load in less than 1/2 second
...
- updated the CreateDatatableRows do perform a check and set on the last items end time. If the end time of the last item exceeds the show time's end I set the items end time to the show's end time.
2012-02-17 17:58:19 -05:00
c7f4b17e81
CC-3331: Optimize "Now Playing" to load in less than 1/2 second
...
- cleaned up sql statement Schedule's getScheduleItemsInRange
2012-02-17 17:08:47 -05:00
5dd94ce12c
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-17 16:49:44 -05:00
5cb99e9532
CC-3331: Optimize "Now Playing" to load in less than 1/2 second
...
- Reorganized the now playing to find all the scheduled items within two time frames instead of in a loop per show id.
- I've cut the time in half
2012-02-17 16:47:12 -05:00
0db3a45fcf
SAAS-196: Stats: Check if easy_install installation method detection
...
is working properly
- fixed
2012-02-17 15:40:37 -05:00
2ef6d230f9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-02-17 15:39:50 -05:00
bb1cdc4a8f
SAAS-196: Stats: Check if easy_install installation method detection
...
is working properly
- fixed
2012-02-17 15:39:31 -05:00
6d71ec8c9c
CC-3331 : Optimize "Now Playing" to load in less than 1/2 second
...
- The logic to build the NowPlaying list was updated to refactor the quering of the database for playlist tracks played from in the loop per show ID to outside the loop for a given duration. The resulting list was then partitioned off for each show.
2012-02-17 11:13:34 -05:00
09ae26a531
CC-3174 : showbuilder
...
fixing bug moving item to beginning of show
2012-02-17 12:19:42 +01:00
ac11d8bcf6
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
2012-02-17 11:50:49 +01:00
9bed56a2c3
CC-3174 : showbuilder
...
incorrect variable name fixed for updating last scheduled timestamp.
2012-02-17 11:14:44 +01:00
b2d0565ec4
CC-3174 : showbuilder
...
checking to make sure UI is up to date with db
2012-02-16 19:46:14 +01:00
e1d5d6de73
CC-3174 : showbuilder
...
checking modification time before deleting items.
Throws a ScheduleOutdatedException
2012-02-16 16:29:11 +01:00
f14ebce239
CC-3174 : showbuilder
...
adding new column last_scheduled to cc_show_instance
changing column time_filled to be of type interval.
2012-02-15 18:27:59 +01:00
190490d6f4
CC-3329: Library: Add "track number" to the list of available columns to show (was in 1.9, disappeared in 2.0)
...
- updated the view columns to include track_number from db as track
- updated sql query to include track_number from db
2012-02-15 11:21:21 -05:00
b1fbeeb448
CC-3174 : showbuilder
...
adding a showbuilder form, can filter by show,
or if you're a host user by all shows you can schedule in a range.
2012-02-15 00:39:27 +01:00
14a9225b97
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-02-14 18:12:51 -05:00
14cd9ed0e9
CC-323: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
- Updated the StoreFile logic so it won't die while trying to copy a file, and instead pass error messages to the controller which can decide if it wants to die, which I've set ApiController and PluploadController todo on receipt of error code.
2012-02-14 18:12:29 -05:00
54cbc86a0a
Merge branch '2.0.x' into devel
...
Conflicts:
VERSION
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Nowplaying.php
airtime_mvc/application/models/Show.php
airtime_mvc/application/models/airtime/CcShowInstances.php
2012-02-14 14:47:07 -05:00
eba84ee878
CC-3174 : showbuilder
...
disabling editing of past/current shows.
2012-02-14 14:44:46 +01:00
b7b1c401f6
CC-3174 : showbuilder
...
fixing classes on show footer, selector for the select all.
only adding a checkbox on a row if a user is allowed to schedule there.
2012-02-14 13:33:25 +01:00
4f5b5d8562
CC-3174 : Show Content Builder
...
adding time filled/empty row data.
2012-02-13 18:29:39 +01:00
3df396756f
CC-3323: Don't send description text to Full Calendar since it is never used.
...
-Done
2012-02-13 12:10:23 -05:00
5059d13156
-handle case gracefully when pypo hasn't registered with Airtime server yet.
2012-02-12 01:34:53 -05:00
eadf68cb61
CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback
...
-fixed
2012-02-10 18:43:40 -05:00
941da1fe44
CC-3174 : showbuilder
...
adding add/remove to the context menu.
airtimeline now has default set start/end times in the inputs.
2012-02-09 23:41:12 +01:00
fdd962f5ce
CC-3174 : showbuilder
...
replacing context menus on calendar screen.
2012-02-09 21:19:21 +01:00
9fc0ed198e
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
- moved the logic used to test that the destination folder has enought space to copy the given audio file into.
2012-02-09 12:45:39 -05:00
cdc72beb6b
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
- Updated the code to get the remaining free disk space and compare it to the size of the file to be uploaded and notify the user if the file is larger then diskspace.
2012-02-08 17:56:26 -05:00
6254467e02
CC-3305: 404 Error after meta data edit on Airtime Pro
...
-Fixed
2012-02-08 16:17:18 -05:00
d257ddf482
CC-3285 : Nowplaying
...
nowplaying didn't show correct start date if show crossed 0:00 boundry.
2012-02-08 16:00:37 +01:00
252777c3f9
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-08 15:14:33 +01:00
c23491b257
CC-3285 : show over booked error message
...
checking if percentage is over 100.
2012-02-08 15:13:17 +01:00
529f3fa52f
CC-3174 : showbuilder
...
forgot to actually return fades.... heh
2012-02-07 17:52:04 +01:00
aa7afce245
CC-3174 : showbuilder
...
modifying times to work with scheduling times.
2012-02-07 17:29:52 +01:00
251f3a3e5b
CC-3174 : showbuilder
...
testing newly returned times, fixing the secondsToPlaylistTime method
to not drop subsecond precision for the calculations.
2012-02-07 14:58:16 +01:00
f651024a6e
CC-3174 : showbuilder
...
overriding some propel setter/getters to support subseconds
or using fades in ss.uuuuuu time as a default.
2012-02-07 13:29:50 +01:00
58b4576ae1
CC-3297: Depend on zendframework and php-pear as external packages
...
-DB dependency should now be externalized
2012-02-06 14:18:03 -05:00
d9947b622a
CC-3174 : showbuilder
...
fixing times in CcPlaylistContents
2012-02-06 18:46:53 +01:00
613006e69c
CC-3174 : showbuilder
...
merge
2012-02-06 12:57:08 +01:00
e487b4a444
CC-3174 : showbuilder merges
...
adjusting format of default fade to not confuse DateTime.
2012-02-06 12:48:53 +01:00
9e08f857bf
CC-3174 : showbuilder
...
fixing merge with playlist tooltip
2012-02-06 11:59:20 +01:00
42452b8ea9
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/PlaylistController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Playlist.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/public/js/airtime/library/spl.js
2012-02-06 11:07:10 +01:00
8212624c4a
CC-3174 : showbuilder
...
fixed moving an item to an earlier position in a show,
timeline needs a width or connected list doesn't work.
place holder still has problems with floats.
2012-02-06 01:51:22 +01:00
16863ee95e
CC-3174 : showbuilder/library
...
playlist fades are working again, still need more error checking to be done.
2012-02-05 23:38:12 +01:00
6c2475bf1f
CC-3174 : showbuilder
...
mostly done with new context menu, need to finish
add/delete button actions on lib table for both screens.
2012-02-05 18:19:22 +01:00
e8f2506474
CC-3174 : showbuilder
...
changing playlist table to remove unused columns, adding foreign key to user, adding aggregate length column.
2012-02-04 21:26:21 +01:00
38f3d6bfb0
CC-3174: showbuilder/library refactoring
...
adding new context menu files, playlist is working except for editing fades.
2012-02-04 19:27:26 +01:00
46fdf56b70
CC-3174 : showbuilder
...
refactoring playlist to work with group add/delete by resource id and using transactions.
2012-02-04 15:52:31 +01:00
d6bf95500c
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
...
- didn't change much fixed two bugs and changed formating.
- I introduced a but in Playlist.changeFadeInfo because for the general playlist fade in and out I didn't realize that these values are being set to the first and last elements. So I added a guard.
- I also updated the logic for Playlist.moveAudioClip so if new and old position are the same we just return
2012-02-03 18:19:13 -05:00
19f069b602
CC-3174 : showbuilder
...
can add items to a playlist with the refactoring.
2012-02-04 00:12:06 +01:00
1deebedf11
CC-3174 : showbuilder
...
throwing an exception if playlist doesn't exist.
2012-02-03 18:28:35 +01:00
0afa904ffe
CC-3174 : showbuilder
...
refactoring playlists for the group add/delete
2012-02-03 18:15:10 +01:00
6da4397a96
CC-3174 : show builder
...
can add playlists to the time line
upgraded datatables to 1.9
upgraded qtip2 to a newer version
put qtips on type column on lib table.
2012-02-02 23:15:39 +01:00
7317b1d5af
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
2012-02-02 15:59:35 -05:00
09ccac3384
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
...
- Fixed refresh bug that results in storing to database a 00.000000 value instead of 00:00:00
2012-02-02 15:30:05 -05:00
61fb8a4fb9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2012-02-02 14:49:08 -05:00
03329ad2cf
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
...
- Updated the logic in the fade in/out loggic so the Time format 00:00:00 appears as the more practical seconds format 00.
- I also updated the error message so it includes the time unit seconds in the message.
2012-02-02 14:44:14 -05:00
11e0f3ead8
CC-3296: Sometimes the Current Playing Item on the top Panel in the UI incorrectly shows "Nothing Scheduled"
2012-02-02 14:11:03 -05:00
60ac01dd41
CC-3174 : show builder
...
scheduled item keeps same id after being moved.
2012-02-02 18:38:56 +01:00
e001cd24c1
CC-3174 : show builder
...
darg into and drag around in the timeline is now working.
need to change schedule table to not have auto incrementing ids
to preserve an item's id for REST.
(might find another way)
2012-02-02 18:13:20 +01:00
942cfaac25
CC-3174 : show builder
...
moving columns around in library to look better.
2012-02-02 01:29:50 +01:00
3aab811a3e
CC-3174 : showbuilder
...
fixing some css/js for display.
2012-02-01 23:33:20 +01:00
f5b2a23eb1
CC-3174 : showbuilder
...
group add/delete is working
2012-02-01 18:47:08 +01:00
4ffe79a286
CC-3290: A file should be removed from playlists if it is removed
...
through the interface
- fixed
2012-02-01 10:59:04 -05:00
5d02581d38
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
Modified the error message to prepend a The, simple change.
2012-02-01 10:59:04 -05:00
d495eac326
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
-fixed using the return result of the rename call to verifty the upload worked.
2012-02-01 10:59:04 -05:00
3d502b748f
CC-3174 : showbuilder
...
removing items recalulates everything correctly.
2012-01-31 21:39:34 +01:00
de7bbbb479
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
Modified the error message to prepend a The, simple change.
2012-01-31 15:17:53 -05:00
026f49ab31
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
-fixed using the return result of the rename call to verifty the upload worked.
2012-01-31 14:54:03 -05:00
fbda0e733b
CC-3174 : showbuilder
...
check into issue that propel doesn't return DateTime object in UTC.
using table tools to keep track of selected rows.
2012-01-31 18:59:27 +01:00
3f3117cf0e
CC-3174 : Show builder
...
creating a scheduling system to work with the new timeline in mind using propel.
2012-01-27 21:06:04 +01:00
f5761fd03c
CC-3174 : show builder
...
status icon on left side of table
static check mark in the footer currently
2012-01-26 19:10:37 +01:00
b0c3bace1c
CC-3174 : show builder
...
made sure the column reordering/visibility selection works with
modified show header/footer rows (their td spans the entire tr)
2012-01-26 15:21:04 +01:00
1080bf692f
CC-3277 : Overbooking a show to include 24+ hours of audio
...
truncating time values greater that the max allowed for time without timezone
2012-01-24 18:08:39 +01:00
ecaebbeb67
CC-3174 : Show builder, working on date choice pickers, make sure they accomodate client/server timezones.
2012-01-23 19:07:07 +01:00
fa872894f3
CC-3259 : change repeating state of show.
2012-01-18 16:21:46 +01:00
087d893a60
Merge branch 'airtime-2.0.x' into devel
2012-01-17 14:48:04 -05:00
3588cca654
CC-3258 : Deleting a rebroadcasting show deletes also the recorded show
2012-01-17 14:11:12 +01:00
a69be24831
CC-3256 : Recorded/repeated/rebroadcast is invalid after show update
...
only the original rebroadcasts are left when toggling the repeat option.
2012-01-17 12:45:05 +01:00
424206b9a9
CC-3174 : Show Builder
...
data tables column resizing, starting separating out events.
2012-01-17 11:18:17 +01:00
54ee177f7d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-16 13:58:45 -05:00
df33a457b1
Merge branch 'devel' into CC-3174
2012-01-16 09:58:02 +01:00
859213b760
CC-3174 Show Builder
...
experimenting
2012-01-16 09:56:57 +01:00
9629e2bbae
Merge branch 'group_action_playlist_builder' into devel
2012-01-13 14:21:29 -05:00
258521ffbf
CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
...
- Fixed issues in "Manage Users" page
- Moved some code to more appropriate place
2012-01-13 14:17:39 -05:00
08a09e4096
CC-2977: Never delete files from the database
...
- using mtab(previous and current) files to figure out directories to be
added or removed
- adding index to cc_files
- see the tickets and media monitor design page for more info
2012-01-12 17:55:05 -05:00
79141fa070
CC-3240: When playlist is longer than a show, the now playing bar shows as if the playlist is still playing after show ends
...
-Fixed
2012-01-12 12:14:38 -05:00
d1de836a92
-make rabbitmq_host configurable via $_SERVER var (.htaccess etc.)
2012-01-11 16:28:03 -05:00
d5d4d50a9e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/om/BaseCcFiles.php
airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php
2012-01-11 12:31:54 -05:00
f6f1b143d7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-11 12:18:28 -05:00
04b48d47cc
CC-2977: Never delete files from the database
...
- Files are marked deleted(file_exists to false) on deletion.
- Dirs are marked removed(removed flag to true) on removal of watched
folder in a usual way. If dir is unmounted, without being removed from
watched list first, it will be marked as not exists(exist flag to false)
- Manage Media Folders will show if dirs exist or not( mounted or not)
- Playlist builder will show if files exists or not
2012-01-11 12:17:48 -05:00
ef141625a3
Merge branch 'group_action_playlist_builder' into devel
2012-01-10 14:46:31 -05:00
d1d01e55ce
CC-1986: Configurable columns for media search
...
- added column 'utime' (upload time) and 'lptime' (last played time) in the tables cc_files and cc_playlist
2012-01-10 14:45:43 -05:00
7f6d3cd942
Merge branch 'group_action_playlist_builder' into devel
2012-01-10 09:54:55 -05:00
7a27be878b
CC-1986: Configurable columns for media search
...
- Added "Year" column
- Added "Upload Time" column
- Fixed some formatting issue
2012-01-08 22:31:18 -05:00
61c5355e8a
cc-2977: getting close!!!
2012-01-06 15:47:11 -05:00
1c9b134748
CC-3183: recorder shows have extra 1ms which cause the now playing to report the show exceeding its time
...
Done
2012-01-04 17:10:14 -05:00
7247f75563
SAAS-135: Airtime status page reporting free space being incorrectly for Gluster FS mounts
...
-Done
2012-01-04 14:18:40 -05:00
5fa92f3d17
- temp commit on group action
2012-01-04 12:47:27 -05:00
905775552d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-12-27 14:34:27 -08:00
53d504f26e
CC-3110 : Password reset
2011-12-27 14:33:22 -08:00
a55b47efff
-Allow etc and stor directories to be configurable
2011-12-22 17:21:18 -05:00
52b0e3c5f9
CC-3110 : Password reset
...
basic functionality password reset using sendmail
2011-12-21 16:01:29 -08:00
7086444247
SAAS-94: Phone home metrics: Gather info about streaming setup
...
- fixed comment
2011-12-19 15:45:44 -05:00
018fa1d79c
CC-3213: Customer is unable to save Fade Out/Cue out for playlists
...
- fixed cue out/in issue
2011-12-19 14:55:23 -05:00
cdcdd9227d
-add vhost support
2011-12-19 00:11:45 -05:00
7c81fa29eb
CC-3192: Problem with web uploads for Airtime 2.0.0 beta2
...
- The bug was introduced with CC-3086. When file is large enough so
the pluload use chucking, it would create different temp name for each
chuck.
- Fixed it by using unique_name feature on plupload
2011-12-14 15:58:26 -05:00
9bbe1d14fa
-remove persistent connections from DB connections
2011-12-13 17:16:45 -05:00
e81c14c1db
CC-3185 : Live show can be dragged into a future date after the rebroadcasting
2011-12-13 13:04:03 +01:00
9275b21f48
CC-3177 : editing a show in the calendar brakes show edit form
2011-12-13 11:10:04 +01:00
c887fec86b
CC-3179 : shows populated date must be timestamp.
2011-12-12 21:11:05 +01:00
72952024b7
CC-3177 : editing a show in the calendar brakes show edit form
...
will only update shows if the duration is 24:00 or less.
2011-12-12 12:11:31 +01:00
83f02c3408
SAAS-57: Add LiveChat to Airtime Pro
...
Adding client_id getter/setter to preference
2011-12-08 17:23:46 -05:00
fd10393b01
SAAS-94: Phone home metrics: Gather info about streaming setup
...
- changes in Airtime repo side
- phone home stat sends stream info to data collection server
2011-12-07 10:31:16 -05:00
73c0408315
CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed.
...
-fixed
2011-12-05 12:56:16 -05:00
2bf4c93e5c
CC-3160: Once Hardware dropdown is changed, stream information does not refresh
...
-Fixed one error...a few more to go.
2011-12-04 21:47:11 -05:00
efbaebbbf5
CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed.
...
-fixed
2011-12-02 16:22:54 -05:00
966dd49610
CC-3094 : Rebroadcast editing problems
2011-12-02 16:24:11 +01:00
198340ac67
CC-3094 : Rebroadcast editing problems
2011-12-02 13:31:54 +01:00
878fa3461d
CC-3094 : Rebroadcast editing problems
2011-12-02 12:06:09 +01:00
f15429c8d6
CC-3144 : Search box shows Track, Show Contents box shows Genre
...
replaces track number with genre.
2011-12-01 11:16:29 +01:00
0d4e1d21e2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-30 16:12:53 -05:00
0193eec89e
CC-3139: Undefined index errors in Live stream player after fresh install
...
Got SQL syntax mixed up with PHP...
2011-11-30 16:10:40 -05:00
48d9d2d93b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-29 20:16:01 -05:00
9c65bfeba7
CC-3131: Latency of stream authentication warning in Stream Settings page
...
- it compares boot time of liquidsoap and the time user clicks on "Save"
on stream setting page. The status only gets updated if the
"boot_time" > "user update time"
- as soon as a user click on save, status is set to "wating"
- since there is no timing issue, quering interval is reduced to 1 sec
2011-11-29 20:15:38 -05:00
53aecd1c00
CC-3130: Disabling a Shoutcast stream causes the service type to revert back to Icecast
...
This happens because we use same field in the db to store whether stream is disabled, and which
type is it (Icecast/Shoutcast). Thus when we disable a stream, we forget about the fact that
it was set to Shoutcast before.
Fixed by separating out the enable/disable state from stream type.
Whether a stream is enabled/disabled is stored in new fields sx_enable.
Stream type is stored in the old fields, sx_output.
2011-11-29 16:25:30 -05:00
f1e1b747ad
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-26 13:32:05 +01:00
5828b2037d
CC-3102 : Show Editing, how it uses day of the week
2011-11-26 13:31:42 +01:00
b16fa16042
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-26 00:06:29 -05:00
317bed8643
CC-3094: Rebroadcast editing problems
...
-Fixed
2011-11-26 00:06:17 -05:00
41eeefe427
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-25 21:34:05 -05:00
f03b875e06
CC-3084: After canceling a repeating show that is being played currently, the progress bar is still going at the top
...
Deleted show was being returned because we don't delete it from database if it's repeating, nor do we check
if it's modified when querying the db.
Fixed by checking modified_instance column; only return it if modified_instance != TRUE
2011-11-25 21:33:42 -05:00
267d48f640
SAAS-82: Add "airtime-system --status" command
...
- add a function that returns just global data of stream setting
2011-11-25 17:33:59 -05:00
c9644d4a73
CC-3077: Preference/stream-setting page has no Vorbis metadata option
...
- cleaning up some code
2011-11-25 15:38:29 -05:00
c21cbeb73b
CC-3102 : Show Editing, how it uses day of the week
2011-11-25 16:07:03 +01:00
b84c51212a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-24 14:05:38 -05:00
276607c302
CC-3104: Timezone issues in the widget
...
For a previous ticket, I changed the code so that both "Today's Program" widget
and "Now Playing" widget both use the liveInfoAction, but forgot that for "Now Playing" widget, it retrieves
the shows within next 48 hours instead of within end of day today...
Fixed by passing GET parameters to liveInfoAction, specify whether we want to retrieve shows within an
interval or end of day. Also added a GET parameter for specifying the number of shows to display.
2011-11-24 13:54:58 -05:00
40b99dfc0f
CC-3085 : Repeating shows get added to the wrong days
2011-11-24 19:39:08 +01:00
54ef9f2b03
CC-3102 : Show Editing, how it uses day of the week
...
not sure if this change should be here anymore yet.
2011-11-24 17:10:49 +01:00
e68d7afa3f
CC-3102 : Show Editing, how it uses day of the week
2011-11-24 16:20:17 +01:00
5c7828c1f5
CC-3102 : Show Editing, how it uses day of the week
2011-11-24 11:56:24 +01:00
a886b53d74
CC-3077: Preference/stream-setting page has no Vorbis metadata option
...
- done
2011-11-23 17:03:30 -05:00
7ac13d26f0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-23 14:12:34 -05:00
ab0dc64ba9
CC-3086: When uploading a file to /tmp filename collisions can occur
...
- mktemp is used to generate temp name within /tmp dir
- it generate temp file when the file gets uploade to /tmp and then copy to
organize folder as original file name
2011-11-23 14:12:14 -05:00
87886b039f
CC-3083 Must convert to UTC start/end times using the timezone start/end times
2011-11-23 19:11:48 +01:00
685e5e03c4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-23 18:49:13 +01:00
65fb00ad8d
CC-3083 Must convert to UTC start/end times using the timezone start/end times
2011-11-23 18:47:44 +01:00
212205b0ff
CC-3070: Scheduling show on the 31st of a month causes problem to months that don't have 31 days
...
-fixed.
2011-11-22 18:03:47 -05:00
ac74ca2449
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-21 18:04:19 -05:00
86729475f6
CC-3067: Shows in frontend widgets appear on the wrong day after changing timezone
...
- Converting times to UTC timezone in ApiController before sending them to model functions
- Added utility functions in DateHelper.php
- GetShowsByDayOfWeek has been removed due to bugs caused by using local timezone
based variable like $day, which represents day of the week in local time, in db query,
which has times saved in UTC timezone. Converting stuff like day of the week from local
to UTC is messy. GetNextShows(...) can do the job so WeekInfoAction now uses it instead
2011-11-21 18:03:56 -05:00
21bbb983ac
CC-3065: When editing a show after changing timezone, the time listed under "When" displays time in old timezone
...
-fixed
2011-11-20 14:46:01 -05:00
9ab47d5eba
CC-3036: Deleted Show instances reappear
...
-Renamed deleted_instance to modified_instance
2011-11-18 12:20:25 -05:00
c773c5c674
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-18 11:59:27 -05:00
f3e1f63226
CC-3060: Apache errors: Undefined index: deleted_instance
...
-fixed
2011-11-18 11:59:15 -05:00
15c84ddfdb
CC-2950: Tell users if they are running an out-of-date version or not
...
- changed default url to "http://airtime.sourcefabric.org "
2011-11-17 23:25:46 -05:00
52052bd573
CC-2950: Tell users if they are running an out-of-date version or not
...
- added error checking to curl call
- added regex validation when storing link to latest version
2011-11-17 15:33:29 -05:00
eae90862b1
CC-2950: Tell users if they are running an out-of-date version or not
...
Get rid of hardcoded url for downloading the latest version, and use the url
stored in the stat server instead
2011-11-17 14:10:26 -05:00
ad708d9983
CC-2156: Searching for a host and hitting ENTER submits the show form
...
- done. Had to port the code manually
2011-11-16 18:14:10 -05:00
1fd29def27
CC-2436: Save pulldown settings
...
Move the code that updates the database for the "show entries" dropdown to
a more appropriate place.
2011-11-16 16:12:58 -05:00
4820bb617b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-16 15:52:31 -05:00
a0bf7c90ba
CC-2436: Save pulldown settings
...
Fixing the issue of "show entries" dropdown setting not being saved.
After some investigation, it seems like we're destroying the calendar
everytime we modify the dropdown value, and create a new one,
which explains why the new setting is not being saved.
Fixed by moving the code that handles the updating to the place after
we create the new calendar. This makes the code cleaner as well.
2011-11-16 15:52:05 -05:00
James
Martin Konecny
denise
Vladimir
Rudi Grinberg
james
Naomi Aro
paul.baranowski
James
Daniel
Martin Konecny
Yuchen Wang
Yuchen Wang