Age | Commit message (Collapse) | Author |
|
Conflicts:
app/assets/javascripts/srp
test/nagios/soledad_sync.py
test/nagios/webapp_login.py
|
|
make download button wide enough for helvetica #5039
|
|
upgrade rails to 3.2.18 for security fixes
|
|
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.
|
|
|
|
|
|
open/close toggle and fields in different forms - fixes #5659
|
|
Bugfix/5664 stop email autofill
|
|
move User Control Panel heading out of masthead
|
|
Ticket.is_creator_vlidated? now actually fetches the user from the db and returns false if it does not exist.
|
|
|
|
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.
|
|
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.
|
|
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.
|
|
|
|
We should respect the users choice. We can still get their email from the user id if we really need to.
|
|
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.
|
|
hide srp forms when no js is available
|
|
|
|
|
|
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
|
|
adopt pricing view to current service_level format
|
|
Feature/simplify download btn
|
|
|
|
|
|
|
|
keeping the platform detection for now.
|
|
To use bitmask services:
Download Bitmask
|
|
|
|
basic password validation without client side gem
|
|
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.
|
|
Bugfix/5542 capitalize loading
|
|
|
|
input or button can be used
|
|
They do not save any changes. So i think it's better to keep them separated from the Save button that does save changes.
|
|
|
|
|
|
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
|
|
Feature/api quota support + current_user null pattern
|
|
Bugfix/5549 prefer client signup
|
|
Bugfix/5552 recover from invalid tickets
|
|
|
|
|
|
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.
|
|
|
|
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.
|
|
|
|
|
|
let's devide the partials rather than having super specific parameters (on_user_page)
|
|
|