leap_web.git
21 months agoMerge branch 'feature/different-keytypes' into 'master' master
azul [Wed, 31 Jan 2018 12:44:15 +0000 (04:44 -0800)]
Merge branch 'feature/different-keytypes' into 'master'

couch: add identity view to get all keys

See merge request leap/webapp!61

21 months agokeys: store type and rev in hash rather than serialized
Azul [Wed, 31 Jan 2018 11:27:55 +0000 (12:27 +0100)]
keys: store type and rev in hash rather than serialized

Since the old keys used to be strings i started out by
json serializing the new keys with type, value, rev.

However storing serialized json in couch (json) does
not really make sense. So now we do not serialize but
instead have one json document. The lookup for a key of
type pgp may still return a string but for everything
that uses the new api it will return a hash with type
and revision.

This data structure is way easier to handle also on the
nickserver side.

21 months agoMerge branch 'upgrade/srp_js' into 'master'
azul [Wed, 31 Jan 2018 09:29:35 +0000 (01:29 -0800)]
Merge branch 'upgrade/srp_js' into 'master'

Upgrade/srp js

See merge request leap/webapp!60

21 months agoMerge branch 'deprecate/old-key-api' into 'master'
azul [Wed, 31 Jan 2018 09:28:47 +0000 (01:28 -0800)]
Merge branch 'deprecate/old-key-api' into 'master'

doc: list deprecations and compatibility issues for 0.10

See merge request leap/webapp!59

21 months agodoc: list deprecations and compatibility issues for 0.10
Azul [Wed, 31 Jan 2018 09:16:21 +0000 (10:16 +0100)]
doc: list deprecations and compatibility issues for 0.10

21 months agogit subrepo clone https://leap.se/git/srp_js app/assets/javascripts/srp
Azul [Wed, 31 Jan 2018 09:06:21 +0000 (10:06 +0100)]
git subrepo clone https://leap.se/git/srp_js app/assets/javascripts/srp

subrepo:
  subdir:   "app/assets/javascripts/srp"
  merged:   "2088cbe"
upstream:
  origin:   "https://leap.se/git/srp_js"
  branch:   "master"
  commit:   "2088cbe"
git-subrepo:
  version:  "0.3.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a7ee886"

21 months agoclean up old subrepo
Azul [Wed, 31 Jan 2018 09:06:15 +0000 (10:06 +0100)]
clean up old subrepo

21 months agocouch: add identity view to get all keys
Azul [Wed, 31 Jan 2018 08:58:37 +0000 (09:58 +0100)]
couch: add identity view to get all keys

This needs to be included in the platforms views.

21 months agoMerge branch 'feature/different-keytypes' into 'master'
azul [Sun, 28 Jan 2018 16:37:45 +0000 (08:37 -0800)]
Merge branch 'feature/different-keytypes' into 'master'

initial feature description for key uploads

See merge request leap/webapp!58

21 months agoAPI: implement deleting keys through new keys api
Azul [Fri, 19 Jan 2018 13:11:24 +0000 (14:11 +0100)]
API: implement deleting keys through new keys api

21 months ago(WIP) first steps towards implementing keys API
Azul [Mon, 15 Jan 2018 17:21:44 +0000 (18:21 +0100)]
(WIP) first steps towards implementing keys API

22 months agogitattributes: help gitlab detect gherkin
Azul [Fri, 12 Jan 2018 11:56:36 +0000 (12:56 +0100)]
gitattributes: help gitlab detect gherkin

22 months agoWIP: initial feature description for key uploads
Azul [Fri, 12 Jan 2018 11:42:14 +0000 (12:42 +0100)]
WIP: initial feature description for key uploads

This is an initial draft of the keys api for uploading other
keys than the OpenPGP public key.

refers #8815

23 months agoMerge branch 'ci/ruby-2.4' into 'master'
azul [Mon, 11 Dec 2017 15:10:32 +0000 (07:10 -0800)]
Merge branch 'ci/ruby-2.4' into 'master'

ci: also test with ruby 2.4

Closes #8812

See merge request leap/webapp!56

23 months agoci: also test with ruby 2.4
Azul [Sat, 9 Dec 2017 22:45:51 +0000 (23:45 +0100)]
ci: also test with ruby 2.4

23 months agoMerge branch 'upgrade/gemfile' into 'master'
azul [Sat, 9 Dec 2017 13:45:47 +0000 (05:45 -0800)]
Merge branch 'upgrade/gemfile' into 'master'

