Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,808 Commits 2 Branches 249 Tags
Commit Graph

5808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans-Christoph Steiner
fc27122dae Merge branch 'master' into 'master' 
fix #1642

Closes #1642

See merge request fdroid/fdroidclient!768
 2018-12-18 08:55:32 +00:00
dkanada
28863cf88f fix #1642 2018-12-18 08:55:32 +00:00
Hans-Christoph Steiner
083e3ead75 Merge branch 'class-renames' into 'master' 
Class renames

See merge request fdroid/fdroidclient!767
 2018-12-17 16:58:10 +00:00
Hans-Christoph Steiner
0e6b4acabf
rename RepoUpdater to IndexUpdater 2018-12-17 17:17:28 +01:00
Hans-Christoph Steiner
148d1cdc8a rename AppDetails2 to AppDetailsActivity 
This also moves it into org.fdroid.fdroid.views
 2018-12-17 17:16:51 +01:00
Hans-Christoph Steiner
9cddc0c990 Merge branch 'html' into 'master' 
remove html method from changelog section

See merge request fdroid/fdroidclient!766
 2018-12-13 18:17:46 +00:00
dkanada
2b512d96c5 remove html method from changelog section 2018-12-14 02:48:22 +09:00
Hans-Christoph Steiner
b0ee5b120c version code 1005001 1.5-alpha1 2018-12-12 23:56:04 +01:00
Hans-Christoph Steiner
a589f53e30 update CHANGELOG 2018-12-12 23:56:04 +01:00
Hans-Christoph Steiner
f1a27c72ef Merge branch 'weblate' into 'master' 
Weblate

See merge request fdroid/fdroidclient!765
 2018-12-12 22:55:02 +00:00
Hans-Christoph Steiner
b8dc569809 Weblate 2018-12-12 22:55:02 +00:00
Hans-Christoph Steiner
551b577bca Merge branch 'badge' into 'master' 
use new design for other badge instances

See merge request fdroid/fdroidclient!754
 2018-12-12 20:17:47 +00:00
Hans-Christoph Steiner
ea9697b48e Merge branch 'pr-1144' into 'master' 
Improve error messages, prevent duplicate information display.

Closes #1144

See merge request fdroid/fdroidclient!764
 2018-12-12 19:45:15 +00:00
darken
1ea4d0a330 Improve error messages, prevent duplicate information display. 
Fixes #1144
 2018-12-12 14:08:11 +01:00
dkanada
568ef56247 fix merge issues and tweak the header layouts a bit more 2018-12-09 16:37:18 +09:00
dkanada
85ed0d46ab string changes 2018-12-09 16:29:07 +09:00
dkanada
24a4da9d89 some layout modifications to Updates and AppDetails headers 2018-12-09 16:28:45 +09:00
Hans-Christoph Steiner
eb651c9996 Merge branch 'wording-fixes' into 'master' 
Wording fixes

See merge request fdroid/fdroidclient!759
 2018-12-06 18:33:48 +00:00
Jan-Christoph Borchardt
9dd64b8cbc Avoid addressing person with 'me' (when 'you' is used elsewhere) 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-12-06 18:01:08 +00:00
Jan-Christoph Borchardt
09a7ec3fd3 Change inconsistent 'Upgrade' to 'Update' 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-12-06 18:01:08 +00:00
Jan-Christoph Borchardt
5f660501e3 Change technical 'Run' to more understandable 'Open' 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-12-06 18:01:08 +00:00
Hans-Christoph Steiner
42934a6ec9 Merge branch 'index-v1.json-integer-sdk-version' into 'master' 
switch all SDK version values to integers, as per definition

See merge request fdroid/fdroidclient!763
 2018-12-06 16:35:43 +00:00
Hans-Christoph Steiner
c1db27715c switch all SDK version values to integers, as per definition 
```
sed -E -i 's,("[a-z]+SdkVersion": )"([0-9]+)",\1 \2,' app/src/test/resources/*.json
```

* fdroid/fdroidserver!596
* fdroid/fdroidserver#593
* fdroid/fdroidserver#596
 2018-12-06 16:07:56 +00:00
Hans-Christoph Steiner
589a29386c Merge branch 'fix_apk_address' into 'master' 
fix apk address

See merge request fdroid/fdroidclient!762
 2018-11-20 09:24:30 +00:00
