Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,244 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

1635 Commits

Author SHA1 Message Date
Albert Santoni 75914b791c Merge branch 'saas-dev' into saas 
Conflicts:
	airtime_mvc/application/common/FileDataHelper.php
 2015-08-10 09:00:54 -04:00
Albert Santoni ea2a6b3f68 Clean up and bugfixes for password reset (SAAS-1009) 2015-08-07 13:57:42 -04:00
Albert Santoni e49d337db0 Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev 2015-08-05 14:50:31 -04:00
Albert Santoni eef61a65fc Cleanup and comments for the timezone/language popup 2015-08-05 14:49:43 -04:00
Albert Santoni c934866063 Two small code improvements 2015-08-04 17:42:53 -04:00
drigato 989b4994aa SAAS-945: Language + Timezone Setup Popup 
forgot to auto detect user's timezone
 2015-07-27 14:38:42 -04:00
drigato ee2bfe7664 SAAS-945: Language + Timezone Setup Popup 2015-07-27 07:06:22 -04:00
drigato ce7765a8cb Merge branch 'saas' into saas-dev 2015-07-21 11:03:31 -04:00
drigato 3e60713590 SAAS-962: "Now" option should not be available for linked shows 
Also added fix for SAAS-957
 2015-07-20 15:20:50 -04:00
drigato a6854ea507 SAAS-957: Error on "update show" 2015-07-17 16:28:33 -04:00
Duncan Sommerville 1816be156f SAAS-922 - change file extensions in pypo based on mime-type, update lists of accepted mime types 2015-07-16 16:26:52 -04:00
drigato b37b574cea Real fix for calendar context menu width problem 2015-07-15 10:30:59 -04:00
drigato dddc6e6591 Fix for context menu on calendar being too small sometimes 2015-07-15 07:19:48 -04:00
drigato 8309289356 Merge branch 'saas-dev-usability-hints' of https://github.com/sourcefabric/Airtime into saas-dev-usability-hints 2015-07-14 11:52:10 -04:00
drigato e5c574229f SAAS-940: Provide usability hints to user 
fix hint message transitions
 2015-07-14 11:51:50 -04:00
Albert Santoni 2693c9f02c Small bugfix for CC-6064 2015-07-14 11:25:11 -04:00
Albert Santoni 30b8ada622 Merge branch 'saas-dev-usability-hints' of github.com:sourcefabric/Airtime into saas-dev-usability-hints 2015-07-14 10:56:18 -04:00
Albert Santoni 45b09a0d24 Merge branch 'saas-dev' into saas-dev-usability-hints 
Conflicts:
	airtime_mvc/public/js/airtime/schedule/add-show.js
 2015-07-14 10:56:12 -04:00
drigato e24307180c Merge branch 'saas-dev-usability-hints' of https://github.com/sourcefabric/Airtime into saas-dev-usability-hints 2015-07-14 10:40:10 -04:00
drigato 794a4a21d8 SAAS-940: Provide usability hints to user 
Update hints after library table has changed
 2015-07-14 10:39:58 -04:00
Albert Santoni 5a2ef8d3db Merge branch 'saas-dev-usability-hints' of github.com:sourcefabric/Airtime into saas-dev-usability-hints 2015-07-14 10:35:47 -04:00
Albert Santoni 66caf2574a CC-6064: Allow shows to be started "now" 2015-07-14 10:35:21 -04:00
drigato 71e8909365 SAAS-940: Provide usability hints to user 
Fixed bug where hints were not showing up sometimes
 2015-07-14 10:08:56 -04:00
drigato 25ef70767b SAAS-940: Provide usability hints to user 
Customized hints depending on what page the user is on and what action
they just completed.
 2015-07-13 17:02:31 -04:00
