Commit Graph

3954 Commits

Author SHA1 Message Date
Martin Konecny 4595aab694 Merge branch '2.3.x' 2013-04-05 15:33:48 -04:00
Martin Konecny d1f655d79d CC-5038: Silan error: list index out of range
-fixed
2013-04-05 15:32:44 -04:00
Martin Konecny fcbac2a044 Merge branch '2.3.x' into devel 2013-04-04 15:15:19 -04:00
Martin Konecny 301115c035 CC-5039: Encoded forward slash causing lots of apache error logs
-fixed: data should have been sent as POST rather than GET
2013-04-04 15:12:52 -04:00
Martin Konecny d1e72cfeea Merge branch '2.3.x' into devel 2013-04-03 17:12:28 -04:00
Martin Konecny a748b05125 CC-5040:
All API actions need to have consistent return value

-temp fix. Correct fix will require ensuring api_client always sends
XmlHttpRequest
2013-04-03 17:11:36 -04:00
Martin Konecny 563f5b64d2 Merge branch '2.3.x' into devel
Conflicts:
	debian/postinst
2013-04-02 12:31:48 -04:00
Daniel James 860524a873 Added locales for English localizations 2013-04-02 17:19:48 +01:00
Daniel James ebbb9f1b9c Added Austrian German localization, thanks Hoerich! 2013-04-02 17:06:16 +01:00
Martin Konecny 5ac51e289d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-04-01 19:15:02 -04:00
Martin Konecny 6ae8da98e4 removing logging 2013-04-01 19:14:55 -04:00
Martin Konecny ee617c8a70 Merge branch '2.3.x' into devel
Conflicts:
	airtime_mvc/application/controllers/UserController.php
2013-03-26 16:34:11 -04:00
Martin Konecny d9646994e9 remove airtime-demo specific code 2013-03-26 16:33:14 -04:00
Martin Konecny 5dc0a4477b disable deletion of users 2013-03-26 16:10:42 -04:00
Martin Konecny 894887bd62 Merge branch '2.3.x' into devel 2013-03-26 15:02:17 -04:00
Martin Konecny 265ac49f2e remove duplicate cc_config 2013-03-24 23:11:55 -04:00
Martin Konecny b1160afeab cleanup 2013-03-22 18:05:49 -04:00
Martin Konecny d12f793578 remove potential password change exploit in airtime-demo 2013-03-22 18:05:34 -04:00
Martin Konecny 5ceeb88899 Merge branch '2.3.x' into devel 2013-03-06 13:46:01 -05:00
Martin Konecny 7ca178295f CC-4993: airtime-check-system reports airtime-liquidsoap as down
-fixed
2013-03-06 13:43:22 -05:00
Martin Konecny 0ef1a5ffda CC-4976: Cannot select Ogg/Vorbis output stream after selecting SHOUTcast then selecting Icecast
-fixed
2013-03-05 18:19:08 -05:00
Martin Konecny cc69418215 Merge branch '2.3.x' into devel 2013-03-05 16:21:22 -05:00
Martin Konecny d7d1170ee1 CC-5003:
Some tracks are being cut off before fully playout out

-fixed
2013-03-04 18:52:51 -05:00
Martin Konecny 00d577fd5b CC-4985: Ensure files deleted via the UI are deleted from stor directory.
-temporary fix. We know rabbitmq received the message, but we don't know
if media-monitor actually acted on it.
2013-03-04 15:22:09 -05:00
Martin Konecny ae503121d8 CC-4984: Exception for replaygain
-fixed
2013-02-28 18:26:15 -05:00
Martin Konecny 943538ed9d Revert "CC-4980: Create graphic with 4 switches for Airtime Dashboard"
This reverts commit baf693d1a9.
2013-02-27 14:35:35 -05:00
Vladimir baf693d1a9 CC-4980: Create graphic with 4 switches for Airtime Dashboard 2013-02-27 17:36:43 +01:00
Martin Konecny e08732fba7 CC-4975: airtime-silan cmd error
-fixed
2013-02-25 19:45:26 -05:00
denise 176e78632f Added a comment about referring to the wiki when adding a new datatable column 2013-02-19 16:43:47 -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 959839e180 Renamed criteriaTypes to libraryColumnTypes for library advanced search 2013-02-19 15:09:24 -05:00
denise 32fc5eb758 CC-4951: Add cue in and cue out to library filter columns
Configured advanced search for these columns
2013-02-19 14:44:32 -05:00
denise 8bdf3508b0 CC-4951: Add cue in and cue out to library filter columns
Done
2013-02-19 13:38:35 -05:00
denise 49dc3140a8 CC-4962: Library -> Library and playlist editor have different heights sometimes
Fixed: needed to set height when we open the playlist editor
2013-02-19 11:59:17 -05:00
denise 9113853e41 Removed logging messages from Library controller, index action 2013-02-19 11:51:26 -05:00
denise c0c6ac5d75 CC-4954: Please make Library page remember the status per user
- it was only working if there was a playlist object set
- fixed so it works even if there isnt
2013-02-19 11:37:22 -05:00
denise 14f1d5572f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-02-19 10:59:03 -05:00
denise d1301ff676 CC-4954: Please make Library page remember the status per user
-done
2013-02-19 10:58:48 -05:00
Naomi 542553bbc1 Merge branch '2.3.x' into devel 2013-02-15 17:05:36 -05:00
Naomi 9a2b8af7b1 Revert "CC-4955: Datatables saves its parameters twice on every page load"
This reverts commit 39ec07e71c.
2013-02-15 16:50:43 -05:00
Naomi f2773fcb01 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-15 16:32:43 -05:00
Naomi fe611e7c6a CC-4957 : Replay Gain undefined error, json response not being sent back properly. 2013-02-15 16:32:05 -05:00
Martin Konecny 09baf3a47d remove unecessary file + better error handling 2013-02-15 14:19:04 -05:00
Martin Konecny 39ec07e71c CC-4955: Datatables saves its parameters twice on every page load
-fixed
2013-02-15 14:18:32 -05:00
Martin Konecny 4f3ea3f406 Update ColReorder Datatables plugin 2013-02-14 17:48:32 -05:00
Martin Konecny b30f67b24b CC-4950: builder-feed is called twice on NowPlaying screen load 2013-02-14 15:49:38 -05:00
denise e2e45b0160 CC-4948: Library -> library loses have its width when window is resized
-fixed
2013-02-14 15:34:11 -05:00
denise 1a36953d82 CC-4898: Pressing "Enter" from anywhere on the edit metadata popup should automatically Save and close the popup
-fixed
2013-02-14 14:52:48 -05:00
Martin Konecny 58740d6b41 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-14 13:33:27 -05:00
Martin Konecny b3ab84db2e add minified datatables.js and upgrade from 1.9.1 to 1.9.4 2013-02-14 13:33:18 -05:00