dfb1ffed79
CC-4319: Calendar: Remove all contents doesn't work
...
- fixed
2012-09-10 15:42:05 -04:00
db0a34b35c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 15:37:36 -04:00
67b295a553
CC-4367: Media Library -> Search: Please enable searching Bit Rate by Kbps
...
- done
2012-09-10 15:37:22 -04:00
97317c0195
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 15:35:46 -04:00
e85ea5c683
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 15:35:42 -04:00
3107286799
CC-4370: Transitioning between two webstreams a hiccup in the stream is audible
2012-09-10 15:35:32 -04:00
0c1c4aa27d
Put sql in heredoc for better readability
2012-09-10 15:35:30 -04:00
9d825a55b3
Crap comment removed
2012-09-10 15:32:31 -04:00
2e0b29b14e
Removed unused code
2012-09-10 15:31:56 -04:00
987b65af28
cc-4347: Extra pdo work
2012-09-10 14:53:26 -04:00
0ab08af48f
CC-4380: Show ReplayGain value in the Library page
...
- done
2012-09-10 14:37:38 -04:00
60cf74a602
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 14:16:52 -04:00
957e644829
-fixed javascript error in datatables.js
2012-09-10 14:16:36 -04:00
b085f9ef67
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 14:15:07 -04:00
e85a83d045
Fixed pdo
2012-09-10 14:14:44 -04:00
4d3c624607
CC-4380: Show ReplayGain value in the Library page
...
- temp commit
2012-09-10 12:35:32 -04:00
e5de4f560d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 12:18:41 -04:00
ac8610ca06
CC-4385: Problem with mono streams for stream rebroadcasting
...
-fixed
2012-09-10 12:18:19 -04:00
567a8a2635
cc-4347: Fixed typo
2012-09-10 12:04:33 -04:00
8340db3ce9
Added error handing todo
2012-09-10 11:53:22 -04:00
a0b3742758
cc-4347: resizeShow pdo'd
2012-09-10 11:49:56 -04:00
3df4c8d65a
cc-4347: deleteRebroadcasts and GetEndTimeOfNextShowWithLiveDJ pdo'd
2012-09-10 11:39:22 -04:00
e2c2f67fbb
cc-4347: GetShowInstanceCount() pdo'd
2012-09-10 11:29:28 -04:00
375e89169e
Removed code duplication
2012-09-10 11:27:39 -04:00
53de942c2b
cc-4347: GetNextShowInstance PDO'd.
2012-09-10 11:25:44 -04:00
de86b904a5
Fixed extra cast.
2012-09-10 11:25:21 -04:00
8c3be7393a
cc-4347: GetCurrentShowInstance got PDO nuked.
2012-09-10 11:17:45 -04:00
57aae73074
cc-4347: PDO'd: GetLastShowInstance
2012-09-10 11:06:34 -04:00
737c3fcbae
Todo for consistency.
2012-09-10 11:06:11 -04:00
a3d4b8c722
Todo for consistency.
2012-09-10 11:05:30 -04:00
35c8b50d96
cc-4347: PDO'd Show create
2012-09-07 18:23:55 -04:00
a479a11c8f
Removed crazy handling of flac.
2012-09-07 18:23:14 -04:00
78b0dcedfc
Added smartPrepareAndExecute. Warning: Test before using
2012-09-07 17:58:16 -04:00
33035a4212
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-07 17:38:35 -04:00
d20c450226
CC-4370: Transitioning between two webstreams a hiccup in the stream is audible
...
-some major refactoring before fixing this problem
2012-09-07 17:38:24 -04:00
f1487ba69d
cc-4347: Fixed missing AND clause
2012-09-07 17:23:32 -04:00
b4748a3b1f
cc-4347: Fixed typo
2012-09-07 17:15:49 -04:00
a8e7cb392a
Sexification 2
2012-09-07 16:59:35 -04:00
7fa17a644e
Sexification
2012-09-07 16:58:49 -04:00
79513356fb
cc-4347: PDO'd getShows
2012-09-07 16:53:16 -04:00
101c28f9c3
remove unused variable (PHP 5.4 warning)
2012-09-07 16:50:52 -04:00
3c0541f138
fix function camelcase
2012-09-07 16:50:33 -04:00
87787081ce
Removed unused optional argument.
2012-09-07 16:26:05 -04:00
8f3c7e8eba
cc-4347: PDO'd getInstanceOnDate()
2012-09-07 15:29:30 -04:00
26a3e35de0
Refactored getMaxLengths()
2012-09-07 15:14:33 -04:00
27c1361fbb
Small refactoring to use getter instead of accessing private variable.
2012-09-07 15:12:46 -04:00
089e896552
fix camelCase of function
2012-09-07 14:34:58 -04:00
49a85afc06
Refactor
2012-09-07 14:33:08 -04:00
5ee24ceb23
cc-4347: PDO. getAllFutureInstanceIds()
2012-09-07 14:30:59 -04:00
82f267310e
cc-4347: Undid refactoring
2012-09-07 14:18:40 -04:00
efb35dd9d6
cc-4347: PDO'd deleteAllRebroadcasts()
2012-09-07 12:29:42 -04:00
ad776ff8f3
cc-4347: PDO deleteAllInstances()
2012-09-07 12:22:49 -04:00
727769b376
cc-4347: PDO getRepeatingDate()
2012-09-07 12:18:13 -04:00
23ccd75290
cc-4347: PDO getRbroadcastsRelative()
2012-09-07 12:10:07 -04:00
cfe0d7aa0c
Unrelated refactorings of Show.php. Added TODO for more later work.
2012-09-07 12:07:29 -04:00
2a00e58610
cc-4347: PDO like a boss.
2012-09-07 11:58:57 -04:00
22a250b5d2
cc-4347: PDOOO
2012-09-07 11:54:32 -04:00
92682b9f89
Added TODO about unused code
2012-09-07 11:39:58 -04:00
f61463b8ba
premature optimization
2012-09-07 11:20:23 -04:00
c28f3af9cf
removed unused code. reformatted some comments.
2012-09-07 11:18:10 -04:00
d805995e72
cc-4347: ~~~~PDO~~~~~~
2012-09-07 11:12:26 -04:00
95cd5a7dde
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 17:46:58 -04:00
0f1cb61a13
CC-4330: Media Library - > Search: Please change the way to search by owner
...
- fixed
2012-09-06 17:46:45 -04:00
33326ec052
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 17:23:58 -04:00
73ba643563
cc-4347: _-=~^PDO^~=-_
2012-09-06 17:23:39 -04:00
d9af434138
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 16:46:35 -04:00
7d3ac8eb07
CC-4346: Prepared statements - part 2
...
- done
2012-09-06 16:46:22 -04:00
83415cf298
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 16:18:37 -04:00
fba5d56c76
CC-4364: Show - > On Air button is greyed out although you can hear the playout
...
-fixed
2012-09-06 16:18:28 -04:00
f30507fce6
cc-4347: pdo
2012-09-06 16:17:14 -04:00
2b659f9c91
Sexified.
2012-09-06 16:16:53 -04:00
1852843f96
cc-4347: ~~~~PDO~~~~~~
2012-09-06 15:55:29 -04:00
977c664bfe
cc-4347: Fixed table quoting
2012-09-06 15:49:13 -04:00
ad6e601d5e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 15:47:20 -04:00
0fdf1e5e86
cc-4347: PDO
2012-09-06 15:47:07 -04:00
18ec23526f
CC-4294: Webstream length should make hours or minutes optional. Also minutes > 59 should be parsed correctly.
...
-fixed
2012-09-06 15:02:26 -04:00
5c13223315
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 14:48:55 -04:00
3f1d979c67
cc-4347: PDO PDO PDO!!
2012-09-06 14:41:40 -04:00
8534cf16d8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 14:30:20 -04:00
8125d6b553
CC-4344: Conductor column not available in library view
...
-done
2012-09-06 14:30:09 -04:00
264e909d5a
cc-4347: PDOOOOOOOOOOOOOOOO
2012-09-06 14:17:24 -04:00
cd9e89560d
cc-4347: small correction.
2012-09-06 14:16:10 -04:00
a39116c687
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 14:14:19 -04:00
45729f16e7
cc-4347: PDOOOOOOOOOOOOOOOO
2012-09-06 14:14:05 -04:00
46d87a2868
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 14:11:08 -04:00
33fe2f3467
CC-4351: Library->Deletion of Smart Block and saving it leads to "Processing" message being displayed for a while
...
-fixed
2012-09-06 14:10:50 -04:00
acf06e289f
Try catching more errors into zendphp.log
2012-09-06 14:01:54 -04:00
a941743ed7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/User.php
2012-09-06 12:55:24 -04:00
eae48cf47d
CC-4348: Prepared statements - part 4
...
-User.php
2012-09-06 12:54:44 -04:00
d196666c31
got rid of print statements possible interfering with view
2012-09-06 12:52:11 -04:00
744577a8b5
Removed bad line break
2012-09-06 12:38:55 -04:00
3f898bfc3a
Fixed wrong function name
2012-09-06 12:33:04 -04:00
7a3c2db2bf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 12:24:07 -04:00
6cb8dd35e2
- fixed sql error
2012-09-06 12:23:53 -04:00
f4591f825f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 12:17:39 -04:00
56527e727c
extra debuggin
2012-09-06 12:17:18 -04:00
8d1003bbbe
CC-4303: Library Tab grays out after certain scenario with normal playlist
...
-fixed
2012-09-06 11:48:00 -04:00
35a5e38aca
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 11:21:47 -04:00
9b29f5e701
CC-4345: Prepared statements - part 1
...
-modified Datatables.php to use Application_Common_Database::prepareAndExecute()
2012-09-06 11:21:36 -04:00
9079f29584
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 11:15:12 -04:00
bed360cd3e
Formatting
2012-09-06 11:15:01 -04:00
b25ce921ee
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 11:11:15 -04:00
f06b3e2c36
CC-4345: Prepared statements - part 1
...
-modified Block.php to use Application_Common_Database::prepareAndExecute()
2012-09-06 11:11:09 -04:00
f3ff9cc461
cc-4360: Fix for this bug. Table name was being quoted needlessly.
2012-09-06 11:03:24 -04:00
88c5ef484f
Formatting
2012-09-06 10:38:14 -04:00
5481191730
added type hint
2012-09-05 18:01:20 -04:00
b112a0fe2b
cc-4347: PDOOOOOOOOOOOOO
2012-09-05 17:59:18 -04:00
78c81aa434
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/common/Database.php
2012-09-05 17:55:26 -04:00
26c2c2c0d1
CC-4345: Prepared statements - part 1
...
-added extra parameter to prepareAndExecute()
2012-09-05 17:52:53 -04:00
8be51d5bf4
sexified code
2012-09-05 17:52:27 -04:00
73e152ebcf
added type annotation again
2012-09-05 17:51:50 -04:00
aa6e061118
conflicts merged
2012-09-05 17:51:16 -04:00
d2e883da7a
Added type annotation
2012-09-05 17:48:15 -04:00
0385c008ce
cc-4347: PDO00!!!
2012-09-05 17:46:48 -04:00
0ae1b9fea6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/common/Database.php
2012-09-05 17:45:13 -04:00
139950fac2
PSR fixes
2012-09-05 17:44:09 -04:00
43f5258219
CC-4348: Prepared statements - part 4
...
-User.php
2012-09-05 17:43:45 -04:00
3894990975
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-05 17:41:30 -04:00
23ee726cfd
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-05 17:41:21 -04:00
4af9bfaa9d
CC-4346: Prepared statements - part 2
...
- fix spelling
2012-09-05 17:41:18 -04:00
8f33523095
cc-4347: PDO
2012-09-05 17:35:08 -04:00
b6b4e25a37
allow Airtime environment to be accessed from CLI
...
-fixed
2012-09-05 17:34:12 -04:00
dad1cf32c9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-05 17:29:55 -04:00
7cbfb5d40d
allow Airtime environment to be accessed from CLI
2012-09-05 17:29:34 -04:00
0838e31094
cc-4347: PDO
2012-09-05 16:57:01 -04:00
c1bc50c1db
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-05 16:56:14 -04:00
80fa090f13
Uncommented old line of code perhaps it's useful
2012-09-05 16:39:58 -04:00
d9baddeba0
CC-4349: Encoded search in library should be labelled 'Encoded by'
...
-fixed
2012-09-05 16:38:55 -04:00
91c74d8995
-fixed syntax error
2012-09-05 16:21:59 -04:00
24024a0a60
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-05 16:15:11 -04:00
326ba012c1
CC-4346: Prepared statements - part 2
...
- CRLF
- adding include in bootstrap
2012-09-05 16:15:02 -04:00
87e58282de
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-05 16:14:23 -04:00
15b9d09991
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-05 16:12:44 -04:00
8ec9ccedf3
CC-4358: Calendar: Show Content: Undefined Index
...
-fixed
2012-09-05 16:07:40 -04:00
bc5cc9ff48
remove cartesian cross-product on some SQL queries
2012-09-05 16:06:10 -04:00
27bd22f10c
CC-4348: Prepared statements - part 4
...
-Syntax error
2012-09-05 16:02:23 -04:00
0a70b7d6f1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-05 15:59:28 -04:00
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
f86fa8f945
gotten rid of annoying logging
2012-09-05 15:38:43 -04:00
a61d856be9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-05 15:27:36 -04:00
87ef317b6f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-05 15:16:34 -04:00
f036c84a64
CC-4348: Prepared statements - part 4
...
-StreamSetting.php
2012-09-05 15:15:56 -04:00
579180301a
Removed stat caching to make sure is_file is accurate
2012-09-05 15:05:50 -04:00
cf0fc13c81
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-05 14:50:34 -04:00
7543a33aa1
CC-4345: Prepared statements - part 1
...
-fixed for Datatables.php
2012-09-05 14:50:26 -04:00
ab6ae1ce8e
cc-4336: Fixed the issue. But this whole chunk of code could probably be removed.
2012-09-05 14:33:49 -04:00
1590bf4fa0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-05 10:17:04 -04:00
e636d371b0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-04 17:22:32 -04:00
ac547342f1
Logging typo
2012-09-04 17:22:21 -04:00
982dd1e2a7
CC-4348: Prepared statements - part 4
...
-StoredFile.php
2012-09-04 17:21:59 -04:00
63bd2f6381
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-04 16:59:40 -04:00
5bb1f4720e
CC-4345: Prepared statements - part 1
...
-Block.php done
2012-09-04 16:59:33 -04:00
cae2245936
MM2: Cleaned up pure.py a little
2012-09-04 16:52:22 -04:00
122bfc6e97
CC-4070: Built-in help text is wrongly worded about adding files
...
-fixed
2012-09-04 16:25:05 -04:00
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
f698b70341
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-04 16:00:26 -04:00
9701614087
CC-4342: Enabling hardware audio output kills all stream output
...
-fixed
2012-09-04 16:00:12 -04:00
4f4b08c0af
major sexification
2012-09-04 15:38:48 -04:00
f660e1da9f
removed useless code
2012-09-04 15:31:09 -04:00
1d758db42b
Sexified some code. PDO'd the shit out of some sql query.
2012-09-04 15:26:12 -04:00
398215f1d0
Corrected documentation for method.
2012-09-04 15:25:18 -04:00
8c02b3ec8a
removed redundancy
2012-09-04 15:14:56 -04:00
fa5939a72f
Added todo to later clean code.
2012-09-04 15:14:26 -04:00
867fa559a0
Sexified code
2012-09-04 15:10:04 -04:00
c974d3df0c
fixored
2012-09-04 15:08:51 -04:00
0819419b3b
fixed typo
2012-09-04 15:03:49 -04:00
1fcd20fea3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-04 14:55:28 -04:00
89dcc18724
general cleanups
2012-09-04 14:55:23 -04:00
18dd0f232a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-04 14:54:44 -04:00
0bdfe3986c
CC-4348: Prepared statements - part 4
...
-fixed some incorrect usage of PDO.
2012-09-04 14:54:34 -04:00
ed7d233ca2
Changed execute( array(...) ) to multiple bindParam calls.
2012-09-04 14:45:16 -04:00
c840de0a71
Fix to the fix
2012-09-04 14:05:26 -04:00
330828fbdd
Refactored sql substition into pdo
2012-09-04 13:52:33 -04:00
27ea00f5d4
Refactored sql substition into pdo
2012-09-04 13:50:13 -04:00
a731fc147b
CC-4348: Prepared statements - part 4
...
-fixed Show.php
2012-09-04 13:34:05 -04:00
8e40137b7d
CC-4316: Missing image file
...
-fixed
2012-09-04 11:58:54 -04:00
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
0755933ccd
CC-4279: Library: Searching by criteria "Uploaded from" does not work
...
-fixed
2012-09-04 10:03:24 -04:00
886888a958
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-31 17:21:48 -04:00
3eac8c8531
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-31 13:34:39 -04:00
d7aad93e4f
cc-4288. Added owner to query.
2012-08-31 13:34:21 -04:00
2e8ed352b8
cc-4288:Sexification of =>.
2012-08-31 13:33:55 -04:00
59f527c14c
cc-4288: added owner column.
2012-08-31 13:31:14 -04:00
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
0ceb0167fe
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-31 12:18:48 -04:00
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
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
3571e2c691
cc-1710: switched bwf to wav
2012-08-30 16:50:10 -04:00
3911662cff
Remove unused function
2012-08-30 16:30:49 -04:00
a0a4094332
cc-4304: Small refactoring
2012-08-30 16:00:14 -04:00
417997e617
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-30 15:23:24 -04:00
a11ec08154
cc-4304: Implemented default behaviour to cascade delete all the files
2012-08-30 15:23:12 -04:00
010ba63d59
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-30 14:37:08 -04:00
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
1884bebf15
CC-4281: Webstream: Nothing appears in the timeline if dr...
...
-fixed
2012-08-30 14:36:23 -04:00
ea2595d70f
Documeneted funny quirk related to creating a password
2012-08-30 12:26:36 -04:00
6a6f6c2ee7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-30 11:48:02 -04:00
c09ebce1f0
cc-1710: Removed verbosity
2012-08-30 11:43:11 -04:00
bed9989d2a
cc-1710: Added more supported extensions to the allowed upload list
2012-08-30 11:40:05 -04:00
2b8bd2ffe9
cc-1710 removed ^M
2012-08-30 11:37:22 -04:00
cd49f99f4b
CC-3412: Icecast stream name not defined
...
-ensure upgrade
2012-08-30 11:29:23 -04:00
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
7f8b5ab92e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 17:40:07 -04:00
859445c766
CC-3301: Add ability to switch stereo/mono stream in stream settings
...
-fixed
2012-08-29 17:39:24 -04:00
6067cc221f
CC-4279: Library: Searching by criteria "Uploaded from" does not work
...
-fixed
2012-08-29 17:37:02 -04:00
a7427645d5
CC-4273: Library: Open 'Edit Metadata' page and click 'Cancel' will cause an exception
...
-fixed
2012-08-29 17:01:55 -04:00
3ff80fae14
CC-4314: Library: Add playlist to playlist shows wrong error message
...
-fixed
2012-08-29 16:47:20 -04:00
b75f2ab9c7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 16:13:30 -04:00
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
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
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
f483e271f6
formatting
2012-08-29 14:50:10 -04:00
af3cea464b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 12:58:06 -04:00
5e180f0ce2
sexified code
2012-08-29 12:57:56 -04:00
ca66073fb5
did some reformatting.
2012-08-29 12:31:59 -04:00
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
e796d4c03d
MM2: equal signs sexified
2012-08-29 11:39:42 -04:00
5effb253bf
CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save'
...
-done
2012-08-29 11:38:47 -04:00
8b5f94fa9f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 11:05:14 -04:00
4848717d4d
CC-4090: Make code style PSR compliant - part 4
...
-models dir
2012-08-29 10:58:03 -04:00
f188cfbba2
CC-4300: System -> Preference: Please add a option let user choose if the SMTP server requires User Authentication
...
-small fix
2012-08-29 10:56:47 -04:00
699a49a103
CC-4090: Make code style PSR compliant - part 4
...
-controllers dir
2012-08-29 10:54:36 -04:00
b2327472e8
CC-4090: Make code style PSR compliant - part 4
...
-forms directory
2012-08-28 23:04:55 -04:00
3d20ded170
CC-4307: Add "Never show again" to the pop-up registration prompt
...
-done
2012-08-28 17:30:34 -04:00
c67ad44699
Merge branch 'cc-4274' into devel
2012-08-28 17:25:11 -04:00
6487072a4e
cc-4274: added stub
2012-08-28 17:24:55 -04:00
481616a0d6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-28 17:22:57 -04:00
a0ad9a91ea
CC-1665: Scheduled stream rebroadcasting and recording
...
-Better error logging
-convert minutes > 59 into hours
2012-08-28 17:22:48 -04:00
b7107fb948
CC-1665: Scheduled stream rebroadcasting and recording
...
-fixed uninitialized variable
2012-08-28 17:03:20 -04:00
5b5ac3e38f
cc-4274: Added scaffolding to implement this feature.
2012-08-28 16:23:16 -04:00
05908d121f
cc-4274: Fixed bad table name.
2012-08-28 16:23:16 -04:00
33bb4e600c
cc-4274: implemented james' hack to fix this issue.
2012-08-28 16:23:16 -04:00
7ee68c55e0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-28 16:17:46 -04:00
9d90e8c531
CC-4300: System -> Preference: Please add a option let user choose if the SMTP server requires User Authentication
...
-done
2012-08-28 16:17:37 -04:00
8cf048d459
CC-1665: Scheduled stream rebroadcasting and recording
...
-parse m3u playlists to get actual stream
2012-08-28 13:14:13 -04:00
8249ea8816
CC-1665: Scheduled stream rebroadcasting and recording
...
-small optimization for user auth
2012-08-28 12:38:13 -04:00
219fba9bee
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-28 12:30:45 -04:00
fc67d7f08d
CC-1665: Scheduled stream rebroadcasting and recording
...
-allow user more flexibility for entering length interval (require hours OR minutes)
2012-08-28 12:30:33 -04:00
69b61c4cfe
CC-4285: Playlists-> Smart Block - displays that certain amount meets the criteria while no criteria is specified
...
-fixed
2012-08-28 12:13:58 -04:00
f84f611ab2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-28 11:22:49 -04:00
98ab38ff54
CC-4295: Smart Block: Please deal with the float value when criteria likes 'length is'
...
-fixed
2012-08-28 11:22:41 -04:00
7f66bdbb66
cc-4301: Fixed bug where owner_id would be null whenever show is recorded.
2012-08-27 17:58:09 -04:00
583d3837be
cc-3936: formattingk
2012-08-27 17:15:38 -04:00
57020b6e3b
cc-3936: Added warning whenever files that don't exist in db are requested to be deleted.
2012-08-27 16:50:22 -04:00
3f0df6d101
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-27 16:50:03 -04:00
c28025ecfb
hotfix for bad class name
2012-08-27 16:49:45 -04:00
3823a566ae
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-27 16:46:25 -04:00
7c5765ccb9
CC-4298: Smart Block: Sometimes criteria value text box doesn't resize properly
...
-fixed
2012-08-27 16:46:05 -04:00
8d7f3817ec
cc-3936: Fixed bug where setDbColMetadata to use airtime metadata key names.
2012-08-27 15:11:28 -04:00
7aba1dcebd
Added warning method. Changed some code to use it.
2012-08-27 14:51:35 -04:00
1a13731216
Merge branch 'cc-3936-3' into devel
2012-08-27 14:46:31 -04:00
cab7a6c930
cc-3936: added comment documenting metadata translation
2012-08-27 14:07:05 -04:00
dea764b8fd
cc-3936: added warning for metadata attributes that are not defined in constants.php
2012-08-27 14:03:22 -04:00
0edfb10f19
Smart Blocks: extra criteria field was undefined sometimes
2012-08-27 12:43:46 -04:00
d4dbca5de3
CC-4296: Media Library: Dragging Smart Block gives wrong item number
...
-fixed
2012-08-27 12:33:57 -04:00
b92ff1de89
CC-4290: Playlists -> Dynamic Smart Block-> "in the range" criteria seems to be not working
...
-fixed
2012-08-27 12:04:04 -04:00
687a6d3c5a
cc-3936: removed intrusive logging
2012-08-27 11:49:36 -04:00
fcc853b732
cc-3936: Renamed metadata key for owner id.
2012-08-27 11:06:06 -04:00
3fb0fbd73f
CC-4291: Adding webstreams: Need ability to parse webstreams from .m3u and .xspf urls
...
-fixed
2012-08-24 19:25:19 -04:00
53418e475d
CC-4286: Library: Alert pops up when double clicking any item in Library when nothing is opened in right side
...
-fixed
2012-08-24 17:37:13 -04:00
bc660c4cdf
-removing type column from cc_playlist
2012-08-24 17:12:52 -04:00
4406d26c95
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-24 17:10:50 -04:00
2ca4a369b2
CC-4264: Smart Block: Fail to generate block with some unavailable files
...
- fixed
2012-08-24 17:02:37 -04:00
01849c08bf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-24 15:27:12 -04:00
5443c1931a
CC-4081: Calendar -> Can create overlapping show by dragging a show in "day" view
...
-fixed
2012-08-24 15:27:04 -04:00
c561f36aa1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-24 15:26:27 -04:00
baf5460e14
CC-4284: Calendar: AddContentToShow -> "Processing..." message pops up and never goes away
...
- fixed
2012-08-24 15:26:12 -04:00
54db68bb26
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-24 12:40:39 -04:00
dc8e3da6db
CC-4283: Password Reset: Please let user input username they want to reset
...
-done
2012-08-24 12:40:30 -04:00
bc078b790d
Merge branch 'cc-3936-2' into devel
2012-08-24 12:39:05 -04:00
7284770226
cc-3936: Changed setting of owner when modifying/inserting metadata.
2012-08-24 12:38:33 -04:00
5841cb7066
cc-3936:
...
Made it so that identifer file is written before the file itself so that media monitor always
has the identifier file before the song itself.
2012-08-24 12:37:16 -04:00
e53c20bbcd
cc-3936: added method to make it easier to get users of a certain type.
2012-08-24 12:36:20 -04:00
ffa4c131ee
CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
...
-code refactor
2012-08-24 11:50:02 -04:00
2e505ee970
CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
...
-small code fix
2012-08-24 11:47:32 -04:00
b8571be827
CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
...
- small code fix
2012-08-24 11:45:56 -04:00
5f1c6453a5
CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
...
-fixed
-disabled shuffle button
2012-08-24 11:44:18 -04:00
82f2b2e7c3
CC-4249: Playlist: Playlist's length doesn't update if it contains a smart playlist which the length is changed
...
-fixed
2012-08-24 11:12:31 -04:00
4efdf71aea
cc-3936: Made phpName of foreign key conform to Fk prefix convention.
2012-08-24 11:10:05 -04:00
857be6b702
cc-3936: Removed manual path concatenation. Fixed setting owner of file.
2012-08-24 11:09:38 -04:00
1f7a6fdc63
CC-4262: Smart Block: Characters do not get escaped properly
...
-fixed
2012-08-24 10:29:28 -04:00
19a5a8f992
cc-3936: fixed wrong argument order bug.
2012-08-24 10:20:59 -04:00
4ad983f63c
cc-3936: applied schema changes
2012-08-24 10:20:59 -04:00
c83fad2546
cc-3936: added owner to every file insert
2012-08-24 10:20:59 -04:00
60803e5146
cc-3936:
...
Name of foreign key was given for easier access through propel. Also renamed phpName for ownerId
to fit the existing convention.
2012-08-24 10:20:59 -04:00
b0a61fc291
cc-3936: Added setting default owner_id for inserted files.
2012-08-24 10:20:59 -04:00
43ca0d21e6
cc-3936: removed unnecessary object creation
2012-08-24 10:20:59 -04:00
dcc9c58577
cc-3936: Sexified equal signs.
2012-08-24 10:20:59 -04:00
50de229258
cc-3936:
...
Refactored getUsers not to take multiple types of arguments.
2012-08-24 10:20:59 -04:00
996dcfd35f
cc-3936: Ran propgen to generate schema changes
2012-08-24 10:20:59 -04:00
e2d9f220f8
cc-3936:
...
Changed schema so that owner_id is not required for every file.
2012-08-24 10:20:59 -04:00
36b344a910
cc-3936: remove unneeded garbage.
2012-08-24 10:20:59 -04:00
dcfa865f7d
cc-3936:
...
Ran propel-gen to commit schema changes.
2012-08-24 10:20:58 -04:00
4f88543de2
cc-3936:
...
Updated schema so that every file has an owner.
2012-08-24 10:20:58 -04:00
f940c20701
cc-3936:
...
Added success logging when identifier file has been written.
2012-08-24 10:20:58 -04:00
23e3f6137d
cc-3936:
...
Sexified code. Added section for user handling.
2012-08-24 10:20:58 -04:00
9893282e43
CC-4275: Enable debug mode where all Propel queries are displayed in raw SQL
...
-add enablePropelLogging and disablePropelLogging functions
2012-08-23 22:27:24 -04:00
7cbe037c7e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-23 21:58:39 -04:00
628bb6de1f
CC-4275: Enable debug mode where all Propel queries are displayed in raw SQL
...
-done
2012-08-23 21:58:21 -04:00
d06fda0329
fix indentation
2012-08-23 21:43:55 -04:00
17d030a3f9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-23 17:41:20 -04:00
0a851f3c96
CC-4263: Calendar: Can create one show contains another show (overlapping)
...
-fixed
2012-08-23 17:41:05 -04:00
a9cf597f14
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-23 15:04:38 -04:00
ea58ae9cc8
-remove unecessary logging
2012-08-23 15:03:59 -04:00
9dfbd90e0f
CC-4270: Media Library: Sample Rate is broken to 2 lines in context view
...
-fixed
2012-08-23 13:50:46 -04:00
2f9ea4dc0b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-23 11:53:56 -04:00
bf69f23343
CC-4249: Playlist: Playlist's length doesn't update if it contains a smart playlist which the length is changed
...
-fixed
2012-08-23 11:53:44 -04:00
a94039a0c6
CC-4268: Playlist: No "preview" button if a track of the playlist does not exist any more
...
- fixed
2012-08-23 11:32:37 -04:00
a4c579f36e
CC-4254: Library: advanced search on library
...
- bug fix
2012-08-23 10:59:34 -04:00
c2d475e6d8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/controllers/PlaylistController.php
2012-08-23 10:43:28 -04:00
de0aeee594
CC-4254: Library: advanced search on library
...
- initial commit
2012-08-23 10:41:40 -04:00
38173bd3a2
- small fix
2012-08-23 10:19:00 -04:00
e987f7a0aa
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-22 16:29:53 -04:00
f47e32d9de
CC-4266: Smart Block: Bit rate with 'is in the range' modifier -> 2nd range value doesn't get multiplied by 1000
...
-fixed
2012-08-22 16:29:17 -04:00
a3b6d0259c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-22 16:09:14 -04:00
e7689e5355
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-22 16:09:03 -04:00
b506c37341
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-22 16:08:58 -04:00
442c156458
CC-1665: Scheduled stream rebroadcasting and recording
...
-fixed context menu for webstreams
2012-08-22 16:08:51 -04:00
d1e7341046
cc-3936: Refactored php code to upload files
2012-08-22 16:08:46 -04:00
6fec9b0301
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-22 16:02:02 -04:00
7e50a11195
CC-4225: Smart playlists: Sample and bit rate ranges should include entered values
...
-fixed
2012-08-22 16:01:50 -04:00
fe1aa7a169
CC-1665: Scheduled stream rebroadcasting and recording
...
-fixed syntax error
2012-08-22 15:56:18 -04:00
8573dcb870
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-22 15:35:09 -04:00
91f13a6279
CC-1665: Scheduled stream rebroadcasting and recording
...
-current Library session object should not be stored as a property of the Controller class.
-fixed
2012-08-22 15:34:59 -04:00
9b3890ad19
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-22 15:22:13 -04:00
0071caf94d
CC-4080: Calendar -> Cannot create show because there was a repeating show at same time before
...
-fixed
2012-08-22 15:22:01 -04:00
6a16cf0084
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-22 14:39:45 -04:00
e9bc0074c0
cleaned up ApiController.php a little bit.
2012-08-22 14:38:48 -04:00
ef5427d0bc
CC-4197: Media Library -> Regular Playlist: Some character get cut off in context view
...
-fixed
2012-08-22 14:18:48 -04:00
c8c257a330
CC-1665: Scheduled stream rebroadcasting and recording
...
-change behaviour so that the webstream is not saved as soon as it it created.
2012-08-22 14:04:01 -04:00
24988616b3
CC-1665: Scheduled stream rebroadcasting and recording
...
-current Library session object should not be stored as a property of the Controller class.
-fixed
2012-08-22 14:03:11 -04:00
cef3ffb07b
CC-4265: Keep track of how much memory each request is taking and log if over a threshold
...
-fixed
2012-08-22 14:01:44 -04:00
ea4567f373
Make user functions work more consistently
...
isHost didn't work similar to isPM or isAdmin
2012-08-22 13:59:37 -04:00
462e73d93b
CC-4245: Playlists: Can only rearrange, by dragging and dropping, tracks once
...
-fixed
2012-08-22 13:58:13 -04:00
9885374d34
CC-1665: Scheduled stream rebroadcasting and recording
...
-more work to make webstreams behave like playlist creator
2012-08-21 18:55:38 -04:00
462542bf68
change Logging::log to Logging::info
2012-08-21 18:41:56 -04:00
15eae0698b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-21 16:55:17 -04:00
9b7413dafa
CC-1665: Scheduled stream rebroadcasting and recording
...
-use sessions to determine currently open object in Library
-forgot to check in these files
2012-08-21 16:55:10 -04:00
ecfc27431a
CC-1665: Scheduled stream rebroadcasting and recording
...
-verify user that is deleting has current permissions
2012-08-21 16:54:41 -04:00
a1b91aebbd
CC-1665: Scheduled stream rebroadcasting and recording
...
-use sessions to determine currently open object in Library
2012-08-21 16:54:14 -04:00
316afaf2a1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-21 16:37:41 -04:00
ffbdba6f6b
CC-4260: Add-user: Undefined index: ftype
...
-fixed
2012-08-21 16:37:33 -04:00
64a36ea21a
cc-4240: fixed
2012-08-21 16:33:37 -04:00
2cdaa186e3
CC-4257: Smart Block: Admin cannot delete DJ user's block
...
-fixed
2012-08-21 15:42:44 -04:00
d06f02f1f5
CC-4244: Playlist Builder: Original Length should not be changed after setting Cue in/out value
...
-fixed
2012-08-21 14:08:30 -04:00
167881c903
CC-4253: Smart Playlist: Please support filter tracks by date
...
-code refactor
2012-08-21 12:01:48 -04:00
d23bd2d85b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-21 11:58:46 -04:00
0c381d4692
CC-4253: Smart Playlist: Please support filter tracks by date
...
-fixed
2012-08-21 11:58:39 -04:00
0ce4c1000b
replace tabs with spaces
...
-also remove \r characters
2012-08-21 11:16:07 -04:00
51ebae3de9
Make sure we are using the Library controller for the Library page
2012-08-21 11:12:33 -04:00
d2eca0faaf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-21 10:50:33 -04:00
47852bce2a
indentation fixes
2012-08-21 10:50:24 -04:00
179aa3d739
CC-1665: Scheduled stream rebroadcasting and recording
...
-Show meaningful page after webstream is deleted
2012-08-21 10:50:18 -04:00
025656be1c
CC-4205: Smart Playlist Builder: Change text on button mouseovers
...
-changed generate success msg
2012-08-21 10:46:25 -04:00
c60198722d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-21 10:42:37 -04:00
4cd5dbb926
CC-4205: Smart Playlist Builder: Change text on button mouseovers
...
-changed save button text
2012-08-21 10:42:10 -04:00
cba717dc4b
CC-1665: Scheduled stream rebroadcasting and recording
...
-Fixed regressions introduced by changing HTML element id
2012-08-21 10:33:36 -04:00
337e5fec8a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-20 18:36:32 -04:00
3230f14231
CC-1665: Scheduled stream rebroadcasting and recording
...
-Fixed delete button on right side of library screen not working
2012-08-20 18:35:10 -04:00
d517bf6e19
fix indentation and remove \r characters
2012-08-20 18:29:57 -04:00
734be21269
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-20 17:18:00 -04:00
a24da9e324
CC-4256: Smart Playlist: change name to smart block and etc
...
- done
2012-08-20 17:17:48 -04:00
4d8dc01638
don't crash js if a backend service is not running
2012-08-20 17:09:59 -04:00
f3f9ef80ff
CC-4119: zendphp.log is not rotated
...
-fixed
2012-08-20 16:05:25 -04:00
f6a4732e87
CC-4119: zendphp.log is not rotated
...
-fixed
2012-08-20 15:54:10 -04:00
69f150ac7f
more detailed error message
2012-08-20 14:41:43 -04:00
398fbb04db
CC-1665: Scheduled stream rebroadcasting and recording
...
-don't show delete button until a stream has been saved
2012-08-17 17:29:17 -04:00
284b028521
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-17 16:51:45 -04:00
4216440670
CC-1665: Scheduled stream rebroadcasting and recording
...
-previewing streams have NaN:NaN:NaN as length
2012-08-17 16:51:23 -04:00
76833344d6
CC-4250: Smart Playlists: Remove save button from form
...
-done
2012-08-17 16:24:11 -04:00
817fe13533
CC-4248: Playlist Builder: 'Something went wrong' error message when dragging playlist into playlist
...
-fixed
2012-08-17 15:56:16 -04:00
764316a36c
CC-4247: Smart Playlist: Lost modifier when delete one from multiple modifiers
...
-fixed
2012-08-17 15:30:30 -04:00
854e3ec75e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-17 15:11:52 -04:00
92408612f6
CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
...
-fixed
2012-08-17 15:11:43 -04:00
99437147dc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-17 15:08:10 -04:00
2a1ea33362
CC-1665: Scheduled stream rebroadcasting and recording
...
-store Liquidsoap metadata in cc_schedule instead of cc_webstream
2012-08-17 15:07:58 -04:00
36a080ac13
CC-4243: Playlist Builder: Remove main fade block if there are no fades to set
...
-fixed
2012-08-17 14:30:46 -04:00
3e879f390a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-17 12:56:52 -04:00
e2fe6d4284
CC-4243: Playlist Builder: Remove main fade block if there are no fades to set
...
-fixed
2012-08-17 12:56:45 -04:00
5b134d0055
cc-4228: fixed this ticket by stomping out bugs in eventcontractor and tweaking ApiController
2012-08-17 12:37:58 -04:00
c1cc1c8fba
CC-4184: Playlist Builder : Error alert for trying to add Web Stream to Smart Playlist
...
- fixed
2012-08-17 10:55:42 -04:00
1e1398739f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-16 18:17:54 -04:00
e57885c934
CC-4191: Password Reset: Reset link should be updated after default port is changed
...
-done
2012-08-16 18:17:43 -04:00
0cbd6165c4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-16 17:49:23 -04:00
e511f7cd37
CC-1665: Scheduled stream rebroadcasting and recording
...
-fixed clicking save multiple times creates multiple smart playlists
2012-08-16 17:49:07 -04:00
6b841a0fc4
CC-4239: Playlist: need to improve error msg "Something went wrong"
...
-fixed
2012-08-16 17:11:48 -04:00
12ddf30049
CC-1665: Scheduled stream rebroadcasting and recording
...
-fixed preview icon in context menu doesn't work
2012-08-16 16:52:38 -04:00
9930ffae35
CC-4178: Smart Playlist: Cannot update the block's title
...
-fixed
2012-08-16 16:00:59 -04:00
b17cd2b3c9
CC-4178: Smart Playlist: Cannot update the block's title
...
-fixed
2012-08-16 15:58:03 -04:00
45f08e41d1
Smart playlists: fixed shuffle button activation clause
2012-08-16 15:47:31 -04:00
0d21d9a9af
Smart Playlists: code cleanup
2012-08-16 15:40:36 -04:00
ae0d5d8598
CC-4238: Playlists: Fade in/out is in wrong format
...
-added comment
2012-08-16 14:45:51 -04:00
5e6a94edb9
CC-4238: Playlists: Fade in/out is in wrong format
...
-fixed
2012-08-16 14:37:10 -04:00
6b54440b7e
CC-4238: Playlists: Fade in/out is in wrong format
...
-fixed
2012-08-16 14:35:24 -04:00
73ec580316
Playlists: set cue/fade in/out were not saving when editing a playlist
2012-08-16 13:02:48 -04:00
1b7d174509
CC-4233: Smart Playlist: Cannot save the change of Fade in/out
...
-fixed
2012-08-16 12:33:25 -04:00
09c66f9f94
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-16 11:26:11 -04:00
4ca290320d
CC-4236: Smart Playlists: Deactivate shuffle button when playlist contents is empty
...
-done
-refactor code
2012-08-16 11:26:04 -04:00
45a4c8d896
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-15 18:31:07 -04:00
4ee0c368ac
CC-1665: Scheduled stream rebroadcasting and recording
...
-pre buffer streams part 2
2012-08-15 17:03:14 -04:00
1e57c12ce7
CC-1665: Scheduled stream rebroadcasting and recording
...
-pre buffer streams part 1
2012-08-15 16:43:01 -04:00
ea621fd9dc
CC-4223: Smart playlists: BPM criteria should have numeric modifiers
...
-done
2012-08-15 16:40:04 -04:00
4783bf121a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-15 16:23:15 -04:00
2d80131351
CC-4229: Smart Playlist: refactor code
...
- bug fixes
2012-08-15 16:22:56 -04:00
c58e2e7ff9
Revert "Revert "cc-4232: changed bit formatter to give empty string when bitrate is set to 0""
...
This reverts commit 340e5deb51c11c2dd3445cc1483b21c533d5bdef.
2012-08-15 15:56:24 -04:00
a2dfcd6bc2
Revert "cc-4232: changed bit formatter to give empty string when bitrate is set to 0"
...
This reverts commit 4e25a5ff442258c13f366a4557ca22181cdfac02.
2012-08-15 15:56:24 -04:00
7fe45a5bbc
cc-4232: changed bit formatter to give empty string when bitrate is set to 0
2012-08-15 15:56:24 -04:00
3e80781308
Smart playlist:
...
- fixed modifier selection onchange function
2012-08-15 15:36:06 -04:00
ceba380127
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-15 15:13:15 -04:00
3947b6d033
CC-4113: Smart Playlist: Filename contains '\' cannot be searched
...
-fixed
2012-08-15 15:13:07 -04:00
d773dcd112
CC-1665: Scheduled stream rebroadcasting and recording
...
-send stream name back to Airtime: [("url","http://idobiradio.com/ "), ("title","Good Charlotte - Like It's Her Birthday")]
2012-08-15 15:12:44 -04:00
7225345541
CC-4231: Library: Prevent audio preview popup for dynamic blocks
...
- done
2012-08-15 12:51:53 -04:00
4d9a31b3c1
CC-4219: Smart Playlist: Cannot preview static block
...
-fixed
2012-08-15 12:10:56 -04:00
9fc5411895
CC-4229: Smart Playlist: refactor code
...
- done
2012-08-15 11:36:41 -04:00
92568db01f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-14 17:11:10 -04:00
5ece15c1e8
CC-4206: Smart Playlist: Edit cue in/out setting will lost all contents
...
- fixed
2012-08-14 17:10:31 -04:00
e98eda144a
cc-4105: removed naive replaygain again. added micro optimization to Insert into cc_files
2012-08-14 14:50:41 -04:00
6981a5cb49
cc-4105: added truncation of BPM to prevent crashes
2012-08-14 14:50:40 -04:00
ba03447946
cc-4105: added handling for pyinotify events and create more logical events
2012-08-14 14:50:39 -04:00
688d22e995
cc-4105: fixed metadata formatting bug
2012-08-14 14:50:39 -04:00
6e9db647c1
cc-4105: Fixed metadata handling. Added more error reporting to rmq requests
2012-08-14 14:50:39 -04:00
5f1024bb7d
cc-4105: Tweaked config params. Fixed error checking. Fixed unicode stuff. Removed redundant php
2012-08-14 14:50:39 -04:00
7abe882455
cc-4105-2: added retries on failed requests. added ignored files set like in the old media monitor
2012-08-14 14:50:39 -04:00
3422eb3cc0
cc-4105: added event packing to event objects
2012-08-14 14:50:39 -04:00
9964c826ab
cc-4105: Added problem dir moving. Also locale config from old media monitor
2012-08-14 14:50:37 -04:00
09f1fe6775
CC-4220: Smart Playlists: Change indexing of criteria elements
...
-code refactoring
2012-08-14 10:05:13 -04:00
c62d89d5da
CC-4220: Smart Playlists: Change indexing of criteria elements
...
-changed indexing on UI
2012-08-14 10:02:36 -04:00
0a05db1230
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-14 09:26:59 -04:00
83085220e2
CC-4220: Smart Playlists: Change indexing of criteria elements
...
-changed Block model to reflect index changes
2012-08-14 09:26:49 -04:00
7a5d9a0f91
CC-1665: Scheduled stream rebroadcasting and recording
...
-don't require 2 digits for minutes or hours
2012-08-13 15:26:32 -04:00
c3862d69e5
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-13 14:58:20 -04:00
51e242ec7f
CC-1665: Scheduled stream rebroadcasting and recording
...
-remove edit menu from show builder
2012-08-13 14:58:11 -04:00
fa87393ba9
CC-4216: Playlist: 'Close' button for fade in/out is out of the border when it's empty
...
-fixed
2012-08-13 14:53:21 -04:00
cfc5587043
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-13 14:41:59 -04:00
b8ea08c065
CC-1665: Scheduled stream rebroadcasting and recording
...
-analyze stream mime type and report error as needed.
2012-08-13 12:59:26 -04:00
0203c3f0c5
CC-4206: Smart Playlist: Edit cue in/out setting will lost all contents
...
-fixed event bubbling
2012-08-13 12:46:17 -04:00
dad8762f4f
CC-4209: Smart Playlist: 'Processing' wont disappear after clicking Generate during 'File import in progress'
...
- fixed
2012-08-13 12:31:49 -04:00
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
1e36d77857
CC-4213: Smart Playlist -> Criteria Bpm: Cannot find track by 'is in the range'
...
- changed BPM to string type
2012-08-13 11:51:25 -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
d84ad78984
CC-1665: Scheduled stream rebroadcasting and recording
...
-remove warning icons from playlists with streams
-play icons are now white, not orange
2012-08-10 12:53:22 -04:00
41320d0e5d
CC-1665: Scheduled stream rebroadcasting and recording
...
-remove warning icons from playlists with streams
2012-08-10 12:52:36 -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
5e1d8eabb3
Smart Playlists: moved Save button from right side to left side
2012-08-10 12:34:45 -04:00
7911761017
CC-4208: Smart Playlists: Cannot see error messages sometimes after clicking 'Save'
...
-fixed
2012-08-10 12:22:59 -04:00
8b13af2e04
fix bug on widget
2012-08-10 12:14:15 -04:00
bd966915ee
CC-4207: Smart Playlists: Criteria is lost on 'Shuffle' click
...
-fixed
2012-08-10 11:56:01 -04:00
7d73f0996c
CC-4205: Smart Playlist Builder: Change text on button mouseovers
...
-done
2012-08-10 10:54:13 -04:00
c774e3b9bd
Smart Playlists: got rid of horitzontal scrolling
2012-08-10 10:42:01 -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
8eea34dc39
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 18:27:53 -04:00
037e78730b
CC-4203: Smart Playlist: Please support limit as 0.5 hour
...
-fixed
2012-08-09 18:27:46 -04:00
5a63a284c8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 18:24:32 -04:00
10ea825536
CC-4201: Playlist Builder -> Smart Playlist: DJ user can edit SP created by others in particular situation
...
-fixed
2012-08-09 18:24:22 -04:00
200eec37f6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 18:15:03 -04:00
65cb34db4a
CC-1665: Scheduled stream rebroadcasting and recording
...
-webstream preview on show builder working
2012-08-09 18:14:53 -04:00
321e6c6524
CC-4197: Media Library -> Regular Playlist: Some character get cut off in context view
...
-fixed
2012-08-09 17:55:08 -04:00
63a51081c1
CC-4182: Media Library -> Smart Playlist: Empty box appears after left clicking a Dynamic Smart Playlist created by other users, when login as DJ
...
- fixed
2012-08-09 17:50:43 -04:00
00a484d595
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 17:43:22 -04:00
23683ccccb
Smart Playlists: changed positioning of error message on click 'Save'
2012-08-09 17:43:12 -04:00
bc72a6743b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 17:42:32 -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
ac295243d4
Smart Playlists: changed success message for 'Save' button
2012-08-09 17:34:47 -04:00
e6ee29f57c
Smart Playlist Options: changed width of fieldset
2012-08-09 17:28:35 -04:00
f75cf5ffe2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 17:24:00 -04:00
e674654cb1
CC-4192: Smart Playlist Builder: make save button save title, description, and criteria
...
-done
2012-08-09 17:23:52 -04:00
618813ebc1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 16:59:33 -04:00
6c721cd68d
CC-4184: Playlist Builder : Error alert for trying to add Web Stream to Smart Playlist
...
- fixed
- extra fix: context menu for webstream
2012-08-09 16:59:18 -04:00
c73328e297
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to preview webstreams inside of playlists
2012-08-09 16:49:20 -04:00
952f18dc3c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 14:39:42 -04:00
b53bc36f4f
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to preview webstreams
2012-08-09 14:39:31 -04:00
1367bde728
CC-4185: Playlist Builder -> Smart Playlist: Able to create Smart Playlist more than 24 hours
...
- fixed
2012-08-09 14:18:15 -04:00
ef0e800c92
CC-4186: Playlist Builder -> Smart Playlist : The static Smart Playlist's length value will be empty if no file meet the criteria.
...
- fixed
2012-08-09 14:12:30 -04:00
825abca61b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 11:44:43 -04:00
685354e000
CC-4189: Playlist Builder -> Smart Playlist: Cannot change the position of manually added tracks
...
- fixed
2012-08-09 11:44:27 -04:00
bad418062e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 11:21:01 -04:00
677d523ef4
CC-4187: Media Library -> Regular Playlist : Use legend instead of label for different elements in context view
...
-done
2012-08-09 11:20:49 -04:00
ae5b6e58d7
CC-4144: Playlist Builder: Adding smart playlist into regular playlist will reset the Fade in/out settings to default value
...
- fixed
2012-08-09 11:03:57 -04:00
d959e4ff11
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 10:47:59 -04:00
cf1178522a
CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error
...
- changes made on phtml were cause some errors. fixed.
2012-08-09 10:47:43 -04:00
c69dac7ab6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-08 23:02:39 -04:00
d0d70db391
remove useless debugging
2012-08-08 23:02:16 -04:00
8f3037c3e4
CC-1665: Scheduled stream rebroadcasting and recording
...
-remove incorrect "no items" warning when a show only contained a webstream
2012-08-08 23:02:08 -04:00
90ec046854
CC-4188: Playlist Builder -> Smart Playlist : sometimes elements do not index properly when add a new criteria row
...
-fixed
2012-08-08 16:27:03 -04:00
b2d3ee0aa4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-08 15:35:44 -04:00
791989faf7
Smart Playlists: changed label 'block' to 'playlist' type
2012-08-08 15:35:28 -04:00
ab19d6f511
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-08 15:29:28 -04:00
d1e6f8178b
CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error
...
- fixed. Not displaying fade setting button if the playst/smartplaylist
is empty.
2012-08-08 15:29:09 -04:00
3a4a827f1f
CC-4180: Smart Playlist Builder: modifier select boxes do not change when criteria changes
...
-fixed
2012-08-08 15:24:47 -04:00
50f9582b95
CC-4179: Media Library -> In brief view of Dynamic Smart Playlist, 'does not contain' will be broken to 2 lines
...
-fixed
2012-08-08 13:24:53 -04:00
67a8457889
Smart Playlists: modifier buttons appear incorrectly when editing
2012-08-08 13:16:02 -04:00
5c3701c064
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-08 13:07:12 -04:00
85259e5bba
CC-4170: Smart Playlist Builder: elements don't organize properly after deleting a row
...
-fixed
2012-08-08 13:07:00 -04:00
83917ed894
CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error
...
- fixed
2012-08-08 12:23:07 -04:00
fd1628f971
CC-4117: Smart Playlist: radio_station_name criteria doesnot take effect
...
- removing radio_station_name from criteria list
2012-08-08 12:01:10 -04:00
61e38381af
CC-4176: Smart Playlist: Set implicit item limit when user uses time as a limit
...
- done
2012-08-08 11:46:48 -04:00
f33485f8ea
Merge branch '2.1.x' into devel
2012-08-08 00:09:13 -04:00
333c8ec211
slightly improved PHP logging format
2012-08-08 00:08:46 -04:00
18ca6b22cb
CC-1665: Scheduled stream rebroadcasting and recording
...
-add placeholder icons for smart playlists/webstreams
2012-08-07 23:44:21 -04:00
230c3399ef
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix newlines appearing in playlist/webstream title
-disable autosave of playlist/webstream title
2012-08-07 20:48:58 -04:00
db36870aec
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix creator id on another SQL query
2012-08-07 20:38:36 -04:00
8876b312fb
CC-4167: Create new playlist doesn't work
...
-fixed
2012-08-07 19:49:59 -04:00
1dddaa0ba2
CC-1665: Scheduled stream rebroadcasting and recording
...
-refresh library to show new stream after save
2012-08-07 19:49:26 -04:00
47ae223a1c
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix SQL error
2012-08-07 19:23:42 -04:00
9b805f0a01
CC-4159: Playlist Builder -> Smart Playlist : "+" for modifier disappears if 3 or more Criteria
...
-fixed
2012-08-07 17:40:47 -04:00
4ee232944d
CC-4169: Playlist Builder: Smart Playlist time validates even if time isn't given
...
-fixed
2012-08-07 16:27:18 -04:00
9c678c0429
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-07 16:18:00 -04:00
97943a6af8
CC-4157: Playlist Builder -> Smart Playlist -> Wrong warning msg if trying to input 0000-00-00 into Upload criteria
...
-fixed
2012-08-07 16:17:24 -04:00
0fe501508e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-07 15:54:42 -04:00
171825e19a
CC-4148: Playlist Builder: Please add a 'Processing' for generating Smart playlist
...
- added processing box
2012-08-07 15:54:16 -04:00
f6dffc95c8
CC-4158: Playlist Builder -> Smart Playlist: Warning msg field is a little bit longer
...
-fixed
2012-08-07 15:22:32 -04:00
152a97917d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-07 15:20:32 -04:00
823ab1dd41
CC-4162: Smart Playlist Builder: extra space in between limit and error message
...
-fixed
2012-08-07 15:20:12 -04:00
550c97a2dc
CC-4154L: Indicate whether a show has scheduled content on the calendar page
...
-done
2012-08-07 14:57:04 -04:00
2f8d0b77fa
CC-4149: Playlist Builder: Fail to generate Smart Playlist with 5000 items
...
- set the items limit to 500
2012-08-07 14:53:07 -04:00
d05661afff
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-07 11:08:34 -04:00
2c0f7bf03b
CC-4145: Playlist Builder: Alert pops up when clicking 'Add to playlist' in context menu of Smart Playlist to add it into regular playlist
...
-fixed
2012-08-07 11:08:00 -04:00
e20289e5cf
Merge branch '2.1.x' into devel
2012-08-06 17:17:05 -04:00
975abbaf10
Remove unecessary information being sent from API
2012-08-06 17:16:43 -04:00
48a1bf3f02
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/Show.php
2012-08-06 17:10:46 -04:00
40023d9086
CC-4152: Widget does not display current show in some modes
...
-fixed
2012-08-06 17:07:18 -04:00
688051b59e
CC-1665: Scheduled stream rebroadcasting and recording
...
-Remove sX_name from being inserted into DB
2012-08-03 18:45:43 -04:00
f901e13a84
CC-1665: Scheduled stream rebroadcasting and recording
...
-Make playlist builder show creator name instead of creator id
2012-08-03 18:06:47 -04:00
b23b9a0cbd
CC-1665: Scheduled stream rebroadcasting and recording
...
-allow to filter by webstream only
2012-08-03 16:33:58 -04:00
183937b8e9
CC-1665: Scheduled stream rebroadcasting and recording
...
-when editing string should hav 00h 00m format.
2012-08-03 16:18:45 -04:00
0ea66fc33f
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to edit playlists
2012-08-03 15:59:34 -04:00
d18acfdc75
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-02 17:17:52 -04:00
2a7c5eef64
CC-84: Smart Playlists
...
- added no-wrap class to qtip
2012-08-02 17:17:44 -04:00
8e67ecff0a
CC-84: Smart Playlists
...
- added a no-wrap class to qtip
2012-08-02 17:17:13 -04:00
82970c6e73
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-02 17:04:49 -04:00
af939469d3
CC-84: Smart Playlists
...
- fixed bug on expanding block
- fixed text bug
2012-08-02 17:03:54 -04:00
361e681a59
CC-84: Smart Playlists
...
- remove 'add to playlist' option on showbuilder screen
2012-08-02 16:50:35 -04:00
ef994aa449
CC-84: Smart Playlists
...
- block options scroll for small screens
2012-08-02 16:40:32 -04:00
028e089c82
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/Block.php
2012-08-02 16:37:12 -04:00
0d2d8218bf
CC-84: Smart Playlists
...
- audio preview on playlist
- cleaning up some code
2012-08-02 16:36:12 -04:00
a146fdcd37
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-02 16:27:00 -04:00
9cc152c0ae
CC-1665: Scheduled stream rebroadcasting and recording
...
-validate form fields of new webstream
2012-08-02 15:45:15 -04:00
4fca33c5fc
CC-84: Smart Playlists
...
- removed block from right side if it gets deleted from context menu
2012-08-02 12:59:00 -04:00
997b5c31c3
CC-84: Smart Playlists
...
- fixed dragging tracks into playlists (smart and dumb)
- display alert when dragging into dynamic block
- display alert when dragging playlist into block
2012-08-02 11:52:11 -04:00
6e71a6bb92
CC-84: Smart Playlists
...
- dynamic block length display
2012-08-02 11:17:10 -04:00
9479aeb3dd
CC-84: Smart Playlists
...
- fixed db column mapping for radio station name and track title
2012-08-01 17:10:56 -04:00
ddd6016b28
CC-84: Smart Playlists
...
- qtip cleanup
2012-08-01 16:36:12 -04:00
James
Rudi Grinberg
Martin Konecny
denise
denise