Upgrade/gemfile

See merge request leap/webapp!55

23 months agoupgrade: fix mocha deprecation
Azul [Fri, 8 Dec 2017 20:34:14 +0000 (21:34 +0100)]
upgrade: fix mocha deprecation

23 months agoupgrade: factory_girl -> factory_bot
Azul [Fri, 8 Dec 2017 17:27:24 +0000 (18:27 +0100)]
upgrade: factory_girl -> factory_bot

23 months agoupgrade: bundle to latest that still supports ruby 2.1.5
Azul [Fri, 8 Dec 2017 15:33:15 +0000 (16:33 +0100)]
upgrade: bundle to latest that still supports ruby 2.1.5

23 months agoVersion 0.9.3 - bugfixes version/0.9 0.9.3
Azul [Mon, 4 Dec 2017 08:03:00 +0000 (09:03 +0100)]
Version 0.9.3 - bugfixes

* on invalid key upload respond with error and 422 response code
* fix alternate email address dialogue
* publish public key in webfinger
* update translations from transifex
* hand out config.json without auth
* sanity checks on user params
* cleanup temp invites from server tests so they do not clutter admin ui

23 months agoMerge branch 'fix/8798-key-errors' into 'master'
azul [Thu, 16 Nov 2017 12:58:10 +0000 (04:58 -0800)]
Merge branch 'fix/8798-key-errors' into 'master'

Fix/8798 key errors

Closes #8798

See merge request leap/webapp!54

23 months agofix: respond with error on invalid pgp key
Azul [Thu, 16 Nov 2017 12:18:55 +0000 (13:18 +0100)]
fix: respond with error on invalid pgp key

We used to just ignore the key.
Also separated the code for handling key updates from other
user updates. This should eventually be moved to a different
route. Mixing the two makes the implementation really hard.

23 months agominor: clean up account test
Azul [Thu, 16 Nov 2017 12:17:22 +0000 (13:17 +0100)]
minor: clean up account test

also ensures that created user is cleaned up even if test fails

23 months agoMerge branch 'fix/8796-alternate-email' into 'master'
azul [Mon, 13 Nov 2017 12:44:41 +0000 (04:44 -0800)]
Merge branch 'fix/8796-alternate-email' into 'master'

fix: alternate email dialogue

Closes #8796

See merge request leap/webapp!53

23 months agofix: alternate email dialogue
Azul [Mon, 13 Nov 2017 12:16:41 +0000 (13:16 +0100)]
fix: alternate email dialogue

fixes #8796

Cleaned up UserController#update earlier but missed that it was
used to change fallback email addresses. Now it is back. This
time including an integration test.

2 years agoMerge branch 'fix/webfinger-key' into 'master'
azul [Wed, 8 Nov 2017 10:53:50 +0000 (02:53 -0800)]
Merge branch 'fix/webfinger-key' into 'master'

fix #8010 - publish public key in webfinger

Closes #8010

See merge request leap/webapp!52

2 years agofix #8010 - publish public key in webfinger
Azul [Wed, 8 Nov 2017 10:47:17 +0000 (11:47 +0100)]
fix #8010 - publish public key in webfinger

we were simply referring to the wrong key.
includes test

2 years agoMerge branch 'i18n/update' into 'master'
azul [Wed, 8 Nov 2017 08:03:24 +0000 (00:03 -0800)]
Merge branch 'i18n/update' into 'master'

i18n: update translations from transifex

Closes #8797

See merge request leap/webapp!51

2 years agoi18n: update translations from transifex
Azul [Wed, 8 Nov 2017 07:55:17 +0000 (08:55 +0100)]
i18n: update translations from transifex

2 years agoMerge branch '8800-hand-out-configs-json-without-authentication' into 'master'
azul [Wed, 8 Nov 2017 06:58:09 +0000 (22:58 -0800)]
Merge branch '8800-hand-out-configs-json-without-authentication' into 'master'

feat: allow unauthenticated access to list of configs

Closes #8800

See merge request leap/webapp!45

2 years agoMerge branch '8801-500-on-lynx' into 'master'
azul [Tue, 24 Oct 2017 11:40:46 +0000 (11:40 +0000)]
Merge branch '8801-500-on-lynx' into 'master'

fix: sanity checks on user params

Closes #8801

See merge request leap/webapp!50

