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 |
|
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 |
|
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 |
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 |
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 |
|
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 |
|
Rudi Grinberg
|
7a958ec8b6
|
formatting
|
2012-09-18 15:52:16 -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 |
|
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
|
72e6ee35fa
|
cc-4304: Temporarily fixed
|
2012-09-18 15:26:43 -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
|
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 |
|
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 |
|
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 |
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
James
|
396b529162
|
- UI interation of advanced search
|
2012-09-17 11:23:38 -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
|
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
|
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
|
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 |