James
|
3894990975
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 17:41:30 -04:00 |
Rudi Grinberg
|
23ee726cfd
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 17:41:21 -04:00 |
James
|
4af9bfaa9d
|
CC-4346: Prepared statements - part 2
- fix spelling
|
2012-09-05 17:41:18 -04:00 |
Rudi Grinberg
|
8f33523095
|
cc-4347: PDO
|
2012-09-05 17:35:08 -04:00 |
Martin Konecny
|
b6b4e25a37
|
allow Airtime environment to be accessed from CLI
-fixed
|
2012-09-05 17:34:12 -04:00 |
Martin Konecny
|
dad1cf32c9
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 17:29:55 -04:00 |
Martin Konecny
|
7cbfb5d40d
|
allow Airtime environment to be accessed from CLI
|
2012-09-05 17:29:34 -04:00 |
Rudi Grinberg
|
0838e31094
|
cc-4347: PDO
|
2012-09-05 16:57:01 -04:00 |
Rudi Grinberg
|
c1bc50c1db
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 16:56:14 -04:00 |
Rudi Grinberg
|
80fa090f13
|
Uncommented old line of code perhaps it's useful
|
2012-09-05 16:39:58 -04:00 |
denise
|
d9baddeba0
|
CC-4349: Encoded search in library should be labelled 'Encoded by'
-fixed
|
2012-09-05 16:38:55 -04:00 |
denise
|
91c74d8995
|
-fixed syntax error
|
2012-09-05 16:21:59 -04:00 |
denise
|
24024a0a60
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 16:15:11 -04:00 |
James
|
326ba012c1
|
CC-4346: Prepared statements - part 2
- CRLF
- adding include in bootstrap
|
2012-09-05 16:15:02 -04:00 |
denise
|
87e58282de
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 16:14:23 -04:00 |
James
|
15b9d09991
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 16:12:44 -04:00 |
denise
|
8ec9ccedf3
|
CC-4358: Calendar: Show Content: Undefined Index
-fixed
|
2012-09-05 16:07:40 -04:00 |
Martin Konecny
|
bc5cc9ff48
|
remove cartesian cross-product on some SQL queries
|
2012-09-05 16:06:10 -04:00 |
Martin Konecny
|
27bd22f10c
|
CC-4348: Prepared statements - part 4
-Syntax error
|
2012-09-05 16:02:23 -04:00 |
James
|
0a70b7d6f1
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 15:59:28 -04:00 |
James
|
4ac2d6ac4e
|
CC-4346: Prepared statements - part 2
- adding common function to prepare param to PDO statement and excute.
|
2012-09-05 15:59:15 -04:00 |
Rudi Grinberg
|
f86fa8f945
|
gotten rid of annoying logging
|
2012-09-05 15:38:43 -04:00 |
Rudi Grinberg
|
a61d856be9
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 15:27:36 -04:00 |
Martin Konecny
|
87ef317b6f
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 15:16:34 -04:00 |
Martin Konecny
|
f036c84a64
|
CC-4348: Prepared statements - part 4
-StreamSetting.php
|
2012-09-05 15:15:56 -04:00 |
Rudi Grinberg
|
579180301a
|
Removed stat caching to make sure is_file is accurate
|
2012-09-05 15:05:50 -04:00 |
denise
|
cf0fc13c81
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 14:50:34 -04:00 |
denise
|
7543a33aa1
|
CC-4345: Prepared statements - part 1
-fixed for Datatables.php
|
2012-09-05 14:50:26 -04:00 |
Rudi Grinberg
|
ab6ae1ce8e
|
cc-4336: Fixed the issue. But this whole chunk of code could probably be removed.
|
2012-09-05 14:33:49 -04:00 |
Rudi Grinberg
|
1590bf4fa0
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 10:17:04 -04:00 |
Martin Konecny
|
e636d371b0
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-04 17:22:32 -04:00 |
Martin Konecny
|
ac547342f1
|
Logging typo
|
2012-09-04 17:22:21 -04:00 |
Martin Konecny
|
982dd1e2a7
|
CC-4348: Prepared statements - part 4
-StoredFile.php
|
2012-09-04 17:21:59 -04:00 |
denise
|
63bd2f6381
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-04 16:59:40 -04:00 |
denise
|
5bb1f4720e
|
CC-4345: Prepared statements - part 1
-Block.php done
|
2012-09-04 16:59:33 -04:00 |
Rudi Grinberg
|
cae2245936
|
MM2: Cleaned up pure.py a little
|
2012-09-04 16:52:22 -04:00 |
Martin Konecny
|
122bfc6e97
|
CC-4070: Built-in help text is wrongly worded about adding files
-fixed
|
2012-09-04 16:25:05 -04:00 |
Martin Konecny
|
4b09d5eff2
|
CC-4199: Webstream: Please show warning when the URL is too long
-upped max webstream length to 512
-show warning if > 512 characters
|
2012-09-04 16:18:18 -04:00 |
Martin Konecny
|
f698b70341
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-04 16:00:26 -04:00 |
Martin Konecny
|
9701614087
|
CC-4342: Enabling hardware audio output kills all stream output
-fixed
|
2012-09-04 16:00:12 -04:00 |
Rudi Grinberg
|
4f4b08c0af
|
major sexification
|
2012-09-04 15:38:48 -04:00 |
Rudi Grinberg
|
f660e1da9f
|
removed useless code
|
2012-09-04 15:31:09 -04:00 |
Rudi Grinberg
|
1d758db42b
|
Sexified some code. PDO'd the shit out of some sql query.
|
2012-09-04 15:26:12 -04:00 |
Rudi Grinberg
|
398215f1d0
|
Corrected documentation for method.
|
2012-09-04 15:25:18 -04:00 |
Rudi Grinberg
|
8c02b3ec8a
|
removed redundancy
|
2012-09-04 15:14:56 -04:00 |
Rudi Grinberg
|
fa5939a72f
|
Added todo to later clean code.
|
2012-09-04 15:14:26 -04:00 |
Rudi Grinberg
|
867fa559a0
|
Sexified code
|
2012-09-04 15:10:04 -04:00 |
Rudi Grinberg
|
c974d3df0c
|
fixored
|
2012-09-04 15:08:51 -04:00 |
Rudi Grinberg
|
0819419b3b
|
fixed typo
|
2012-09-04 15:03:49 -04:00 |
Rudi Grinberg
|
1fcd20fea3
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-04 14:55:28 -04:00 |
Rudi Grinberg
|
89dcc18724
|
general cleanups
|
2012-09-04 14:55:23 -04:00 |
Martin Konecny
|
18dd0f232a
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-04 14:54:44 -04:00 |
Martin Konecny
|
0bdfe3986c
|
CC-4348: Prepared statements - part 4
-fixed some incorrect usage of PDO.
|
2012-09-04 14:54:34 -04:00 |
Rudi Grinberg
|
ed7d233ca2
|
Changed execute( array(...) ) to multiple bindParam calls.
|
2012-09-04 14:45:16 -04:00 |
Rudi Grinberg
|
c840de0a71
|
Fix to the fix
|
2012-09-04 14:05:26 -04:00 |
Rudi Grinberg
|
330828fbdd
|
Refactored sql substition into pdo
|
2012-09-04 13:52:33 -04:00 |
Rudi Grinberg
|
27ea00f5d4
|
Refactored sql substition into pdo
|
2012-09-04 13:50:13 -04:00 |
Martin Konecny
|
a731fc147b
|
CC-4348: Prepared statements - part 4
-fixed Show.php
|
2012-09-04 13:34:05 -04:00 |
denise
|
8e40137b7d
|
CC-4316: Missing image file
-fixed
|
2012-09-04 11:58:54 -04:00 |
denise
|
15f750eca5
|
CC-4248: Playlist Builder: 'Something went wrong' error message when dragging playlist into playlist
-included webstreams in the allowance type list in the error message
|
2012-09-04 11:29:23 -04:00 |
denise
|
0755933ccd
|
CC-4279: Library: Searching by criteria "Uploaded from" does not work
-fixed
|
2012-09-04 10:03:24 -04:00 |
Martin Konecny
|
886888a958
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-31 17:21:48 -04:00 |
Rudi Grinberg
|
3eac8c8531
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-31 13:34:39 -04:00 |
Rudi Grinberg
|
d7aad93e4f
|
cc-4288. Added owner to query.
|
2012-08-31 13:34:21 -04:00 |
Rudi Grinberg
|
2e8ed352b8
|
cc-4288:Sexification of =>.
|
2012-08-31 13:33:55 -04:00 |
Rudi Grinberg
|
59f527c14c
|
cc-4288: added owner column.
|
2012-08-31 13:31:14 -04:00 |
Martin Konecny
|
cad0a8fbd7
|
CC-1665: Scheduled stream rebroadcasting and recording
-make sure webstream length is properly updated in browser view after editing
|
2012-08-31 13:01:22 -04:00 |
Martin Konecny
|
0ceb0167fe
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-31 12:18:48 -04:00 |
Martin Konecny
|
c043053407
|
CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out
-fixed
|
2012-08-31 12:18:37 -04:00 |
Martin Konecny
|
79b6d13c16
|
CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out
-set DbEnds to 1 second in the past when cancelling stream
|
2012-08-30 17:53:28 -04:00 |
Rudi Grinberg
|
3571e2c691
|
cc-1710: switched bwf to wav
|
2012-08-30 16:50:10 -04:00 |
Rudi Grinberg
|
3911662cff
|
Remove unused function
|
2012-08-30 16:30:49 -04:00 |
Rudi Grinberg
|
a0a4094332
|
cc-4304: Small refactoring
|
2012-08-30 16:00:14 -04:00 |
Rudi Grinberg
|
417997e617
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-30 15:23:24 -04:00 |
Rudi Grinberg
|
a11ec08154
|
cc-4304: Implemented default behaviour to cascade delete all the files
|
2012-08-30 15:23:12 -04:00 |
Martin Konecny
|
010ba63d59
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-30 14:37:08 -04:00 |
Martin Konecny
|
7eefbf3e24
|
CC-4311: On Air button gets greyed out few seconds after show starts
-additional debug info
|
2012-08-30 14:36:55 -04:00 |
Martin Konecny
|
1884bebf15
|
CC-4281: Webstream: Nothing appears in the timeline if dr...
-fixed
|
2012-08-30 14:36:23 -04:00 |
Rudi Grinberg
|
ea2595d70f
|
Documeneted funny quirk related to creating a password
|
2012-08-30 12:26:36 -04:00 |
Rudi Grinberg
|
6a6f6c2ee7
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-30 11:48:02 -04:00 |
Rudi Grinberg
|
c09ebce1f0
|
cc-1710: Removed verbosity
|
2012-08-30 11:43:11 -04:00 |
Rudi Grinberg
|
bed9989d2a
|
cc-1710: Added more supported extensions to the allowed upload list
|
2012-08-30 11:40:05 -04:00 |
Rudi Grinberg
|
2b8bd2ffe9
|
cc-1710 removed ^M
|
2012-08-30 11:37:22 -04:00 |
Martin Konecny
|
cd49f99f4b
|
CC-3412: Icecast stream name not defined
-ensure upgrade
|
2012-08-30 11:29:23 -04:00 |
Martin Konecny
|
89d8ac701b
|
CC-3301: Add ability to switch stereo/mono stream in stream settings
-refactor code and use Propel
|
2012-08-29 17:51:47 -04:00 |
Martin Konecny
|
7f8b5ab92e
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-29 17:40:07 -04:00 |
Martin Konecny
|
859445c766
|
CC-3301: Add ability to switch stereo/mono stream in stream settings
-fixed
|
2012-08-29 17:39:24 -04:00 |
denise
|
6067cc221f
|
CC-4279: Library: Searching by criteria "Uploaded from" does not work
-fixed
|
2012-08-29 17:37:02 -04:00 |
denise
|
a7427645d5
|
CC-4273: Library: Open 'Edit Metadata' page and click 'Cancel' will cause an exception
-fixed
|
2012-08-29 17:01:55 -04:00 |
denise
|
3ff80fae14
|
CC-4314: Library: Add playlist to playlist shows wrong error message
-fixed
|
2012-08-29 16:47:20 -04:00 |
denise
|
b75f2ab9c7
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-29 16:13:30 -04:00 |
denise
|
80258f1fb7
|
CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
-fixed for dragging tracks into deleted blocks
|
2012-08-29 16:13:18 -04:00 |
denise
|
7c79aad5f4
|
CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
-removed unnecessary exception catch
|
2012-08-29 16:04:40 -04:00 |
denise
|
fe48780932
|
CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
-fixed
|
2012-08-29 16:00:58 -04:00 |
Rudi Grinberg
|
f483e271f6
|
formatting
|
2012-08-29 14:50:10 -04:00 |
Rudi Grinberg
|
af3cea464b
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-29 12:58:06 -04:00 |
Rudi Grinberg
|
5e180f0ce2
|
sexified code
|
2012-08-29 12:57:56 -04:00 |
Rudi Grinberg
|
ca66073fb5
|
did some reformatting.
|
2012-08-29 12:31:59 -04:00 |
denise
|
46a6a5fc30
|
CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save'
-added in saving behaviour for regular playlists
|
2012-08-29 12:05:41 -04:00 |
Rudi Grinberg
|
e796d4c03d
|
MM2: equal signs sexified
|
2012-08-29 11:39:42 -04:00 |