2 years agofix: sanity checks on user params
Azul [Sun, 17 Sep 2017 07:54:55 +0000 (09:54 +0200)]
fix: sanity checks on user params

fixes #8801

Includes a test reproducing 500 on lynx

We now make use of ActionController::Parameters require and permit
methods.

2 years agoMerge branch 'bugfix/8807-cleanup-tmp-invites' into 'master'
azul [Tue, 24 Oct 2017 10:31:29 +0000 (10:31 +0000)]
Merge branch 'bugfix/8807-cleanup-tmp-invites' into 'master'

Bugfix/8807 cleanup tmp invites

Closes #8807

See merge request leap/webapp!49

2 years agorefactor: instance method create for Account.create
Azul [Tue, 24 Oct 2017 10:22:06 +0000 (12:22 +0200)]
refactor: instance method create for Account.create

This simplifies returning the user while still working
on it a lot. Much cleaner than all these return user statements.

There's a lot more to refactor here. For example delegating methods
to user etc. ... but for now this should suffice. Don't want to
break this in a bugfix release.

2 years agofix: also remove invite codes used for tmp users
Azul [Tue, 24 Oct 2017 10:12:26 +0000 (12:12 +0200)]
fix: also remove invite codes used for tmp users

fixes #8807

2 years agoVersion 0.9.2 - bugfixes and invite code tweaks 0.9.2
Azul [Sat, 21 Oct 2017 08:14:12 +0000 (10:14 +0200)]
Version 0.9.2 - bugfixes and invite code tweaks

Bugfix release for 0.9:

* pin to the newest psych gem
* remove better_errors gem
* fix login error message with non en locales

Features:

* destroy invites used to create test accounts
* sort invite codes by last update

2 years agoMerge branch 'feat/8806-sort-invite-codes' into 'master'
azul [Sat, 21 Oct 2017 08:06:26 +0000 (08:06 +0000)]
Merge branch 'feat/8806-sort-invite-codes' into 'master'

feat: sort invite codes by last update

Closes #8806

See merge request leap/webapp!48

2 years agofeat: sort invite codes by last update
Azul [Tue, 17 Oct 2017 12:05:59 +0000 (14:05 +0200)]
feat: sort invite codes by last update

They used to be sorted by the code which was not helpful

fixes #8806
requires deploy of new design docs to the platform

2 years agoMerge branch 'bugfix/8804-destroy-invites' into 'master'
azul [Tue, 17 Oct 2017 09:11:33 +0000 (09:11 +0000)]
Merge branch 'bugfix/8804-destroy-invites' into 'master'

fix: destroy invites used to create test accounts

See merge request leap/webapp!47

2 years agofix: destroy invites used to create test accounts
Azul [Tue, 17 Oct 2017 09:05:53 +0000 (11:05 +0200)]
fix: destroy invites used to create test accounts

Production instances are getting cluttered with invites from
test accounts. Instead of marking them as used we will now completely
remove them.

refers to #8804
refers to #8807\

2 years agoMerge branch 'bugfix/8805-failed-login-with-locale' into 'master'
azul [Mon, 16 Oct 2017 13:56:48 +0000 (13:56 +0000)]
Merge branch 'bugfix/8805-failed-login-with-locale' into 'master'

fix: login error message with locale set

Closes #8805

See merge request leap/webapp!46

2 years agofix: login error message with locale set
Azul [Mon, 16 Oct 2017 13:46:07 +0000 (15:46 +0200)]
fix: login error message with locale set

On a failed login the warden failure app gets called.
Some of the params are changed accordingly but controller
and action remain.
set_locale would detect there was no locale in the path
and thus attempt to redirect. However the params still
belong to the previous request which was a POST to
  Api::SessionsController.
This route does not respond to get requests and so it
would trigger a 404 in production and a 500 in development.

This commit prevents set_locale to act upon warden failure
app controller calls by adding /new to the list of
`NON_LOCALE_PATHS`. (The path is updated by warden to the
name of the action called in the failure app).

A test is included in this commit that tries to login
with an invalid username, password combination and a german
locale set.

fixes #8805

2 years agofeat: allow unauthenticated access to list of configs
Azul [Mon, 11 Sep 2017 12:55:14 +0000 (14:55 +0200)]
feat: allow unauthenticated access to list of configs

This should simplify client code significantly according to
platform#8849

