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

Commit 2b75568

Browse files
authored
Merge pull request #247 from yanokwa/update-about
Update version, names, slugs
2 parents e322d0a + 23b58c3 commit 2b75568

7 files changed

Lines changed: 11 additions & 33 deletions

File tree

.circleci/config.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- run:
1212
name: Install dependencies
1313
command: |
14-
sudo apt-get update
14+
sudo apt-get --allow-releaseinfo-change update
1515
sudo apt-get install -y zlib1g-dev libbz2-dev default-jre
1616
- run:
1717
name: Install and deploy
@@ -28,17 +28,6 @@ jobs:
2828
paths:
2929
- /home/circleci/work/vendor/bundle
3030

31-
# webhooks are undocumented and won't work for circleci 2.1
32-
# https://github.com/circleci/circleci-docs/issues/2411
33-
notify:
34-
webhooks:
35-
- url: "http://staging.build.getodk.org:5566/deploy"
36-
experimental:
37-
notify:
38-
branches:
39-
only:
40-
- "staging"
41-
4231
workflows:
4332
version: 2
4433
build:

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ config.yml
88
.build_rev
99
public/javascripts/build.js
1010
tmp/
11+
node_modules/
12+
build/

CONTRIBUTING.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,3 @@ Otherwise, files of note include:
6666

6767
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.
6868

69-
Staging
70-
-------
71-
72-
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.
73-

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2009 Clint Tseng and contributors
1+
Copyright 2009 Issa Tseng and contributors
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

public/javascripts/draggable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ $.fn.droppable = function(passedOptions)
372372
}
373373

374374
// now we may have to scroll things about depending on what browser we're in.
375-
// scroll behaviour adapted from: https://github.com/clint-tseng/awesomereorder
375+
// scroll behaviour adapted from: https://github.com/issa-tseng/awesomereorder
376376
// (tbh i think this is a nicer scrollspeed calculation than Chrome's)
377377
if (($.isFirefox || $.isSafari) && ($scrollParent.length !== 0))
378378
{

server/lib/multipart.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Author:: Cody Brimhall <mailto:cbrimhall@ucdavis.edu>
55
# Created:: 22 Feb 2008
66

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

99

1010
require 'cgi'

server/views/index.erb

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
<div class="loadingScreen">
2828
<div class="loadingMessage">
2929
<div class="spinner"><div class="spinnerInner"></div></div>
30-
<h1>loading <strong>odk build</strong><sup>BETA</sup></h1>
31-
<p>version 0.3.5</p>
30+
<h1>Loading <strong>ODK Build</strong></h1>
3231
<p class="status">loading application...</p>
3332
</div>
3433
</div>
@@ -409,22 +408,15 @@
409408
<h3>About</h3>
410409
<div class="modalContents">
411410
<p>
412-
ODK Build is part of the <a href="https://getodk.org/" rel="external">ODK</a>
413-
suite of tools. It is licensed under the
414-
<a href="http://www.apache.org/licenses/LICENSE-2.0" rel="external">Apache License 2.0</a>.
415-
You can find the source code on
416-
<a href="http://github.com/getodk/build/issues" rel="external">GitHub</a>.
411+
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>.
417412
</p>
418413
<p>
419-
Built by <a href="http://dontexplain.com" rel="external">Issa
414+
Build was created by <a href="http://dontexplain.com" rel="external">Issa
420415
Tseng</a> in Seattle, Bangalore, Pittsburgh, and 40,000 feet in the air.
421416
</p>
422417
<p>
423-
Found a bug? Have a feature request?
424-
<a href="http://github.com/getodk/build/issues" rel="external">Report it</a>.
425-
</p>
426-
<p>
427-
You are running <%= AssetManager.build_rev %>
418+
Need help?
419+
<a href="http://forum.getodk.org/" rel="external">Ask on the forum</a>.
428420
</p>
429421
</div>
430422
<div class="modalButtonContainer">

0 commit comments

Comments
 (0)