summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-16Merge remote-tracking branch 'origin/develop'Azul
Conflicts: app/assets/javascripts/srp test/nagios/soledad_sync.py test/nagios/webapp_login.py
2014-05-15Merge pull request #161 from azul/bugfix/download-button-widerazul
make download button wide enough for helvetica #5039
2014-05-15Merge pull request #160 from azul/upgrade/rails-3.2.18azul
upgrade rails to 3.2.18 for security fixes
2014-05-14check for presence of service_levelsAzul
This way the pricing link will not be shown for an empty hash. Which is easier to get into the config file than nil. And we can later verify the configuration to have a hash as the service_levels.
2014-05-14upgrade rails to 3.2.18 for security fixesAzul
2014-05-14make download button wide enough for helvetica #5039Azul
2014-05-14Merge pull request #159 from azul/bugfix/5659-fix-ticket-form-submitazul
open/close toggle and fields in different forms - fixes #5659
2014-05-14Merge pull request #157 from azul/bugfix/5664-stop-email-autofillazul
Bugfix/5664 stop email autofill
2014-05-14Merge pull request #158 from azul/bugfix/5658-fix-broken-mastheadazul
move User Control Panel heading out of masthead
2014-05-13adjust tests to new config and method implementationAzul
Ticket.is_creator_vlidated? now actually fetches the user from the db and returns false if it does not exist.
2014-05-13open/close toggle and fields in different forms - fixes #5659Azul
2014-05-13move User Control Panel heading out of mastheadAzul
the masthead can only handle content of a limited width. Alternatively we could make the masthead title wider and add padding on the left so it still aligns nicely with the mask. However the wider we make it the worse it looks on small width displays. Another option would be to make the masthead contain multiple lines. However vertical aligment to the middle of 1 OR 2 lines of text is a real pain. So I went with a super simple masthead and the Caption goes below.
2014-05-13destinguish user.email from user.email_addressAzul
use the former if you want a working email account or nil, the latter if you want the email address associated with a given user no matter if the user actually has an email account or not.
2014-05-13prefill ticket form from the model - fixes #5657Azul
email and regarding user fields can be set to defaults based on created_by user. If these fields are emptied by the submitting user they will be set to whereas they are nil if they have not been initialized. In that case we will use meaningful defaults from the user who created the ticket.
2014-05-13minor: use %Q for interpolated string with "Azul
2014-05-13keep empty email field if user removed prefillAzul
We should respect the users choice. We can still get their email from the user id if we really need to.
2014-05-13allow for usernames with dotsAzul
preparing for #5664 with some test improvements i ran into this issue This commit includes a fix and the test improvements. In particular it adds BrowserIntegrationTest#login - so there is no need to go through the signup procedure everytime you want a user to be logged in.
2014-05-09Merge pull request #156 from azul/bugfix/5548-hide-signup-forms-without-js0.5.1-rc2azul
hide srp forms when no js is available
2014-05-08minor fix to default pricing chartelijah
2014-05-06minor: fixing commentAzul
2014-05-06hide srp forms when no js is availableAzul
Hiding them using two mechanisms in case one fails: .hidden class - bootstrap hides them then style='display:none' - so they are hidden even if css load fails
2014-05-06Merge pull request #154 from azul/feature/display-pricingazul
adopt pricing view to current service_level format
2014-05-06Merge pull request #155 from azul/feature/simplify-download-btnazul
Feature/simplify download btn
2014-04-30upgrade debugger so it works with p545 on travisAzul
2014-04-30remove outdated os detection testAzul
2014-04-29adopt pricing view to current service_level formatAzul
2014-04-29remove os specific download buttonsAzul
keeping the platform detection for now.
2014-04-29smaller download button with context on dashAzul
To use bitmask services: Download Bitmask
2014-04-29simplify download buttonAzul
2014-04-25Merge pull request #153 from azul/bugfix/5557-password-validationsazul
basic password validation without client side gem
2014-04-25basic password validation without client side gemAzul
The client_side_validations gem is not maintained anymore and the validations were not working lately. So instead of trying to fix it I started working on independent validations for the password as it can't be validated on the server due to SRP. So far these validations are very primitive. They require 8 characters length and a matching confirmation.
2014-04-25Merge pull request #150 from azul/bugfix/5542-capitalize-loadingazul
Bugfix/5542 capitalize loading
2014-04-25use i18n keys for signup & login buttonsAzul
2014-04-25make test independent of button tagAzul
input or button can be used
2014-04-25move open and close buttons into status displayAzul
They do not save any changes. So i think it's better to keep them separated from the Save button that does save changes.
2014-04-25ensure buttons are properly loading... and resetAzul
2014-04-25using simple_form for the last form that was not using it.Azul
2014-04-25simple form: add wrapped and loading... buttons #5542Azul
the loading... text on the buttons was not capitalized before. So in order to change this in a (more or less) single place i added new button types to simple_form: button :wrapped - normal button, with loading and an optional cancel button wrapped in the classical bootstrap action div. cancel option contains the url to go to when canceling. button :loading - simple button with loading text capitalized by using i18n (simple_form.buttons.loading) Conflicts: engines/support/app/views/tickets/new.html.haml
2014-04-25Merge pull request #148 from azul/feature/api-quota-supportazul
Feature/api quota support + current_user null pattern
2014-04-25Merge pull request #151 from azul/bugfix/5549-prefer-client-signupazul
Bugfix/5549 prefer client signup
2014-04-25Merge pull request #152 from azul/bugfix/5552-recover-from-invalid-ticketsazul
Bugfix/5552 recover from invalid tickets
2014-04-24remove cert link - has no purpose anymoreAzul
2014-04-24add tests for invalid ticket creationAzul
2014-04-24check user_id param for present? instead of !nil?Azul
when rendered from teh create action due to an error user_id param will sometimes be an empty string. We should still avoid rendering the navigation because the path's can not be resolved without a user_id.
2014-04-24let's only add the flash notice if the ticket has been createdAzul
2014-04-24return nil as auto_ticket_path for invalid ticketsAzul
The auto_ticket_path is referenced from the tickets_controller like this: respond_with(@ticket, :location => auto_ticket_path(@ticket)) While this only uses the location parameter when the ticket is valid it will still attampt to calculate it if not. During the create action this will lead to crashes because the ticket_path can not be calculated for a ticket without an id. This led to https://leap.se/code/issues/5552 and probably https://leap.se/code/issues/5545.
2014-04-24cert_path now is api_cert_pathAzul
2014-04-24unified wording: destroy accountAzul
2014-04-24cleanup homepage buttons someAzul
let's devide the partials rather than having super specific parameters (on_user_page)
2014-04-24add signup and login info on the formsAzul