2 years agoMerge remote-tracking branch 'origin/master' into master
Azul [Fri, 8 Sep 2017 07:16:53 +0000 (09:16 +0200)]
Merge remote-tracking branch 'origin/master' into master

2 years agoMerge branch 'bugfix/psych' into 'master'
azul [Fri, 8 Sep 2017 06:39:06 +0000 (06:39 +0000)]
Merge branch 'bugfix/psych' into 'master'

pin to the newest psych gem, so as to not hit bugs in older versions (required by faker)

See merge request !44

2 years agobugfix: remove better_errors gem
elijah [Thu, 17 Aug 2017 23:10:12 +0000 (16:10 -0700)]
bugfix: remove better_errors gem

it is currently incompatible with haml

2 years agoremove merge cruft
elijah [Tue, 15 Aug 2017 18:32:21 +0000 (11:32 -0700)]
remove merge cruft

2 years agouse i18n for login test
elijah [Tue, 15 Aug 2017 18:31:04 +0000 (11:31 -0700)]
use i18n for login test

2 years agopin to the newest psych gem, so as to not hit bugs in older versions (required by...
elijah [Mon, 14 Aug 2017 22:21:32 +0000 (15:21 -0700)]
pin to the newest psych gem, so as to not hit bugs in older versions (required by faker)

2 years agoVersion 0.9.1 - bugfixes 0.9.1
Azul [Mon, 7 Aug 2017 08:49:40 +0000 (10:49 +0200)]
Version 0.9.1 - bugfixes

Plain bugfix release for 0.9:

* prevent token conflicts
* custom: fix stylesheet customization
* fix: set token in forms correctly

2 years agocleanup: Revert accidental favicon change
Azul [Mon, 7 Aug 2017 08:44:55 +0000 (10:44 +0200)]
cleanup: Revert accidental favicon change

2 years agoMerge branch 'fix/token-conflict' into 'master'
azul [Mon, 7 Aug 2017 08:37:13 +0000 (08:37 +0000)]
Merge branch 'fix/token-conflict' into 'master'

prevent token conflicts

Closes #8792

See merge request !42

2 years agoprevent token conflicts
Azul [Fri, 28 Jul 2017 09:35:14 +0000 (11:35 +0200)]
prevent token conflicts

2 years agoMerge branch 'fix/sass-load-path' into 'master'
azul [Wed, 26 Jul 2017 09:28:28 +0000 (09:28 +0000)]
Merge branch 'fix/sass-load-path' into 'master'

Fix/sass load path

Closes #8794

See merge request !40

2 years agocustom: fix stylesheet customization
Azul [Wed, 26 Jul 2017 09:19:41 +0000 (11:19 +0200)]
custom: fix stylesheet customization

fixes #8794

Reported the underlying issue here:
https://github.com/rails/sass-rails/issues/406

Basically `@import` works like this:
* look for the file relative to the current file
* look for the file as an absolute path following the priorities in the
* asset load_paths

If the file can be imported as a relative path that will take
precedence.

So in order to pick up the head and tails inside customization rather
than in app/assets there are three possibilities:
1) use an absolute path. This is not as easy as it seems. There is no
way of indicating a path is meant to be absolute so we would have to
ensure it does not resolve to a relative path.
2) have a application.scss file inside the customization folder. Since
this is the main file it will be used instead of the app/assets one. In
there relative paths will now also default to the customization folder
rather than app/assets. Once we are in an app/assets file though it will
not go back to picking up customization with relative paths
3) use //= require instead of import. rails-sass advices against this as
each required file would be compiled on it's own and variables could not
be shared.

Going with option 1 here:
```scss
// application.scss:
@import "custom/head_import";
```

```scss
// custom/head_import.scss:
@import "head";
```

As long as there is no custom/head.scss in app/assets it will import
head as an absolute path and thus prefer config/custom over app/assets.

This seems like the best option for now as it does not require changes
to the deployments.

2 years agoRevert "fix: make customization available to sass"
Azul [Wed, 26 Jul 2017 08:55:11 +0000 (10:55 +0200)]
Revert "fix: make customization available to sass"

This reverts commit cc95bb27e873dc6140f9a909a57f075a0ef2f387.

2 years agoMerge branch 'fix/sass-load-path' into 'master'
azul [Tue, 25 Jul 2017 09:18:18 +0000 (09:18 +0000)]
Merge branch 'fix/sass-load-path' into 'master'

fix: make customization available to sass