Danial Behzadi
a912c3ea3e fix apk address 2018-11-19 11:35:04 +03:30
dkanada
3f00b2a4fb standardize version properties 2018-10-27 05:27:01 +09:00
dkanada
fef3309714 slight changes to update header 2018-10-27 05:27:01 +09:00
dkanada
ce1756db62 use new design for other badge instances 2018-10-27 05:27:01 +09:00
Hans-Christoph Steiner
f6a7029fed version code 1005000 1.5-alpha0 2018-10-19 15:30:02 +02:00
Hans-Christoph Steiner
04468d4576 update changelog 2018-10-19 15:29:18 +02:00
Hans-Christoph Steiner
071bca951e Merge branch 'weblate' into 'master' 
Weblate

See merge request fdroid/fdroidclient!758
 2018-10-19 12:55:50 +00:00
Hans-Christoph Steiner
d191d10621 Weblate 2018-10-19 12:55:50 +00:00
Hans-Christoph Steiner
255fe37dc1 Merge branch 'jsonLoader' into 'master' 
* jsonLoader: (28 commits)
  fix checkstyle complaints
  force DBHelperTest.canAddAdditionalRepos() to run on CI
  clean up whitespace in repo descriptions
  rename parseXmlRepos to parseAdditionalReposXml
  rename item lists to repoItems
  rename defaultReposFile to additionalReposFile
  separate defaultRepos from initialRepos, which includes additionalRepos
  rename REPO_XML_ARG_COUNT to REPO_XML_ITEM_COUNT
  fix additional_repos.xml handling to be properly parsed
  move comments to javadoc
  priority is NOT ignored, just additional_repos.xml is not allowed to set
  fix DBHelperTest to actually load and parse additional_repos.xml
  changed the tests: now testing only DBHelper.parseXmlRepos()
  removed stars from imports
  finished additional repos test
  some minor style changes
  minor style changes
  implemented creating xml file on oem partition; not sure whether it works cause gradle runs forever (>20min)
  started implementing test
  removed priority from additional_repos.xml
  ...

closes fdroid/fdroidclient!705
 2018-10-19 13:40:48 +02:00
Hans-Christoph Steiner
eb023887a5 fix checkstyle complaints 
* LocalFinalVariableName
* EqualsAvoidNull
* EmptyLineSeparator
* SeparatorWrap
* LineLength
 2018-10-18 15:07:54 +02:00
Hans-Christoph Steiner
409846e199 force DBHelperTest.canAddAdditionalRepos() to run on CI 2018-10-18 15:07:54 +02:00
Hans-Christoph Steiner
6dd4523d3c clean up whitespace in repo descriptions 
This cleans up the whitespace in the description item, since the
XML parsing will include the linefeeds and indenting in the description.
 2018-10-18 15:07:54 +02:00
Hans-Christoph Steiner
1788546267 rename parseXmlRepos to parseAdditionalReposXml 2018-10-18 15:07:54 +02:00
Hans-Christoph Steiner
ec58141379 rename item lists to repoItems 2018-10-18 15:07:53 +02:00
Hans-Christoph Steiner
9f3a32d986 rename defaultReposFile to additionalReposFile 2018-10-18 15:07:53 +02:00
Hans-Christoph Steiner
aace086da4 separate defaultRepos from initialRepos, which includes additionalRepos 2018-10-18 15:07:53 +02:00
Hans-Christoph Steiner
e8264d7dbb rename REPO_XML_ARG_COUNT to REPO_XML_ITEM_COUNT 2018-10-18 15:07:53 +02:00
Hans-Christoph Steiner
b9b7dab2c4 fix additional_repos.xml handling to be properly parsed 
additional_repos.xml has 7 <item> elements per repo, while default_repos.xml
has 8.  The difference is that additional_repos.xml does not have the
"priority" <item> since it is not allowed to override anything that is set
in default_repos.xml.

see spec in !705
 2018-10-18 15:07:53 +02:00
Hans-Christoph Steiner
7eb53518aa move comments to javadoc 2018-10-18 15:07:53 +02:00
Hans-Christoph Steiner
b529e10c4a priority is NOT ignored, just additional_repos.xml is not allowed to set 2018-10-18 15:07:53 +02:00
Hans-Christoph Steiner
95c375ac26 fix DBHelperTest to actually load and parse additional_repos.xml 2018-10-18 15:07:53 +02:00
Dimitri Rusin
dd08655d43 changed the tests: now testing only DBHelper.parseXmlRepos() 2018-09-20 19:12:14 +00:00
Dimitri Rusin
5a6d2df3ac removed stars from imports 2018-09-20 12:19:35 +00:00
Dimitri Rusin
dc19b11ae1 finished additional repos test 2018-09-17 13:54:15 +00:00
Dimitri Rusin
59d0f7d6be some minor style changes 2018-09-17 13:54:15 +00:00
Dimitri Rusin
324cb2998b minor style changes 2018-09-17 13:54:15 +00:00