Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13367 commits 3 branches 0 tags 405 MiB
Commit graph

725 commits

Author SHA1 Message Date
Albert Santoni
d785d92953 VAT fixes 2014-06-26 17:44:53 -04:00
Albert Santoni
18c828defd Finished up VAT validation for Plans page 2014-06-26 17:31:34 -04:00
Albert Santoni
94bbd3c8a5 Don't open trialbox My Account link in new window 2014-06-25 20:36:08 -04:00
Albert Santoni
51b7fe9adf Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 2014-06-25 20:33:10 -04:00
Albert Santoni
b36967a690 Nicer auto-styling for the Billing Details form 2014-06-25 20:32:41 -04:00
Albert Santoni
fce6116d60 Made the invoices view nice! 2014-06-25 20:01:14 -04:00
Albert Santoni
338fd06f81 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 
Conflicts:
	airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
 2014-06-25 19:03:13 -04:00
Albert Santoni
d92e5197e1 Design and overhaul of Account Plans screen 
* Basically working now except for VAT calculation
* Includes pricing grid, basic total calculation
* Revamped layout
* Implemented getting the service ID in BillingController.php
 2014-06-25 18:58:54 -04:00
Albert Santoni
8c20592423 Start of form customization for billing 2014-06-24 15:52:43 -04:00
drigato
f40cdbc8cd Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas 2014-06-23 10:59:07 -04:00
drigato
497841225b Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now 2014-06-20 16:54:41 -04:00
drigato
1e1dc1dd03 Validation 
Refactoring
 2014-06-20 16:31:26 -04:00
drigato
01bf2883e5 Save client info on upgrade 2014-06-20 15:00:28 -04:00
Albert Santoni
faa12c8065 Super Admin edit page points to billing now 
* Also prevent super admin from being deleted
 2014-06-20 13:36:06 -04:00
drigato
40f2796972 Created an invoice view 
Some refactoring
Some validation
 2014-06-19 16:55:01 -04:00
drigato
1f4c8b755d Created a separate view for upgrades and client info 2014-06-17 12:47:08 -04:00
drigato
81ceafbfbd whmcs client form 2014-06-12 17:54:20 -04:00
drigato
267cc78699 'My Account' link on free trial box was broken 2014-06-12 09:37:16 -04:00
Albert Santoni
fa3c7bd67a Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-09 11:37:06 -04:00
Albert Santoni
560d1a9b14 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
 2014-06-09 11:36:51 -04:00
Albert Santoni
345c782eb9 Fixed the unit tests and changed ops->zu 2014-06-09 11:34:25 -04:00
Albert Santoni
446eca057c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
	airtime_mvc/locale/template/airtime.po
	airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
 2014-04-25 00:43:22 -04:00
drigato
f536a7b1b4 CC-5814: 'Down for maintenance' page during upgrades 2014-04-24 16:19:55 -04:00
drigato
edcf8844e3 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-14 11:25:02 -04:00
drigato
4add0f0b7b CC-5786: Quota Enforcement in the File Upload API 2014-04-14 11:24:39 -04:00
Albert Santoni
8fb95316f2 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
 2014-04-09 15:01:11 -04:00
Albert Santoni
1e62908e66 CC-5709: Airtime Analyzer 
* Bounce files with file extensions we don't support in MediaController
* Added translation stuff for Recent Uploads
 2014-04-09 11:28:41 -04:00
Albert Santoni
1c5e2d6205 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/public/index.php

* Reverted some SaaS-only thing Martin did a year ago. Looks benign but
  only one way to find out...
 2014-03-27 16:38:03 -04:00
Albert Santoni
878dd11ccc CC-5709: Airtime Analyzer 
* Overhauled Add Media screen, now shows state of recent uploads
* Dropped old unused "state" column, added new file_import column to cc_files
* New PluploadController methods
* Save the filename as the track title for unprocessed uploads
* Hide pending files from the library until they've been processed.
* Don't overwrite files with duplicate names, we rename them instead.
 2014-03-21 13:22:00 -04:00
Naomi Aro
49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
 2013-12-17 17:20:38 -05:00
Albert Santoni
f16d8ca2ea Fixed a bunch of annoying/major graphical issues with the calendar 
* Fixed a bug where the calendar would keep shrinking smaller and
  smaller as you resized the window.
* Fixed the size and alignment of the time span combobox in the corner,
  which fixes a bug where the text was cut off.
* Fixed a bug where the schedule header would grow as you flipped
  to the next or previous week.
* Dropped javascript from the resizing of the calendar (for the most
  part).
 2013-12-14 00:05:13 -05:00
denise
55254e88a5 UI text improvements for setting the station/user timezones 
Added info icon in the add-show form for timezone setting
 2013-10-07 14:49:52 -04:00
Albert Santoni
7b1cd5c908 CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
denise
a8a02704f3 Merge branch '2.5.x' into cc-5232-show-timezone 2013-09-25 17:24:44 -04:00
Albert Santoni
a1f3309cf7 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-09-25 16:41:35 -04:00
Albert Santoni
99669c78a0 Fixed CC-5045 and Now Playing time remaining style improvements 2013-09-25 16:40:20 -04:00
denise
107263ae20 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
Naomi Aro
53341d40f7 CC-5334 : Localize Ryerson History Feature 2013-09-24 09:56:04 +02:00
Naomi Aro
ee45f10aeb CC-5334 : Localize Ryerson History Feature 2013-09-23 14:42:35 +02:00
Naomi Aro
682a37894b Merge branch 'ryerson-history' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/views/scripts/menu.phtml
 2013-09-02 15:52:43 -04:00
Naomi Aro
60bf334aeb Merge branch '2.4.x' into 2.4.x-saas 2013-09-02 15:46:25 -04:00
Naomi Aro
619dbf7bbf format/json to prevent zend errors. 2013-09-01 13:38:18 -04:00
Naomi Aro
9c0bee3877 adding show instance to the create form if it's already set. 2013-08-31 23:34:37 -04:00
Naomi
4fd37a4fa0 Merge branch '2.4.x' into ryerson-history 2013-08-30 16:07:41 -04:00
Naomi Aro
0e017374b7 change default text to "No Show" 2013-08-30 01:30:23 -04:00
Naomi Aro
15e27f8166 history records for a show have times validated within show range. 2013-08-30 00:43:43 -04:00
Naomi Aro
5a8957273f removing choice for show instance if in shows tab. 2013-08-29 18:52:40 -04:00
Naomi
d50cdd16c2 starting association of a show instance. 2013-08-29 17:40:08 -04:00
Naomi Aro
a4c97479b6 using an accordian to display per show logs. 2013-08-28 23:30:15 -04:00
Naomi
429cdeeffb filtering by a host's show so they can edit their own playout history. 2013-08-28 19:37:46 -04:00