denise
|
b817684972
|
Merge branch '2.2.x' into devel
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/public/js/bootstrap/bootstrap.js
|
2012-11-07 11:21:36 -05:00 |
|
denise
|
8fda0ba610
|
CC-4625: On tablet you cannot create a playlist, smart block or webstream
-attempt #2
|
2012-11-05 12:03:46 -05:00 |
|
denise
|
c051e0671d
|
CC-4625: On tablet you cannot create a playlist, smart block or webstream
-attempt #2
|
2012-11-05 12:00:37 -05:00 |
|
denise
|
715a21acb2
|
CC-4625: On tablet you cannot create a playlist, smart block or webstream
-upgraded bootstrap-dropdown.js to v2.2.1
|
2012-11-02 11:59:36 -04:00 |
Vladimir
|
77824afdd3
|
Added Bootstrap CSS, images and JS for new buttons and dropdown menues
|
2012-09-12 21:23:25 +02:00 |