Martin Konecny
|
dc2b4fed0a
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-07-10 10:19:35 -04:00 |
Martin Konecny
|
00a2a19833
|
CC-4090: Make code style PSR compliant
Subjects.php
|
2012-07-09 23:41:00 -04:00 |
Martin Konecny
|
e91c96b90e
|
CC-4090: Make code style PSR compliant
StreamSetting.php
|
2012-07-09 23:32:21 -04:00 |
James
|
c279e008d0
|
Merge branch '2.1.x' into devel
|
2012-07-06 15:52:09 -04:00 |
James
|
63856ea918
|
CC-4079: Apache error: missing $startDt variable
- fixed
|
2012-07-06 15:40:16 -04:00 |
Martin Konecny
|
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 |
Martin Konecny
|
5c1af49252
|
CC-430: Audio normalization (Replaygain Support)
-Added support on Liquidsoap side
|
2012-07-05 23:24:34 -04:00 |
Martin Konecny
|
ce698d4123
|
CC-430: Audio normalization (Replaygain Support)
-Added support on server side
|
2012-07-05 22:37:40 -04:00 |
denise
|
4441bf18b7
|
CC-4072: Improve the check overlapping shows function
-done
|
2012-07-05 11:24:49 -04:00 |
denise
|
771974433b
|
CC-4071: Prevent shows from overlapping on drag and drop in calendar
-done
|
2012-07-05 11:01:48 -04:00 |
denise
|
1fa3da5bd0
|
CC-4069: Edit Show -> cannot edit show
-fixed
|
2012-07-04 18:58:22 -04:00 |
denise
|
cbf026412c
|
CC-4056: Add Show -> Prevent shows from overlapping
-done
|
2012-07-04 11:34:18 -04:00 |
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 |