Closes #8793

See merge request !39

2 years agofix: make customization available to sass
Azul [Tue, 25 Jul 2017 09:09:47 +0000 (11:09 +0200)]
fix: make customization available to sass

Somehow sass did not follow the rails assets path order.
Therefore the default tail.scss would stay in effect even when
there was a different tail.scss in the customization folder.

Adding the customization stylesheet folder to the sass load_paths
works around this for now. Still need to check if it works in
production though.

2 years agoMerge branch 'test/gitlab-artifacts' into 'master'
azul [Fri, 21 Apr 2017 12:54:43 +0000 (12:54 +0000)]
Merge branch 'test/gitlab-artifacts' into 'master'

ci: logs and debug files as artifacts

See merge request !38

2 years agoci: logs and debug files as artifacts
Azul [Fri, 21 Apr 2017 09:37:37 +0000 (11:37 +0200)]
ci: logs and debug files as artifacts

2 years agoMerge branch 'bugfix/8784-import-pgp-key' into 'master'
azul [Thu, 20 Apr 2017 14:11:42 +0000 (14:11 +0000)]
Merge branch 'bugfix/8784-import-pgp-key' into 'master'

fix: set token in forms correctly

Closes #8784

See merge request !37

2 years agofix: set token in forms correctly
Azul [Thu, 20 Apr 2017 13:59:18 +0000 (15:59 +0200)]
fix: set token in forms correctly

We now use the hash of the token for comparison and as the id.
In order to use it you need the original token though. So forms and
thus the session should have token.to_s rather than token.id.

2 years agoVersion 0.9.0 - twitter, rails 4 and deprecations 0.9.0
Azul [Mon, 3 Apr 2017 11:55:31 +0000 (13:55 +0200)]
Version 0.9.0 - twitter, rails 4 and deprecations

This release features a great contribution from the Rails Girls Summer of Code:
The landing page of the webapp can now include a twitter feed to display
news from the provider.

Other than that this is a maintainance and transition release.

* Twitter feed on main page (thanks theaamanda and lilaluca).
* upgrade to rails 4.2
* upgrade to bootstrap 3

Upgrading:

* We now use rails 4's `secret_key_base`. Please make sure to supply it
  in config/config.yml for production environments. If you are using the
  leap platform that will already take care of it.

Deprecations:

* We have not seen any active use of the **billing** functionality.
  So we deprecate it and will probably drop it in one of the next releases.
* We will replace the user facing **help desk** functionality with a single
  sign on mechanism to integrate with other help desk systems.
  We will maintain the endpoint to submit tickets and the ticket management
  in the admin interface. That way it should also be easy to create your own
  ticket submission form.
* We deprecate the ability to **signup and login** directly through the webapp.
  We will remove it in the future for security reasons. Signup and Login should
  only happen through bitmask to prevent password phishing and js injections.

2 years ago:Changes: update changelog to reflect deprecations
Azul [Mon, 3 Apr 2017 10:48:07 +0000 (12:48 +0200)]
:Changes: update changelog to reflect deprecations

2 years agoMerge branch 'fix/icons' into 'master'
azul [Mon, 3 Apr 2017 10:35:20 +0000 (10:35 +0000)]
Merge branch 'fix/icons' into 'master'

fix: icons that were using the bootstrap 2 syntax

Closes #27

See merge request !35

2 years agofix: icons that were using the bootstrap 2 syntax
Azul [Mon, 3 Apr 2017 09:27:27 +0000 (11:27 +0200)]
fix: icons that were using the bootstrap 2 syntax

2 years agoMerge branch 'feature/clear-user' into 'master'
azul [Mon, 3 Apr 2017 08:51:56 +0000 (08:51 +0000)]
Merge branch 'feature/clear-user' into 'master'

feature: delete user clearing username

Closes #26

See merge request !34

2 years agofeature: delete user clearing username
Azul [Mon, 3 Apr 2017 08:43:42 +0000 (10:43 +0200)]
feature: delete user clearing username

2 years agoMerge branch 'fix/error-display' into 'master'
azul [Mon, 3 Apr 2017 08:17:34 +0000 (08:17 +0000)]
Merge branch 'fix/error-display' into 'master'

Fix error display

See merge request !33

2 years agofix: error message display in production
Azul [Mon, 3 Apr 2017 07:21:20 +0000 (09:21 +0200)]
fix: error message display in production

