denise
|
b79e190d3c
|
-small comment change
|
2012-10-12 15:42:51 -04:00 |
|
denise
|
e60a23aab4
|
CC-4555: Can create overlapping shows with a repeating show if another show is on the last repeating day
-fixed
|
2012-10-12 15:34:42 -04:00 |
|
denise
|
8f5830757f
|
CC-4553: Calendar: Can create overlapping show by repeat show's instances
-fixed
|
2012-10-12 14:26:54 -04:00 |
Daniel James
|
1613353be8
|
Fix inconsistent label which does not match tooltip
|
2012-10-12 17:15:57 +01:00 |
|
Daniel James
|
f77ec31a8d
|
CC-4552: Small formatting improvement
|
2012-10-11 17:44:08 +01:00 |
|
denise
|
4b2b5ada6e
|
CC-4548: Calendar -> Add/Remove contents -> Advanced search: Green check is pushed to different line under 1400 screen width
-fixed
|
2012-10-11 12:23:24 -04:00 |
|
denise
|
03e4bb15c7
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-10-11 12:12:06 -04:00 |
|
denise
|
5c0bdfa2db
|
CC-4544: Playlist/Smart Blocks: Add cue format helper
-done
|
2012-10-11 12:11:53 -04:00 |
|
Daniel James
|
93fde28cfe
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-10-11 17:04:07 +01:00 |
|
Daniel James
|
843a456b3b
|
CC-4552: Fixed various errors in Support Feedback page
|
2012-10-11 17:03:09 +01:00 |
|
denise
|
5f35336fd0
|
CC-2295 Improvements to playlist builder beha...CC-2303 Cue-in Cue-out inconsistency with time values:
-fixed
|
2012-10-11 11:49:04 -04:00 |
|
denise
|
c95050c04c
|
CC-4546: Library->Context view for playlist: It only displays "..." instead of Static smart block's name
-fixed
|
2012-10-10 15:06:30 -04:00 |
|
denise
|
2fbd8e868b
|
CC-4547: Calendar: Create record & rebroadcast show will be blocked by "overlapping error"
-fixed
|
2012-10-10 14:22:09 -04:00 |
|
Daniel James
|
395d25158f
|
CC-4545: Fix tooltip for Auto Switch On feature
|
2012-10-10 16:26:32 +01:00 |
|
Daniel James
|
fa8c561dab
|
CC-4543 Adjusted CSS for wider colour code label
|
2012-10-10 11:44:38 +01:00 |
|
Daniel James
|
d4fa24a9af
|
CC-4543: Fixed colour code labels in playlist preview pop-up
|
2012-10-10 11:17:09 +01:00 |
|
denise
|
c9ac675a10
|
CC-4529: Playlist Builder: The panel of 'Adding n items' will be bigger than usual if there is a item in Playlist has expanded cue in/out setting
-fixed
|
2012-10-09 14:39:29 -04:00 |
|
denise
|
dc410f4289
|
CC-4528: Calendar: Can drag and drop current show into past (it's forbidden to set it by editing show)
-fixed
|
2012-10-09 14:20:00 -04:00 |
|
denise
|
279737751b
|
CC-4540: Smart Block: Error messages are too long
-fixed
|
2012-10-09 12:12:52 -04:00 |
|
Daniel James
|
b4fee4321c
|
CC-4537: Bit rate hint should be in kbps to match actual search
|
2012-10-09 16:46:51 +01:00 |
|
Daniel James
|
c6dc5a818f
|
CC-4172: Fix alignment of 'is in the range' boxes
|
2012-10-09 16:24:03 +01:00 |
|
Daniel James
|
2f447d24a5
|
Fixed typo in password restore message
|
2012-10-09 14:21:58 +01:00 |
|
Daniel James
|
456d9ba99a
|
CC-4172: Shrink width of table to fit 1280 pixel wide display
|
2012-10-08 15:33:57 +01:00 |
|
Daniel James
|
44a3f85636
|
CC-4507: Tweak CSS to make more room for metadata in Master Panel
|
2012-10-08 12:49:54 +01:00 |
|
denise
|
0d35056cd4
|
CC-4486: Library -> Advanced Search: Alignment is off sometimes
-added placeholders to input tags for format examples
|
2012-10-04 12:16:57 -04:00 |
Rudi Grinberg
|
5a0df2b6d5
|
Adde TODO's
|
2012-10-03 12:01:24 -04:00 |
|
Rudi Grinberg
|
9dc8707c40
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-10-03 11:59:05 -04:00 |
|
Rudi Grinberg
|
1ae7784331
|
Added TODO
|
2012-10-03 11:59:02 -04:00 |
|
Rudi Grinberg
|
2deceaa5fb
|
comment formatting
|
2012-10-03 11:58:21 -04:00 |
|
denise
|
317bb7de69
|
CC-4479: Buttons in dialog windows are not styled
-done
|
2012-10-03 11:40:40 -04:00 |
|
denise
|
eadde1c498
|
CC-4519: Advanced Search Option: Please use text search instead of scope search from Mime's type
-fixed
|
2012-10-03 11:29:16 -04:00 |
|
denise
|
f94c4cd96a
|
CC-4515: Calendar: Errors for editing recording show
-fixed
|
2012-10-03 11:13:41 -04:00 |
|
denise
|
1b0dd13eac
|
CC-4521: Playlist Builder: Cannot set fades
-fixed
|
2012-10-02 15:38:05 -04:00 |
|
denise
|
aede8e8efa
|
CC-4520: Playlist Builder: Cannot set cue in
-fixed
|
2012-10-02 15:35:49 -04:00 |
|
denise
|
968c719fa1
|
CC-4172: Smart Playlist creator requires full HD monitor to avoid buttons being hidden
-done
|
2012-10-02 14:12:22 -04:00 |
|
denise
|
3dd7e9767b
|
CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes
-validation was missing for Encoded By filter
|
2012-10-02 13:57:36 -04:00 |
|
Daniel James
|
7d00631150
|
Set min-width value for source info block in Master Panel (CC-4510)
|
2012-10-01 12:11:36 +01:00 |
|
Rudi Grinberg
|
4ff267ee8a
|
removed z
|
2012-09-19 17:45:03 -04:00 |
|
Rudi Grinberg
|
7bb1eadf03
|
formatting
|
2012-09-19 17:39:30 -04:00 |
|
Rudi Grinberg
|
cde8c60afc
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 17:38:00 -04:00 |
|
Rudi Grinberg
|
36d454184d
|
formatted
|
2012-09-19 17:37:49 -04:00 |
Martin Konecny
|
9df90414fc
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 17:22:13 -04:00 |
|
Martin Konecny
|
5a8510b909
|
remove gap on right side of show builder: part 3
|
2012-09-19 17:22:04 -04:00 |
|
denise
|
29347527cf
|
CC-4471: Library -> Remove extra top margin in playlist builder
-done
|
2012-09-19 17:14:22 -04:00 |
|
Rudi Grinberg
|
abd58c25a1
|
removed duplicated comment
|
2012-09-19 17:12:18 -04:00 |
|
denise
|
253a31b1ea
|
-datatables small fix
|
2012-09-19 17:05:20 -04:00 |
|
Rudi Grinberg
|
cdcb1f0ef9
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 17:04:45 -04:00 |
|
Rudi Grinberg
|
3e769b6e7a
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 17:04:26 -04:00 |
|
denise
|
e926b62915
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 17:00:15 -04:00 |
|
denise
|
f909ab9da2
|
CC-4490: Calendar: Empty show icon should have a tooltip
-done
|
2012-09-19 16:59:45 -04:00 |
|
Rudi Grinberg
|
b66f00ff07
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 16:59:21 -04:00 |
|
Martin Konecny
|
40c122fafa
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 16:56:04 -04:00 |
|
Martin Konecny
|
84ed03ffac
|
remove gap on right side of show builder: part 2
|
2012-09-19 16:55:44 -04:00 |
|
denise
|
f2e495cbd8
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 16:40:05 -04:00 |
|
denise
|
2afc4183bb
|
CC-4496: Library -> Contents-feed does not work if advanced search data is invalid
-fixed
|
2012-09-19 16:39:56 -04:00 |
|
Rudi Grinberg
|
946df8a2e3
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 16:36:13 -04:00 |
|
Rudi Grinberg
|
89ed6925df
|
removed benchmarking
|
2012-09-19 16:36:04 -04:00 |
|
Rudi Grinberg
|
e5085f0df3
|
Cleaned up code.
|
2012-09-19 16:34:46 -04:00 |
|
Martin Konecny
|
a3b53ee3d3
|
remove gap on right side of show builder
|
2012-09-19 16:19:02 -04:00 |
|
denise
|
b4277f1f17
|
CC-4495: Library -> Advanced Search: Some fields with ranges do not get validated
-fixed
|
2012-09-19 15:46:03 -04:00 |
|
denise
|
4b2d6caf0e
|
CC-4485: Library -> Advanced Search -> Tooltip needed for invalid input
-done
|
2012-09-19 15:35:45 -04:00 |
|
denise
|
dc4e12a0ae
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 15:03:29 -04:00 |
|
denise
|
d70951a334
|
CC-4494: Calendar: Cannot resize show
-fixed
|
2012-09-19 15:03:16 -04:00 |
|
Martin Konecny
|
f717efd7fb
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 13:23:14 -04:00 |
|
Martin Konecny
|
ca0fb969b7
|
fix jplayer errors for mp3 and firefox (flash)
|
2012-09-19 13:23:06 -04:00 |
james
|
51bcf04803
|
CC-4491: Calendar -> Add /Remove contents: Cannot expand/collapse Advanced Search Options
- fixed
|
2012-09-19 13:11:08 -04:00 |
|
james
|
b2e452acbb
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 12:51:13 -04:00 |
|
james
|
8652681eda
|
CC-4306: Watch folder: rescan watch directory and remove watch directory tooltips should be shifted depending on the path length
- fixed
|
2012-09-19 12:51:03 -04:00 |
|
Rudi Grinberg
|
0158d3f936
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 12:47:18 -04:00 |
|
denise
|
801edc2fcf
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 12:42:08 -04:00 |
|
denise
|
81620d4f94
|
CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes
-fixed
|
2012-09-19 12:41:54 -04:00 |
|
Rudi Grinberg
|
f801fcb81e
|
empty space
|
2012-09-19 11:20:26 -04:00 |
|
Rudi Grinberg
|
014da73eed
|
heredoc sql
|
2012-09-19 11:17:32 -04:00 |
|
Rudi Grinberg
|
6001995e01
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 11:15:09 -04:00 |
|
Rudi Grinberg
|
ecb5c93ddf
|
Removed methods again...
|
2012-09-19 11:14:59 -04:00 |
|
Rudi Grinberg
|
7dac1c6561
|
Added them back because not sure
|
2012-09-19 11:14:26 -04:00 |
|
Rudi Grinberg
|
99b28cca82
|
Removed unused methods
|
2012-09-19 11:11:50 -04:00 |
|
denise
|
dc95ab1d00
|
CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-changed null values to empty strings
|
2012-09-19 11:05:17 -04:00 |
|
Martin Konecny
|
ddc0e8d2ba
|
remove console.log from javascript library :/
|
2012-09-19 11:04:01 -04:00 |
|
denise
|
281e7d1092
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 10:49:52 -04:00 |
|
denise
|
0c823af660
|
CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-done
|
2012-09-19 10:49:17 -04:00 |
|
Rudi Grinberg
|
20b79374e2
|
Removed empty method
|
2012-09-19 10:25:29 -04:00 |
|
Rudi Grinberg
|
58620203cf
|
line wrap
|
2012-09-19 10:24:45 -04:00 |
|
Rudi Grinberg
|
fb4f7c1cb5
|
psr
|
2012-09-19 10:23:54 -04:00 |
|
Martin Konecny
|
1da4f44768
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 21:29:19 -04:00 |
|
Martin Konecny
|
7036036a86
|
CC-4476: Make all green notification boxes fade out after 5 seconds
-fixed
|
2012-09-18 21:29:02 -04:00 |
|
Rudi Grinberg
|
33be48e9e3
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 18:21:00 -04:00 |
|
Rudi Grinberg
|
a9eefe21fa
|
cc-4304: Add call to save after each file reassignment
|
2012-09-18 18:20:33 -04:00 |
|
denise
|
92b40bea0c
|
CC-4484: Some js files do not have the airtime version appended
-fixed
|
2012-09-18 17:43:13 -04:00 |
|
denise
|
5003e86eac
|
- changed smart block qtip text
|
2012-09-18 17:37:38 -04:00 |
|
denise
|
f9778f2da4
|
-removed windows CRLF
|
2012-09-18 17:26:34 -04:00 |
|
denise
|
610a5da24e
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 17:23:37 -04:00 |
|
denise
|
1d699fe0b8
|
CC-4479: Buttons in dialog windows are not styled
-done
|
2012-09-18 17:22:24 -04:00 |
|
Martin Konecny
|
b69f3288d3
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 17:22:22 -04:00 |
|
Martin Konecny
|
6420e6a830
|
remove trailing whitespace
|
2012-09-18 17:22:14 -04:00 |
|
denise
|
39e1bd5271
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 16:55:57 -04:00 |
|
denise
|
b77429164b
|
CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
-removed setInterval function
|
2012-09-18 16:55:46 -04:00 |
James
|
3ecbab3259
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 16:50:57 -04:00 |
|
James
|
8433ec5445
|
CC-4482: Smart Blocks -> tracks with empty "Album" name are NOT filtered in
- fixed
|
2012-09-18 16:50:42 -04:00 |
|
denise
|
cc966ca62b
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 16:49:52 -04:00 |
|
denise
|
54ab58a9c7
|
CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
-removed (commented out) code for this ticket
-postponing for now
|
2012-09-18 16:49:45 -04:00 |
|
Rudi Grinberg
|
d55915d649
|
naming convention fix
|
2012-09-18 16:40:23 -04:00 |
|
Rudi Grinberg
|
608fff090c
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 15:52:26 -04:00 |
|
denise
|
1c89244b02
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 15:52:20 -04:00 |
|
Rudi Grinberg
|
7a958ec8b6
|
formatting
|
2012-09-18 15:52:16 -04:00 |
|
denise
|
8cae11d588
|
CC-4478: Library: audio preview check should be skipped if file does not exist
-fixed
|
2012-09-18 15:52:11 -04:00 |
|
James
|
be214ac126
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 15:47:48 -04:00 |
|
James
|
eecc90547d
|
CC-4461: Now Playing: Timeline does not reflect the changes on Show start time (which is changed from Calendar->Edit Show)
- fixed
|
2012-09-18 15:47:37 -04:00 |
|
denise
|
0241eb4714
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 15:29:08 -04:00 |
|
denise
|
09b117999e
|
CC-4475: Register form button doesn't have any styling
-fixed
|
2012-09-18 15:28:38 -04:00 |
|
Martin Konecny
|
da11dc077e
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 15:27:35 -04:00 |
|
Martin Konecny
|
4c58c4c9a9
|
CC-4473: On Air button greys out when one out of two same Webstreams is cancelled
-fixed
|
2012-09-18 15:27:27 -04:00 |
|
Rudi Grinberg
|
a2f3210c79
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 15:26:53 -04:00 |
|
Rudi Grinberg
|
72e6ee35fa
|
cc-4304: Temporarily fixed
|
2012-09-18 15:26:43 -04:00 |
|
denise
|
e676cf856f
|
-remove console.log
|
2012-09-18 15:16:54 -04:00 |
|
denise
|
0386f8a9cb
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 15:14:57 -04:00 |
|
denise
|
7bbd10556b
|
CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
-done
|
2012-09-18 15:14:46 -04:00 |
|
Rudi Grinberg
|
2cfb0c85d5
|
Formatted sql
|
2012-09-18 15:04:22 -04:00 |
|
Rudi Grinberg
|
3a60d729fd
|
added todo
|
2012-09-18 15:02:07 -04:00 |
|
Rudi Grinberg
|
b372c9ae50
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 14:56:53 -04:00 |
|
James
|
859041bcf4
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 14:40:32 -04:00 |
|
James
|
98f0692b8d
|
CC-4457: Media Library: The background of 'Adding items' is minimize to a point
- fixed
|
2012-09-18 14:40:18 -04:00 |
|
Rudi Grinberg
|
b069b1254e
|
Aligned
|
2012-09-18 12:56:01 -04:00 |
|
Rudi Grinberg
|
90d3494576
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 12:48:55 -04:00 |
|
Rudi Grinberg
|
6ac241b1fc
|
Added todo
|
2012-09-18 12:48:45 -04:00 |
|
Martin Konecny
|
09bc686d99
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 12:41:30 -04:00 |
|
Martin Konecny
|
b0f2176329
|
fix some TODO's in webstream.php
|
2012-09-18 12:40:44 -04:00 |
|
Rudi Grinberg
|
a22ba39de1
|
formatting
|
2012-09-18 12:26:07 -04:00 |
|
Rudi Grinberg
|
d2f43058c2
|
fixed comment
|
2012-09-18 12:09:28 -04:00 |
|
Rudi Grinberg
|
f9319b869a
|
Corrected comments
|
2012-09-18 12:08:30 -04:00 |
|
Rudi Grinberg
|
bc873a3ece
|
Added extension handling for file path
|
2012-09-18 12:04:54 -04:00 |
|
Rudi Grinberg
|
8657a80459
|
removed return ''
|
2012-09-18 11:51:13 -04:00 |
|
Rudi Grinberg
|
6fc0d50c9f
|
lined up
|
2012-09-18 11:46:35 -04:00 |
|
Rudi Grinberg
|
018b50d316
|
added better logging
|
2012-09-18 11:45:10 -04:00 |
|
denise
|
355ceadedb
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 11:22:44 -04:00 |
|
denise
|
e00ff6367d
|
CC-4458: Now Playing -> "+ Add to current playlist text" might be replaced by something more appropriate
-fixed
|
2012-09-18 11:22:37 -04:00 |
|
Rudi Grinberg
|
9759543943
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 11:11:06 -04:00 |
|
Rudi Grinberg
|
0a83b33a5a
|
Removed extra logging statements
|
2012-09-18 11:10:54 -04:00 |
|
Rudi Grinberg
|
6481556f9b
|
Showbuilder formatting
|
2012-09-18 11:07:32 -04:00 |
|
denise
|
75d6b509ea
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 11:05:20 -04:00 |
|
denise
|
9c721f202f
|
-small UI improvement
|
2012-09-18 11:05:13 -04:00 |
|
Rudi Grinberg
|
49e1b29bc9
|
Removed instances of getLine and getFile
|
2012-09-18 11:04:33 -04:00 |
|
Rudi Grinberg
|
2e0e0849c5
|
More clean up
|
2012-09-18 11:03:34 -04:00 |
|
Rudi Grinberg
|
d90559fdf8
|
Cleaned up ShowbuilderController
|
2012-09-18 11:02:41 -04:00 |
|
Rudi Grinberg
|
96f138a9fe
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 10:55:55 -04:00 |
|
Rudi Grinberg
|
9249bf8cd0
|
Big formatting changes.
|
2012-09-18 10:55:42 -04:00 |
|
denise
|
1698aae251
|
CC-4466: Buttons on Now Playing page are clickable even though they are disabled
-fixed
|
2012-09-18 10:53:19 -04:00 |
Naomi Aro
|
f50fccaf5f
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 16:28:36 -07:00 |
|
Naomi Aro
|
bb3ffce071
|
CC-3944 : Now Playing -> Time Line view: Cannot cancel record show, cancel button is disabled
|
2012-09-17 16:28:28 -07:00 |
|
Rudi Grinberg
|
542c5c857f
|
alignment
|
2012-09-17 17:54:10 -04:00 |
|
Rudi Grinberg
|
53c6d77821
|
Formatting
|
2012-09-17 17:52:56 -04:00 |
|
Rudi Grinberg
|
095a5cce4f
|
Added better debugging
|
2012-09-17 17:51:50 -04:00 |
|
Rudi Grinberg
|
69756f60ca
|
formatting
|
2012-09-17 17:49:25 -04:00 |
|
Rudi Grinberg
|
ff22b80dfc
|
formatting
|
2012-09-17 17:49:16 -04:00 |
|
Rudi Grinberg
|
3ba3df07f8
|
better logging
|
2012-09-17 17:39:41 -04:00 |
|
Rudi Grinberg
|
5a37777cfd
|
formatting
|
2012-09-17 17:04:49 -04:00 |
|
Rudi Grinberg
|
9c5ebdc4c0
|
Removed old commented code
|
2012-09-17 17:02:59 -04:00 |
|
Rudi Grinberg
|
1c736d6366
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 16:47:45 -04:00 |
|
Rudi Grinberg
|
d0e67d8475
|
cc-4462: Bandaided, marked as hack
|
2012-09-17 16:47:33 -04:00 |
|
Martin Konecny
|
117f11ef97
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 16:46:57 -04:00 |
|
Martin Konecny
|
75620be761
|
remove all mosty carriage return characters
|
2012-09-17 16:46:51 -04:00 |
|
Rudi Grinberg
|
81c72b8344
|
cc-4462: Bandaided
|
2012-09-17 16:46:49 -04:00 |
|
Martin Konecny
|
56eb2dff92
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 16:40:37 -04:00 |
|
Martin Konecny
|
c310cecf40
|
CC-4463: do we need getFileExtension()?
|
2012-09-17 16:40:27 -04:00 |
|
Rudi Grinberg
|
ae1ae80d36
|
in_array -> array_key_exists
|
2012-09-17 16:40:22 -04:00 |
|
Rudi Grinberg
|
c2b2ea1d16
|
Fixed formatting
|
2012-09-17 16:27:10 -04:00 |
|
Martin Konecny
|
8b445486b1
|
CC-4427: Listen button does not work
fixed
|
2012-09-17 16:17:53 -04:00 |
|
Martin Konecny
|
efc0ace49c
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 16:06:30 -04:00 |
|
denise
|
182bdd0cf6
|
-added border to smart block expansion
|
2012-09-17 15:57:41 -04:00 |
|
Martin Konecny
|
0e82083ba1
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 15:55:53 -04:00 |
|
denise
|
cf57c12782
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 15:49:34 -04:00 |
|
denise
|
9b39ff93b4
|
-removed console.log
|
2012-09-17 15:49:22 -04:00 |
|
Rudi Grinberg
|
1a29499bb8
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 15:48:09 -04:00 |
|
James
|
c9b7fa7073
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 15:41:40 -04:00 |
|
James
|
54b6b12ec0
|
CC-4094: Dashboard -> Source Info panel: DJ assigned to current show can turn off the Master Resouce but cannot disconnect it.
- fixed
|
2012-09-17 15:41:27 -04:00 |
|
denise
|
43c336eb6d
|
CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-implemented css changes
-formatted playlist_builder.css
|
2012-09-17 15:41:22 -04:00 |
|
Rudi Grinberg
|
4f576afc00
|
cc-4396. Initial fix problem was a module was not being included in the soundcloud upload script.
|
2012-09-17 15:24:02 -04:00 |
|
denise
|
3329c36d0c
|
- changed smart block range text boxes to align with new UI
|
2012-09-17 15:23:47 -04:00 |
|
James
|
b6f447a827
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 14:58:45 -04:00 |
|
Martin Konecny
|
54bb414500
|
CC-4318: Widgets: Weekly show cannot show the schedule
-fixed
|
2012-09-17 14:56:34 -04:00 |
|
denise
|
1e0595d7ad
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 14:53:17 -04:00 |
|
denise
|
8801ccecce
|
CC-4459: Now Playing -> Timeline: 'Filter by show' does not work
-fixed
|
2012-09-17 14:52:56 -04:00 |
|
Rudi Grinberg
|
ed45011b40
|
needle <-> haystack
|
2012-09-17 14:21:13 -04:00 |
|
Rudi Grinberg
|
fef949f6ea
|
band aided some bug
|
2012-09-17 12:50:04 -04:00 |
|
Rudi Grinberg
|
92a5bf51a6
|
Added warning for uploading unknown file types
|
2012-09-17 12:45:33 -04:00 |
|
James
|
5d60a599a6
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 12:42:11 -04:00 |
|
James
|
5e514b3b60
|
-UI alignment of input text element
|
2012-09-17 12:41:58 -04:00 |
|
Rudi Grinberg
|
048da282fa
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 12:36:57 -04:00 |
|
Rudi Grinberg
|
2337078dd8
|
Cleaned up unused variables. Formatted some lines.
|
2012-09-17 12:35:12 -04:00 |
|
Martin Konecny
|
5bbc815a78
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 12:32:54 -04:00 |
|
Martin Konecny
|
5d0592c729
|
CC-4454: Show deleting: if you do 'delete this instance and all following', it doesn't remove entries from cc_schedule table
-fixed
|
2012-09-17 12:32:39 -04:00 |
|
denise
|
fd72e20d83
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 12:30:56 -04:00 |
|
denise
|
f840a9b24a
|
CC-4451: (Firefox) Now Playing -> Can't cancel Current Show
-fixed
|
2012-09-17 12:30:43 -04:00 |
|
James
|
54c3c13754
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 12:29:07 -04:00 |
|
James
|
d089d3fbf3
|
- putting scroll bar on library left pane
|
2012-09-17 12:28:46 -04:00 |
|
denise
|
f02bf04a25
|
CC-4449: (Firefox) Now Playing -> Cancel currently playing track does not work
-fixed
|
2012-09-17 12:27:17 -04:00 |
|
denise
|
b8b3bfb495
|
CC-4450: Now Playing -> Can't remove overbooked tracks
-fixed
|
2012-09-17 12:23:49 -04:00 |
|
denise
|
e30d3b770c
|
-removed unused code
|
2012-09-17 12:19:02 -04:00 |
|
denise
|
3c3b39796d
|
CC-4445: Timeline: 'Select' dropdown menu should be disabled if the button is disabled
-fixed
|
2012-09-17 12:10:23 -04:00 |
|
Rudi Grinberg
|
990bcebfe8
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 11:58:18 -04:00 |
|
Rudi Grinberg
|
b913b067c2
|
Added setColumnFilter(oTable)
|
2012-09-17 11:58:08 -04:00 |
|
denise
|
99969ff19d
|
CC-4445: Timeline: 'Select' dropdown menu should be disabled if the button is disabled
-fixed
|
2012-09-17 11:58:05 -04:00 |
Vladimir
|
c19030e8fb
|
CC-4155: additional styling
|
2012-09-17 17:39:40 +02:00 |
|
James
|
b3420984e2
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 11:27:52 -04:00 |
|
James
|
396b529162
|
- UI interation of advanced search
|
2012-09-17 11:23:38 -04:00 |
|
Rudi Grinberg
|
fab7042ce6
|
cc-4419: Added quick hack for now -- actual fix
|
2012-09-17 11:18:18 -04:00 |
|
Martin Konecny
|
ab99e64e8a
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 11:13:44 -04:00 |
|
Rudi Grinberg
|
d4443da626
|
Removed debugging statement
|
2012-09-17 11:12:52 -04:00 |
|
Rudi Grinberg
|
f6967ac575
|
Added Martin's fix
|
2012-09-17 11:03:36 -04:00 |
|
Martin Konecny
|
7fed5bcd18
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 10:57:19 -04:00 |
|
Rudi Grinberg
|
1d46110f36
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 10:52:47 -04:00 |
|
Rudi Grinberg
|
6118cd63d7
|
cc-4419: Added quick hack for now
|
2012-09-17 10:52:37 -04:00 |
|
Vladimir
|
207fe29560
|
CC-4155: Style static/dynamic expansion blocks in playlist contents
|
2012-09-17 16:50:34 +02:00 |
|
Rudi Grinberg
|
a664e7f74a
|
Removed extra comments
|
2012-09-17 10:30:55 -04:00 |
|
Rudi Grinberg
|
1c2cebf5a8
|
Removed comment
|
2012-09-17 10:27:12 -04:00 |
|
Rudi Grinberg
|
44f3020709
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 10:21:34 -04:00 |
|
Vladimir
|
f6d8e4b957
|
CC-4078: Calendar -> Need better 'now-playing' icon
|
2012-09-17 16:17:05 +02:00 |
|
Vladimir
|
465de07ae0
|
Minor cosmetic change of the liquidsoap status
|
2012-09-17 15:32:33 +02:00 |
|
Vladimir
|
d888d1cb1c
|
CC-4443: Context menu is not displayed correctly
|
2012-09-17 15:27:13 +02:00 |
|
Vladimir
|
9776da8bf4
|
Fixed playlist item width
|
2012-09-17 14:39:57 +02:00 |
|
Rudi Grinberg
|
f809a17c02
|
Formatting
|
2012-09-14 19:05:30 -04:00 |
|
Martin Konecny
|
be80eeb5fd
|
CC-4404: restart airtime-liquidsoap will interrupt the output stream and never resume until restart playout engine
-fixed
|
2012-09-14 18:20:46 -04:00 |
|
denise
|
a75a12a198
|
-smart block criteria UI change for small screen resolution
|
2012-09-14 18:02:40 -04:00 |
|
denise
|
d5a2fc93e1
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-14 17:35:25 -04:00 |
|
denise
|
84deda99c5
|
CC-4440: System -> Streams: Update and Save 'Stream 1/2/3' will make it invisible
-fixed
|
2012-09-14 17:35:14 -04:00 |
|
Rudi Grinberg
|
2faf299c73
|
Removed code duplication
|
2012-09-14 17:28:50 -04:00 |
|
Rudi Grinberg
|
092595eb9f
|
Removed profane logging message
|
2012-09-14 17:10:10 -04:00 |
|
Rudi Grinberg
|
7b1b271a2c
|
Reformatted sql to use heredocs
|
2012-09-14 17:09:05 -04:00 |
|
Rudi Grinberg
|
f2b07e4a83
|
alignment
|
2012-09-14 17:02:38 -04:00 |
|
Rudi Grinberg
|
67483f8bb2
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-14 17:01:45 -04:00 |
|
Rudi Grinberg
|
81dadb7f85
|
Removed annoying logging
|
2012-09-14 17:01:35 -04:00 |
|
Martin Konecny
|
4ea3d86121
|
remove unnecessary logging
|
2012-09-14 16:58:42 -04:00 |
|
Martin Konecny
|
39903be69a
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-14 16:51:48 -04:00 |
|
Martin Konecny
|
c84a608747
|
CC-4438: Station Time is always UTC time no matter what the time zone setting is
-fixed
|
2012-09-14 16:51:39 -04:00 |
|
Martin Konecny
|
3ced92db7a
|
CC-4415: Smart Block audio preview doesn't work
|
2012-09-14 16:51:14 -04:00 |
|
Rudi Grinberg
|
ec3e0a9b9f
|
Added todo
|
2012-09-14 16:50:28 -04:00 |
|
Rudi Grinberg
|
29909f0bd9
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-14 16:49:37 -04:00 |
|
Rudi Grinberg
|
bf651a96aa
|
cc-4431: Fixed isUserType
|
2012-09-14 16:47:55 -04:00 |
|
denise
|
ee98c8fba5
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-14 16:38:33 -04:00 |
|
denise
|
8ffaaaef25
|
-skip playable test if item is a smart block
|
2012-09-14 16:38:26 -04:00 |
|
Rudi Grinberg
|
ba08355c38
|
quick fix
|
2012-09-14 16:16:52 -04:00 |
|
Rudi Grinberg
|
76ba4bb6f0
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-14 16:03:03 -04:00 |
|
denise
|
4201176b3a
|
-small UI change
|
2012-09-14 15:59:34 -04:00 |
|
denise
|
da107f5120
|
-small UI fix
|
2012-09-14 15:55:55 -04:00 |
|
denise
|
0524e4e5d2
|
-implemented UI changes for playlist/block/webstream builder
|
2012-09-14 15:49:39 -04:00 |
|
Rudi Grinberg
|
05916a4d26
|
Code cleanup
|
2012-09-14 15:13:08 -04:00 |
|
Martin Konecny
|
198d15adc8
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-14 14:53:32 -04:00 |
|
Martin Konecny
|
78460703a2
|
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
-done
|
2012-09-14 14:53:25 -04:00 |
|
Rudi Grinberg
|
79ce7b572c
|
cc-4202: Fixed
|
2012-09-14 14:51:50 -04:00 |
|
Martin Konecny
|
6e239d08e9
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-14 14:43:15 -04:00 |
|
Martin Konecny
|
239a228175
|
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
-small fix
|
2012-09-14 14:36:31 -04:00 |
|
Martin Konecny
|
e3c1a3ac0e
|
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
-initial commit
|
2012-09-14 12:09:40 -04:00 |
|
denise
|
c7f4ede766
|
-implemented UI changes for library page
|
2012-09-14 12:08:51 -04:00 |
|
denise
|
f581b0536e
|
-fixed formatting
|
2012-09-14 11:18:13 -04:00 |
|
denise
|
bb38512bae
|
-fixed formatting
|
2012-09-14 10:52:50 -04:00 |
|
denise
|
97a0a82dc3
|
-renamed AIRTIME_DEV_README to AIRTIME_DEV_README_COLUMN_FILTER
-added new diff file for dataTables.ColVis.js
|
2012-09-13 17:19:08 -04:00 |
|
denise
|
c35c76351b
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 17:11:10 -04:00 |
|
denise
|
8f48544bb7
|
-implemented UI changes for Now Playing page
|
2012-09-13 17:10:38 -04:00 |
|
James
|
d93fcec490
|
CC-4424: Clicking "edit" on playlist allows you to preview tracks that should be disabled
- fixed
|
2012-09-13 17:09:10 -04:00 |
|
James
|
43503475fd
|
CC-4430: Block: Please don't count the removed files in when calculating how many files meet the criteria
- CRLF fix
|
2012-09-13 17:07:47 -04:00 |
|
James
|
d2f0b10552
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 17:05:56 -04:00 |
|
James
|
0b917f385e
|
CC-4430: Block: Please don't count the removed files in when calculating how many files meet the criteria
- fixed
|
2012-09-13 17:05:40 -04:00 |
|
Martin Konecny
|
d534f22ce4
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 16:11:15 -04:00 |
|
Martin Konecny
|
505b53fa16
|
cc-1665: fix broken checkin for webstream
|
2012-09-13 16:11:06 -04:00 |
|
Martin Konecny
|
da72c00f28
|
CC-4370: Transitioning between two webstreams: a hiccup in the stream is audible
-fixed
|
2012-09-13 16:10:17 -04:00 |
|
Rudi Grinberg
|
11ef613d1c
|
comment formatting
|
2012-09-13 15:16:46 -04:00 |
|
Rudi Grinberg
|
e31d570a1c
|
Sql formatting
|
2012-09-13 15:13:37 -04:00 |
|
Rudi Grinberg
|
f754d78687
|
Formatted comments and =
|
2012-09-13 15:12:54 -04:00 |
|
Rudi Grinberg
|
410a3406af
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 15:05:48 -04:00 |
|
Martin Konecny
|
14db5053b1
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 14:56:10 -04:00 |
|
Martin Konecny
|
203378e60a
|
More exception handling
|
2012-09-13 14:56:03 -04:00 |
|
Martin Konecny
|
b04afaec2c
|
CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
-detect flash fallback
|
2012-09-13 14:55:17 -04:00 |
|
Rudi Grinberg
|
8d08aa888b
|
cc-4421: Added special handling for files that mutagen returns None for.
|
2012-09-13 14:54:52 -04:00 |
|
James
|
b2d61f2402
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 14:22:27 -04:00 |
|
James
|
2293fcda01
|
CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
- fixed
|
2012-09-13 14:22:13 -04:00 |
|
Rudi Grinberg
|
4137602116
|
Cleaned up API controller
|
2012-09-13 14:21:15 -04:00 |
|
Rudi Grinberg
|
e984faf394
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 12:33:30 -04:00 |
|
Rudi Grinberg
|
8a2703c50d
|
Made method static
|
2012-09-13 12:33:15 -04:00 |
|
Martin Konecny
|
4fd9993108
|
CC-1710FLAC, BWF, AAC support
-Enable browser preview for new filetypes
|
2012-09-13 12:30:26 -04:00 |
|
Martin Konecny
|
fad6635a1a
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 12:28:30 -04:00 |
|
Martin Konecny
|
09d587e262
|
CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
-better file type detection
|
2012-09-13 12:28:10 -04:00 |
|
Rudi Grinberg
|
9dfb762bbe
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 12:27:17 -04:00 |
|
Rudi Grinberg
|
2b9e6081a4
|
Added log for exception
|
2012-09-13 12:27:04 -04:00 |
|
Martin Konecny
|
e95933525b
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 12:25:03 -04:00 |
|
Martin Konecny
|
983bbc5fc5
|
CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
-better file type detection
|
2012-09-13 12:24:53 -04:00 |
|
Rudi Grinberg
|
e043816bf4
|
Removed superfluous logging
|
2012-09-13 12:23:48 -04:00 |
|
Rudi Grinberg
|
3fb7526fbb
|
Shortened logging
|
2012-09-13 12:15:51 -04:00 |
|
Rudi Grinberg
|
b28116f622
|
removed empty space
|
2012-09-13 11:34:00 -04:00 |
|
Rudi Grinberg
|
d564b85e7c
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 11:12:32 -04:00 |
|
denise
|
771ca5e0b3
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 11:12:51 -04:00 |
|
denise
|
a779142a08
|
-fix commenting error
|
2012-09-13 11:12:39 -04:00 |
|
Rudi Grinberg
|
e2f8d8e0e7
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 11:10:43 -04:00 |
|
Rudi Grinberg
|
d409af2876
|
shortened logging
|
2012-09-13 11:07:29 -04:00 |
|
Rudi Grinberg
|
dced49c425
|
Removed unused variable
|
2012-09-13 10:52:58 -04:00 |
|
James
|
5067a304d9
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 10:49:33 -04:00 |
|
James
|
b6b93618e6
|
CC-4353: Numeric search fields in Library would benefit from format labels
- bug fix
|
2012-09-13 10:49:24 -04:00 |
|
Martin Konecny
|
4fc278a55a
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 10:42:59 -04:00 |
|
Martin Konecny
|
a396136600
|
bootstrap.css file
|
2012-09-13 10:42:53 -04:00 |
|
Rudi Grinberg
|
55993352bf
|
Removed unused variables.
|
2012-09-13 10:35:24 -04:00 |
|
Rudi Grinberg
|
52882ef938
|
Added mp4 removed aac.
|
2012-09-13 10:35:13 -04:00 |
|
Rudi Grinberg
|
8eda4a7035
|
Subtle bug fixed in smartPrepareAndExecute.
|
2012-09-13 10:34:15 -04:00 |
|
denise
|
e1403d45bd
|
CC-4368: Unused local variables in Airtime Controllers. Should be removed.
-done
|
2012-09-13 10:32:33 -04:00 |
|
Rudi Grinberg
|
24b3fb7e8a
|
Remvod unused CC_CONFIG, reformatted some code
|
2012-09-13 10:26:50 -04:00 |
|
Martin Konecny
|
1f3bab2458
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-12 23:06:19 -04:00 |
|
Martin Konecny
|
54d7f496d9
|
add bootstrap.js to bootstrap.php
|
2012-09-12 23:06:05 -04:00 |
|
Rudi Grinberg
|
cc88a9a8e3
|
Fixed a lot of unused variables
|
2012-09-12 18:36:27 -04:00 |
|
Martin Konecny
|
4998a63a6a
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-12 17:34:32 -04:00 |
|
Martin Konecny
|
1c293839da
|
CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track
-disable preview icon
|
2012-09-12 17:32:19 -04:00 |
|
Rudi Grinberg
|
536fdabb77
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-12 17:27:08 -04:00 |
|
denise
|
3b43efefe0
|
CC-4413: Unused local variables in models.
-done
|
2012-09-12 17:26:41 -04:00 |
|
Rudi Grinberg
|
8e91c515f0
|
cc-4397: Fixed handling for bad metadata.
|
2012-09-12 17:26:37 -04:00 |
|
Vladimir
|
8938eaa637
|
Added missind Bootstrap CSS (bootstrap_custom.css)
|
2012-09-12 23:18:37 +02:00 |
|
Rudi Grinberg
|
e708f60f68
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-12 17:08:58 -04:00 |
|
denise
|
9c8f4fe404
|
CC-4414: Unused local variables in forms
-done
|
2012-09-12 17:09:00 -04:00 |
|
Rudi Grinberg
|
af8c813f35
|
Documented unimplemented interface methods
|
2012-09-12 17:08:51 -04:00 |
|
denise
|
32b1ee95b7
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-12 16:29:35 -04:00 |
|
denise
|
5ac6877e60
|
CC-4362: Smart Block: error for multiple criteria
-fixed
|
2012-09-12 16:29:26 -04:00 |
|
Rudi Grinberg
|
88604eabcc
|
Removed unused variable
|
2012-09-12 16:24:49 -04:00 |
|
Rudi Grinberg
|
15355f9e30
|
Formatted comment
|
2012-09-12 16:12:00 -04:00 |
|
Rudi Grinberg
|
6e8313a395
|
Fixed typo in SQL missing ,
|
2012-09-12 16:10:56 -04:00 |
|
Rudi Grinberg
|
db5dbab086
|
Removed unused local variables
|
2012-09-12 16:09:53 -04:00 |
|
Rudi Grinberg
|
414d1fa511
|
PDO'd UpdateBroadcastedStatus
|
2012-09-12 16:09:28 -04:00 |
|
Rudi Grinberg
|
643c00418a
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-12 15:59:53 -04:00 |
|
Rudi Grinberg
|
64a1dade9b
|
Massive formatting of SQL
|
2012-09-12 15:59:46 -04:00 |
|
Martin Konecny
|
20f5fe6480
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
airtime_mvc/application/models/Block.php
airtime_mvc/public/css/styles.css
|
2012-09-12 15:55:43 -04:00 |
|
Martin Konecny
|
87fb9998dd
|
increase mem warning limit to 30MB
|
2012-09-12 15:44:26 -04:00 |
|
Martin Konecny
|
a418f5777c
|
CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track
-initial commit
|
2012-09-12 15:43:50 -04:00 |
|
Rudi Grinberg
|
9e7e9639ae
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-12 15:42:09 -04:00 |
|
Rudi Grinberg
|
2c1acf8b17
|
Removed reference to CC_CONFIG
|
2012-09-12 15:42:00 -04:00 |
|
Rudi Grinberg
|
6fc8df9226
|
Here doc'd sql
|
2012-09-12 15:39:02 -04:00 |
|
Rudi Grinberg
|
b2737688cc
|
Added space to sql squery
|
2012-09-12 15:36:37 -04:00 |
|
Vladimir
|
77824afdd3
|
Added Bootstrap CSS, images and JS for new buttons and dropdown menues
|
2012-09-12 21:23:25 +02:00 |
|
Rudi Grinberg
|
d1b4ce3de6
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-12 15:19:57 -04:00 |
|
Rudi Grinberg
|
a432665146
|
Changed to heredoc
|
2012-09-12 15:19:39 -04:00 |
|
denise
|
07ac651f71
|
- move title and creator to top of library column view
|
2012-09-12 15:09:07 -04:00 |
|
Rudi Grinberg
|
92532cb708
|
cc-4394: Added m4a
|
2012-09-12 14:54:11 -04:00 |
|
denise
|
b43a1e3032
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-12 14:27:29 -04:00 |
|
denise
|
54d18b7bcd
|
CC-4382: Editing the color of a repeating show gives error message
-fixed
|
2012-09-12 14:27:17 -04:00 |
|
Rudi Grinberg
|
d62ba61ea6
|
Formatting schedule.php
|
2012-09-12 14:19:02 -04:00 |
|
Rudi Grinberg
|
806fd83ccc
|
Reformatted schedule
|
2012-09-12 14:14:55 -04:00 |
|
Rudi Grinberg
|
dd68f6d945
|
Changed schedule to use james' helper function
|
2012-09-12 13:44:20 -04:00 |
|
Rudi Grinberg
|
7f9642dcd2
|
Fixed typo
|
2012-09-12 12:18:06 -04:00 |
|
Rudi Grinberg
|
195008d1e4
|
more pdo fix
|
2012-09-12 12:16:53 -04:00 |
|
Rudi Grinberg
|
845ec23fa3
|
fixed booboo
|
2012-09-12 12:15:47 -04:00 |
|
Rudi Grinberg
|
ad75849a6f
|
Fixed array_map over query instances
|
2012-09-12 12:09:38 -04:00 |
|
Rudi Grinberg
|
d194ff1809
|
PDO'd a few things missed before in cancelShow()
|
2012-09-12 12:05:03 -04:00 |
|
Rudi Grinberg
|
6d32c03351
|
getHosts() changed sql style
|
2012-09-12 12:00:53 -04:00 |
|
Rudi Grinberg
|
cebfdd6558
|
Changed sql string to heredoc
|
2012-09-12 11:59:27 -04:00 |
|
Rudi Grinberg
|
6519512924
|
fixed array_map over iterable
|
2012-09-12 11:54:37 -04:00 |
|
Rudi Grinberg
|
f47593575c
|
switch defaults for verbose stack trace
|
2012-09-12 11:51:11 -04:00 |
|
Rudi Grinberg
|
8b433de006
|
Made verbose trace opt out.
|
2012-09-12 11:45:08 -04:00 |
|
Rudi Grinberg
|
d69391d2dd
|
Formatted Block.php
|
2012-09-12 11:35:28 -04:00 |
|
Rudi Grinberg
|
7b41d94352
|
Reforamtted Block.php
|
2012-09-12 11:31:41 -04:00 |
|
Rudi Grinberg
|
e0286b112f
|
cc-4292: Removed unnecessary code related to md5.
|
2012-09-12 11:10:25 -04:00 |
|
Rudi Grinberg
|
6b8cb52572
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 18:23:01 -04:00 |
|
Rudi Grinberg
|
faa04a2f5c
|
Refactored RecallByX
|
2012-09-11 18:22:46 -04:00 |
|
Rudi Grinberg
|
975830ff90
|
Removed wrong comments
|
2012-09-11 18:22:24 -04:00 |
|
Rudi Grinberg
|
77215d175c
|
More verbose exceptions
|
2012-09-11 18:22:12 -04:00 |
|
Rudi Grinberg
|
e2d69df4a6
|
Removed unused code
|
2012-09-11 17:51:39 -04:00 |
|
Rudi Grinberg
|
dc91db1f46
|
formatting
|
2012-09-11 17:48:08 -04:00 |
|
denise
|
acaf5f76c2
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 17:40:36 -04:00 |
|
denise
|
ceccb547c2
|
CC-4355: Smart block criteria do not match library columns or metadata editor
-put library column filter in alphabetical order to match smart block criteria order
|
2012-09-11 17:39:47 -04:00 |
|
Rudi Grinberg
|
bc5718ec09
|
logging removed
|
2012-09-11 17:39:28 -04:00 |
|
Rudi Grinberg
|
cc3ba90ec3
|
added debugging
|
2012-09-11 17:32:26 -04:00 |
|
Rudi Grinberg
|
32297111f5
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 17:23:19 -04:00 |
|
Rudi Grinberg
|
b8db419717
|
All hands for America. Added robust debugging
|
2012-09-11 17:23:07 -04:00 |
|
Rudi Grinberg
|
fc8b2096af
|
Added debugging for Clifford
|
2012-09-11 17:21:20 -04:00 |
|
denise
|
c6ab540120
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 17:19:12 -04:00 |
|
denise
|
f1b8ada1e6
|
- removed logging
|
2012-09-11 17:19:02 -04:00 |
|
denise
|
58d39d74d4
|
CC-4355: Smart block criteria do not match library columns or metadata editor
-fixed
|
2012-09-11 17:18:17 -04:00 |
|
Rudi Grinberg
|
72a424bb7e
|
Added todo to fix crust
|
2012-09-11 16:25:45 -04:00 |
|
Rudi Grinberg
|
728a0dd736
|
Added todo documenting slight inefficiency
|
2012-09-11 16:24:59 -04:00 |
|
Rudi Grinberg
|
0dd38920a3
|
Cosmetic changes.
|
2012-09-11 16:20:59 -04:00 |
|
Rudi Grinberg
|
51d4f35c55
|
Removed unused global variable
|
2012-09-11 16:15:15 -04:00 |
|
Rudi Grinberg
|
d95731f2f3
|
Reformatted sql to use heredoc
|
2012-09-11 16:13:39 -04:00 |
|
Rudi Grinberg
|
e664707076
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 16:03:01 -04:00 |
|
Rudi Grinberg
|
355b0ad35d
|
cc-4292: Initial fix of the MD5 issue. Now MD5's are only collected not really used for anything. Moves are handled completely
through paths.
|
2012-09-11 16:02:39 -04:00 |
|
denise
|
131a723ed2
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 15:10:53 -04:00 |
|
denise
|
bc355fe7a7
|
- webstream controller wasn't assigning webstream object properly
|
2012-09-11 15:10:30 -04:00 |
|
James
|
b692abb9ae
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 15:10:17 -04:00 |
|
James
|
1ba24a8d0b
|
CC-4353: Numeric search fields in Library would benefit from format labels
- done
|
2012-09-11 15:09:57 -04:00 |
|
denise
|
c56d3e47ef
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 15:02:23 -04:00 |
|
denise
|
8af91f3901
|
-webstream controller wasn't setting webstream object properly
|
2012-09-11 15:02:12 -04:00 |
|
Rudi Grinberg
|
6c1d7fedc1
|
Made Loggging::warn proper.
|
2012-09-11 14:34:03 -04:00 |
|
Rudi Grinberg
|
57b59a3290
|
Cleaned up preference.php
|
2012-09-11 14:33:50 -04:00 |
|
Rudi Grinberg
|
1304111682
|
Shortened code with if -> ?
|
2012-09-11 14:10:13 -04:00 |
|
Rudi Grinberg
|
751ed8276d
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 14:05:54 -04:00 |
|
Rudi Grinberg
|
1afdcb8c2d
|
Shortened an if statement to p ? x : y
|
2012-09-11 14:05:40 -04:00 |
|
Martin Konecny
|
c61f5d1972
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 14:04:53 -04:00 |
|
Martin Konecny
|
0fec175681
|
CC-1710: FLAC, BWF, AAC support
-context menu for mp4's having a problem
|
2012-09-11 14:04:45 -04:00 |
|
Rudi Grinberg
|
63b1ead363
|
Undefined index error fixed by returning a default error if none is set in the database.
|
2012-09-11 13:56:48 -04:00 |
|
Rudi Grinberg
|
e1f4010346
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 12:03:56 -04:00 |
|
Martin Konecny
|
bcc095e924
|
CC-4389: Convert all PHP errors to throw exceptions instead
-don't throw exception for suppressed errors.
|
2012-09-11 12:03:52 -04:00 |
|
Rudi Grinberg
|
1e1b5919a2
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 11:57:13 -04:00 |
|
Rudi Grinberg
|
9b0e5a6b2f
|
removing unused file.
|
2012-09-11 11:53:36 -04:00 |
|
denise
|
45795cfbb6
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 11:22:25 -04:00 |
|
denise
|
49f2a31be1
|
- added advanced search validation for owner and last played time
|
2012-09-11 11:22:12 -04:00 |
|
Martin Konecny
|
a06eeaa76a
|
-fix silly mistake after refactoring
again
|
2012-09-11 11:20:42 -04:00 |
|
Martin Konecny
|
41d9b2490a
|
-fix silly mistake after refactoring
|
2012-09-11 11:14:47 -04:00 |
|
Martin Konecny
|
245d9a95d0
|
CC-4389: Convert all PHP errors to throw exceptions instead
-don't throw exception for suppressed errors.
|
2012-09-11 11:12:58 -04:00 |
|
Martin Konecny
|
1635842b81
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 00:51:08 -04:00 |
|
Martin Konecny
|
8db4c94af1
|
CC-4389: Convert all PHP errors to throw exceptions instead
-echo to stdout as well
|
2012-09-11 00:50:56 -04:00 |
|
denise
|
ba89982b17
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-10 18:09:19 -04:00 |
|
denise
|
4239a49d58
|
- advanced search validation UI cleanup
|
2012-09-10 18:09:13 -04:00 |
|
James
|
585ee579d6
|
CC-4005: Tag files with Last Played date and number of times played
- fixed CRLF
|
2012-09-10 18:07:12 -04:00 |
|
James
|
645593f954
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/Webstream.php
|
2012-09-10 18:04:35 -04:00 |
|
James
|
ba37bb4327
|
CC-4005: Tag files with Last Played date and number of times played
- done for files and webstreams
|
2012-09-10 18:01:36 -04:00 |
|
denise
|
c536169fb3
|
-original dataTables.columnFilter.js
|
2012-09-10 17:58:31 -04:00 |
|
denise
|
fb7de88a30
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-10 17:54:45 -04:00 |
|
denise
|
2474d50e9f
|
CC-4379: Playlist Builder: Click Save will cause playlist disappear from right side
-fixed
|
2012-09-10 17:53:55 -04:00 |
|
Martin Konecny
|
e275e286cb
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-10 17:43:40 -04:00 |
|
Martin Konecny
|
8bbc0bff94
|
CC-4389: Convert all PHP errors to throw exceptions instead
-echo to stdout as well
|
2012-09-10 17:43:29 -04:00 |
|
denise
|
bba001c0db
|
-diff between original dataTables.columnFilter.js and our modified version
|
2012-09-10 17:41:54 -04:00 |
|
Martin Konecny
|
726cadf5ce
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-10 17:40:19 -04:00 |
|
denise
|
def513d200
|
-fixed commit problem
|
2012-09-10 17:38:05 -04:00 |
|
Martin Konecny
|
ade4bcf958
|
CC-4389: Convert all PHP errors to throw exceptions instead
-fixed
|
2012-09-10 17:36:55 -04:00 |
|
denise
|
fe0b6cd32b
|
-changed windows line endings to unix
|
2012-09-10 17:36:51 -04:00 |
|
denise
|
80bdc95cd5
|
-redoing a commit undo
|
2012-09-10 17:24:18 -04:00 |
|
Martin Konecny
|
d8b0de4ffa
|
CC-4387: NULL is set to default Station Name
-fixed
|
2012-09-10 17:17:52 -04:00 |
|
denise
|
bca7fbf50e
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-10 17:17:19 -04:00 |
|
denise
|
8520141240
|
CC-4282: Library ->"Uploaded From" -> Submitting data in wrong format causes "Processing ..." message pop up for a while
-implemented advanced search validation
-data only gets sent to server if all fields are valid
|
2012-09-10 17:17:09 -04:00 |
|
Martin Konecny
|
87ac1744f7
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-10 16:54:51 -04:00 |
|
Martin Konecny
|
5292137430
|
-return json as data type for schedule action
|
2012-09-10 16:54:42 -04:00 |
|
Rudi Grinberg
|
43bef4939e
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-10 16:30:38 -04:00 |
|
Rudi Grinberg
|
4fe8407659
|
Adde configurable value for list_all_files
|
2012-09-10 16:29:17 -04:00 |
|
Rudi Grinberg
|
af225418c4
|
Removed empty constructor.
|
2012-09-10 16:08:21 -04:00 |
|
Rudi Grinberg
|
c90ead9ef2
|
cc-4359: fixed at the cost of other issues that will be fixed later (restarting media monitor).
|
2012-09-10 16:08:08 -04:00 |
|
James
|
dfb1ffed79
|
CC-4319: Calendar: Remove all contents doesn't work
- fixed
|
2012-09-10 15:42:05 -04:00 |
|
James
|
db0a34b35c
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-10 15:37:36 -04:00 |
|
James
|
67b295a553
|
CC-4367: Media Library -> Search: Please enable searching Bit Rate by Kbps
- done
|
2012-09-10 15:37:22 -04:00 |
|
Rudi Grinberg
|
97317c0195
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-10 15:35:46 -04:00 |
|
Martin Konecny
|
e85ea5c683
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-10 15:35:42 -04:00 |
|
Martin Konecny
|
3107286799
|
CC-4370: Transitioning between two webstreams a hiccup in the stream is audible
|
2012-09-10 15:35:32 -04:00 |
|
Rudi Grinberg
|
0c1c4aa27d
|
Put sql in heredoc for better readability
|
2012-09-10 15:35:30 -04:00 |
|
Rudi Grinberg
|
9d825a55b3
|
Crap comment removed
|
2012-09-10 15:32:31 -04:00 |
|
Rudi Grinberg
|
2e0b29b14e
|
Removed unused code
|
2012-09-10 15:31:56 -04:00 |
|
Rudi Grinberg
|
987b65af28
|
cc-4347: Extra pdo work
|
2012-09-10 14:53:26 -04:00 |
|
James
|
0ab08af48f
|
CC-4380: Show ReplayGain value in the Library page
- done
|
2012-09-10 14:37:38 -04:00 |
|
denise
|
60cf74a602
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-10 14:16:52 -04:00 |
|
denise
|
957e644829
|
-fixed javascript error in datatables.js
|
2012-09-10 14:16:36 -04:00 |
|
Rudi Grinberg
|
b085f9ef67
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-10 14:15:07 -04:00 |
|
Rudi Grinberg
|
e85a83d045
|
Fixed pdo
|
2012-09-10 14:14:44 -04:00 |
|
James
|
4d3c624607
|
CC-4380: Show ReplayGain value in the Library page
- temp commit
|
2012-09-10 12:35:32 -04:00 |
|
Martin Konecny
|
e5de4f560d
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-10 12:18:41 -04:00 |
|
Martin Konecny
|
ac8610ca06
|
CC-4385: Problem with mono streams for stream rebroadcasting
-fixed
|
2012-09-10 12:18:19 -04:00 |
|
Rudi Grinberg
|
567a8a2635
|
cc-4347: Fixed typo
|
2012-09-10 12:04:33 -04:00 |
|
Rudi Grinberg
|
8340db3ce9
|
Added error handing todo
|
2012-09-10 11:53:22 -04:00 |
|
Rudi Grinberg
|
a0b3742758
|
cc-4347: resizeShow pdo'd
|
2012-09-10 11:49:56 -04:00 |
|
Rudi Grinberg
|
3df4c8d65a
|
cc-4347: deleteRebroadcasts and GetEndTimeOfNextShowWithLiveDJ pdo'd
|
2012-09-10 11:39:22 -04:00 |
|
Rudi Grinberg
|
e2c2f67fbb
|
cc-4347: GetShowInstanceCount() pdo'd
|
2012-09-10 11:29:28 -04:00 |
|
Rudi Grinberg
|
375e89169e
|
Removed code duplication
|
2012-09-10 11:27:39 -04:00 |
|
Rudi Grinberg
|
53de942c2b
|
cc-4347: GetNextShowInstance PDO'd.
|
2012-09-10 11:25:44 -04:00 |
|
Rudi Grinberg
|
de86b904a5
|
Fixed extra cast.
|
2012-09-10 11:25:21 -04:00 |
|
Rudi Grinberg
|
8c3be7393a
|
cc-4347: GetCurrentShowInstance got PDO nuked.
|
2012-09-10 11:17:45 -04:00 |
|
Rudi Grinberg
|
57aae73074
|
cc-4347: PDO'd: GetLastShowInstance
|
2012-09-10 11:06:34 -04:00 |
|
Rudi Grinberg
|
737c3fcbae
|
Todo for consistency.
|
2012-09-10 11:06:11 -04:00 |
|
Rudi Grinberg
|
a3d4b8c722
|
Todo for consistency.
|
2012-09-10 11:05:30 -04:00 |
|
Rudi Grinberg
|
35c8b50d96
|
cc-4347: PDO'd Show create
|
2012-09-07 18:23:55 -04:00 |
|
Rudi Grinberg
|
a479a11c8f
|
Removed crazy handling of flac.
|
2012-09-07 18:23:14 -04:00 |
|
Rudi Grinberg
|
78b0dcedfc
|
Added smartPrepareAndExecute. Warning: Test before using
|
2012-09-07 17:58:16 -04:00 |
|
Martin Konecny
|
33035a4212
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-07 17:38:35 -04:00 |
|
Martin Konecny
|
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 |
|
Rudi Grinberg
|
f1487ba69d
|
cc-4347: Fixed missing AND clause
|
2012-09-07 17:23:32 -04:00 |
|
Rudi Grinberg
|
b4748a3b1f
|
cc-4347: Fixed typo
|
2012-09-07 17:15:49 -04:00 |
|
Rudi Grinberg
|
a8e7cb392a
|
Sexification 2
|
2012-09-07 16:59:35 -04:00 |
|
Rudi Grinberg
|
7fa17a644e
|
Sexification
|
2012-09-07 16:58:49 -04:00 |
|
Rudi Grinberg
|
79513356fb
|
cc-4347: PDO'd getShows
|
2012-09-07 16:53:16 -04:00 |
|
Martin Konecny
|
101c28f9c3
|
remove unused variable (PHP 5.4 warning)
|
2012-09-07 16:50:52 -04:00 |
|
Martin Konecny
|
3c0541f138
|
fix function camelcase
|
2012-09-07 16:50:33 -04:00 |
|
Rudi Grinberg
|
87787081ce
|
Removed unused optional argument.
|
2012-09-07 16:26:05 -04:00 |
|
Rudi Grinberg
|
8f3c7e8eba
|
cc-4347: PDO'd getInstanceOnDate()
|
2012-09-07 15:29:30 -04:00 |
|
Rudi Grinberg
|
26a3e35de0
|
Refactored getMaxLengths()
|
2012-09-07 15:14:33 -04:00 |
|
Rudi Grinberg
|
27c1361fbb
|
Small refactoring to use getter instead of accessing private variable.
|
2012-09-07 15:12:46 -04:00 |
|
Martin Konecny
|
089e896552
|
fix camelCase of function
|
2012-09-07 14:34:58 -04:00 |
|
Rudi Grinberg
|
49a85afc06
|
Refactor
|
2012-09-07 14:33:08 -04:00 |
|
Rudi Grinberg
|
5ee24ceb23
|
cc-4347: PDO. getAllFutureInstanceIds()
|
2012-09-07 14:30:59 -04:00 |
|
Rudi Grinberg
|
82f267310e
|
cc-4347: Undid refactoring
|
2012-09-07 14:18:40 -04:00 |
|
Rudi Grinberg
|
efb35dd9d6
|
cc-4347: PDO'd deleteAllRebroadcasts()
|
2012-09-07 12:29:42 -04:00 |
|
Rudi Grinberg
|
ad776ff8f3
|
cc-4347: PDO deleteAllInstances()
|
2012-09-07 12:22:49 -04:00 |
|
Rudi Grinberg
|
727769b376
|
cc-4347: PDO getRepeatingDate()
|
2012-09-07 12:18:13 -04:00 |
|
Rudi Grinberg
|
23ccd75290
|
cc-4347: PDO getRbroadcastsRelative()
|
2012-09-07 12:10:07 -04:00 |
|
Rudi Grinberg
|
cfe0d7aa0c
|
Unrelated refactorings of Show.php. Added TODO for more later work.
|
2012-09-07 12:07:29 -04:00 |
|
Rudi Grinberg
|
2a00e58610
|
cc-4347: PDO like a boss.
|
2012-09-07 11:58:57 -04:00 |
|
Rudi Grinberg
|
22a250b5d2
|
cc-4347: PDOOO
|
2012-09-07 11:54:32 -04:00 |
|
Rudi Grinberg
|
92682b9f89
|
Added TODO about unused code
|
2012-09-07 11:39:58 -04:00 |
|
Rudi Grinberg
|
f61463b8ba
|
premature optimization
|
2012-09-07 11:20:23 -04:00 |
|
Rudi Grinberg
|
c28f3af9cf
|
removed unused code. reformatted some comments.
|
2012-09-07 11:18:10 -04:00 |
|
Rudi Grinberg
|
d805995e72
|
cc-4347: ~~~~PDO~~~~~~
|
2012-09-07 11:12:26 -04:00 |
|
James
|
95cd5a7dde
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-06 17:46:58 -04:00 |
|
James
|
0f1cb61a13
|
CC-4330: Media Library - > Search: Please change the way to search by owner
- fixed
|
2012-09-06 17:46:45 -04:00 |
|
Rudi Grinberg
|
33326ec052
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-06 17:23:58 -04:00 |
|
Rudi Grinberg
|
73ba643563
|
cc-4347: _-=~^PDO^~=-_
|
2012-09-06 17:23:39 -04:00 |
|
James
|
d9af434138
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-06 16:46:35 -04:00 |
|
James
|
7d3ac8eb07
|
CC-4346: Prepared statements - part 2
- done
|
2012-09-06 16:46:22 -04:00 |
|
Martin Konecny
|
83415cf298
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-06 16:18:37 -04:00 |
|
Martin Konecny
|
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 |
|
Rudi Grinberg
|
f30507fce6
|
cc-4347: pdo
|
2012-09-06 16:17:14 -04:00 |
|
Rudi Grinberg
|
2b659f9c91
|
Sexified.
|
2012-09-06 16:16:53 -04:00 |
|
Rudi Grinberg
|
1852843f96
|
cc-4347: ~~~~PDO~~~~~~
|
2012-09-06 15:55:29 -04:00 |
|
Rudi Grinberg
|
977c664bfe
|
cc-4347: Fixed table quoting
|
2012-09-06 15:49:13 -04:00 |
|
Rudi Grinberg
|
ad6e601d5e
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-06 15:47:20 -04:00 |
|
Rudi Grinberg
|
0fdf1e5e86
|
cc-4347: PDO
|
2012-09-06 15:47:07 -04:00 |
|
Martin Konecny
|
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 |
|
Rudi Grinberg
|
5c13223315
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-06 14:48:55 -04:00 |
|
Rudi Grinberg
|
3f1d979c67
|
cc-4347: PDO PDO PDO!!
|
2012-09-06 14:41:40 -04:00 |
|
denise
|
8534cf16d8
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-06 14:30:20 -04:00 |
|
denise
|
8125d6b553
|
CC-4344: Conductor column not available in library view
-done
|
2012-09-06 14:30:09 -04:00 |
|
Rudi Grinberg
|
264e909d5a
|
cc-4347: PDOOOOOOOOOOOOOOOO
|
2012-09-06 14:17:24 -04:00 |
|
Rudi Grinberg
|
cd9e89560d
|
cc-4347: small correction.
|
2012-09-06 14:16:10 -04:00 |
|
Rudi Grinberg
|
a39116c687
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-06 14:14:19 -04:00 |
|
Rudi Grinberg
|
45729f16e7
|
cc-4347: PDOOOOOOOOOOOOOOOO
|
2012-09-06 14:14:05 -04:00 |
|
denise
|
46d87a2868
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-06 14:11:08 -04:00 |
|
denise
|
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 |
|
Martin Konecny
|
acf06e289f
|
Try catching more errors into zendphp.log
|
2012-09-06 14:01:54 -04:00 |
|
Martin Konecny
|
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 |
|
Martin Konecny
|
eae48cf47d
|
CC-4348: Prepared statements - part 4
-User.php
|
2012-09-06 12:54:44 -04:00 |
|
Rudi Grinberg
|
d196666c31
|
got rid of print statements possible interfering with view
|
2012-09-06 12:52:11 -04:00 |
|
Rudi Grinberg
|
744577a8b5
|
Removed bad line break
|
2012-09-06 12:38:55 -04:00 |
|
Rudi Grinberg
|
3f898bfc3a
|
Fixed wrong function name
|
2012-09-06 12:33:04 -04:00 |
|
denise
|
7a3c2db2bf
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-06 12:24:07 -04:00 |
|
denise
|
6cb8dd35e2
|
- fixed sql error
|
2012-09-06 12:23:53 -04:00 |
|
Rudi Grinberg
|
f4591f825f
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-06 12:17:39 -04:00 |
|
Rudi Grinberg
|
56527e727c
|
extra debuggin
|
2012-09-06 12:17:18 -04:00 |
|
denise
|
8d1003bbbe
|
CC-4303: Library Tab grays out after certain scenario with normal playlist
-fixed
|
2012-09-06 11:48:00 -04:00 |
|
denise
|
35a5e38aca
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-06 11:21:47 -04:00 |
|
denise
|
9b29f5e701
|
CC-4345: Prepared statements - part 1
-modified Datatables.php to use Application_Common_Database::prepareAndExecute()
|
2012-09-06 11:21:36 -04:00 |
|
Rudi Grinberg
|
9079f29584
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-06 11:15:12 -04:00 |
|
Rudi Grinberg
|
bed360cd3e
|
Formatting
|
2012-09-06 11:15:01 -04:00 |
|
denise
|
b25ce921ee
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-06 11:11:15 -04:00 |
|
denise
|
f06b3e2c36
|
CC-4345: Prepared statements - part 1
-modified Block.php to use Application_Common_Database::prepareAndExecute()
|
2012-09-06 11:11:09 -04:00 |
|
Rudi Grinberg
|
f3ff9cc461
|
cc-4360: Fix for this bug. Table name was being quoted needlessly.
|
2012-09-06 11:03:24 -04:00 |
|
Rudi Grinberg
|
88c5ef484f
|
Formatting
|
2012-09-06 10:38:14 -04:00 |
|
Rudi Grinberg
|
5481191730
|
added type hint
|
2012-09-05 18:01:20 -04:00 |
|
Rudi Grinberg
|
b112a0fe2b
|
cc-4347: PDOOOOOOOOOOOOO
|
2012-09-05 17:59:18 -04:00 |
|
denise
|
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 |
|
denise
|
26c2c2c0d1
|
CC-4345: Prepared statements - part 1
-added extra parameter to prepareAndExecute()
|
2012-09-05 17:52:53 -04:00 |
|
Rudi Grinberg
|
8be51d5bf4
|
sexified code
|
2012-09-05 17:52:27 -04:00 |
|
Rudi Grinberg
|
73e152ebcf
|
added type annotation again
|
2012-09-05 17:51:50 -04:00 |
|
Rudi Grinberg
|
aa6e061118
|
conflicts merged
|
2012-09-05 17:51:16 -04:00 |
|
Rudi Grinberg
|
d2e883da7a
|
Added type annotation
|
2012-09-05 17:48:15 -04:00 |
|
Rudi Grinberg
|
0385c008ce
|
cc-4347: PDO00!!!
|
2012-09-05 17:46:48 -04:00 |
|
Martin Konecny
|
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 |
|
Martin Konecny
|
139950fac2
|
PSR fixes
|
2012-09-05 17:44:09 -04:00 |
|
Martin Konecny
|
43f5258219
|
CC-4348: Prepared statements - part 4
-User.php
|
2012-09-05 17:43:45 -04:00 |
|
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 |