eae93008b4
CC-5589: SQL error when adding/moving a scheduled item
...
Error was occuring when a moved item didn't exist in a linked show instance
Error was also occuring when trying to insert item into a schedule localtion
that does not exist in a linked instance.
Fixed by skipping the move action if the file does not exist in a linked instance,
cleaning up the position numbers after deleting schedule items, and by
setting the insert time to the show start time in a linked instance is empty
2013-12-02 16:40:15 -05:00
89feb3d0fb
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-11-22 09:39:37 -05:00
52f0d5a13b
CC-5570: Tracks get scheduled ahead of their show start time
2013-11-22 09:39:19 -05:00
757e35aaf9
CC-5555 : Implement simple caching for preferences
...
comment out logging to not flood logs.
2013-11-11 17:22:55 -05:00
b8a084998e
CC-5555 : Implement simple caching for preferences
...
cache key creation change.
2013-11-11 17:08:15 -05:00
f615e176e2
CC-5555 : Implement simple caching for preferences
...
better to include the key in the error message
2013-11-11 16:36:21 -05:00
f69dd123ca
CC-5555 : Implement simple caching for preferences
...
making sure locale/timezone is returned properly in generic calls.
2013-11-11 16:32:43 -05:00
06323a40fd
CC-5555 : Implement simple caching for preferences
...
fixing up code so user id is never passed in manually to a preference getter.
2013-11-11 16:20:51 -05:00
f45708682f
CC-5555 : Implement simple caching for preferences
...
using apc to save/fetch preferences to/from a cache.
2013-11-11 15:07:13 -05:00
24663d9851
Merge branch '24hourfileimport' into 2.5.x
2013-10-16 17:29:22 -04:00
02dbde82ec
CC-5429 : importing file > 24 hours doesn't work
2013-10-16 17:27:40 -04:00
0d74d744da
Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x
2013-10-16 16:49:15 -04:00
fa5c1018bf
CRLF
2013-10-16 16:01:30 -04:00
60cbd15381
CC-5428 : Ordering by length not working
2013-10-16 15:56:32 -04:00
109b313d37
CC-5424 : Same webstream playing will switch off ON AIR light
2013-10-16 12:26:39 -04:00
b62fde46e7
CC-5407: Scheduling problem with global crossfade
...
Sometimes we set a flag to not apply the global crossfade value when inserting tracks.
This flag needs to get reset when more than one track is getting inserted or when
inserting an item into a linked show
2013-10-15 15:20:58 -04:00
73e5fa8a90
CC-5410 : Now playing icon should not lag to show up on calendar
2013-10-11 18:15:12 -04:00
c85833239c
CC-5379: adding a file after a gap in now playing - starts too early
...
Fixed the start time in cc_schedule
Track still starts playing later than cue in (CC-5019)
2013-10-10 12:11:23 -04:00
febadd08b9
Updated comment to explain newer repeat types
2013-10-10 10:43:45 +01:00
ff28daf28e
CC-5378: Subseconds are gone from cc_schedule calulations
...
Formatting error
2013-10-07 16:58:57 -04:00
c707967567
CRLF
2013-10-02 11:25:40 -04:00
faa6c7210c
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-02 11:25:08 -04:00
4d01e3b11f
CC-5347 : isScheduled doesn't work for webstreams
2013-10-02 11:24:48 -04:00
3d9bc85fa0
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-01 08:49:10 -04:00
1fa13eed13
CRLF
2013-09-30 13:59:08 -04:00
7d739a0f66
CC-5316 : Playout History: Doesn't support webstream
...
adding the webstream metadata to the history table.
2013-09-30 13:56:27 -04:00
af03502592
CC-5323: User's Timezone Can Improperly Edit Show
...
-added comments to timezone getters and setters in Prefences model
to reduce confusion on station timezone and user timezone
2013-09-25 16:22:30 -04:00
107263ae20
CC-5323: User's Timezone Can Improperly Edit Show
2013-09-25 16:22:30 -04:00
577bbf14b6
Remove swear words from source code
2013-09-23 16:16:51 +01:00
ae1c41e4ce
CC-5333 : Rebroadcast Shows are not created
2013-09-23 12:20:10 +02:00
682a37894b
Merge branch 'ryerson-history' into 2.5.x-saas
...
Conflicts:
airtime_mvc/application/views/scripts/menu.phtml
2013-09-02 15:52:43 -04:00
60bf334aeb
Merge branch '2.4.x' into 2.4.x-saas
2013-09-02 15:46:25 -04:00
075342c637
don't delete a history item if a show instance is removed from the database.
2013-08-30 16:43:05 -04:00
4fd37a4fa0
Merge branch '2.4.x' into ryerson-history
2013-08-30 16:07:41 -04:00
15e27f8166
history records for a show have times validated within show range.
2013-08-30 00:43:43 -04:00
8208f8596b
ordering by show start time
2013-08-29 15:37:33 -04:00
653a6384b9
creating a separate controller for playouthistory templates.
2013-08-28 18:25:46 -04:00
5aa983be36
adding an instance id to the playout history table.
2013-08-28 17:15:36 -04:00
969889859b
improper naming of propel tables in php caused cc_mount_name to not get any generated files, double declaration of some variables for cc_timestamp.
2013-08-28 13:07:55 -04:00
c48f556b7d
CC-5303: Interface freezes sometimes when using smart blocks
2013-08-13 16:41:32 -04:00
27b079ace9
adding a label to the form fields (Datatables column headers)
2013-08-07 17:55:18 -04:00
774027c9bd
crlf
2013-08-02 15:30:35 -04:00
c110b4b4df
file summary table now starting to work with templates.need to change query around to be configurable still.
2013-08-02 15:29:39 -04:00
7ca3048f36
can add a new list item using the template.
...
set a default item template
working on sql to get a table with unified columns for file md and manually entered metadata without a file.
2013-07-30 19:24:05 -04:00
06e21029d0
saving a template to the DB.
2013-07-29 17:35:07 -04:00
8eecbb18c0
propel rename done for template fields, template name input.
2013-07-29 17:21:46 -04:00
16581088d9
working on configuring an item template UI.
...
modified db to have fields concept for templates.
2013-07-29 16:31:01 -04:00
69afc715d1
creating templates for validation.
2013-07-22 18:11:44 -04:00
ec44b81f6a
clrf
2013-07-18 01:37:39 -04:00
29c8570ade
editing in progress
2013-07-18 01:31:20 -04:00
e63518f2da
IM-733 Create Development timetable for Airtime Development
...
IM-777
Database structure for new History Feature
moving original functionality into the service.
2013-07-03 16:00:48 -04:00
328c1f3cac
IM-733 Create Development timetable for Airtime Development
...
IM-777
Database structure for new History Feature
2013-07-03 15:19:05 -04:00
f2d5fa96da
Merge branch '2.4.x' into 2.4.x-saas
...
Conflicts:
python_apps/pypo/liquidsoap_scripts/ls_script.liq
utils/phone_home_stat.php
2013-06-26 01:25:26 -04:00
e0d2de642d
CC-5254 : Listener Status for SHOUTcast doesn't work
...
clrf
2013-06-24 17:26:20 -04:00
c5221aae6a
CC-5254 : Listener Status for SHOUTcast doesn't work
2013-06-24 17:24:43 -04:00
3858371b16
CC-5251 : clrf
2013-06-24 11:15:09 -04:00
a680421281
CC-5251 : Playlist length is not shown in Library
2013-06-24 11:09:03 -04:00
3b353b47b1
CC-5216: Library length does not consider cue points
2013-06-07 14:19:46 -04:00
c9b7deba52
CC-5213: Crossfades aren't properly applied in schedule table sometimes
2013-06-07 13:07:08 -04:00
2c35a0416a
clrf fix
2013-05-30 16:53:03 -04:00
61427647d6
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-30 16:52:17 -04:00
891cc80069
CC-5190 : Playlist: Copy playlist will lost cue in/out setting
2013-05-30 16:52:03 -04:00
afda0c140b
CC-5196: L10N: Smartblock only generate 1 file even multiple files are qualified, no matter which limitation is set.
2013-05-30 15:50:35 -04:00
4728a90ce5
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-30 15:43:49 -04:00
c1c90a4b9a
Smart block fix
2013-05-30 15:43:31 -04:00
5fbae77c1f
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-30 15:38:34 -04:00
1fa0ee49d6
CC-5190 : Playlist: Copy playlist will lost cue in/out setting
2013-05-30 15:36:55 -04:00
527b1eaf1d
CC-5191: I18N: "items" is not translated when expanding dynamic Smartblock in playlist
2013-05-30 15:05:57 -04:00
91ea1f2240
CC-5184: Timeline -> Filter by show option doesn't work
2013-05-29 15:00:35 -04:00
2a2fd45567
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-29 13:48:01 -04:00
362eba60d5
CC-5181
...
Library -> Edit Metadata:Exception in zendphp.log if trying to set a really large number as track number
-fixed
2013-05-29 13:47:55 -04:00
d3355a527a
Removed commented out code
2013-05-29 13:18:37 -04:00
90e235350f
Small fix
2013-05-29 13:16:14 -04:00
4c2de70256
CC-5185: Liquidsoap: Sometimes the 1st track ends early when crossfading is set
2013-05-29 13:14:44 -04:00
4a7a08a119
CC-5185: Liquidsoap: Sometimes the 1st track ends early when crossfading is set
...
Crossfades were not getting applied to the track end time
2013-05-29 12:49:48 -04:00
0d436d323c
CC-5179: Now Playing: Schedule will be incorrect after insert action
...
Was not accounting for crossfade value when adjusting schedule times after insert
2013-05-29 11:42:02 -04:00
be59810810
CC-5180: Now Playing: No crossfading effects if inserting tracks one by one
2013-05-29 09:41:06 -04:00
4ed7c4ccd3
fix errors reported by Facebook's scheck
2013-05-28 17:30:48 -04:00
6520211b4d
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-28 16:19:30 -04:00
9545d8aacb
Removed dropping and recreating cc_schedule table index before inserting into this table.
...
We thought it would be a significant performance booster but it isn't
2013-05-28 16:19:17 -04:00
4d1a15b7ca
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2013-05-28 14:27:59 -04:00
85ee8aa0b2
Fixed bug where schedule start times were not getting calculated properly
2013-05-28 11:25:37 -04:00
bf6437cf09
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-27 17:02:46 -04:00
28f957be92
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2013-05-27 17:02:34 -04:00
84abd78c8f
CC-5109: Fix race-condition when updating cc_pref table
...
-not a race condition..was a logic error.
2013-05-27 15:58:29 -04:00
1c452988cf
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-27 15:35:06 -04:00
90ad62e4f9
CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
...
Refactoring schedule inserts
2013-05-27 15:34:54 -04:00
5ba72d00bc
CC-5109 : Fix race-condition when updating cc_pref table
2013-05-27 15:33:53 -04:00
63b0d4194a
CC-5109:
...
Fix race-condition when updating cc_pref table
-not a race condition..was a logic error.
2013-05-27 12:30:58 -04:00
cee74b59f9
CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
...
Calculate crossfades during insert instead of after
2013-05-27 10:39:31 -04:00
f23fc472ef
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-24 17:01:15 -04:00
daa310ac18
CC-5175:
...
Now Playing: SQL syntax error happens when removing and add contents to current show.
-fixed
2013-05-23 18:37:30 -04:00
06fbbe89f2
CLRF fix.
2013-05-23 18:34:35 -04:00
6110d47941
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-23 18:33:53 -04:00
75e6f21ce0
CC-5108 : Waveform Editor UI
...
putting on the timescale for time reference.
fade editor now has cursor playback info.
2013-05-23 18:33:40 -04:00
e104146b9a
CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
...
Removed propel from calculateCrossfades function and used prepared statements instead
2013-05-23 16:10:00 -04:00
c57de650e8
CC-5172 : errors from setting cues in waveform editor not handled properly
...
Conflicts:
airtime_mvc/application/models/Playlist.php
2013-05-23 13:01:38 -04:00
02292569f9
CC-5172 : errors from setting cues in waveform editor not handled properly
...
Conflicts:
airtime_mvc/application/models/Playlist.php
2013-05-23 13:00:37 -04:00
0107f36206
Changed propel to prepared statements
2013-05-23 12:49:15 -04:00
792366e1f5
CC-5100: Now Playing: Editing schedule on-the-fly will cause 2 tracks mixed at the same time.
2013-05-23 11:35:56 -04:00
5c11f5fc72
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
...
Conflicts:
python_apps/pypo/liquidsoap_scripts/ls_script.liq
2013-05-22 18:08:14 -04:00
bb5889e6a5
CC-5172 : errors from setting cues in waveform editor not handled properly
2013-05-22 17:52:02 -04:00
0bfcd32554
CC-5172 : errors from setting cues in waveform editor not handled properly
2013-05-22 17:50:34 -04:00
254d3b8950
Merge branch '2.4.x' into 2.4.x-saas
2013-05-22 16:09:02 -04:00
d82725cb54
CLRF fix
2013-05-22 15:35:59 -04:00
a569d2f3f5
CC-5163 : Waveform - Hard coded api path will cause fail to open file when airtime is put under subfolder
2013-05-22 15:33:49 -04:00
3b9b23a7dd
Merge branch '2.3.x-saas' into 2.4.x-saas
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/models/Schedule.php
python_apps/pypo/airtime-playout
2013-05-21 16:40:10 -04:00
3d09747990
CC-5150: Calendar->Add/Remove Show contents: Exception happens when try to adding contents for show
2013-05-16 13:42:06 -04:00
491ea6a32c
CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
...
Made some small optimizations. Still needs more work.
2013-05-15 15:32:29 -04:00
5080807a21
IM-629
...
-fix minor SQL syntax error
2013-05-14 19:18:41 -04:00
bb36556bb9
IM-629
...
-filter by using instance id instead of show id
Conflicts:
airtime_mvc/application/models/Schedule.php
2013-05-14 19:18:08 -04:00
74c0e390b6
CC-5147 : check builder feed on now playing page updating when not needed
...
wrong timestamp used when changing to prepared statement.
2013-05-14 16:51:34 -04:00
c173744929
CC-5090: Unscheduled tracks are still marked at Scheduled in linked show
2013-05-14 10:58:06 -04:00
d9b6a15fb6
CC-5139 : WaveForm: Click save will cause problem when setting crossfading between track and Smart block
2013-05-13 18:21:24 -04:00
bd2462170b
CC-5121 : fix some SQL statements not being escaped/prepared
2013-05-13 11:42:11 -04:00
6b560eede1
Deleted unused functions in Show.php
2013-05-13 09:55:17 -04:00
82945038d5
CRLF fix
2013-05-10 17:44:50 -04:00
da46757e28
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 17:36:18 -04:00
b0018083c7
CC-5121 : fix some SQL statements not being escaped/prepared
2013-05-10 17:14:10 -04:00
6e0a3ffc60
CC-5102:
...
Cross Fading: No cross fading effect
-fixed start/end calculations
2013-05-10 15:24:43 -04:00
0c4691f3ea
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 13:20:07 -04:00
2250d89cbd
CC-5013:
...
Re-Added watched folder wont update
-fixed
2013-05-10 13:19:56 -04:00
c36333ae07
code cleanup
...
-user proper method for checking null
-reduce line length to 80 chars
2013-05-10 12:37:25 -04:00
987537fbdc
CC-5121 :fix some SQL statements not being escaped/prepared
2013-05-10 12:35:08 -04:00
d5e7185789
Merge branch 'sql-changes'
...
Conflicts:
airtime_mvc/application/models/StreamSetting.php
airtime_mvc/application/models/Subjects.php
2013-05-10 12:23:57 -04:00
5666b688a0
CC-5112 : Listen Status: Please clean obsoleted mount point from status report page
...
CRLF
2013-05-10 12:03:33 -04:00
263b89295f
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 11:59:49 -04:00
115af29f2e
Merge branch 'CC-5112-status-page'
2013-05-10 11:59:37 -04:00
8f31dd3069
CC-5112 : Listen Status: Please clean obsoleted mount point from status report page
2013-05-10 11:56:20 -04:00
3948964e8d
remove useless log
2013-05-09 16:58:50 -04:00
afb24c37ab
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 16:07:34 -04:00
8cd8d0922f
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 16:05:04 -04:00
b7337d0df3
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-09 15:53:24 -04:00
40eb51b892
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 15:53:12 -04:00
9c05511613
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 15:08:47 -04:00
540e817101
fixing sql to be prepared statements.
2013-05-09 13:28:22 -04:00
fedf564090
CC-5081: Calendar -> Add a linked show icon
2013-05-09 12:14:49 -04:00
9c8935af47
CC-5114: Calendar: User from different timezone will see the same start/end time when editing show
2013-05-09 09:35:27 -04:00
a18fc87d97
CC-5065 : Playlist length is not built on actual cue in/out value
2013-05-08 14:19:22 -04:00
299dfdc18a
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-08 11:44:50 -04:00
fe916ec043
CC-2301 : adding in crossfade durations to smart blocks.
2013-05-08 11:43:53 -04:00
9f6a1033ea
CC-5109: Fix race-condition when updating cc_pref table
2013-05-07 16:21:34 -04:00
ad82b4ff98
throw exception if we get unexpected numbers of results in cc_pref
2013-05-07 15:36:21 -04:00
92f6ec029f
CC-5079: Timeline -> Moving items in linked shows doesn't work
2013-05-07 14:49:24 -04:00
75e4e0c9b6
CC-2301 : only showing waveform buttons if the browser supports the audio api.
2013-05-03 14:42:42 -04:00
435bb83588
CC-2301 : dos2unix being run
2013-05-02 16:52:30 -04:00
3e320f1e2e
Merge branch 'master' into CC-2301
2013-05-02 16:15:58 -04:00
517bb7557a
CC-2301 : testing default crossfade settings
2013-05-02 16:15:21 -04:00
0e5ba2f07f
CC-5085: Linked show: Changing a regular show to linked show and updating the weekday, all the contents will lost
2013-05-02 15:36:14 -04:00
5ba5864d8c
CC-5078: Wrong start time if dragging dynamic smart block into a show
2013-05-01 11:29:32 -04:00
92ef0608d6
Merge branch 'master' into CC-2301
2013-05-01 11:04:14 -04:00
2a1ac0ddb9
CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps.
2013-04-30 16:27:31 -04:00
2462e4f144
CC-2301 : CRLF fix.
2013-04-30 15:34:20 -04:00
0db557a570
CC-2301 : fades editor saving offset to database for playlists and smart blocks.
2013-04-30 15:32:43 -04:00
decb12f6b8
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-04-30 15:00:45 -04:00
de4934a317
ensure that uploaded file is UTF-8 encoded
2013-04-30 15:00:31 -04:00
4ca60ca676
CC-5074: Editing a linked instance sets incorrect schedule start times
2013-04-30 13:58:03 -04:00
2e03e1982f
CC-2301 : changing more CRLF files
2013-04-29 18:11:11 -04:00
b2a490ac47
CC-2301 : working on creating a crossfade method for waveforms.
2013-04-29 18:09:12 -04:00
58957cc919
CC-2301 : running dos2unix on 3 files.
2013-04-29 17:01:08 -04:00
410d298272
CC-2301 : creating an offset column to help create crossfades in the playlist.
...
changing default fade to be a separate default fade in/out
2013-04-29 16:55:08 -04:00
71526a94cc
Merge branch 'cc-4961-show-linking'
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
2013-04-29 15:35:16 -04:00
de8f7b0ff7
CC-4961: Show linking
2013-04-29 15:27:14 -04:00
a5264aac1e
CC-4961: Show linking
2013-04-26 16:10:01 -04:00
52655ab375
CC-4961: Show linking
2013-04-26 13:43:30 -04:00
0f1383d541
CC-4961: Show linking
2013-04-25 09:00:37 -04:00
179621d687
CC-2301 : fades editor is loading now with a leftoffset for the second track and the cues for both tracks.
2013-04-24 14:15:07 -04:00
8f6b583fcb
CC-5061:
...
Use propel transactions for StoredFile class
2013-04-19 20:40:31 -04:00
fd78ad29bf
cleanup of function names
2013-04-19 20:24:05 -04:00
f39f9329cc
CC-4992:
...
Decouple pypo from Airtime install
-first commit
2013-04-19 20:10:51 -04:00
a9b5d00d87
CC-4961: Show linking
2013-04-18 16:12:26 -04:00
479e69de12
CC-5009:
...
Use Silan to silently update track length in the background
-done
2013-04-18 15:40:33 -04:00
1a2a05c3cf
CC-4961: Show linking
2013-04-12 16:34:36 -04:00
9b4a0ba9c1
CC-4961: Show linking
...
Removed stamp tables
2013-04-12 10:52:13 -04:00
9b2fb3bece
CC-4961: Show linking
2013-04-09 15:55:18 -04:00
e64f6fb3fd
CC-4961: Show linking
...
-modified db
2013-04-08 14:43:27 -04:00
76bfce21b1
CC-4961: Show linking
...
-modified db
2013-04-08 14:42:37 -04:00
62d1b22fcc
CC-4961: Show linking
...
created new cc_show_stamp table
2013-04-05 12:27:54 -04:00
f9d7167638
CC-4961: Show linking
2013-04-04 16:30:33 -04:00
5ac51e289d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-04-01 19:15:02 -04:00
6ae8da98e4
removing logging
2013-04-01 19:14:55 -04:00
ab10ae68a2
CC-5036: Add back edit show instance functionality
2013-04-01 14:42:35 -04:00
418bf0b5ff
Created calendar service and moved the context menu creation there
2013-03-26 16:03:53 -04:00
ef8f87df5d
Show linking
2013-03-25 16:28:53 -04:00
6766d208aa
CC-4961: Show linking
...
Removed logic out of edit-show action
Created new SchedulerService
Fixed overlapping show bug
2013-03-21 16:31:05 -04:00
a7601d290f
CC-4961: Show linking
...
Refactored services
Removed ShowDaysService and ShowInstanceService
Combined all show actions into one ShowService
2013-03-21 10:05:11 -04:00
896e03d76b
CC-4961: Show linking
...
Refactoring all services thus far
2013-03-15 16:56:22 -04:00
f9f4e4f1fb
CC-4961: Show linking
...
Made some progress on show editing
2013-03-12 18:01:12 -04:00
c721b81a13
CC-4961: Show linking
...
Refactoring
2013-03-12 10:30:31 -04:00
7347be35b1
Created a new service for show days
...
Created a new user service
Started refactoring edit show action
2013-03-11 16:18:40 -04:00
8415dfdf6f
Add comments
2013-03-08 12:18:24 -05:00
af622eb4b8
CC-4961: Show linking
...
Refactored some more show instance creation functions
2013-03-06 09:58:35 -05:00
d497cfa857
Created show service
2013-03-06 09:58:35 -05:00
99c07272fd
- Moved all form validation to it's own function in schedule service
...
- Moved show creation to it's own function in schedule service
2013-03-06 09:58:35 -05:00
bdab294fce
Added comments to Schedule Service
2013-03-06 09:58:35 -05:00
d08f6cf3e1
CC-4961: Show linking
...
-initial schedule service experimentation
2013-03-06 09:58:35 -05:00
1c80701488
Merge branch '2.3.x' into 2.3.x-saas
2013-03-05 16:21:47 -05:00
cc69418215
Merge branch '2.3.x' into devel
2013-03-05 16:21:22 -05:00
00d577fd5b
CC-4985: Ensure files deleted via the UI are deleted from stor directory.
...
-temporary fix. We know rabbitmq received the message, but we don't know
if media-monitor actually acted on it.
2013-03-04 15:22:09 -05:00
8bec9dea55
Merge branch '2.3.x' into 2.3.x-saas
2013-02-20 14:41:55 -05:00
c8d7d23d62
CC-4963: Add cue in and cue out to smart block criteria list
...
Done
2013-02-19 16:38:58 -05:00
8bdf3508b0
CC-4951: Add cue in and cue out to library filter columns
...
Done
2013-02-19 13:38:35 -05:00
d1301ff676
CC-4954: Please make Library page remember the status per user
...
-done
2013-02-19 10:58:48 -05:00
ec159131a8
Merge branch '2.3.x' into devel
2013-02-13 16:09:53 -05:00
76cb04e296
CC-4538: Cannot edit title or change time of repeating show if first instance has ended
...
- fixed by populating the edit show form with the next repeating show that is not in the past
2013-02-13 11:55:27 -05:00
50613dd9a8
CC-4907: Library -> Adding items to show doesn't add the correct item sometimes
...
-fixed
2013-02-12 17:21:21 -05:00
2c1fa283da
CC-4941: Dynamic Smart Block ignores the silan check
...
-fixed for playlists that contain dynamic blocks
2013-02-11 14:17:18 -05:00
51ade73e85
CC-4941: Dynamic Smart Block ignores the silan check
...
-fixed
2013-02-11 13:45:51 -05:00
3c73535f70
Convert clip length seconds to interval format before inserting into cc_playlistcontents / cc_blockcontents
2013-02-11 12:37:20 -05:00
6071dea839
CC-4940: Playlist editor in Library ignores cue points set by silence detection when displaying item time
...
-small fix on where to set clip length
2013-02-11 12:32:20 -05:00
69054806c4
CC-4940: Playlist editor in Library ignores cue points set by silence detection when displaying item time
...
- fixed by setting length to cue_out - cue_in when tracks get added to playlist/block
2013-02-11 12:24:06 -05:00
e8bde50909
CC-4939: All webstreams in a playlist will have 0 length in Schedule
...
- set cuein and cueout of playlist item if it is a webstream
2013-02-11 11:17:00 -05:00
c39b99da6c
CC-4839: Nginx doesn't allow liquidsoap to check uploaded file, which blocks uploading any file
...
-fixed
2013-02-07 15:42:06 -05:00
8e82db1bc7
CC-4921: Now Playing: Cannot insert items into current playing show
...
-filler time in cc_schedule was not setting cue_in and cue_out
-since we made those colunns not null and removed a default value, we always have to set a value
2013-02-05 17:57:21 -05:00
8db71eac52
CC-4914: Update is_scheduled after tracks play out
...
-done
2013-02-05 16:52:25 -05:00
23c29455d9
Modified schema.xml - made cue_in and cue_out required columns in cc_scheuled and removed default values
2013-02-05 13:18:25 -05:00
74bc485b4b
XSS exploit prevention
...
- Calendar - Show Contents
- Playlist tooltip in Library page
- Adding track to a show
- Widgets
- Playlist/Webstream title and description
- Smart block expansion
2013-02-05 10:56:38 -05:00
103ad6fe6d
CC-4909: php warning
...
-fixed
2013-02-04 16:32:03 -05:00
b45f71e8f9
CC-4897: XSS exploit on library page
2013-02-04 12:44:14 -05:00
20a3f674b4
CC-4897: XSS exploit on library page
...
-fixed where this was happening on Calendar - show content
2013-02-04 12:12:57 -05:00
1f0b9fa5dc
CC-4897: XSS exploit on library page
2013-02-04 11:06:46 -05:00
93ec4c001b
Merge branch '2.3.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/models/StoredFile.php
2013-02-02 21:07:34 -05:00
8309593a0f
CC-4904: Library -> Sort by status doesn't work
...
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
2013-02-01 17:47:07 -05:00
384298f680
CC-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist
2013-02-01 12:06:01 -05:00
0a198ae424
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/models/User.php
2013-01-30 18:31:45 -05:00
cf2ed25bfb
CC-4900: Indicate in the library if a webstream is scheduled in the future or belongs to a playlist
...
-done
2013-01-30 16:53:59 -05:00
4f5d7869d8
Removed html from Library/contents-feed and StoredFile model
...
Added new Library column to indicate if a file is scheduled in the future or belongs to a playlist/smart block
2013-01-30 15:38:25 -05:00
043fbd1dfb
CC-4886: Warn if track is part of a playlist when deleting from library.
...
-done
2013-01-30 10:55:24 -05:00
694c54f272
Merge branch 'cc-4887-show-whether-track-is-scheduled-in-the-future-on-Library-page' into devel
2013-01-30 10:35:29 -05:00
d4742577c9
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-30 10:20:27 -05:00
c45440482a
CC-4887: Show whether track is scheduled in the future on Library page
2013-01-30 08:57:59 -05:00
b15c4569eb
CC-4894: Need to filter output for potential XSS exploits
...
-fixed few areas
2013-01-29 15:17:29 -05:00
5f3f2cd97c
CC-4881: Cue in time can be greater than Cue out time in some situations
...
-fixed
2013-01-28 16:46:11 -05:00
f1215c10fd
CC-4882: Scheduled item does not take into account cue_out - cue_in time
...
-fixed
2013-01-28 14:21:11 -05:00
d47469be25
read num bytes used from file instead of calculating manually
2013-01-25 16:36:57 -05:00
2ef8604c31
remove unnecessary code
2013-01-25 16:23:12 -05:00
c6493f9d74
remove unecessary saas code
2013-01-25 16:22:08 -05:00
6f5ffdc1e7
Merge branch '2.3.x' into 2.3.x-saas
2013-01-24 17:49:08 -05:00
c3f2bf57de
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
-further optimization by looking at the preferred time scale
2013-01-24 14:02:50 -05:00
ef806b8357
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-24 12:14:12 -05:00
091f5ff49f
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
-we know what month will be the initial view for the user.
-Provide this data ahead of time.
2013-01-24 12:13:55 -05:00
1e336fa2d7
CC-4875: use a reference when iterating over show events
2013-01-24 12:00:31 -05:00
78f617cacb
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
- put makeFullCalendarEvent inline with loop
- removed unnecessary epoch time conversion
2013-01-23 17:33:34 -05:00
adaab6ba96
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
-added a 5 second grace period for checking if shows are partially filled
2013-01-23 16:31:20 -05:00
9714b44d7f
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
2013-01-23 16:27:26 -05:00
9fd3b43bb2
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
Made improvement by accessing db just once to determine if each show instance is full or not
2013-01-23 16:12:16 -05:00
77b0c21192
Small refactor
2013-01-22 10:39:20 -05:00
909e290bd3
Merge branch 'devel' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
2013-01-18 17:38:48 -05:00
b9c7ea1184
CC-4869: Default fades greater than 99 seconds won't allow you to drag item into block/playlist
...
-fixed
2013-01-18 17:22:54 -05:00
c1941fea2b
Merge branch 'devel' into 2.3.x-saas
2013-01-18 14:45:55 -05:00
ad0879996d
CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect.
...
-use existing function to convert seconds to time format
2013-01-18 14:35:17 -05:00
22ecc3f1fc
CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect.
...
-fixed
2013-01-18 14:28:45 -05:00
f8208a355c
Merge branch 'devel' into 2.3.x-saas
2013-01-18 12:22:45 -05:00
ed7b22118c
Merge branch 'silan-script' into devel
2013-01-18 11:54:10 -05:00
f70ca93b53
CC-4841: Silan script
...
done
2013-01-18 11:53:26 -05:00
e2b83a0c8c
CC-4857: Playlist length will increase every time I duplicate it.
...
- fixed
2013-01-17 22:20:28 -05:00
57629b4eac
Changed path to locale directory from absolute to relative
2013-01-17 14:31:40 -05:00
784cb390d3
Merge branch 'devel' into 2.3.x-saas
2013-01-17 10:56:18 -05:00
e4c2f43d9e
CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect.
...
-fixed
2013-01-16 15:40:50 -05:00
f7e8fd33fd
CC-4848: Streaming server passwords should be hidden with dots, once entered
...
-fixed
2013-01-16 14:36:56 -05:00
9cb4633823
CC-4850: Upgrade Scripts -> Add default timezone and locale for each user in cc_pref
...
-fallback to default settings if user setting is not set
2013-01-16 12:42:58 -05:00
8cd6bd9aa4
Merge branch 'devel' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/forms/SoundcloudPreferences.php
airtime_mvc/application/forms/SupportSettings.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
airtime_mvc/public/js/airtime/preferences/preferences.js
python_apps/api_clients/api_client.py
python_apps/pypo/listenerstat.py
2013-01-15 13:44:44 -05:00
bb2f9316af
CC-4841: Silan script
...
- temp commit
2013-01-15 11:16:50 -05:00
9ae3559305
Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2013-01-14 16:19:51 -05:00
5a97fb69f2
CC-4384: Remove annoying usage of $CC_CONFIG
...
- done
2013-01-14 16:16:14 -05:00
fae3f3a03f
CC-2184: Hardcoded CSS path should be relative path instead
...
-Make '/' the default root
2013-01-14 16:00:38 -05:00
dcf3526000
CC-4384: Remove annoying usage of $CC_CONFIG
...
- done
2013-01-10 18:09:00 -05:00
55fa8b8dc1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-10 14:52:45 -05:00
048ee05030
CC-4821: Add option to disable ReplayGain
...
- done
2013-01-10 13:49:41 -05:00
c20ed7ebad
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-10 12:04:44 -05:00
690a6d2654
Removed user id from cc_pref keystr value
2013-01-10 12:04:27 -05:00
4bf9ab60d9
CC-4819: Tracks length in Scheduler is 0.0 all the time
...
- fixed in better way
2013-01-10 11:49:02 -05:00
594a38da16
CC-4770: Playlist's length doesn't counts Webstream and Smartblock in
...
- the bug was introduced by CC-4668
- fixed
2013-01-09 22:53:29 -05:00
3a72302a3c
CC-4819: Tracks length in Scheduler is 0.0 all the time
...
- fixed
2013-01-09 22:19:39 -05:00
1572955d07
CC-4810: Add language setting to login page
...
-done
2013-01-09 18:03:23 -05:00
db62b538dd
CC-4816: Timezones should be a user preference
...
-done
2013-01-09 13:38:38 -05:00
1263c04621
CC-4796: Listener Stat: Authentication exception happens but no warning message on UI
...
- done
2013-01-08 17:32:27 -05:00
6d48e1faf0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 15:52:33 -05:00
adda497bbb
CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start
...
- fixed
2013-01-08 15:52:11 -05:00
1ee90ed9b9
CC-4790: Media Monitor: Re-added files won't show up in Library
...
-fixed
2013-01-08 15:42:35 -05:00
45e3fccae2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 12:31:22 -05:00
b580a7be73
CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start
...
- fixed
2013-01-08 12:31:14 -05:00
f308305df8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-07 18:18:59 -05:00
a65e72941f
CC-4805: Localization -> Changing default language changes datatables and add media language setting
...
-fixed
2013-01-07 18:18:40 -05:00
6e241fd3ec
CC-4512: Allow changing stream "Offline" message via Web UI
...
- fixed
2013-01-07 18:14:57 -05:00
51425d451f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-07 13:49:09 -05:00
ecbff94f11
CC-4795: Library -> Playlist: Cannot add Smart Block into Playlist
...
- fixed
2013-01-07 13:48:51 -05:00
82da4dcfe8
CC-4599: Calendar: Add an icon to indicate show is not fully booked
...
-done but a new icon is needed
2013-01-07 12:41:28 -05:00
771b9b9412
Fixed whitespace in Preferences page between 'Timezone' and colon
2013-01-07 11:41:29 +00:00
63c847080f
CC-4732: Ask for admin username + password in Stream Settings page
...
- CRLF
2013-01-03 18:02:19 -05:00
5d76bb2d17
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-03 18:00:33 -05:00
ae7b6fe092
CC-4732: Ask for admin username + password in Stream Settings page
...
- done
2013-01-03 17:58:50 -05:00
e2c87ed8b6
CC-4781: Store localization settings on a per-user basis
...
-done
2013-01-03 16:19:02 -05:00
a1837366be
Merge branch 'cc-3018-silence-detection' into devel
2013-01-03 14:08:21 -05:00
b8f80866cf
CC-3018: Automatically strip out silence from audio tracks
...
- done
2013-01-03 14:02:06 -05:00
d6eb043899
CC-4765: Webstream of AAC type can't be previewed
...
-fixed
2013-01-02 16:09:32 -05:00
dcdbc3160d
CC-4769: Duplicate Playlist: Fade in/out setting doesn't get copied correctly
...
- fixed
2013-01-02 11:41:33 -05:00
17e66f5537
Merge branch 'cc-4759-add-aac-stream-in-support' into 2.2.x-saas
2012-12-27 17:30:10 -05:00
0596d1c391
Merge branch 'cc-4759-add-aac-stream-in-support' into devel
...
Conflicts:
python_apps/media-monitor2/media/monitor/pure.py
2012-12-27 17:29:25 -05:00
ee8dde07c8
add support for AAC input streams
2012-12-27 17:18:47 -05:00
c0665e4748
CC-4754: Replay gain modifier
...
- Initial commit
2012-12-27 00:36:11 -05:00
127d0187b7
CC-4706: Calendar -> Context menu -> Show content does not work
...
-fixed
2012-12-03 11:45:06 -05:00
b2699fa914
merge from devel
2012-12-03 11:06:56 -05:00
2f0c6b702a
CC-1960: Internationalize Airtime / Support translations
...
- created locale table
- create locale model
- set default locale in pref table
2012-11-29 18:21:03 -05:00
542434d9f0
CC-1960: Internationalize Airtime / Support translations
...
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
2012-11-28 16:16:39 -05:00
4983721565
Merge branch '2.2.x' into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/forms/LiveStreamingPreferences.php
2012-11-28 16:10:33 -05:00
9acfb6c181
CC-1960: Internationalize Airtime / Support translations
...
- overwrote default zend form error messages
2012-11-27 17:11:29 -05:00
42d535a922
CC-1960: Internationalize Airtime / Support translations
...
-unlocalized some strings
2012-11-27 12:33:43 -05:00
3b124e6f5d
CC-4668: Blocks/Playlists: Length includes deleted tracks
...
-saving block length was including files that do not exist
2012-11-26 15:05:27 -05:00
b677130a3f
CC-1960Internationalize Airtime / Support translations
...
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
2012-11-23 16:39:41 -05:00
5ba964c783
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-23 14:03:51 -05:00
75adf9b6a1
CC-4701: same webstream played twice in a row does not work.
...
-fixed
2012-11-23 14:03:31 -05:00
dd0e71efcc
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
2012-11-22 17:32:24 -05:00
87d0383533
CC-4703: Now Playing duration column ignores any cue point set
...
- fixed
2012-11-22 14:37:57 -05:00
8483439551
CC-4709:
...
Exception happens when DJ try to click a Webstream not belongs to himself
- fixed
2012-11-22 10:29:40 -05:00
c0e49b69e2
Merge branch 'devel' into cc-1960-internationalize-airtime
2012-11-21 17:17:53 -05:00
2172ee82d3
Merge branch '2.2.x' into devel
2012-11-21 17:17:32 -05:00
2a4e4c6405
CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.
...
-fixed
2012-11-21 14:17:46 -05:00
25ddd083bc
CC-1960: Internationalize Airtime / Support translations
...
-added language option in preferences
2012-11-21 12:44:50 -05:00
10b6dd202e
Merge branch 'devel' into cc-1960-internationalize-airtime
...
Conflicts:
airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
2012-11-21 11:44:40 -05:00
f88a7bdb31
Merge branch '2.2.x' into devel
2012-11-21 10:54:17 -05:00
48253b8d14
CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.
...
-fixed
2012-11-21 10:19:21 -05:00
8d9fa1976e
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-20 16:39:04 -05:00
3c1f80de68
CC-4658: Smart Block: Unable to drag songs into block directly
...
- fixed
2012-11-20 16:38:43 -05:00
fe44d23b74
CC-4715: Better management of tracks that are shorter than they claim to be.
2012-11-20 16:31:27 -05:00
3a682aeada
cc-4585: fixed + added logging
2012-11-20 15:25:41 -05:00
7124cbe04d
fixed bug where hidden files would be shown in library
2012-11-20 15:18:41 -05:00
20855c73b5
refactoring + fix typo
2012-11-20 15:10:38 -05:00
a76b9b305f
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper to all strings in models
2012-11-20 11:33:37 -05:00
fed39077c0
Merge branch '2.2.x' into devel
2012-11-20 11:21:29 -05:00
9c612d17a3
CC-4694: Apache/Zend error only specific to some users
2012-11-19 18:41:31 -05:00
7efa7169ca
CC-4700: Return mime type of streams instead of null
...
-fixed
2012-11-15 16:41:46 -05:00
2b2a1db055
CC-2401: Shuffle option in playlists
...
- done
2012-11-13 17:32:10 -05:00
6145f9bcad
Merge branch '2.2.x' into devel
2012-11-08 17:28:23 -05:00
f657ee4f20
Merge branch '2.2.x' into 2.2.x-saas
2012-11-08 17:27:51 -05:00
33b2520c14
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-08 17:27:28 -05:00
628e6bed37
CC-4689: Live Stream: The 1st song of a show won't play if there is another show have live stream assigned and finished right before
...
- fixed
2012-11-08 17:26:55 -05:00
ed7aba83bf
Merge branch 'cc-4661-listener-statistics' into 2.2.x-saas
2012-11-07 17:22:36 -05:00
7300b608cf
Merge branch 'cc-4661-listener-statistics' into devel
...
Conflicts:
python_apps/api_clients/api_client.py
2012-11-07 17:20:12 -05:00
9112a8d0b1
CC-4661: Listener Statistics
...
- enhancement on flot
- data point reduction
2012-11-07 16:26:31 -05:00
ccd6447696
- install failed due to wrong metadata key
...
- wrong controller action called
2012-11-07 12:05:20 -05:00
b817684972
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/public/js/bootstrap/bootstrap.js
2012-11-07 11:21:36 -05:00
272e428fa7
Merge branch '2.2.x' into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/forms/EmailServerPreferences.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/forms/Preferences.php
airtime_mvc/application/forms/SupportSettings.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/menu.phtml
airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
2012-11-06 17:23:32 -05:00
fd3305bc4c
SAAS-289: Remove all isSaaS checks
...
-done
2012-11-06 17:10:47 -05:00
38d28d3346
SAAS-289: Remove all isSaaS checks
2012-11-06 16:48:34 -05:00
504d9968f1
CC-4639:
...
Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit
- fixed the bug where airtime hangs when repeat is checked but 0 files that
meet criteria
- fixed dynamic block bug where it didn't generate correct list
2012-11-06 16:32:00 -05:00
3f7d8a0c7f
Merge branch '2.2.x' into 2.2.x-saas
2012-11-06 16:11:51 -05:00
a99191f4bd
CC-4669: Smart Blocks: Dynamic length of less than 1 hour shows 0.0
...
-fixed
2012-11-06 11:14:40 -05:00
8e69e50eea
Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics
...
Conflicts:
airtime_mvc/application/models/ListenerStat.php
2012-11-06 11:06:58 -05:00
6ef646124e
CC-4668: Blocks/Playlists: Length includes deleted tracks
...
-fixed
2012-11-06 10:58:25 -05:00
2e79e8421c
CC-4661: Listener Statistics
...
- better legend for multiple series of data
- consistant number of ticks on x-axis
2012-11-06 10:54:52 -05:00
4218a7f30d
CC-4661: Listener Statistics
...
-factor out mountname into it's own table
2012-11-05 15:48:56 -05:00
080c3ec944
CC-4661: Listener Statistics
...
-factor out mountname into it's own table
2012-11-05 15:38:35 -05:00
90a93e9a6c
CC-4664: Playlist/Block preview: Tracks deleted from library still get played
...
-fixed
2012-11-05 13:58:11 -05:00
d467abe509
Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel
2012-11-05 11:27:34 -05:00
bd3cf543bf
made param useless in listAllFiles since its now safe to pass all files to MM
2012-11-05 11:11:05 -05:00
1c628bd831
renamed displayable to visible
2012-11-05 10:57:18 -05:00
acf954f637
changed hidden check to displayable check
2012-11-05 10:55:54 -05:00
6e89fdab30
changed file existence checks to displayable
2012-11-05 10:14:49 -05:00
b6341e44b3
removed pointless code duplication
2012-11-05 10:12:03 -05:00
34248921fc
refactored code to use displayable
2012-11-05 10:09:34 -05:00
aa9a6691f2
added a single test for checking if a file should be shown or not
2012-11-05 10:08:29 -05:00
311c88a8a2
added check for hidden in buildEntry
2012-11-05 09:54:00 -05:00
a62e64969d
Removed commented method
2012-11-05 09:49:49 -05:00
00a4e45491
added check for hidden in buildEntry
2012-11-05 09:47:16 -05:00
800f8b9ded
added criteria to remmove hidden files in blocks
2012-11-05 09:40:58 -05:00
4522fa94b2
added clause to exclude hidden files from getShowListContent
2012-11-05 09:30:21 -05:00
e01a61208d
Merge remote-tracking branch 'sf/2.2.x' into cc-4585
2012-11-05 09:19:20 -05:00
7e03333496
changed deletion by the user to be setting the file to be hidden instead
2012-11-03 01:33:13 -04:00
9c4f2e3298
refactored addWatchedDir to use early return style
2012-11-03 01:16:57 -04:00
5d3aa68c72
written method to unhide all files in a music dir
2012-11-03 01:09:36 -04:00
a93b588a09
Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics
2012-11-02 18:25:23 -04:00
74fe958cad
CC-4661: Listener Statistics
...
- changes for different mount names
2012-11-02 18:25:08 -04:00
34d0ee5954
CC-4661: Listener Statistics
...
-add mount point names
2012-11-02 18:04:32 -04:00
6438b54a5f
CC-4661: Listener Statistics
...
-backend part working
2012-11-02 17:50:43 -04:00
106b18bf30
CC-4637: Media Library: Item will be removed from Playlist if it's removed from Library
...
-fixed
2012-11-02 17:49:32 -04:00
8b70136dd6
CC-4661: Listener Statistics
...
- db change commit
2012-11-02 17:44:06 -04:00
7f27e5ff3f
- ListenerStat Model
2012-11-02 16:28:13 -04:00
5cb83909d8
Merge remote-tracking branch 'sf/2.2.x' into cc-4585
2012-11-02 16:00:09 -04:00
796274e4ef
CC-4642: Default Fade preference should be in seconds and tenths, rather than millionths
...
-fixed
2012-11-02 15:51:36 -04:00
aec11feba5
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-11-02 14:59:02 -04:00
ba1f6ed054
CC-4374: Nowplayling page: Cannot remove tracks from recording show
...
-fixed by disallowing dragging into recording shows
2012-11-02 13:24:47 -04:00
135aadf16b
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/public/js/airtime/showbuilder/builder.js
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 12:28:21 -04:00
3478797744
cc-4661: new database tables for listener stats
2012-11-02 11:32:02 -04:00
feb6c9d6f5
CC-4636: Exception happens when trying to remove user that have created some smart block
...
- doing delete cascade on cc_block on deleting users
2012-11-01 17:45:28 -04:00
575400b4c2
CC-4623: Library: Preview button for Flac does not work
...
- fixed
2012-11-01 16:44:37 -04:00
270eb97128
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into cc-4585
2012-11-01 15:14:53 -04:00
5b14c4fe88
CC-4656: Library -> No error message when a dj tries to delete smart blocks and webstreams they do not own
...
-fixed
2012-10-31 17:19:27 -04:00
2507e0f8a4
CC-4655: DJ's can delete files that they do not own
...
-fixed
2012-10-31 16:51:29 -04:00
4cca80fe44
Added schema changes
2012-10-31 16:23:12 -04:00
fc613aa597
CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files
...
-fixed
2012-10-31 16:01:17 -04:00
cc40dfdf4e
CC-4641: Now Playing: Extending show's length won't change the overbooked track's style
...
-added comment
2012-10-31 14:16:16 -04:00
71be2b2bd1
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-31 12:36:56 -04:00
fd0e1c3c95
CC-4641: Now Playing: Extending show's length won't change the overbooked track's style
...
-fixed
2012-10-31 12:36:45 -04:00
2e4d5ec142
CC-4539: Advanced search: Sample rate searched on Hz, but search results
...
shown in kHz
- fixed
2012-10-31 12:32:40 -04:00
9293a26738
CC-4639: Give an option to allow smart blocks to reuse tracks if not enough
...
tracks meet the time limit
- code optimazation
2012-10-31 12:05:17 -04:00
1899d588ee
- CRLF fix
2012-10-30 18:03:03 -04:00
cbee9422ec
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-30 17:58:16 -04:00
9d495ebc03
CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit.
...
- done
2012-10-30 17:57:58 -04:00
9b77007e03
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-30 17:19:51 -04:00
8c90c1a12f
CC-4645: Add support for x-scpls playlist types
...
-fixed
2012-10-30 17:19:40 -04:00
5061dfa05d
CC-4647: apache error log entries
...
- fixed
2012-10-30 12:36:50 -04:00
5651dbce56
CC-4644: Exception from zendphp.log
...
- fixed
2012-10-29 16:37:27 -04:00
a937aa0e28
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-29 16:19:39 -04:00
4861397872
CC-4644: Exception from zendphp.log
...
- fixed
2012-10-29 16:19:23 -04:00
dc00528cd5
Merged baseUrl related conflicts
2012-10-29 11:56:20 -04:00
d6a4f2f713
Cleaned up soundcloud
2012-10-26 18:45:27 -04:00
f14320a769
CC-4603: Dynamic Smart Blocks: adding to multiple shows at once generates the same content
...
- fixed
2012-10-26 17:15:39 -04:00
6231998cc0
Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas
2012-10-23 18:47:44 -04:00
b8d6132b52
- saas patch #1
2012-10-23 18:47:15 -04:00
4daaa776e2
CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table
...
-fixed
2012-10-23 17:45:55 -04:00
a4d91a5d48
CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table
...
-small fix
2012-10-23 17:44:06 -04:00
2d6be404d4
cc-4304: fixed ticket by deleting playlists when user is deleted. also removed useless index on file_exists
...
-regen propel files
2012-10-23 13:45:15 -04:00
dff5bb4e2b
CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table
...
- fixed
2012-10-23 12:24:38 -04:00
abf4319d67
Removed logging
2012-10-22 15:55:24 -04:00
feac48a003
cc-4613: fixed
2012-10-22 15:34:33 -04:00
e0402c88cf
cc-4613: fixed
2012-10-22 15:20:03 -04:00
0084f8ce93
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 17:48:47 -04:00
a9df8cd7f2
CC-4610: Creating recording show will generate lots of exception in zendphp.log
...
- fixed
2012-10-19 17:30:54 -04:00
9dfee6aa68
CC-4564: Webstream: Book same webstream twice in Scheduler, the 2nd one doesn't get played
...
-fixed
2012-10-19 15:39:45 -04:00
2527fa2e1a
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 14:42:01 -04:00
96ff440435
Removed space
2012-10-19 14:18:34 -04:00
7356d4fe89
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 13:42:41 -04:00
8f998fd2c8
CC-4595: Fade in/out setting doesn't work
...
-fixed
2012-10-19 13:42:24 -04:00
57ef1c20ac
Removed trailing whitespace
2012-10-19 13:24:06 -04:00
a1e653b41f
Deep optimization
2012-10-19 13:22:00 -04:00
7d8079f770
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ShowbuilderController.php
airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
airtime_mvc/public/js/airtime/common/common.js
2012-10-19 12:50:36 -04:00
8d56c03fe3
deep voodoo magic to optimize schedule
2012-10-19 11:32:35 -04:00
d32495d100
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 11:09:34 -04:00
58d00cb9b9
Formatting sql
2012-10-19 11:05:12 -04:00
6727bce328
CC-4598: Smart block: cannot save dynamic block with 0.5 hours
...
-fixed
2012-10-18 15:03:59 -04:00
6c8c7aa285
CC-4592: Library: Changing fades does not save microseconds
...
-fixed
2012-10-18 12:09:48 -04:00
7123230eea
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-17 15:28:15 -04:00
5fc72d9e51
add function necessary for saas
2012-10-17 15:28:05 -04:00
45801e5dc4
- fix spelling of some function name
2012-10-17 15:16:03 -04:00
c1745145e8
- CRLF fix
2012-10-16 16:25:56 -04:00
35c8fe55b4
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-16 16:24:12 -04:00
3f1df49221
CC-4572: Adding a playlist to a show in Now Playing page fails, interface greys out
...
- bug with php 5.3.2 with DateTime::createFromFormat()
- fixed with workaround
2012-10-16 16:22:44 -04:00
819dcf70fd
CC-4579: Edit Metadata: Track number defaults to 0 if it is deleted
...
-fixed
2012-10-16 15:56:03 -04:00
fe1d8d51a9
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-16 12:05:24 -04:00
b061573d23
CC-4554: Playout History search sticks on 'Processing' message
...
-fixed
2012-10-16 12:04:52 -04:00
8a93717415
CC-4568: Show preview broken in Now Playing page
...
- fixed
2012-10-16 11:06:01 -04:00
8f5830757f
CC-4553: Calendar: Can create overlapping show by repeat show's instances
...
-fixed
2012-10-12 14:26:54 -04:00
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
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
5a0df2b6d5
Adde TODO's
2012-10-03 12:01:24 -04:00
1ae7784331
Added TODO
2012-10-03 11:59:02 -04:00
2deceaa5fb
comment formatting
2012-10-03 11:58:21 -04:00
f94c4cd96a
CC-4515: Calendar: Errors for editing recording show
...
-fixed
2012-10-03 11:13:41 -04:00
1b0dd13eac
CC-4521: Playlist Builder: Cannot set fades
...
-fixed
2012-10-02 15:38:05 -04:00
aede8e8efa
CC-4520: Playlist Builder: Cannot set cue in
...
-fixed
2012-10-02 15:35:49 -04:00
4ff267ee8a
removed z
2012-09-19 17:45:03 -04:00
7bb1eadf03
formatting
2012-09-19 17:39:30 -04:00
36d454184d
formatted
2012-09-19 17:37:49 -04:00
abd58c25a1
removed duplicated comment
2012-09-19 17:12:18 -04:00
cdcb1f0ef9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 17:04:45 -04:00
253a31b1ea
-datatables small fix
2012-09-19 17:05:20 -04:00
b66f00ff07
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 16:59:21 -04:00
2afc4183bb
CC-4496: Library -> Contents-feed does not work if advanced search data is invalid
...
-fixed
2012-09-19 16:39:56 -04:00
e5085f0df3
Cleaned up code.
2012-09-19 16:34:46 -04:00
d70951a334
CC-4494: Calendar: Cannot resize show
...
-fixed
2012-09-19 15:03:16 -04:00
f801fcb81e
empty space
2012-09-19 11:20:26 -04:00
014da73eed
heredoc sql
2012-09-19 11:17:32 -04:00
ecb5c93ddf
Removed methods again...
2012-09-19 11:14:59 -04:00
7dac1c6561
Added them back because not sure
2012-09-19 11:14:26 -04:00
99b28cca82
Removed unused methods
2012-09-19 11:11:50 -04:00
58620203cf
line wrap
2012-09-19 10:24:45 -04:00
fb4f7c1cb5
psr
2012-09-19 10:23:54 -04:00
a9eefe21fa
cc-4304: Add call to save after each file reassignment
2012-09-18 18:20:33 -04:00
3ecbab3259
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 16:50:57 -04:00
8433ec5445
CC-4482: Smart Blocks -> tracks with empty "Album" name are NOT filtered in
...
- fixed
2012-09-18 16:50:42 -04:00
d55915d649
naming convention fix
2012-09-18 16:40:23 -04:00
608fff090c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 15:52:26 -04:00
7a958ec8b6
formatting
2012-09-18 15:52:16 -04:00
be214ac126
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 15:47:48 -04:00
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
da11dc077e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 15:27:35 -04:00
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
72e6ee35fa
cc-4304: Temporarily fixed
2012-09-18 15:26:43 -04:00
2cfb0c85d5
Formatted sql
2012-09-18 15:04:22 -04:00
3a60d729fd
added todo
2012-09-18 15:02:07 -04:00
b069b1254e
Aligned
2012-09-18 12:56:01 -04:00
90d3494576
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 12:48:55 -04:00
6ac241b1fc
Added todo
2012-09-18 12:48:45 -04:00
09bc686d99
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 12:41:30 -04:00
b0f2176329
fix some TODO's in webstream.php
2012-09-18 12:40:44 -04:00
a22ba39de1
formatting
2012-09-18 12:26:07 -04:00
d2f43058c2
fixed comment
2012-09-18 12:09:28 -04:00
f9319b869a
Corrected comments
2012-09-18 12:08:30 -04:00
bc873a3ece
Added extension handling for file path
2012-09-18 12:04:54 -04:00
8657a80459
removed return ''
2012-09-18 11:51:13 -04:00
0a83b33a5a
Removed extra logging statements
2012-09-18 11:10:54 -04:00
6481556f9b
Showbuilder formatting
2012-09-18 11:07:32 -04:00
49e1b29bc9
Removed instances of getLine and getFile
2012-09-18 11:04:33 -04:00
96f138a9fe
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 10:55:55 -04:00
9249bf8cd0
Big formatting changes.
2012-09-18 10:55:42 -04:00
f50fccaf5f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 16:28:36 -07:00
bb3ffce071
CC-3944 : Now Playing -> Time Line view: Cannot cancel record show, cancel button is disabled
2012-09-17 16:28:28 -07:00
542c5c857f
alignment
2012-09-17 17:54:10 -04:00
53c6d77821
Formatting
2012-09-17 17:52:56 -04:00
095a5cce4f
Added better debugging
2012-09-17 17:51:50 -04:00
69756f60ca
formatting
2012-09-17 17:49:25 -04:00
ff22b80dfc
formatting
2012-09-17 17:49:16 -04:00
3ba3df07f8
better logging
2012-09-17 17:39:41 -04:00
5a37777cfd
formatting
2012-09-17 17:04:49 -04:00
1c736d6366
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 16:47:45 -04:00
d0e67d8475
cc-4462: Bandaided, marked as hack
2012-09-17 16:47:33 -04:00
117f11ef97
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 16:46:57 -04:00
75620be761
remove all mosty carriage return characters
2012-09-17 16:46:51 -04:00
81c72b8344
cc-4462: Bandaided
2012-09-17 16:46:49 -04:00
56eb2dff92
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 16:40:37 -04:00
c310cecf40
CC-4463: do we need getFileExtension()?
2012-09-17 16:40:27 -04:00
ae1ae80d36
in_array -> array_key_exists
2012-09-17 16:40:22 -04:00
c2b2ea1d16
Fixed formatting
2012-09-17 16:27:10 -04:00
8b445486b1
CC-4427: Listen button does not work
...
fixed
2012-09-17 16:17:53 -04:00
0e82083ba1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 15:55:53 -04:00
1a29499bb8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 15:48:09 -04:00
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
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
54bb414500
CC-4318: Widgets: Weekly show cannot show the schedule
...
-fixed
2012-09-17 14:56:34 -04:00
1e0595d7ad
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 14:53:17 -04:00
8801ccecce
CC-4459: Now Playing -> Timeline: 'Filter by show' does not work
...
-fixed
2012-09-17 14:52:56 -04:00
ed45011b40
needle <-> haystack
2012-09-17 14:21:13 -04:00
fef949f6ea
band aided some bug
2012-09-17 12:50:04 -04:00
92a5bf51a6
Added warning for uploading unknown file types
2012-09-17 12:45:33 -04:00
048da282fa
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 12:36:57 -04:00
2337078dd8
Cleaned up unused variables. Formatted some lines.
2012-09-17 12:35:12 -04:00
5bbc815a78
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 12:32:54 -04:00
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
b913b067c2
Added setColumnFilter(oTable)
2012-09-17 11:58:08 -04:00
7fed5bcd18
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 10:57:19 -04:00
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
7b1b271a2c
Reformatted sql to use heredocs
2012-09-14 17:09:05 -04:00
39903be69a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-14 16:51:48 -04:00
3ced92db7a
CC-4415: Smart Block audio preview doesn't work
2012-09-14 16:51:14 -04:00
ec3e0a9b9f
Added todo
2012-09-14 16:50:28 -04:00
bf651a96aa
cc-4431: Fixed isUserType
2012-09-14 16:47:55 -04:00
76ba4bb6f0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-14 16:03:03 -04:00
05916a4d26
Code cleanup
2012-09-14 15:13:08 -04:00
198d15adc8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-14 14:53:32 -04:00
78460703a2
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
...
-done
2012-09-14 14:53:25 -04:00
79ce7b572c
cc-4202: Fixed
2012-09-14 14:51:50 -04:00
6e239d08e9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-14 14:43:15 -04:00
e3c1a3ac0e
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
...
-initial commit
2012-09-14 12:09:40 -04:00
c7f4ede766
-implemented UI changes for library page
2012-09-14 12:08:51 -04:00
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
d2f0b10552
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 17:05:56 -04:00
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
d534f22ce4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 16:11:15 -04:00
da72c00f28
CC-4370: Transitioning between two webstreams: a hiccup in the stream is audible
...
-fixed
2012-09-13 16:10:17 -04:00
11ef613d1c
comment formatting
2012-09-13 15:16:46 -04:00
e31d570a1c
Sql formatting
2012-09-13 15:13:37 -04:00
f754d78687
Formatted comments and =
2012-09-13 15:12:54 -04:00
14db5053b1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 14:56:10 -04:00
203378e60a
More exception handling
2012-09-13 14:56:03 -04:00
8a2703c50d
Made method static
2012-09-13 12:33:15 -04:00
24b3fb7e8a
Remvod unused CC_CONFIG, reformatted some code
2012-09-13 10:26:50 -04:00
cc88a9a8e3
Fixed a lot of unused variables
2012-09-12 18:36:27 -04:00
536fdabb77
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-12 17:27:08 -04:00
3b43efefe0
CC-4413: Unused local variables in models.
...
-done
2012-09-12 17:26:41 -04:00
8e91c515f0
cc-4397: Fixed handling for bad metadata.
2012-09-12 17:26:37 -04:00
af8c813f35
Documented unimplemented interface methods
2012-09-12 17:08:51 -04:00
88604eabcc
Removed unused variable
2012-09-12 16:24:49 -04:00
15355f9e30
Formatted comment
2012-09-12 16:12:00 -04:00
6e8313a395
Fixed typo in SQL missing ,
2012-09-12 16:10:56 -04:00
db5dbab086
Removed unused local variables
2012-09-12 16:09:53 -04:00
414d1fa511
PDO'd UpdateBroadcastedStatus
2012-09-12 16:09:28 -04:00
643c00418a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-12 15:59:53 -04:00
64a1dade9b
Massive formatting of SQL
2012-09-12 15:59:46 -04:00
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
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
2c1acf8b17
Removed reference to CC_CONFIG
2012-09-12 15:42:00 -04:00
6fc8df9226
Here doc'd sql
2012-09-12 15:39:02 -04:00
b2737688cc
Added space to sql squery
2012-09-12 15:36:37 -04:00
a432665146
Changed to heredoc
2012-09-12 15:19:39 -04:00
d62ba61ea6
Formatting schedule.php
2012-09-12 14:19:02 -04:00
806fd83ccc
Reformatted schedule
2012-09-12 14:14:55 -04:00
dd68f6d945
Changed schedule to use james' helper function
2012-09-12 13:44:20 -04:00
7f9642dcd2
Fixed typo
2012-09-12 12:18:06 -04:00
195008d1e4
more pdo fix
2012-09-12 12:16:53 -04:00
845ec23fa3
fixed booboo
2012-09-12 12:15:47 -04:00
ad75849a6f
Fixed array_map over query instances
2012-09-12 12:09:38 -04:00
d194ff1809
PDO'd a few things missed before in cancelShow()
2012-09-12 12:05:03 -04:00
6d32c03351
getHosts() changed sql style
2012-09-12 12:00:53 -04:00
cebfdd6558
Changed sql string to heredoc
2012-09-12 11:59:27 -04:00
6519512924
fixed array_map over iterable
2012-09-12 11:54:37 -04:00
d69391d2dd
Formatted Block.php
2012-09-12 11:35:28 -04:00
7b41d94352
Reforamtted Block.php
2012-09-12 11:31:41 -04:00
e0286b112f
cc-4292: Removed unnecessary code related to md5.
2012-09-12 11:10:25 -04:00
faa04a2f5c
Refactored RecallByX
2012-09-11 18:22:46 -04:00
c6ab540120
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-11 17:19:12 -04:00
58d39d74d4
CC-4355: Smart block criteria do not match library columns or metadata editor
...
-fixed
2012-09-11 17:18:17 -04:00
72a424bb7e
Added todo to fix crust
2012-09-11 16:25:45 -04:00
0dd38920a3
Cosmetic changes.
2012-09-11 16:20:59 -04:00
51d4f35c55
Removed unused global variable
2012-09-11 16:15:15 -04:00
d95731f2f3
Reformatted sql to use heredoc
2012-09-11 16:13:39 -04:00
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
57b59a3290
Cleaned up preference.php
2012-09-11 14:33:50 -04:00
1304111682
Shortened code with if -> ?
2012-09-11 14:10:13 -04:00
751ed8276d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-11 14:05:54 -04:00
1afdcb8c2d
Shortened an if statement to p ? x : y
2012-09-11 14:05:40 -04:00
c61f5d1972
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-11 14:04:53 -04:00
0fec175681
CC-1710: FLAC, BWF, AAC support
...
-context menu for mp4's having a problem
2012-09-11 14:04:45 -04:00
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
1e1b5919a2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-11 11:57:13 -04:00
9b0e5a6b2f
removing unused file.
2012-09-11 11:53:36 -04:00
a06eeaa76a
-fix silly mistake after refactoring
...
again
2012-09-11 11:20:42 -04:00
41d9b2490a
-fix silly mistake after refactoring
2012-09-11 11:14:47 -04:00
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
585ee579d6
CC-4005: Tag files with Last Played date and number of times played
...
- fixed CRLF
2012-09-10 18:07:12 -04:00
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
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
80bdc95cd5
-redoing a commit undo
2012-09-10 17:24:18 -04:00
87ac1744f7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 16:54:51 -04:00
5292137430
-return json as data type for schedule action
2012-09-10 16:54:42 -04:00
43bef4939e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 16:30:38 -04:00
af225418c4
Removed empty constructor.
2012-09-10 16:08:21 -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
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
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
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
45729f16e7
cc-4347: PDOOOOOOOOOOOOOOOO
2012-09-06 14:14:05 -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
6cb8dd35e2
- fixed sql error
2012-09-06 12:23:53 -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
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
b112a0fe2b
cc-4347: PDOOOOOOOOOOOOO
2012-09-05 17:59:18 -04:00
8be51d5bf4
sexified code
2012-09-05 17:52:27 -04:00
aa6e061118
conflicts merged
2012-09-05 17:51:16 -04:00
0385c008ce
cc-4347: PDO00!!!
2012-09-05 17:46:48 -04:00
43f5258219
CC-4348: Prepared statements - part 4
...
-User.php
2012-09-05 17:43:45 -04:00
8f33523095
cc-4347: PDO
2012-09-05 17:35:08 -04:00
0838e31094
cc-4347: PDO
2012-09-05 16:57:01 -04:00
91c74d8995
-fixed syntax error
2012-09-05 16:21:59 -04:00
87e58282de
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-05 16:14:23 -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
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
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
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
0755933ccd
CC-4279: Library: Searching by criteria "Uploaded from" does not work
...
-fixed
2012-09-04 10:03:24 -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
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
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
1884bebf15
CC-4281: Webstream: Nothing appears in the timeline if dr...
...
-fixed
2012-08-30 14:36: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
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
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
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
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
c28025ecfb
hotfix for bad class name
2012-08-27 16:49:45 -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
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
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
5443c1931a
CC-4081: Calendar -> Can create overlapping show by dragging a show in "day" view
...
-fixed
2012-08-24 15:27:04 -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
drigato
Naomi
Albert Santoni
denise
Daniel James
Martin Konecny
James
james
martin
Martin Konecny
Rudi Grinberg
Rudi Grinberg
James
Martin Konecny
denise