From 8f8ac8225396a681cdd9200128137d88f45c6ebc Mon Sep 17 00:00:00 2001 From: Yaw Anokwa Date: Fri, 29 Jan 2021 10:29:38 -0800 Subject: [PATCH 1/6] Move version to one location, simplify description, update support channels --- server/views/index.erb | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/server/views/index.erb b/server/views/index.erb index 8467286..8472064 100644 --- a/server/views/index.erb +++ b/server/views/index.erb @@ -27,8 +27,7 @@
-

loading odk buildBETA

-

version 0.3.5

+

Loading ODK Build

loading application...

@@ -409,22 +408,15 @@

About

- ODK Build is part of the ODK - suite of tools. It is licensed under the - Apache License 2.0. - You can find the source code on - GitHub. + ODK Build is a form builder for ODK. You are using v0.3.6.

- Built by Issa + Build was created by Issa Tseng in Seattle, Bangalore, Pittsburgh, and 40,000 feet in the air.

- Found a bug? Have a feature request? - Report it. -

-

- You are running <%= AssetManager.build_rev %> + Need help? + Ask on the forum.

From f2fd7337ccdbe0e18c11df6feacc13dc6ed156ce Mon Sep 17 00:00:00 2001 From: Yaw Anokwa Date: Wed, 13 Oct 2021 13:53:37 -0700 Subject: [PATCH 2/6] Fix merge conflict --- LICENSE | 2 +- public/javascripts/draggable.js | 2 +- server/lib/multipart.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 671e1f0..3b12211 100644 --- a/LICENSE +++ b/LICENSE @@ -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. diff --git a/public/javascripts/draggable.js b/public/javascripts/draggable.js index cfe32c4..ba4ce21 100644 --- a/public/javascripts/draggable.js +++ b/public/javascripts/draggable.js @@ -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)) { diff --git a/server/lib/multipart.rb b/server/lib/multipart.rb index 4fbb349..229e04f 100644 --- a/server/lib/multipart.rb +++ b/server/lib/multipart.rb @@ -4,7 +4,7 @@ # Author:: Cody Brimhall # 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' From 50f6e842d2ff4143abe20948323a8fccdbd8fbad Mon Sep 17 00:00:00 2001 From: Yaw Anokwa Date: Fri, 29 Jan 2021 10:25:34 -0800 Subject: [PATCH 3/6] Exclude offline files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 7cb62e6..6868a9c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ config.yml .build_rev public/javascripts/build.js tmp/ +node_modules/ +build/ \ No newline at end of file From 130070ce0d4ae7209c874e99a8fc81a3ee814ed3 Mon Sep 17 00:00:00 2001 From: Yaw Anokwa Date: Fri, 29 Jan 2021 10:33:19 -0800 Subject: [PATCH 4/6] Staging server process no longer works --- .circleci/config.yml | 11 ----------- CONTRIBUTING.md | 5 ----- 2 files changed, 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 38ef212..4590f07 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e73fb74..7db886f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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. - From 0ba609ac62fde49385d040c307c66eb6668717f7 Mon Sep 17 00:00:00 2001 From: Yaw Anokwa Date: Fri, 29 Jan 2021 11:13:26 -0800 Subject: [PATCH 5/6] Version bump --- server/views/index.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/views/index.erb b/server/views/index.erb index 8472064..a23b8c8 100644 --- a/server/views/index.erb +++ b/server/views/index.erb @@ -408,7 +408,7 @@

About

- ODK Build is a form builder for ODK. You are using v0.3.6. + ODK Build is a form builder for ODK. You are using v0.3.7.

Build was created by Issa From 23b58c30070c1ccc08b2980e0c458acb247b0832 Mon Sep 17 00:00:00 2001 From: Yaw Anokwa Date: Wed, 13 Oct 2021 13:51:52 -0700 Subject: [PATCH 6/6] Fix build --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4590f07..26942bd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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