Duncan Sommerville
|
ccb4b1552e
|
Merge branch '2.5.x-albertenhancements' into saas
|
2015-03-02 15:26:13 -05:00 |
Duncan Sommerville
|
0272eaef44
|
Changed is_null to empty
|
2015-03-02 15:25:52 -05:00 |
Duncan Sommerville
|
a7cedbb34f
|
Merge branch '2.5.x-albertenhancements' into saas
|
2015-03-02 15:10:37 -05:00 |
Duncan Sommerville
|
b6a6f038a9
|
Added call to setStationDescription in preferences action
|
2015-03-02 15:10:04 -05:00 |
Duncan Sommerville
|
7a035e91ec
|
Merge branch '2.5.x-albertenhancements' into saas
|
2015-03-02 14:58:33 -05:00 |
Duncan Sommerville
|
13bd0b7589
|
Fixed removing image when saving preferences with no upload
|
2015-03-02 14:57:50 -05:00 |
Duncan Sommerville
|
936d11b367
|
Merge branch '2.5.x-albertenhancements' into saas
|
2015-02-27 17:21:20 -05:00 |
Duncan Sommerville
|
78c7170c4e
|
Reformatted logo remove button to use Zend
|
2015-02-27 17:19:37 -05:00 |
Albert Santoni
|
2e2f1f9762
|
Fixed SAAS-612: Recreating a station can wipe its database
|
2015-02-26 17:14:46 -05:00 |
Albert Santoni
|
ac3ad3d23b
|
Prevent overwriting the database if it already exists
|
2015-02-26 15:33:35 -05:00 |
Albert Santoni
|
6047670dbd
|
Fix corner case where failed uploads could show up in the library
|
2015-02-26 14:12:51 -05:00 |
Albert Santoni
|
0b1af01822
|
Better exception logging and small pypo exception fix
|
2015-02-26 13:52:51 -05:00 |
Duncan Sommerville
|
c57d4e3fc4
|
Check if station is on a trial plan before displaying the trial box
|
2015-02-26 13:30:35 -05:00 |
Duncan Sommerville
|
93f62eaadd
|
Added check to hide LiveChat for existing hobbyist users
|
2015-02-26 12:49:52 -05:00 |
drigato
|
48b4e3fb62
|
Also need to diable disk usage in media controller
|
2015-02-25 16:11:52 -05:00 |
drigato
|
7e167e5a47
|
Temporarily disabling disk quota limit until all file sizes have been set
|
2015-02-25 15:28:48 -05:00 |
drigato
|
e0a050ac60
|
Fix file deletion bug
|
2015-02-25 15:09:02 -05:00 |
drigato
|
38aa1d1cd9
|
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
|
2015-02-24 16:44:17 -05:00 |
Albert Santoni
|
562c2f0100
|
Remove widget JS snippet animation because it's bugged
|
2015-02-24 15:18:39 -05:00 |
Albert Santoni
|
e13e4413ea
|
Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas
|
2015-02-24 15:03:06 -05:00 |
Duncan Sommerville
|
5e256df061
|
Added remove button for station logo on preferences page
|
2015-02-24 12:12:30 -05:00 |
Albert Santoni
|
b2a2153572
|
Merge branch '2.5.x' into saas
|
2015-02-24 12:04:11 -05:00 |
drigato
|
be7a6854f0
|
SAAS-596: Store file size and hash in database
Have pypo fetch the file size and md5, if necessary, and make request to
Airtime to set these values
|
2015-02-24 11:00:41 -05:00 |
Duncan Sommerville
|
69d588d2f6
|
Merge branch '2.5.x' into 2.5.x-albertenhancements
|
2015-02-24 10:45:52 -05:00 |
drigato
|
47a7b0245e
|
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
|
2015-02-23 10:29:34 -05:00 |
Duncan Sommerville
|
33ebca00db
|
Small fix to BPM sanitization
|
2015-02-20 14:23:36 -05:00 |
localizer
|
19851efbe5
|
updated translation resources
|
2015-02-20 11:24:14 +00:00 |
drigato
|
fd0db11450
|
SAAS-596: Store file size and hash in database
Added upgrader class to add new filesize column
|
2015-02-19 16:27:50 -05:00 |
drigato
|
6ef085f460
|
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
|
2015-02-19 11:43:34 -05:00 |
drigato
|
2905d0394b
|
Merge branch 'saas-store-file-size-and-hash-in-db' of https://github.com/sourcefabric/Airtime into saas-store-file-size-and-hash-in-db
|
2015-02-19 10:35:07 -05:00 |
drigato
|
e5d6797ce7
|
SAAS-596: Store file size and hash in database
Removed md5_hash column from cc_files since there is already a md5
column
|
2015-02-19 10:34:35 -05:00 |
Albert Santoni
|
73cb14155c
|
Replace the version hashing with git revision hashing to fix browser
caching
|
2015-02-19 10:01:09 -05:00 |
Albert Santoni
|
5a644ae0b8
|
Merge branch 'cc-5709-airtime-analyzer' into saas
|
2015-02-19 09:31:58 -05:00 |
Albert Santoni
|
487ab9bd99
|
CC-5868: Make the BPM field less strict
|
2015-02-19 09:31:23 -05:00 |
Albert Santoni
|
ddab1943f6
|
Merge branch '2.5.x' into saas
|
2015-02-19 09:20:57 -05:00 |
Albert Santoni
|
b3a46b948f
|
CC-5999: Unknown file type: audio/vorbis
|
2015-02-19 09:19:27 -05:00 |
Albert Santoni
|
961cdfc2ee
|
CC-5849: Audio preview audio/x-wav exception
|
2015-02-18 19:41:56 -05:00 |
Albert Santoni
|
857ad9615e
|
CC-5849: Audio preview audio/x-wav exception
|
2015-02-18 19:40:27 -05:00 |
Albert Santoni
|
d0bd4bfe81
|
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
|
2015-02-18 19:29:45 -05:00 |
Albert Santoni
|
08c53a9292
|
Fixed incorrect authorization for ShowImage API
|
2015-02-18 18:34:52 -05:00 |
Albert Santoni
|
0535626df1
|
Merge branch 'saas-file-sanitization' into saas
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
|
2015-02-18 17:19:26 -05:00 |
Albert Santoni
|
9098e204e5
|
Merge branch 'cc-5709-airtime-analyzer' into saas-file-sanitization
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
|
2015-02-18 17:18:43 -05:00 |
Albert Santoni
|
b76ab27230
|
Fixed the unit tests: Ensure key in $_SERVER exists.
|
2015-02-18 17:03:16 -05:00 |
Albert Santoni
|
964d7d1326
|
Merge branch 'cc-5709-airtime-analyzer' into saas
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
|
2015-02-18 16:42:04 -05:00 |
Albert Santoni
|
17f1d0e96d
|
Simplify the metadata sanitization and bugfix it
* SAAS-376 and CC-5868
|
2015-02-18 16:29:08 -05:00 |
Albert Santoni
|
2ae921e9d7
|
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
|
2015-02-18 16:16:41 -05:00 |
Albert Santoni
|
3c064b13a9
|
Merge branch '2.5.x' into saas
Conflicts:
airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
|
2015-02-18 16:03:14 -05:00 |
Albert Santoni
|
68cd5b027a
|
CC-5998: Prevent users from spamming the delete button in the library
|
2015-02-18 15:56:28 -05:00 |
Albert Santoni
|
717d322dc8
|
Fix typo breaking provisioning/create/
|
2015-02-18 15:22:47 -05:00 |
Albert Santoni
|
12c0617e57
|
Set up the cc_music_dirs entry in /provisioning/create
|
2015-02-18 13:27:52 -05:00 |