only use the <pre> tag if the response was a text message i.e. during dev errors.
Use the alert-danger class of bootstrap 3 rather than alert-error.

2 years agofix: bring back wrapped signup button with cancel
Azul [Wed, 29 Mar 2017 08:26:55 +0000 (10:26 +0200)]
fix: bring back wrapped signup button with cancel

2 years agoMerge branch 'ui/menu' into 'master'
azul [Mon, 27 Mar 2017 17:47:42 +0000 (17:47 +0000)]
Merge branch 'ui/menu' into 'master'

fix: bootstrap 3 style of menus

Closes #24

See merge request !32

2 years agofix: bootstrap 3 style of menus
Azul [Mon, 27 Mar 2017 17:38:37 +0000 (19:38 +0200)]
fix: bootstrap 3 style of menus

span10 now is .col-??-10.
ul.unstyled now is ul.list-unstyled
also leave out unnecessary li if billing is disabled.

2 years agoMerge branch 'fix/bootstrap-3' into 'master'
azul [Mon, 27 Mar 2017 16:38:20 +0000 (16:38 +0000)]
Merge branch 'fix/bootstrap-3' into 'master'

Fix/bootstrap 3

See merge request !31

2 years agoupgrade: simple_form to bootstrap 3
Azul [Fri, 24 Mar 2017 11:08:50 +0000 (12:08 +0100)]
upgrade: simple_form to bootstrap 3

* reran the simple form initializer.
* wrapped submit buttons are now broken and need a fix.
* disabled confirmation validation in client side validations as the
  error message always is attached to the wrong field.

2 years agofix: make use of client_side_validations in js
Azul [Fri, 24 Mar 2017 11:06:54 +0000 (12:06 +0100)]
fix: make use of client_side_validations in js

2 years agobugfix: client_side_validation load order
Azul [Fri, 24 Mar 2017 11:05:54 +0000 (12:05 +0100)]
bugfix: client_side_validation load order

The Active::Model modules of client side validations only get included
in CouchRest::Model::Base if the gems are loaded in the right order:

* activemodel is required first so the modules to extend are present
* client_side_validations is required next so its modules get included
* couchrest_model is required last so it includes the enhanced modules.
\

2 years agoMerge branch 'fix/display-js-error-responses' into 'master'
azul [Thu, 23 Mar 2017 15:44:06 +0000 (15:44 +0000)]
Merge branch 'fix/display-js-error-responses' into 'master'

fix: display error js responses in dev environment

See merge request !30
github issue #231

2 years agofix: display error js responses in dev environment
Azul [Thu, 23 Mar 2017 15:35:42 +0000 (16:35 +0100)]
fix: display error js responses in dev environment

Sometimes the dev environment will send back a plain text response.
This causes the json parser to raise an exception and used to cause
the browser not to display any error message.

Now we dumpt the whole server response - which happes to also include the
backtrace. A lot more useful than doing nothing.

In production this should never happen as 500s get handled by the
ExceptionApplication / our ErrorsController there.

2 years agoMerge branch 'cleanup/submodule' into 'master'
azul [Thu, 23 Mar 2017 13:52:56 +0000 (13:52 +0000)]
Merge branch 'cleanup/submodule' into 'master'

cleanup: no more submodules

See merge request !29

2 years agocleanup: no more submodules
Azul [Thu, 23 Mar 2017 13:44:38 +0000 (14:44 +0100)]
cleanup: no more submodules

2 years agoMerge branch 'install/subrepos' into 'master'
azul [Thu, 23 Mar 2017 13:23:42 +0000 (13:23 +0000)]
Merge branch 'install/subrepos' into 'master'

Install/subrepos

See merge request !28
Fixes github issue #238

2 years agogit subrepo clone https://leap.se/git/srp_js app/assets/javascripts/srp
Azul [Thu, 23 Mar 2017 13:12:30 +0000 (14:12 +0100)]
git subrepo clone https://leap.se/git/srp_js app/assets/javascripts/srp

subrepo:
  subdir:   "app/assets/javascripts/srp"
  merged:   "9e1a417"
upstream:
  origin:   "https://leap.se/git/srp_js"
  branch:   "master"
  commit:   "9e1a417"
git-subrepo:
  version:  "0.3.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a7ee886"

2 years agoremove srp submodule
Azul [Thu, 23 Mar 2017 13:12:18 +0000 (14:12 +0100)]
remove srp submodule

