Albert Santoni
8d114c7d6e
Merge branch '2.5.x' into 2.5.x-installer
2015-06-16 16:34:22 -04:00
Albert Santoni
8c9981a155
Merge branch '2.5.x' into 2.5.x-installer
...
Conflicts:
airtime_mvc/public/index.php
2015-06-16 10:37:06 -04:00
drigato
2953576921
CC-5997: Tracks get scheduled outside of the show start and end time
2015-05-11 14:57:20 -04:00
Duncan Sommerville
78c7170c4e
Reformatted logo remove button to use Zend
2015-02-27 17:19:37 -05:00
Duncan Sommerville
5e256df061
Added remove button for station logo on preferences page
2015-02-24 12:12:30 -05:00
Duncan Sommerville
69d588d2f6
Merge branch '2.5.x' into 2.5.x-albertenhancements
2015-02-24 10:45:52 -05:00
Albert Santoni
dec7dddd83
Merge branch '2.5.x' into 2.5.x-installer
2015-01-19 15:40:07 -05:00
Albert Santoni
0c3395289d
Merge pull request #78 from Robbt/realtime-smart-blocks
...
Added sort tracks by upload time to smart blocks criteria
2015-01-19 15:36:28 -05:00
Duncan Sommerville
c5a60d2f09
Last updates before 2.5.2 RC, mainly small fixes for Ubuntu Precise
2015-01-19 15:05:13 -05:00
Albert Santoni
c03dd38c00
Merge branch '2.5.x' into 2.5.x-installer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Show.php
2015-01-16 17:27:52 -05:00
Duncan Sommerville
44018b2cbf
Changed status page to use config-check (tentative) and removed time-intensive check in index routing
2015-01-16 16:15:16 -05:00
Albert Santoni
f9bf71a349
Moved the Station Logo field to GeneralPreferences, and stopped using
...
AJAX on the general prefs form
2015-01-15 16:28:18 -05:00
Duncan Sommerville
5e22f929c7
Reverted commit mistakenly changing file modifiers to 755
2015-01-14 20:45:03 -05:00
Albert Santoni
c4d3a8fa62
Massive simplification of the GeneralPreferences dialog
...
* The purpose of this was so that we can use Zend_Form_Element
decorators, which I need.
2015-01-13 20:51:46 -05:00
Duncan Sommerville
f4c5cf1353
Added virtualenv back into install process
2015-01-05 16:41:03 -05:00
Duncan Sommerville
fcbb1c2ee7
String updates
2014-11-14 10:01:06 -05:00
Duncan Sommerville
795e239ff3
Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls.
2014-11-06 18:39:48 -05:00
Robbt
fe291cdc8c
Added sort tracks by upload time to smart blocks criteria
2014-10-19 23:02:40 -04:00
dpsommer
9a21b99fdf
Merge pull request #70 from RobertElder/more-tokens
...
More tokens
2014-10-07 10:10:14 -04:00
Robert Elder
feff7f4343
tokens for multipart data upload.
2014-10-02 02:04:03 +00:00
Robert Elder
5c69eda010
Tokens for Stream Settings page.
2014-10-01 20:55:07 +00:00
Robert Elder
dbed915469
Tokens for preferences form.
2014-10-01 19:36:17 +00:00
Robert Elder
2be4a5f9d0
Add form tokens to several forms.
2014-09-30 23:09:27 +00:00
Albert Santoni
345c782eb9
Fixed the unit tests and changed ops->zu
2014-06-09 11:34:25 -04:00
Albert Santoni
f16d8ca2ea
Fixed a bunch of annoying/major graphical issues with the calendar
...
* Fixed a bug where the calendar would keep shrinking smaller and
smaller as you resized the window.
* Fixed the size and alignment of the time span combobox in the corner,
which fixes a bug where the text was cut off.
* Fixed a bug where the schedule header would grow as you flipped
to the next or previous week.
* Dropped javascript from the resizing of the calendar (for the most
part).
2013-12-14 00:05:13 -05: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
Albert Santoni
7b1cd5c908
CC-5354: Remove PHP short open tags for better compatibility
2013-10-04 14:15:23 -04:00
denise
a8a02704f3
Merge branch '2.5.x' into cc-5232-show-timezone
2013-09-25 17:24:44 -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
Albert Santoni
99669c78a0
Fixed CC-5045 and Now Playing time remaining style improvements
2013-09-25 16:40:20 -04:00
denise
107263ae20
CC-5323: User's Timezone Can Improperly Edit Show
2013-09-25 16:22:30 -04:00
Naomi Aro
53341d40f7
CC-5334 : Localize Ryerson History Feature
2013-09-24 09:56:04 +02:00
Naomi Aro
ee45f10aeb
CC-5334 : Localize Ryerson History Feature
2013-09-23 14:42:35 +02:00
Naomi Aro
619dbf7bbf
format/json to prevent zend errors.
2013-09-01 13:38:18 -04:00
Naomi Aro
9c0bee3877
adding show instance to the create form if it's already set.
2013-08-31 23:34:37 -04:00
Naomi
4fd37a4fa0
Merge branch '2.4.x' into ryerson-history
2013-08-30 16:07:41 -04:00
Naomi Aro
0e017374b7
change default text to "No Show"
2013-08-30 01:30:23 -04:00
Naomi Aro
15e27f8166
history records for a show have times validated within show range.
2013-08-30 00:43:43 -04:00
Naomi Aro
5a8957273f
removing choice for show instance if in shows tab.
2013-08-29 18:52:40 -04:00
Naomi
d50cdd16c2
starting association of a show instance.
2013-08-29 17:40:08 -04:00
Naomi Aro
a4c97479b6
using an accordian to display per show logs.
2013-08-28 23:30:15 -04:00
Naomi
429cdeeffb
filtering by a host's show so they can edit their own playout history.
2013-08-28 19:37:46 -04:00
Naomi
653a6384b9
creating a separate controller for playouthistory templates.
2013-08-28 18:25:46 -04:00
Naomi
e6b09308a5
IM-932 : File Metadata Distinction/Template Design
2013-08-28 15:40:10 -04:00
Naomi Aro
6d5531f341
CC-5310 : Playlist -> Crash happens on draging a song after a webstream into a playlist
2013-08-27 19:30:17 -04:00
Naomi Aro
01370c2124
reverting back to the bootstrap datetime picker since it's nicer to use.
2013-08-22 20:23:17 -04:00
Naomi
fa6de28bcf
not allowing double file metadata to be added to avoid query problems.
2013-08-22 14:15:40 -04:00
Naomi Aro
09693ef174
changing to context menu single edit/delete.
2013-08-19 23:19:13 -04:00
Naomi Aro
9b45b9dc72
converting to a jquery UI based datepicker.
2013-08-16 15:12:00 -04:00
drigato
033693721e
CC-5302: Undefined variable in zend log
2013-08-13 16:36:04 -04:00