Albert Santoni
8642b1e411
changelog updates
2013-10-08 14:24:56 -04:00
denise
2165000f82
Update airtime version in po files
2013-10-08 12:06:50 -04:00
denise
1b3adcd375
i18n - Update mo files
2013-10-08 11:56:25 -04:00
denise
38634810a3
Update .po files
2013-10-08 11:48:24 -04:00
denise
9be2ec2e99
Fixed small typo
2013-10-08 11:24:42 -04:00
denise
56db6e9386
Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x
2013-10-08 11:19:05 -04:00
denise
c687b6ad24
Merge branch 'master' of https://github.com/jamieconnor/Airtime
...
Conflicts:
airtime_mvc/application/services/ShowService.php
2013-10-08 11:16:25 -04:00
denise
d248f0ca14
Merge branch '2.5.x'
2013-10-08 11:13:39 -04:00
denise
11e4f5a124
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-10-08 11:13:15 -04:00
Daniel James
3fdadf5b66
SAAS-351 Only hide day checkboxes when show repeat type is 2 or 3
2013-10-08 15:55:49 +01:00
denise
7c2e92f6e5
CC-5293: Calendar page cannot be loaded sometimes
2013-10-07 17:16:52 -04:00
denise
5463888947
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-07 16:59:10 -04:00
denise
ff28daf28e
CC-5378: Subseconds are gone from cc_schedule calulations
...
Formatting error
2013-10-07 16:58:57 -04:00
Albert Santoni
7ee797cc47
Merge branch '2.5.x-pypo-timeout-improvements1' into 2.5.x
2013-10-07 16:10:17 -04:00
denise
8a25d9cd2e
CC-5376: Sometimes schedule times don't get updated
2013-10-07 15:53:33 -04:00
Albert Santoni
f34a6d201a
Double the pypo->liquidsoap timeout on second attempt if first attempt failed
2013-10-07 15:39:14 -04:00
Albert Santoni
02101db088
Raise timeout for pypo->liquidsoap communication to improve reliability under load
2013-10-07 15:37:34 -04:00
denise
55254e88a5
UI text improvements for setting the station/user timezones
...
Added info icon in the add-show form for timezone setting
2013-10-07 14:49:52 -04:00
denise
ac8f1d73f3
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-07 14:16:36 -04:00
denise
ff46883c1b
CC-5360: Updating a Show over a timezone change period has problems
...
Need to apply the old timezone to show start time when attempting to
fetch current instance
2013-10-07 14:16:20 -04:00
cliff.wang
5c74cabddb
cc-5372: Update CREDITS
2013-10-04 18:40:27 -04:00
Albert Santoni
477ff248f6
Some more stuff for CC-5356 / Ubuntu Saucy installation
2013-10-04 14:57:25 -04:00
Albert Santoni
a03fe959b6
CC-5356: Disable default site correctly in Ubuntu Saucy
2013-10-04 14:29:17 -04:00
Albert Santoni
855f642936
CC-5346: Install php5-json on Saucy
2013-10-04 14:26:16 -04:00
Albert Santoni
7cca01ab08
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-04 14:15:32 -04:00
Albert Santoni
7b1cd5c908
CC-5354: Remove PHP short open tags for better compatibility
2013-10-04 14:15:23 -04:00
Naomi
548d3eef0e
Merge branch 'all-record-icons' into 2.5.x
2013-10-04 11:06:46 -04:00
Naomi
4ca2554999
CC-5362 : In Calendar Week/Day view crappy JS for now playing show makes everything a record show
...
fc-show-instance is now a class since agenda day/week are prerendered, thought only 1 was rendered at a time.
better handling of adding the now playing icon.
2013-10-04 11:05:35 -04:00
denise
60b4eb5c8a
Removed unnecessary formating when comparing DateTime objects
2013-10-04 09:49:23 -04:00
drigato
37a0c271f6
CC-5359: Update show fails sometimes with overlapping check
...
Some DateTime objects were not getting created in correct timezone
Used format() to get the day of week value instead of getTimestamp()
getTimestamp() sometimes returns the wrong value
2013-10-03 18:02:15 -04:00
Naomi
c707967567
CRLF
2013-10-02 11:25:40 -04:00
Naomi
faa6c7210c
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-02 11:25:08 -04:00
Naomi
4d01e3b11f
CC-5347 : isScheduled doesn't work for webstreams
2013-10-02 11:24:48 -04:00
denise
632b11c0ab
CC-5331: Now Playing keeps refreshing sometimes
...
- typo in GET request parameters causing overriding of data
2013-10-01 16:49:08 -04:00
denise
1e59ab836d
CC-5277: Selecting weekly repeat without selecting days fails silently
...
- added a check in the 'when' form since the validation there relies on the repeat form being valid
- added validation for this in the 'repeat' form
2013-10-01 14:19:02 -04:00
denise
3d9bc85fa0
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-01 08:49:10 -04:00
Naomi
a34ae69d4b
CC-5347 : Random Error think to do with updating is scheduled status of a webstream
...
not sending a notify message if webstream source is -1
2013-09-30 15:56:26 -04:00
Naomi
8a354a8c45
CC-5316 : Playout History: Doesn't support webstream
2013-09-30 14:25:51 -04:00
Naomi
1fa13eed13
CRLF
2013-09-30 13:59:08 -04:00
Naomi
0dd5458269
Merge branch '2.5.x' into CC-5293-calendar-pref
2013-09-30 13:57:23 -04:00
Naomi
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
Albert Santoni
174915005f
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-09-30 13:36:14 -04:00
Naomi
9f38e5a9c6
CC-5342 : Pypo: Webstream disconnection happens when any changes on Now playing page
2013-09-26 17:03:18 -04:00
Albert Santoni
11ae76beb8
Fix SAAS-349 by preventing password changes in demo mode.
...
* Added a NotDemoValidate validator class to ensure no changes to a field in demo mode.
* Prevent the user from changing the password of any user in demo mode.
* Fixes SAAS-349.
2013-09-26 16:23:22 -04:00
Albert Santoni
c8bb12ca45
Freenode identity verification for #airtime
2013-09-26 15:23:02 -04:00
Albert Santoni
28a032388b
Start of bugfixing for SAAS-349.
...
* Also identity verification for erry on Freenode.
2013-09-26 15:18:41 -04:00
Albert Santoni
52b7dbb226
Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x
2013-09-26 08:36:11 -04:00
denise
a8a02704f3
Merge branch '2.5.x' into cc-5232-show-timezone
2013-09-25 17:24:44 -04:00
denise
34e2344100
CC-5323: User's Timezone Can Improperly Edit Show
...
Sometimes show form would populate the start/end time with wrong timezone
2013-09-25 17:18:23 -04:00
Albert Santoni
a1f3309cf7
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-09-25 16:41:35 -04:00