2 years agoMerge branch 'bugfix/ticket-validations' into 'master'
azul [Thu, 23 Mar 2017 11:00:40 +0000 (11:00 +0000)]
Merge branch 'bugfix/ticket-validations' into 'master'

fix: keep ticket submit button clickable

See merge request !27

2 years agofix: keep ticket submit button clickable
Azul [Thu, 23 Mar 2017 09:43:11 +0000 (10:43 +0100)]
fix: keep ticket submit button clickable

It was marked as submitted even when client side validations interfered.

fixes github issue #227

2 years agoMerge branch 'bugfix/handle-couch-conflicts' into 'master'
azul [Thu, 23 Mar 2017 09:03:25 +0000 (09:03 +0000)]
Merge branch 'bugfix/handle-couch-conflicts' into 'master'

bugfix: handle couch 404s

See merge request !26

2 years agobugfix: handle couch 404s
Azul [Mon, 21 Nov 2016 15:14:38 +0000 (16:14 +0100)]
bugfix: handle couch 404s

our special error handler for json requests would turn all exceptions
into 500s - removed it. now the rescue_responses can do their thing
again.

2 years agoMerge branch 'upgrade/secret-key-base' into 'master'
azul [Thu, 23 Mar 2017 08:36:07 +0000 (08:36 +0000)]
Merge branch 'upgrade/secret-key-base' into 'master'

upgrade: use rails4s 'secret_key_base'

Closes #23

See merge request !24

2 years agoMerge branch 'test/ruby-2.3' into 'master'
azul [Thu, 23 Mar 2017 07:48:31 +0000 (07:48 +0000)]
Merge branch 'test/ruby-2.3' into 'master'

test: also test ruby 2.3

Closes #21

See merge request !25

2 years agoupgrade: use rails4s 'secret_key_base'
Azul [Wed, 22 Mar 2017 09:34:12 +0000 (10:34 +0100)]
upgrade: use rails4s 'secret_key_base'

This will get us encrypted cookies but also requires changes to the platform.
fixes #23

2 years agotest: also test ruby 2.3
Azul [Wed, 22 Mar 2017 09:51:43 +0000 (10:51 +0100)]
test: also test ruby 2.3

2 years agoMerge pull request #242 from LoadToCode/develop
azul [Wed, 22 Mar 2017 08:46:19 +0000 (09:46 +0100)]
Merge pull request #242 from LoadToCode/develop

bugfixing for generating token script

2 years agoMerge branch 'upgrade/bundle' into 'master'
azul [Wed, 22 Mar 2017 07:46:58 +0000 (07:46 +0000)]
Merge branch 'upgrade/bundle' into 'master'

upgrade: bundle

Closes #13

See merge request !23

2 years agoupgrade: bundle
Azul [Wed, 22 Mar 2017 07:34:36 +0000 (08:34 +0100)]
upgrade: bundle

update all the dependencies.

minitest now wants assert_nil instead of assert_equal nil, ...
braintree now uses update_attributes rather than save.

2 years agoMerge branch 'bugfix/deliver_now' into 'master'
azul [Tue, 21 Mar 2017 09:56:01 +0000 (09:56 +0000)]
Merge branch 'bugfix/deliver_now' into 'master'

upgrade: rails4.2 deprecated deliver -> deliver now

Closes #16

See merge request !22

2 years agoupgrade: rails4.2 deprecated deliver -> deliver now
Azul [Tue, 21 Mar 2017 09:50:29 +0000 (10:50 +0100)]
upgrade: rails4.2 deprecated deliver -> deliver now

fixes #16

2 years agoMerge branch 'test/admin-user-api' into 'master'
azul [Tue, 21 Mar 2017 09:48:01 +0000 (09:48 +0000)]
Merge branch 'test/admin-user-api' into 'master'

test: admin user api always green

Closes #17

See merge request !21

2 years agotest: admin user api always green
Azul [Tue, 21 Mar 2017 09:42:17 +0000 (10:42 +0100)]
test: admin user api always green

Used to fail because the record already existed in the database
fixes #17

2 years agoMerge branch 'bugfix/404-for-keys-on-text-request' into 'master'
azul [Tue, 21 Mar 2017 09:37:29 +0000 (09:37 +0000)]
Merge branch 'bugfix/404-for-keys-on-text-request' into 'master'

fix: 404 on key request with non html content-type

Closes #8

See merge request !20