repomaker merge requestshttps://staging.gitlab.com/fdroid/repomaker/-/merge_requests2017-06-30T13:50:00Zhttps://staging.gitlab.com/fdroid/repomaker/-/merge_requests/112Directly upload files after selection in repo index view2017-06-30T13:50:00Zusername-removed-124398Directly upload files after selection in repo index viewOnly works with JavaScript, fallback is old behavior.Only works with JavaScript, fallback is old behavior.1.0https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/111Remove margin around repo pagination2017-06-30T14:14:20Zusername-removed-124398Remove margin around repo paginationIn !102 I introduced some margin. This fixes it while keeping the other panels looking good.
Unfortunately, on the screenshots it still looks like there is some margin o_O In reality, there is none.
![Screen_Shot_2017-06-20_at_18.19.51...In !102 I introduced some margin. This fixes it while keeping the other panels looking good.
Unfortunately, on the screenshots it still looks like there is some margin o_O In reality, there is none.
![Screen_Shot_2017-06-20_at_18.19.51](/uploads/7c429ba229fe41b79ec7e17d711abd1b/Screen_Shot_2017-06-20_at_18.19.51.png)
![Screen_Shot_2017-06-20_at_18.19.46](/uploads/d81c126b06146b6bcce8ba4230a6cb4f/Screen_Shot_2017-06-20_at_18.19.46.png)
![Screen_Shot_2017-06-20_at_18.19.58](/uploads/38aec796a662f5c38e52d1c46e2975c6/Screen_Shot_2017-06-20_at_18.19.58.png)
![Screen_Shot_2017-06-20_at_18.19.53](/uploads/541d401952a54ef3f3d71668d1b03585/Screen_Shot_2017-06-20_at_18.19.53.png)
![Screen_Shot_2017-06-20_at_18.20.00](/uploads/18e5954b45287d537a363fb2a196cc86/Screen_Shot_2017-06-20_at_18.20.00.png)
![Screen_Shot_2017-06-20_at_18.20.16](/uploads/65d586092c631e0498aee4b40fd03f13/Screen_Shot_2017-06-20_at_18.20.16.png)
![Screen_Shot_2017-06-20_at_18.20.22](/uploads/ac4f98ac1321bd68ac30bce5e4950c99/Screen_Shot_2017-06-20_at_18.20.22.png)
![Screen_Shot_2017-06-20_at_18.20.19](/uploads/2fe95deefcb6aabc47cb825cbaf0b1ea/Screen_Shot_2017-06-20_at_18.20.19.png)
![Screen_Shot_2017-06-20_at_18.20.24](/uploads/eaf4c4224662f72c8b024fac7e4973a7/Screen_Shot_2017-06-20_at_18.20.24.png)1.0https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/129Remove useless div around panels2017-06-30T14:19:12Zusername-removed-124398Remove useless div around panelshttps://gitlab.com/fdroid/repomaker/merge_requests/111#note_33800079https://gitlab.com/fdroid/repomaker/merge_requests/111#note_338000791.0username-removed-26331username-removed-26331https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/120Internationalise JavaScript code2017-06-30T15:04:50Zusername-removed-124398Internationalise JavaScript codeI did not find any way to let Django add the translations from JavaScript to "django" instead of "django.js".
This is the code I tried:
```python
js_info_dict = {
'domain': 'django',
'packages': ('maker.apps.MakerConfig'...I did not find any way to let Django add the translations from JavaScript to "django" instead of "django.js".
This is the code I tried:
```python
js_info_dict = {
'domain': 'django',
'packages': ('maker.apps.MakerConfig',),
}
urlpatterns = [
# JavaScript Internationalisation
url(r'^jsi18n/$', javascript_catalog, js_info_dict, name='javascript-catalog'),
```1.0https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/121Move repo homepage files into own directory2017-06-30T15:31:09Zusername-removed-124398Move repo homepage files into own directoryThis is how a empty repo looks like:
```bash
➜ repo git:(master) ✗ ls
assets icons icons-120 icons-160 icons-240 icons-320 icons-480 icons-640 index.html qr_code.html qrcode.png
➜ repo git:(master) ✗ ls assets
facebook.png ...This is how a empty repo looks like:
```bash
➜ repo git:(master) ✗ ls
assets icons icons-120 icons-160 icons-240 icons-320 icons-480 icons-640 index.html qr_code.html qrcode.png
➜ repo git:(master) ✗ ls assets
facebook.png f-droid.png material.min.js page.css roboto-fonts twitter.png
```
This is how a repo with two apps looks like:
```bash
➜ repo git:(master) ✗ ls
assets de.grobox.liberario_48.apk icons icons-160 icons-320 icons-640 index.jar index-v1.json qr_code.html
categories.txt de.nico.ha_manager_26.apk icons-120 icons-240 icons-480 index.html index-v1.jar index.xml qrcode.png
```1.0https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/124Implement UI Design for App Details Screen of Remote Apps2017-07-03T21:20:27Zusername-removed-124398Implement UI Design for App Details Screen of Remote Apps![Screen_Shot_2017-06-26_at_14.33.12](/uploads/f332201ef852c28fc0aa6a427e410e7c/Screen_Shot_2017-06-26_at_14.33.12.png)![Screen_Shot_2017-06-26_at_14.33.12](/uploads/f332201ef852c28fc0aa6a427e410e7c/Screen_Shot_2017-06-26_at_14.33.12.png)1.0https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/130Update fdroidserver2017-07-03T22:44:16Zusername-removed-26331Update fdroidserverhttps://staging.gitlab.com/fdroid/repomaker/-/merge_requests/131Handle failing download_remote_screenshot task when App was deleted2017-07-05T11:10:52Zusername-removed-26331Handle failing download_remote_screenshot task when App was deletedCloses #116Closes #1161.0username-removed-124398username-removed-124398https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/128Filter and paginate apps with AJAX requests when adding apps2017-07-05T15:56:54Zusername-removed-124398Filter and paginate apps with AJAX requests when adding appsWhen JavaScript is available, Repomaker acts like before.
Otherwise it reacts on a scroll event in MDL's content container.
Every time the user scrolls to the bottom closer than 800 pixels,
an AJAX request is made to the window URL,...When JavaScript is available, Repomaker acts like before.
Otherwise it reacts on a scroll event in MDL's content container.
Every time the user scrolls to the bottom closer than 800 pixels,
an AJAX request is made to the window URL,
extended by Django's built-in pagination paramter `?page=`.
On first load it will load the second page and saves '2' to HTML's session storage.
When the user scrolls again close to the bottom,
the script increases the page count by one and requests again.
If there are no more apps, Repomaker returns 404 resulting in disabling the script's pagination functionality.
When Repomaker returns some apps,
the script gets the first app card and uses this as a template for the loaded ones.
It replaces the icon, title and other properties of the app and appends it to the page.
What currently does not work is setting the version of an app because
Repomaker somehow does not return it via JSON.
Additionally, categories are not working.
Issue #98 is also about pagination in repo apps,
therefore this commit does not close it.1.0https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/132Check that uploaded APKs are a proper update to current app2017-07-06T09:47:26Zusername-removed-26331Check that uploaded APKs are a proper update to current appAlso refactor the messy upload code and add lots of tests
Closes #107Also refactor the messy upload code and add lots of tests
Closes #1071.0username-removed-124398username-removed-124398https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/127Filter and paginate apps with AJAX requests in repo apps2017-07-06T20:05:38Zusername-removed-124398Filter and paginate apps with AJAX requests in repo appsFilter and paginate apps with AJAX requests
When JavaScript is available, Repomaker acts like before.
Otherwise it reacts on a scroll event in MDL's content container.
Every time the user scrolls to the bottom closer than 800 ...Filter and paginate apps with AJAX requests
When JavaScript is available, Repomaker acts like before.
Otherwise it reacts on a scroll event in MDL's content container.
Every time the user scrolls to the bottom closer than 800 pixels,
an AJAX request is made to the window URL,
extended by Django's built-in pagination paramter `?page=`.
On first load it will load the second page and saves '2' to HTML's session storage.
When the user scrolls again close to the bottom,
the script increases the page count by one and requests again.
If there are no more apps, Repomaker returns 404 resulting in disabling the script's pagination functionality.
When Repomaker returns some apps,
the script gets the first app card and uses this as a template for the loaded ones.
It replaces the icon, title and other properties of the app and appends it to the page.
Fixes #98.1.0https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/133Fix material icon in repo share view2017-07-06T20:33:12Zusername-removed-124398Fix material icon in repo share viewSorry for that, I should really stop copy'n'pasting classes across the project...
![Screen_Shot_2017-07-06_at_22.14.58](/uploads/569884d0efbef2069e0c27021ed355e2/Screen_Shot_2017-07-06_at_22.14.58.png)
_`rm-storage-header-*` is just fo...Sorry for that, I should really stop copy'n'pasting classes across the project...
![Screen_Shot_2017-07-06_at_22.14.58](/uploads/569884d0efbef2069e0c27021ed355e2/Screen_Shot_2017-07-06_at_22.14.58.png)
_`rm-storage-header-*` is just for centering, which is already done by `rm-repo-share-empty`._1.0username-removed-26331username-removed-26331https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/134Implement Workflow for Translating App Metadata2017-07-16T10:23:18Zusername-removed-26331Implement Workflow for Translating App Metadata@NicoAlt you had asked for everything in one MR and here you go! :wink:
This MR contains 10 logically separate commits and could be split further though.
There are some issues left. I created tickets for those and tagged them with...@NicoAlt you had asked for everything in one MR and here you go! :wink:
This MR contains 10 logically separate commits and could be split further though.
There are some issues left. I created tickets for those and tagged them with ~localization
Otherwise, the translation workflow should now be good enough to be merged.
Closes #1261.0username-removed-124398username-removed-124398https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/123Implement UI Improvement for Single Repo App Index2017-07-18T00:54:57Zusername-removed-124398Implement UI Improvement for Single Repo App IndexApp edit had hard dependencies to the drag and drop area in repo index, therefore this got a little bit larger.
### Empty
![Screen_Shot_2017-06-26_at_12.03.33](/uploads/34821e14df46553e5593522f499af887/Screen_Shot_2017-06-26_at_12....App edit had hard dependencies to the drag and drop area in repo index, therefore this got a little bit larger.
### Empty
![Screen_Shot_2017-06-26_at_12.03.33](/uploads/34821e14df46553e5593522f499af887/Screen_Shot_2017-06-26_at_12.03.33.png)
### Three apps
![Screen_Shot_2017-06-26_at_12.03.02](/uploads/b9d0cea5ebdce30de497373e1cf3f348/Screen_Shot_2017-06-26_at_12.03.02.png)
### Pagination => Search
I'm not confident with the large white space at the top but because of the input field this space is sometimes necessary.
![Screen_Shot_2017-06-26_at_12.02.32](/uploads/57f32f9ecddc3bc80f66eeea709c0cb2/Screen_Shot_2017-06-26_at_12.02.32.png)
### App edit
![Screen_Shot_2017-06-26_at_12.02.19](/uploads/034cb8699f50332881909964e0e1e437/Screen_Shot_2017-06-26_at_12.02.19.png)
### Non-JS Fallback
![Screen_Shot_2017-06-26_at_12.13.10](/uploads/c150a950794601f70db337c293e01374/Screen_Shot_2017-06-26_at_12.13.10.png)1.0https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/136Show error page when database is locked2017-07-18T09:10:48Zusername-removed-26331Show error page when database is lockedUnfortunately, I didn't find a way to improve the database locking when using SqLite. It is either locking all or nothing. Also, I couldn't find out how to lock the database only for short intervals while doing background tasks.
So th...Unfortunately, I didn't find a way to improve the database locking when using SqLite. It is either locking all or nothing. Also, I couldn't find out how to lock the database only for short intervals while doing background tasks.
So this MR at least adds an error page, so users know what is going on.
Closes #1151.0username-removed-124398username-removed-124398https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/137Keep last app icon around2017-07-18T12:53:23Zusername-removed-26331Keep last app icon aroundFixes #152Fixes #1521.0username-removed-124398username-removed-124398https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/139Fix redirect after removing APK from app2017-07-19T10:43:47Zusername-removed-26331Fix redirect after removing APK from appCloses #159Closes #1591.0username-removed-124398username-removed-124398https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/135Fix Roboto fonts on external repo page2017-07-19T13:06:26Zusername-removed-124398Fix Roboto fonts on external repo pageUpstream changed the names of all directories to lower case in this commit:
https://github.com/choffmeister/roboto-fontface-bower/commit/afa0e006831247a99376372c993e1d021c1c9610
When updating external NPM resources with `npm install`...Upstream changed the names of all directories to lower case in this commit:
https://github.com/choffmeister/roboto-fontface-bower/commit/afa0e006831247a99376372c993e1d021c1c9610
When updating external NPM resources with `npm install`, the repo publishing task failed with this error message:
```bash
Traceback (most recent call last):
[...]
File "/home/nico/Work/Current/F-Droid/repomaker/maker/views/gitstorage.py", line 83, in form_valid
return super(GitUrlValidationMixin, self).form_valid(form)
File "/home/nico/Work/Current/F-Droid/repomaker/maker/views/sshstorage.py", line 48, in form_valid
return super(SshKeyMixin, self).form_valid(form)
File "/home/nico/Work/Current/F-Droid/repomaker/maker/views/storage.py", line 66, in form_valid
return super(StorageCreateView, self).form_valid(form)
File "/home/nico/Work/Current/F-Droid/repomaker/maker/views/storage.py", line 35, in form_valid
form.instance.repo.set_url(form.instance.get_repo_url())
File "/home/nico/Work/Current/F-Droid/repomaker/maker/models/repository.py", line 248, in set_url
self._generate_page()
File "/home/nico/Work/Current/F-Droid/repomaker/maker/models/repository.py", line 203, in _generate_page
self._copy_page_assets()
File "/home/nico/Work/Current/F-Droid/repomaker/maker/models/repository.py", line 243, in _copy_page_assets
copy(source, target)
File "/usr/lib/python3.4/shutil.py", line 228, in copy
copyfile(src, dst, follow_symlinks=follow_symlinks)
File "/usr/lib/python3.4/shutil.py", line 107, in copyfile
with open(src, 'rb') as fsrc:
FileNotFoundError: [Errno 2] No such file or directory: '/home/nico/Work/Current/F-Droid/repomaker/node_modules/roboto-fontface/fonts/Roboto/Roboto-Bold.woff2'
```1.0https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/138Handle add and back in remote app add properly2017-07-19T14:38:55Zusername-removed-124398Handle add and back in remote app add properlyAdditionally, screenshots will be loaded via JavaScript if it is available.
Fixes #158.Additionally, screenshots will be loaded via JavaScript if it is available.
Fixes #158.1.0username-removed-26331username-removed-26331https://staging.gitlab.com/fdroid/repomaker/-/merge_requests/141Re-sign test APKs to prevent validation errors with MD5 signature2017-07-19T18:42:17Zusername-removed-26331Re-sign test APKs to prevent validation errors with MD5 signature1.0