denise
3e75b28c9d
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
2012-07-03 10:42:29 -04:00
denise
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
denise
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
denise
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
James
d13ade977a
CC-4034: Files on Watched folder shouldn't be deleted physically.
...
- fixed
2012-06-28 13:28:45 -04:00
james
443537b2db
CC-4020: Apache error found: Undefined variable: switch_start
...
- fixed
2012-06-27 22:50:46 -04:00
Martin Konecny
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
Martin Konecny
84f867a00f
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-25 18:31:07 -04:00
Martin Konecny
b8c559db58
add time to our version so cache is never used in dev branch
2012-06-25 18:30:33 -04:00
denise
8005049bdc
CC-3996: Undefined offset: 0 in StoredFile.php (Apache error)
...
-fixed
2012-06-25 12:22:34 -04:00
denise
f029124447
Merge branch '2.1.x' into devel
2012-06-19 17:57:27 -04:00
denise
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
denise
b742033647
- Add Media: fix to accept audio files with ID3 tags liquidsoap complains about
2012-06-18 12:24:13 -04:00
denise
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
denise
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
denise
b0e93005e5
Merge branch '2.1.x' into devel
2012-06-15 15:04:18 -04:00
denise
bb54a9041f
CC-3986: 'Add User' does not convert email address to lowercase
...
-done
2012-06-15 15:03:48 -04:00
denise
87faf47c94
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-15 14:42:37 -04:00
James
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
denise
70bfe031ef
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/models/Email.php
2012-06-14 15:30:33 -04:00
denise
6b990f8712
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into devel
2012-06-14 13:45:14 -04:00
denise
f433fd89fe
CC-3970: Password Reset: No UI error msg for no mail server founded
...
-done
2012-06-13 16:04:57 -04:00
denise
9cabd4d32c
CC-3921: Add mobile phone number field to user record
...
-done
2012-06-13 13:39:54 -04:00
Martin Konecny
f188eeada2
preparation for 2.1.1 release
2012-06-13 11:35:14 -04:00
denise
9b31a6daac
Merge branch '2.1.x' into devel
2012-06-13 10:10:05 -04:00
Martin Konecny
02b6d04952
CC-3956: PHP script can enter inifinite loop
...
-small cleanup
2012-06-12 20:18:06 -04:00
Martin Konecny
d1c224321b
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-12 18:51:31 -04:00
Martin Konecny
b858c34526
CC-3956: PHP script can enter inifinite loop
...
-fixed
2012-06-12 18:51:22 -04:00
denise
f3b925daa2
CC-3412: Icecast stream name not defined
...
-done
2012-06-12 17:08:36 -04:00
denise
8b2353ede0
Merge branch '2.1.x' into devel
2012-06-12 15:49:18 -04:00
denise
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
James
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
denise
d66ba4074c
Merge branch '2.1.x' into devel
2012-06-11 18:11:09 -04:00
denise
d8a1a17f19
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-11 18:08:47 -04:00
denise
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
Martin Konecny
2ebf149a65
CC-3949: On edit empty show, time_filled becomes null
...
fix method of checking null
2012-06-11 17:08:17 -04:00
denise
1b057c8954
Merge branch '2.1.x' into devel
2012-06-11 16:49:03 -04:00
James
6316c23b25
CC-3954: apache log errors part3
...
- bug fix
2012-06-11 16:10:51 -04:00
James
c78ba0faf6
CC-3954: apache log errors part3
...
- fixed
2012-06-11 15:52:39 -04:00
denise
d498c51814
Merge branch '2.1.x' into devel
2012-06-11 15:10:33 -04:00
denise
ca8187c9c2
CC-3718: Please enable user to input the mail server settings
...
-done
2012-06-11 12:53:09 -04:00
James
62eee61d4e
CC-3956: PHP script can enter inifinite loop
...
- fixed
2012-06-08 17:58:21 -04:00
James
0bae3f9038
CC-3949: On edit empty show, time_filled becomes null
...
- fixed
2012-06-08 16:18:27 -04:00
James
e661f400a4
CC-3950: apache log errors part2
...
- fixed
2012-06-08 15:31:45 -04:00
James
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
Martin Konecny
0416c05f9c
add reason why Propel connection failed
2012-06-08 12:06:54 -04:00
James
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
James
2bf6408d90
CC-3864: Calendar -> Edit show: Can edit the start time of current playing show
...
- fixed
2012-06-06 18:23:27 -04:00
James
ec6ff4c9e6
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-06 17:32:10 -04:00
James
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
denise
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
Martin Konecny
68deba81d9
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-05 22:30:50 -04:00
Martin Konecny
d4b1fc711e
CC-3928: Use liquidsoap to test whether file is playable on upload.
...
-change to wording
2012-06-05 22:30:17 -04:00
James
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
denise
4bcf904f92
CC-3932: Master/Source Source Connection URL should be in non-editable box
...
-done
2012-06-05 15:13:04 -04:00
denise
74e9f70506
CC-3928: Use liquidsoap to test whether file is playable on upload.
...
-done
2012-06-05 11:24:40 -04:00
denise
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
Martin Konecny
b6446442ba
CC-3917: record_date field in recorded shows causing problem
...
-fixed
2012-06-04 11:43:41 -04:00
Martin Konecny
89c0583849
CC-3926: System -> Stream setting: input ' into "Name/Description" will cause PDOException
2012-06-03 22:39:42 -04:00
denise
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
Naomi Aro
8b4c876c5b
CC-3884 : UI constantly refreshes when filtered by a show in a timerange
2012-05-24 17:33:15 +02:00
Martin Konecny
eb4207dd1d
CC-3863: Stats should not send version number with extra characters
...
-fixed
2012-05-23 17:25:16 -04:00
denise
80998f2eac
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-23 16:19:06 -04:00
denise
28a383e960
- fixed check for currentShow's end boundary to only be greater than current time
2012-05-23 16:18:59 -04:00
Martin Konecny
1edfb097da
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-23 16:17:37 -04:00
James
01439663d9
CC-3863: Stats should not send version number with extra characters
...
- fixed
2012-05-23 15:06:22 -04:00
James
a969599986
CC-3858: Record and Rebroadcast Creation Problem\
...
- fixed
2012-05-23 14:55:55 -04:00
Martin Konecny
4608f04140
remove useless logging
2012-05-23 00:43:05 -04:00
James
164c158c80
CC-3859: Playout History: Filter out songs that are not played out
...
- done
2012-05-22 17:39:27 -04:00
denise
453b343284
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
- fixed setting end_time
2012-05-22 16:53:04 -04:00
Martin Konecny
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
James
c7a551fe84
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-22 16:13:11 -04:00
James
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
Martin Konecny
6b44792c11
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-22 12:22:11 -04:00
Martin Konecny
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
Naomi Aro
428b13f3d7
CC-3803 : Don't allow editing of a current Record show
2012-05-22 17:51:53 +02:00
Martin Konecny
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
denise
42f75634fc
CC-3854: Crash on Adding Show
...
-fixed
2012-05-18 18:57:22 -04:00
denise
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
denise
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
denise
821484d81a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-15 15:43:16 -04:00
denise
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
Martin Konecny
1921b26943
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-15 15:17:58 -04:00
Martin Konecny
1245d1e860
CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE
...
-fixed in a better way
2012-05-15 15:17:19 -04:00
denise
61fd560daa
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-15 15:11:04 -04:00
denise
b96f0590b1
CC-3808: No tooltip for preview playlist
...
-done
2012-05-15 15:10:56 -04:00
Martin Konecny
6695e3e190
-fix javascript error in widgets
2012-05-15 14:35:01 -04:00
Martin Konecny
4b03a45d46
CC-3757: Widgets: ON AIR show's elapsed and remaining time are wrong
...
-fixed
2012-05-15 14:20:53 -04:00
denise
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
Naomi Aro
d2dc02cf9e
CC-3777 : Decide on what should happen with canceling recorded show
2012-05-15 15:07:42 +02:00
Naomi Aro
07d029b8cc
CC-3777 : Decide on what should happen with canceling recorded show
2012-05-15 14:56:31 +02:00
Naomi Aro
6a2bab66fa
CC-3825 : Deleting any recorded show cancels the current recording show
2012-05-15 13:02:24 +02:00
denise
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
denise
d2704c4d22
- check if variable exists before using if exlpode() was called
2012-05-14 15:24:53 -04:00
denise
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
Naomi Aro
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
Naomi Aro
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
denise
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
denise
de372f967d
--removed function no longer in use
2012-05-11 16:09:36 -04:00
denise
746e55de32
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-calculated scheduled broadcasting
2012-05-11 16:09:36 -04:00
denise
195d0d8311
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-calculated scheduled usage
2012-05-11 16:09:36 -04:00
denise
624ba85212
- deleted old broken code from LiveLog.php
2012-05-11 16:09:36 -04:00
denise
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
denise
99738fad30
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-added cc_live_log inserts
2012-05-11 16:09:35 -04:00
denise
e347819c77
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-created cc_live_log table
2012-05-11 16:06:28 -04:00
Naomi Aro
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
Martin Konecny
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
denise
0a03bba5b7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 15:08:47 -04:00
denise
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
Martin Konecny
1d245ed79d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 14:26:00 -04:00
Martin Konecny
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
Naomi Aro
abd63e736a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 18:19:26 +02:00
Naomi Aro
a514e3b60a
CC-3776 : Current Recorded show is resizeable on the calendar (by dragging)
2012-05-07 18:19:18 +02:00
denise
bdf314b93a
SAAS-157: Automated metrics: gather info about soundcloud usage
...
- put DB query inside try-catch
2012-05-07 12:12:08 -04:00
denise
3a6a1d8691
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 12:02:15 -04:00
denise
96fa5ac715
SAAS-157: Automated metrics: gather info about soundcloud usage
...
-added soundclound_enabled check
2012-05-07 12:01:36 -04:00
Naomi Aro
6a93a479f8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 17:49:35 +02:00
Naomi Aro
df4cdfb07e
CC-3687 : Remove context menus from recorded shows since they are blank.
2012-05-07 17:48:56 +02:00
denise
678e573e7a
SAAS-157: Automated metrics: gather info about soundcloud usage
...
-done
2012-05-07 11:24:40 -04:00
denise
b5db91f0f4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 10:22:41 -04:00
Naomi Aro
a79514c8ee
CC-3687 : Remove context menus from recorded shows since they are blank.
2012-05-07 15:24:06 +02:00
Naomi Aro
41e7150462
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 14:29:02 +02:00
Naomi Aro
a4b949cc2f
CC-3753 : Cannot cancel record show on Timeline view
2012-05-07 14:28:21 +02:00
Martin Konecny
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
Martin Konecny
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
Martin Konecny
4ad3286db2
CC-3769: PHP 5.3.2 issue with DateTime::createFromFormat and format string "U.u"
2012-05-06 15:34:41 -04:00
Martin Konecny
1f214747b2
-catch all exceptions in Preference model and make header 503
2012-05-05 22:29:16 -04:00
denise
7c06e27e7f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-04 15:58:14 -04:00
denise
f50d7c3c03
SAAS-157:Automated metrics: gather info about soundcloud usage
...
-added soundcloud_enabled option
2012-05-04 15:58:07 -04:00
Martin Konecny
9092b7f725
CC-3764: Media Library->Edit Metadata: Throw exception when trying to edit metadata
...
-fixed
2012-05-04 12:47:29 -04:00
Martin Konecny
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
Martin Konecny
b4cd429204
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-04 12:06:41 -04:00
Martin Konecny
65e771d189
CC-3756: Cannot download/preview tracks in Media Library
...
-Fixed
2012-05-04 12:02:42 -04:00
Naomi Aro
d19ed4a97e
CC-3730 : Boundary tracks need recalculating when resizing current show on calendar (by dragging)
2012-05-04 17:49:58 +02:00
denise
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
denise
ff6e2a2e5a
CC-3747: Metadata popup should also show the filepath of the track
...
-fixed
2012-05-02 16:52:49 -04:00
denise
0c337fe430
CC-3747: Metadata popup should also show the filepath of the track
...
-done
2012-05-01 12:39:56 -04:00
denise
4477ac02e7
CC-3677: Tooltips improvements
...
-done
2012-04-30 16:20:23 -04:00
James
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
Naomi Aro
2c84420424
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-26 12:15:31 +02:00
Naomi Aro
b5863d3d7a
CC-3522 : Now Playing Screen-> Periodical message pops up
2012-04-26 12:14:41 +02:00
Martin Konecny
34a1949511
CC-3696: more rebroadcast show instances will be created after change the calendar
...
-fixed
2012-04-25 15:09:58 -04:00
Naomi Aro
d2448b804f
CC-3697 : Only "Recording From Line In" can be added to the Rebroadcast show
2012-04-25 17:09:40 +02:00
Naomi Aro
b6bed6ce7a
CC-3667 : Preferences pages should have an option to enable/disable password recovery option
2012-04-25 15:22:38 +02:00
Naomi Aro
7aeddf5bb0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 12:51:00 +02:00
Naomi Aro
4cdfd33044
CC-3667 : Preferences pages should have an option to enable/disable password recovery option
2012-04-25 11:32:43 +02:00
Martin Konecny
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
Martin Konecny
3bc919affb
CC-3696: more rebroadcast show instances will be created after change the calendar
...
-fixed
2012-04-24 17:52:07 -04:00
Martin Konecny
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
Martin Konecny
6e755b000b
CC-3707: copy files to stor, extra forwardslash
...
-fixed
2012-04-24 16:15:22 -04:00
James
3c4d01aa93
CC-3675: Playlist -> the files from Disconnected Mediafolder can still
...
be previewed (played)
- done
2012-04-24 12:59:07 -04:00
Martin Konecny
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
Martin Konecny
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
Martin Konecny
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
Martin Konecny
7d6e251adf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-20 11:31:37 -04:00
Martin Konecny
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
Naomi Aro
d5a416be43
CC-3416 : Create password reset form
2012-04-20 16:10:27 +02:00
Naomi Aro
e242972a78
Merge branch 'CC-3174' into devel
2012-04-20 13:04:38 +02:00
Naomi Aro
6b4fd7d3bb
CC-3686 : Improve differentiation of a record/rebroadcast show in the timeline
2012-04-20 13:03:50 +02:00
Martin Konecny
16f3a331bb
CC-1927: Remove PEAR DB
...
-missed some conflicts :/
2012-04-19 17:03:13 -04:00
Martin Konecny
cba253439a
CC-1927: Remove PEAR DB
...
-various fixes
2012-04-19 16:54:38 -04:00
paul.baranowski
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
paul.baranowski
9ec584e90c
CC-1927 Remove PEAR DB
...
Removed remaining references to $CC_DBC
2012-04-19 16:35:19 -04:00
paul.baranowski
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
paul.baranowski
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
paul.baranowski
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
James
45fa1efc2d
CC-3603: Calendar->Once you update the rebroadcasted show it disappears
...
- fixed
2012-04-19 12:56:15 -04:00
James
8bd3a35789
CC-3683: Upgraded database not equivalent to fresh install database part 1
...
- fixed
2012-04-19 11:24:30 -04:00
denise
8588857def
CC-3674: Cannot add songs to 'Now Playing' nor Playlists
...
-fixed
2012-04-18 16:49:32 -04:00
denise
7de74f2540
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-18 16:14:04 -04:00
denise
79f3473dfe
CC-3674: Cannot add songs to 'Now Playing' nor Playlists
...
-fixed for Now Playing
2012-04-18 16:13:52 -04:00
James
58f4727f17
CC-3666: Default Playlist fade in/out time is not zero.
...
- fixed
2012-04-18 16:06:23 -04:00
James
897b61b357
CC-3479: Calendar->Drag and Drop show has some inconsistencies with hours
...
- fixed
2012-04-18 14:00:40 -04:00
James
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
denise
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
James
5df1fede9f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-17 15:43:39 -04:00
James
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
Naomi Aro
4732c0ad67
CC-733 : Broadcast Log
2012-04-17 18:59:17 +02:00
Martin Konecny
2c4df4853a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 18:38:55 -04:00
Martin Konecny
79b9de203d
-Better attempt at getting at least 3 items
2012-04-16 18:38:48 -04:00
denise
2fc591db2b
CC-3498: Calendar -> Show Content better representation of duration needed
...
-fixed
2012-04-16 17:09:54 -04:00
James
9aa814212a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 14:58:03 -04:00
James
df3acb5590
CC-3654: Cannot resize current (non-repeating) show on the calendar
...
- fixed
2012-04-16 14:57:53 -04:00
Naomi Aro
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
Naomi Aro
b5f48c7732
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 18:16:33 +02:00
Naomi Aro
b9d82a579f
CC-3407 : Timeline: Display if tracks are missing on disk
2012-04-16 18:16:24 +02:00
Martin Konecny
a6c0a1d2d9
-removed erroneous import
2012-04-16 12:04:35 -04:00
Naomi Aro
a0fb607d30
Merge branch 'CC-3174' into devel
2012-04-16 16:40:02 +02:00
Naomi Aro
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
James
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
Martin Konecny
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
James
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
James
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
James
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
Naomi Aro
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
James
6e1bf50009
CC-3638: Dashboard: On Air and Current playing show wasn't displaying correctly
...
- fixed
2012-04-12 18:49:24 -04:00
James
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
James
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
James
d4533ca545
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 17:19:03 -04:00
James
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