Skip to content
This repository has been archived by the owner on Nov 2, 2023. It is now read-only.

Commit

Permalink
Merge pull request #247 from yanokwa/update-about
Browse files Browse the repository at this point in the history
Update version, names, slugs
  • Loading branch information
yanokwa authored Oct 13, 2021
2 parents e322d0a + 23b58c3 commit 2b75568
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 33 deletions.
13 changes: 1 addition & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- run:
name: Install dependencies
command: |
sudo apt-get update
sudo apt-get --allow-releaseinfo-change update
sudo apt-get install -y zlib1g-dev libbz2-dev default-jre
- run:
name: Install and deploy
Expand All @@ -28,17 +28,6 @@ jobs:
paths:
- /home/circleci/work/vendor/bundle

# webhooks are undocumented and won't work for circleci 2.1
# https://github.com/circleci/circleci-docs/issues/2411
notify:
webhooks:
- url: "http://staging.build.getodk.org:5566/deploy"
experimental:
notify:
branches:
only:
- "staging"

workflows:
version: 2
build:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ config.yml
.build_rev
public/javascripts/build.js
tmp/
node_modules/
build/
5 changes: 0 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,3 @@ Otherwise, files of note include:

Some changes, like adding support for a new field type, might require an addition to `build2xlsform`. Make sure to test that the export to XLSForm yields a valid XLSForm.

Staging
-------

The [staging.build.getodk.org](http://staging.build.getodk.org) site is set up to track the `staging` branch of this repository. You can see the status of the CI build on the [staging branch page on CircleCI](https://circleci.com/gh/getodk/build/tree/staging); the deploy should kick off on the staging server no more than two minutes after the build, and should complete within a minute of that. You can always see which SHA is live by going to `Help > About` in the application itself.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2009 Clint Tseng and contributors
Copyright 2009 Issa Tseng and contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion public/javascripts/draggable.js
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ $.fn.droppable = function(passedOptions)
}

// now we may have to scroll things about depending on what browser we're in.
// scroll behaviour adapted from: https://github.com/clint-tseng/awesomereorder
// scroll behaviour adapted from: https://github.com/issa-tseng/awesomereorder
// (tbh i think this is a nicer scrollspeed calculation than Chrome's)
if (($.isFirefox || $.isSafari) && ($scrollParent.length !== 0))
{
Expand Down
2 changes: 1 addition & 1 deletion server/lib/multipart.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Author:: Cody Brimhall <mailto:[email protected]>
# Created:: 22 Feb 2008

# Modified by Clint Tseng on 2010/12/07 to take strings and pretend they're text/xml files.
# Modified by Issa Tseng on 2010/12/07 to take strings and pretend they're text/xml files.


require 'cgi'
Expand Down
18 changes: 5 additions & 13 deletions server/views/index.erb
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
<div class="loadingScreen">
<div class="loadingMessage">
<div class="spinner"><div class="spinnerInner"></div></div>
<h1>loading <strong>odk build</strong><sup>BETA</sup></h1>
<p>version 0.3.5</p>
<h1>Loading <strong>ODK Build</strong></h1>
<p class="status">loading application...</p>
</div>
</div>
Expand Down Expand Up @@ -409,22 +408,15 @@
<h3>About</h3>
<div class="modalContents">
<p>
ODK Build is part of the <a href="https://getodk.org/" rel="external">ODK</a>
suite of tools. It is licensed under the
<a href="http://www.apache.org/licenses/LICENSE-2.0" rel="external">Apache License 2.0</a>.
You can find the source code on
<a href="http://github.com/getodk/build/issues" rel="external">GitHub</a>.
ODK Build is a form builder for <a href="https://getodk.org/" rel="external">ODK</a>. You are using v<a href="https://github.com/getodk/build/releases/tag/0.3.7" rel="external">0.3.7</a>.
</p>
<p>
Built by <a href="http://dontexplain.com" rel="external">Issa
Build was created by <a href="http://dontexplain.com" rel="external">Issa
Tseng</a> in Seattle, Bangalore, Pittsburgh, and 40,000 feet in the air.
</p>
<p>
Found a bug? Have a feature request?
<a href="http://github.com/getodk/build/issues" rel="external">Report it</a>.
</p>
<p>
You are running <%= AssetManager.build_rev %>
Need help?
<a href="http://forum.getodk.org/" rel="external">Ask on the forum</a>.
</p>
</div>
<div class="modalButtonContainer">
Expand Down

0 comments on commit 2b75568

Please sign in to comment.