James
9eb21cb327
Merge branch '1.9.1' into devel
...
Conflicts:
VERSION
airtime_mvc/application/configs/constants.php
airtime_mvc/application/models/Preference.php
install_minimal/include/airtime-db-install.php
install_minimal/include/airtime-upgrade.php
python_apps/api_clients/api_client.py
2011-08-24 10:30:59 -04:00
James
405edcc5fa
CC-2718: Changes to the support page
...
- "Help Airtime" button is enanbled solely depending on feedback checkbox
when user already agreed to Terms and condition
2011-08-23 16:46:29 -04:00
James
4c4b57fd31
CC-2718: Changes to the support page
...
- overriding isValid in RegisterAirtimeForm
2011-08-23 16:09:11 -04:00
James
796a762908
CC-2718: Changes to the support page
...
- only need to validate publicise fields when publicise is on
2011-08-23 15:42:36 -04:00
James
3e3391dfba
CC-2718: Changes to the support page
...
- stroing and retreving new value "privact" to DB
- Displaying "Terms and Condition" link when user agrees it
2011-08-23 15:11:21 -04:00
martin
e580c5ae0d
CC-2438: Add a button to listen to the stream immediately
...
-initial commit
2011-08-23 12:45:03 -04:00
martin
d7830785df
CC-2717: Media Monitor forgets about watched directories after being restarted
2011-08-22 20:41:34 -04:00
James
376ae1370c
CC-2693: Copy PHP files to /usr/shar/airtime instead of /var/www/airtime
...
- done for new install
- upgrade need some more work
2011-08-22 12:03:09 -04:00
martin
c61759a1da
CC-1942: Add ability to set timezone in preferences
...
-fixed spelling mistake
2011-08-22 11:37:48 -04:00
martin
009c75b217
CC-2683: All times in the database are not stored in UTC.
...
-playlist mtime now uses UTC
2011-08-22 10:14:06 -04:00
martin
fdf1b4c100
CC-2692: Integrate ZFDebug into Airtime
...
-done
2011-08-22 10:12:53 -04:00
James
dc6ed33b47
Merge branch '1.9.1' into devel
2011-08-19 16:43:16 -04:00
James
d6692b7cf9
Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1
2011-08-19 16:43:01 -04:00
James
30fcb0b95d
CC-2704: Support settings UI tweaks
...
- adding server name again under Preference
2011-08-19 16:42:46 -04:00
James
56a21a524e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-08-19 16:35:54 -04:00
James
a73612afd2
CC-2607: Ability to adjust stream bitrate,type,etc from the UI interface
...
- Modified "Descriptioin" to "Name/Description"
- mount point is not append with extension anymore
- fix on auto generated stream url
- name is used in shoutcast
2011-08-19 16:35:23 -04:00
martin
ea2981574c
Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1
2011-08-19 15:46:45 -04:00
martin
1272c172b7
CC-2703: orange progress bar is playing when there is not content
...
-previous and future shows are now ignored as well
2011-08-19 15:46:35 -04:00
martin
5a84ad4e9d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-08-19 15:45:20 -04:00
martin
7859783ccb
CC-2703: orange progress bar is playing when there is not content
...
-fix it so that previous and future shows are ignored as well.
2011-08-19 15:45:07 -04:00
martin
13f7a73850
-convert playlist.js to all spaces (instead of tabs)
2011-08-19 15:30:00 -04:00
James
f2f599f723
CC-2704: String change
...
-fixed
2011-08-19 15:00:45 -04:00
James
9b6ead98ae
Merge branch '1.9.1' into devel
2011-08-19 14:58:56 -04:00
James
8e108e8596
CC-2704: Change text
...
- fixed
2011-08-19 14:58:31 -04:00
James
314749bf98
Merge branch '1.9.1' into devel
2011-08-19 13:11:11 -04:00
James
bb97a0eede
CC-2704: Support Setting UI tweak
...
- move station name under publicise
- make it required field
2011-08-19 13:09:10 -04:00
martin
75ac719b33
Merge branch '1.9.1' into devel
2011-08-19 12:30:14 -04:00
martin
fa50c93914
Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1
2011-08-19 12:29:41 -04:00
martin
c0189e3c5d
CC-2703: orange progress bar is playing when there is not content
...
-fixed
2011-08-19 12:29:26 -04:00
James
e14e4f3713
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-08-19 12:23:34 -04:00
James
ac448c8dbb
CC-2704: Change "Stream Setting" -> "Stream Settings"
...
- done
2011-08-19 12:23:15 -04:00
James
8e0496d8c1
CC-2704: Support Setting UI tweak
...
Merge branch '1.9.1' into devel
Conflicts:
airtime_mvc/application/forms/GeneralPreferences.php
2011-08-19 12:22:08 -04:00
James
db225dd610
CC-2704: Support settings UI tweaks
...
- Move station name to "Support Settins" page
2011-08-19 12:19:35 -04:00
martin
a1c2b0f7d6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-08-19 12:07:42 -04:00
martin
b87e95126c
CC-2379: "Add Show" uses browser time instead of server time
...
-added note about custom changes to fullcalendar.js
2011-08-19 12:07:34 -04:00
James
43298d60be
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-08-18 19:08:10 -04:00
James
f855da0f45
Merge branch '1.9.1' into devel
...
Conflicts:
VERSION
airtime_mvc/application/configs/constants.php
airtime_mvc/application/configs/navigation.php
install_minimal/DoctrineMigrations/Version20110711161043.php
python_apps/api_clients/api_client.py
2011-08-18 19:05:13 -04:00
James
d83f9f1b96
CC-2701: Separate Support Settings from Preference page
...
- done.
2011-08-18 18:58:59 -04:00
martin
846e08699e
CC-2628: update a repeated show start time cause the show to get corrupted
...
-disabled dragging + dropping repeated show instances
2011-08-18 18:13:43 -04:00
martin
fc66b1d1ba
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-08-18 15:44:57 -04:00
martin
dd9ef5b9c8
CC-2379: "Add Show" uses browser time instead of server time
...
-Fixed
2011-08-18 15:44:16 -04:00
James
873f7e1dae
CC-2698: upgrading fail from 1.8.2->1.9.0
...
- fixed version string
- deleting entries from cc_schedule before adding "ON CASCADE" constraint
2011-08-18 15:32:33 -04:00
James
38256de606
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-08-18 13:54:17 -04:00
James
4275cc6667
CC-26027: Remove file
...
- removing old file
2011-08-18 13:53:50 -04:00
James
cf55e92aa3
CC-2607: Ability to adjust stream bitrate, type, etc from UI
...
- removed debug code from NowPlayingController
- New Form for streamsetting
- Action created in PreferenceController
2011-08-18 13:53:12 -04:00
martin
266ee56d6d
CC-2683: All times in the database are not stored in UTC.
...
-missed a spot where we need to use calculate in UTC
2011-08-17 16:35:03 -04:00
martin
4eaf56b93f
-station name in preferences no longer required
2011-08-17 15:55:11 -04:00
martin
e392c8437a
cc-2683: not using utc time
...
-clean up recorder file
2011-08-16 16:36:31 -04:00
martin
0a11160298
cc-2683: not using utc time
...
-fix install script inputting timezone preference even if
it already existed
2011-08-16 15:34:19 -04:00
martin
8aa26b2eb0
cc-2683: not using utc time
...
-top panel now start at correct time
2011-08-16 15:07:55 -04:00