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
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
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
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
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
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
28a032388b
Start of bugfixing for SAAS-349.
...
* Also identity verification for erry on Freenode.
2013-09-26 15:18:41 -04:00
denise
2114383519
CC-5323: User's Timezone Can Improperly Edit Show
...
-overlapping show check was using the user's local timezone to compare new
shows instead of the show's timezone
2013-09-25 16:22:30 -04:00
denise
107263ae20
CC-5323: User's Timezone Can Improperly Edit Show
2013-09-25 16:22:30 -04:00
Jamie Connor
f7f2cdc51c
Follow up changes relating to adding in new show repeat options
2013-09-07 14:54:03 +12:00
Jamie Connor
03f383f764
added more options for show repeats
2013-09-03 12:25:22 +12: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
d50cdd16c2
starting association of a show instance.
2013-08-29 17:40:08 -04:00
Naomi Aro
9b45b9dc72
converting to a jquery UI based datepicker.
2013-08-16 15:12:00 -04:00
Naomi
b65007868a
crlf fix
2013-08-12 15:08:09 -04:00
Naomi
d83c004fb9
subclassing the template types, files summary table is now fully configurable form wise.
2013-08-12 15:06:26 -04:00
Naomi
27b079ace9
adding a label to the form fields (Datatables column headers)
2013-08-07 17:55:18 -04:00
Naomi
aaf2e5c2f6
better casting on form checkbox, setting populate flag properly based on if id is set (for create/update)
2013-08-05 15:05:26 -04:00
Naomi
31c604d09c
can update an existing history item entry. Form is pre-populated.
2013-08-02 18:16:23 -04:00
Naomi
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
Naomi Aro
7183396da5
needed to update jquery, fullcalendar needed updating for the new JS.
...
working on configuring a template.
2013-07-29 08:57:31 -04:00
Naomi
46ecdf393d
dynamic form rendering for template
...
bootstrap datetime widget.
jquery update is needed, testing with hosted jquery first.
2013-07-26 17:33:17 -04:00
Naomi
69afc715d1
creating templates for validation.
2013-07-22 18:11:44 -04:00
Naomi Aro
19ba788bae
CLRF
2013-07-22 10:47:11 -04:00
Naomi Aro
634eb40a0c
creating an entry.
2013-07-22 10:45:39 -04:00
Naomi Aro
ec44b81f6a
clrf
2013-07-18 01:37:39 -04:00
Naomi Aro
29c8570ade
editing in progress
2013-07-18 01:31:20 -04:00
Naomi
c744d88f23
IM-784 : Create Editing Abilities For History
2013-07-08 18:00:02 -04:00
Naomi Aro
6b0ab535e5
CC-5244 : Exception when creating Smartblock
2013-06-20 14:03:13 -04:00
Naomi
440163f199
CC-5225 : Library: Fail to open Metadata Editor
2013-06-12 13:05:58 -04:00
Martin Konecny
6498f43dad
CC-5211:
...
Php Exception: Set large number as year in tracks Metadata
fixed
2013-06-06 17:02:01 -04:00
Daniel James
2e970bfc8a
Fixes date format in Smart Block tooltip (CC-5618)
2013-05-22 10:25:43 +01:00
Naomi
435bb83588
CC-2301 : dos2unix being run
2013-05-02 16:52:30 -04:00
Naomi
517bb7557a
CC-2301 : testing default crossfade settings
2013-05-02 16:15:21 -04:00
Naomi
92ef0608d6
Merge branch 'master' into CC-2301
2013-05-01 11:04:14 -04:00
Naomi
58957cc919
CC-2301 : running dos2unix on 3 files.
2013-04-29 17:01:08 -04:00
Naomi
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
denise
f9d7167638
CC-4961: Show linking
2013-04-04 16:30:33 -04:00
denise
327d0dd6c9
CC-4961: Show linking
...
Add front-end for creating a show with monthly repeats on same day of week
2013-03-22 15:57:15 -04:00
denise
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
denise
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
denise
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
denise
c8d7d23d62
CC-4963: Add cue in and cue out to smart block criteria list
...
Done
2013-02-19 16:38:58 -05:00
denise
ad334d9e74
CC-4926: System-> Preference: Please limit the default fade value less than 60
...
- added a range validator of 0 - 59.9 on default fade
2013-02-06 15:44:52 -05:00
denise
0cf8526f87
CC-4878"Send support feedback" button at initial login tries to load " http://showbuilder " and was missing the local host IP.
...
-fixed
2013-01-25 11:51:56 -05:00
denise
f7e8fd33fd
CC-4848: Streaming server passwords should be hidden with dots, once entered
...
-fixed
2013-01-16 14:36:56 -05:00
James
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
James
5a97fb69f2
CC-4384: Remove annoying usage of $CC_CONFIG
...
- done
2013-01-14 16:16:14 -05:00