Skip to content

Bug fix #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
indication merged 3 commits into from
May 19, 2015
Merged

Bug fix #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9095e7
Fix travis options
May 15, 2015
60cbfcb
Support date time style "yyyy-MM-dd HH:mm:ss Z"
Feb 17, 2015
9fc1c6a
Support pull-to-refresh-event on IssueView
Feb 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
language: android
jdk: oraclejdk7
cache:
directories:
- $HOME/.m2
- $HOME/.idea
- $HOME/.gradle

notifications:
email: false
Expand Down
6 changes: 5 additions & 1 deletion OpenRedmine/src/main/java/jp/redmine/redmineclient/entity/TypeConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ public class TypeConverter {
//Sat Sep 29 12:03:04 +0200 2007
//E M d H :m :s Z y
//public static final String FORMAT_DATETIME = "E M d H:m:s Z y";
//2015-02-05 00:38:50 UTC
public static final String FORMAT_DATETIMEZ = "yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'";
public static final String FORMAT_DATETIMESPZ = "yyyy'-'MM'-'dd' 'HH':'mm':'ss Z";
public static final String FORMAT_DATETIME = "yyyy'-'MM'-'dd'T'HH':'mm':'ssZ";
public static final String FORMAT_DATETIMEMS = "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'SSSZ";
public static final String FORMAT_DATE = "yyyy-MM-dd";
Expand All @@ -25,7 +27,9 @@ public static Date parseDate(String datetime){
public static Date parseDateTime(String datetime){
if (TextUtils.isEmpty(datetime))
return null;
if (datetime.endsWith("Z"))
if (datetime.contains(" "))
return parseDateTimeFormat(datetime,FORMAT_DATETIMESPZ, false);
else if (datetime.endsWith("Z"))
return parseDateTimeFormat(datetime,FORMAT_DATETIMEZ, true);
else if(datetime.contains("."))
return parseDateTimeFormat(datetime,FORMAT_DATETIMEMS, false);
Expand Down
11 changes: 6 additions & 5 deletions OpenRedmine/src/main/java/jp/redmine/redmineclient/fragment/IssueView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,12 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
return view;
}


@Override
public void onRefresh() {
onFetchRemote();
}

protected void onRefresh(boolean isFetch){
IssueArgument intent = new IssueArgument();
intent.setArgument(getArguments());
Expand Down Expand Up @@ -258,11 +264,6 @@ protected void onFetchRemote(){
task.execute(intent.getIssueId());
}

@Override
public void onRefresh() {

}

private class SelectDataTask extends SelectIssueJournalTask{
public SelectDataTask() {
super();
Expand Down
10 changes: 5 additions & 5 deletions external/report.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
#!/bin/sh

export WORKDIR=$(pwd)
export WORK_COMMTER="$(git show --pretty=format:%an --no-notes)"
export WORK_EMAIL="$(git show --pretty=format:%ae --no-notes)"
export WORK_COMMTER="$(git log -1 --pretty=format:%an --no-notes)"
export WORK_EMAIL="$(git log -1 --pretty=format:%ae --no-notes)"
cd ~
git clone --depth=50 git@gist.github.com:/b6e8d189e7f4eb0edc51.git indication/gist || { echo Failed to checkout repository! ; cd $WORKDIR; exit 1; }
git clone -b travis-ci --depth=50 git@github.com:indication/OpenRedmine.git indication/builds || { echo Failed to checkout repository! ; cd $WORKDIR; exit 1; }
git config --global user.email "$WORK_EMAIL"
git config --global user.name "$WORK_COMMTER"
cd indication/gist
cd indication/builds
! test -d OpenRedmine && mkdir OpenRedmine
cp -R $WORKDIR/OpenRedmine/build/outputs OpenRedmine
! test -d Transdroid && mkdir Transdroid
cp -R $WORKDIR/Transdroid/build/outputs Transdroid
git add -A
git commit -a -m "Update $BUILD_RESULT build from Travis-CI $TRAVIS_JOB_ID $TRAVIS_BRANCH $TRAVIS_TAG $TRAVIS_COMMIT_RANGE current $TRAVIS_COMMIT"
git push origin master
git push origin travis-ci
cd $WORKDIR