Duncan Sommerville 755ec79e7d SAAS-876 - frontend tweaks 2015-07-13 15:17:47 -04:00
Duncan Sommerville c05d4bac2f Merge branch 'saas-dev' into saas-stream-settings 2015-07-13 13:27:34 -04:00
Duncan Sommerville 6d883d2fa4 Fix Add Show button bug and update styling 2015-07-13 13:23:24 -04:00
Duncan Sommerville c99165a8dd SAAS-876 - better implementation of toggle between Airtime Pro/Custom streaming options 2015-07-10 13:17:20 -04:00
Duncan Sommerville ac2e1a2d4b SAAS-876 - More work on stream settings page 2015-07-08 16:04:09 -04:00
Duncan Sommerville 6b9d9e8063 Merge branch 'saas-dev' into saas-stream-settings 2015-07-08 12:47:24 -04:00
Duncan Sommerville 31ce52b857 CC-6062 - Fix stretching last column after adding show in calendar view 2015-07-06 11:52:04 -04:00
Duncan Sommerville 457230ba07 SAAS-876 - Initial commit 2015-07-03 13:32:41 -04:00
Duncan Sommerville e3101e90b2 Resize player windows to correct dimensions on open 2015-07-02 16:07:49 -04:00
Duncan Sommerville a8f214803b Fix javascript error on some browsers 2015-06-29 17:07:17 -04:00
Duncan Sommerville 19fb67c8d6 Fix broken delete button 2015-06-29 11:28:27 -04:00
Duncan Sommerville 5cc8774e56 Merge branch 'saas-dev' into soundcloud 
Conflicts:
	airtime_mvc/application/configs/constants.php
 2015-06-29 10:02:58 -04:00
Duncan Sommerville ca9c805ce4 SAAS-906 - Change wording on Add to Show button 2015-06-26 15:25:58 -04:00
Duncan Sommerville c79e4fb9ea CC-4922 2015-06-26 15:12:52 -04:00
Duncan Sommerville c44bae8140 Merge branch 'saas-dev' into soundcloud 
Conflicts:
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
 2015-06-26 10:37:30 -04:00
Duncan Sommerville 79f51f77cb Merge branch '2.5.x-installer' into saas-dev 2015-06-25 18:21:40 -04:00
Duncan Sommerville c59f401eb1 Fix shift selection in library and builder views 2015-06-25 18:21:22 -04:00
Duncan Sommerville 6497bc28c5 Show collapsible sections (other than 'dangerous settings') by default on preferences page 2015-06-25 17:43:15 -04:00
Duncan Sommerville 6fb9c6a30c SAAS-885, SAAS-857, SAAS-878 - Cosmetic fixes, remove js widget box in preferences 2015-06-25 14:13:09 -04:00
Duncan Sommerville 67155b136a Add downgrade action to UpgradeController, fix SoundCloud schema and bugs 2015-06-24 18:38:04 -04:00
Duncan Sommerville 8fcaf7fc74 Merge branch 'saas-dev' into soundcloud 
Conflicts:
	airtime_mvc/application/configs/constants.php
 2015-06-24 16:35:06 -04:00
Duncan Sommerville a3f1cf1d56 CC-6060 - Fix breaking tooltips when viewing context menu in library 2015-06-22 10:47:34 -04:00
Duncan Sommerville e36c8a16d4 CC-6060 - Fix breaking tooltips when viewing context menu in library 2015-06-22 10:46:29 -04:00
Duncan Sommerville 76a7aa9a24 Fix SoundCloud and TaskManager bugs, switch tasks to use acks_late, and provide feedback from SoundCloud context menu items 2015-06-18 18:18:48 -04:00
Albert Santoni 8c9981a155 Merge branch '2.5.x' into 2.5.x-installer 
Conflicts:
	airtime_mvc/public/index.php
 2015-06-16 10:37:06 -04:00
Duncan Sommerville 3902c8c746 Add SoundCloud delete functionality and fixes; implement TaskManager to run background jobs 2015-06-15 15:12:37 -04:00