Paul Baranowski
4fa70c01b0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-06-22 17:29:13 -04:00
Paul Baranowski
29c6006fc1
CC-2420: Reinstall fails. Fixed bug where reinstalling the database tables would crash the installer. Fixed the usage message that prints out for airtime-install so that it shows the correct command. Added code documentation for why things work the way that they do.
2011-06-22 17:29:00 -04:00
martin
9532f8a793
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-06-22 16:51:14 -04:00
martin
8f0b965ea0
CC-2403: Downloading a file via the web UI returns an absolute path, not relative
...
-fixed
2011-06-22 16:50:58 -04:00
Paul Baranowski
9c1754dd38
Updated 3rd party license info for 1.9.0
2011-06-22 14:36:04 -04:00
martin
532ba46cba
-added template file for populating a database table into dev_tools
2011-06-22 11:21:49 -04:00
martin
50cde2f8b0
CC-2418: Show add: end time shown in display is not the time committed to DB
2011-06-22 11:21:26 -04:00
martin
34ced48076
-change version string to 1.9.0-beta1
2011-06-21 12:38:49 -04:00
james
f9193f92c9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-06-21 12:24:02 -04:00
james
66b777aedb
- fixed bug where Description was not sent
...
- changed order of display on info box in popup
2011-06-21 12:23:43 -04:00
Naomi Aro
d642a48e8c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-06-21 18:06:05 +02:00
Naomi Aro
cd3b787c66
cc-1799 File System
...
only adding audio files when adding a watched directory.
2011-06-21 18:05:51 +02:00
Paul Baranowski
2754b199b5
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-06-21 12:03:45 -04:00
james
70b1b73d20
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-06-21 12:03:43 -04:00
Paul Baranowski
546b82598b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-06-21 12:03:23 -04:00
james
ed77eebe59
- removed validator on logo image for now
2011-06-21 12:03:23 -04:00
Paul Baranowski
995f26e379
Updated Changelog for 1.9.0
2011-06-21 12:03:02 -04:00
martin
98259e71bb
-syntax error in MusicDir.php
2011-06-21 11:55:44 -04:00
Paul Baranowski
92f839b368
Removed install/uninstall scripts for twitter plugin
2011-06-21 11:49:47 -04:00
martin
8e62583bb2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-06-21 11:40:21 -04:00
martin
2efe2e67a8
CC-2410: Clean up install process
...
-fixed missing DB::connect
2011-06-21 11:40:07 -04:00
Naomi Aro
0be79b2d91
Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel
2011-06-21 17:33:48 +02:00
james
3dcb10c931
- adding link to who's using page( it was remove somehow ).
2011-06-21 11:20:02 -04:00
Naomi Aro
bb283e195a
cc-1799 Readable Filesystem
...
check if md dictionary has any md.
2011-06-21 17:13:33 +02:00
james
ea78991d57
- removing one line from PreferenceController.php(the function
...
doesn't exist anymore)
2011-06-21 10:26:34 -04:00
james
60eff4c041
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-06-21 10:20:17 -04:00
james
bcfc5507c6
CC-1724: Phone home statistics
...
- Email is not required field in Preference
- removed duplicate line from PreferenceController.php
2011-06-21 10:19:39 -04:00
Naomi Aro
f755e41a9a
propel classes
2011-06-21 15:49:31 +02:00
Naomi Aro
5f562b94ca
replacing propel files
2011-06-21 15:40:40 +02:00
Naomi Aro
e803b76fcf
CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
...
removing watch/adding new watch when changing stor directory.
2011-06-21 15:11:42 +02:00
Naomi Aro
6adce1ba45
CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
...
adding ability to move stor directory.
2011-06-21 14:58:38 +02:00
Naomi Aro
f1893cebe6
CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
...
making separate js file for music dirs page.
2011-06-21 11:57:56 +02:00
Naomi Aro
253eb811c7
Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/models/Preference.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/public/js/airtime/preferences/preferences.js
2011-06-21 11:20:35 +02:00
Naomi Aro
b6888489e0
CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
...
adding music dirs concept to Airtime. New cc_music_dirs table/class.
2011-06-21 10:24:02 +02:00
James Moon
dd4ea127fc
CC-1724:Phone home statistic
...
- Fixed the bug where it didn't populate country dropdown box
This was due to default sql not popuplate country table correctly
- Changed 180*180 min log text to 200*200
- Changed text are size in support settings
- Client now sends base64encoded image to server.
2011-06-20 20:31:20 -07:00
james
2fb721167c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-06-20 18:11:25 -04:00
james
965b96047a
Merge
2011-06-20 18:10:39 -04:00
james
05dc48fa71
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/models/Preference.php
2011-06-20 18:09:37 -04:00
martin
d9c5e2b6d6
-add newline chars to Airtime-upgrade-disabled message
2011-06-20 18:03:07 -04:00
martin
f03c0e5f10
-Disable upgrades for the 1.9.0 beta.
2011-06-20 18:00:26 -04:00
james
e762633405
CC-1724:Phone home statistics
...
- Final commit for client side.
2011-06-20 17:58:38 -04:00
martin
5569a24aef
CC-2410: Clean up install process
...
-Fix includes in airtime-upgrade.php
2011-06-20 17:43:06 -04:00
martin
9e4b4a0e93
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-06-20 17:38:27 -04:00
martin
aa56344a29
CC-2410: Clean up install process
...
-hiding a few more warnings.
2011-06-20 17:38:18 -04:00
Paul Baranowski
1bb2e79a78
CC-2397: Support output to Shoutcast
...
Simply added some config file variables and added the output type in
the liquidsoap script.
2011-06-20 17:34:16 -04:00
martin
de436486fb
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-06-20 17:24:24 -04:00
martin
fe14113b58
CC-2410: Clean up install process
...
-reduced number of messages
-got rid of some warnings.
-moved airtime-install.php, airtime-upgrade.php, airtime-uninstall.php
2011-06-20 17:24:12 -04:00
Paul Baranowski
4c09054dca
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-06-20 16:55:33 -04:00
Paul Baranowski
f72d893ace
Added credits for 1.9.0.
2011-06-20 16:53:50 -04:00
Paul Baranowski
5e733a4276
CC-2406: Reinstall + recreating the database tables doesnt work
...
This was caused because updating the build.properties file did not happen
unless you chose to overwrite your existing configuration files.
Changed it so that it always updates the build.properties file.
2011-06-20 16:53:23 -04:00