Skip to content

[GSoC] Merge Leaderboard branch with master #3905

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.

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
merged 24 commits into from
Aug 27, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b381d40
[GSoC] Fixes #3789 Updated UI of achievements activity to display lev…
madhurgupta10 Jun 4, 2020
eec0f14
Merge branch 'leaderboard' into merge-master-temp-branch
maskaravivek Jul 2, 2020
196b914
Fixes #3861 Use the APIs to fetch leaderboard’s based on uploads via …
madhurgupta10 Jul 8, 2020
5877d7a
[GSoC] Added Unit Tests and Fixed Landscape Mode Bug (#3872)
madhurgupta10 Jul 15, 2020
5f77f61
[GSoC] Added Pagination to Leaderboard (#3881)
madhurgupta10 Jul 29, 2020
bc0b5c0
[GSoC] Added option to set a new avatar (#3892)
madhurgupta10 Aug 9, 2020
baee56e
[GSoC] Added Click to open user profile for leaderboard (#3887)
madhurgupta10 Aug 9, 2020
94952f1
[GSoC] Added Leaderboard Filters (#3902)
madhurgupta10 Aug 18, 2020
7823403
Merge remote-tracking branch 'upstream/master' into leaderboard
madhurgupta10 Aug 21, 2020
ef11bac
Add JavaDocs
madhurgupta10 Aug 21, 2020
b35ad7c
Added Test for Update Avatar
madhurgupta10 Aug 21, 2020
43a6615
Decreased Margin of Filter
madhurgupta10 Aug 21, 2020
a63ef00
[GSoC] Updated leaderboard string (#3897)
madhurgupta10 Aug 21, 2020
e326ef0
Merge remote-tracking branch 'upstream/leaderboard' into leaderboard
madhurgupta10 Aug 21, 2020
61db5a6
Updated Strings
madhurgupta10 Aug 21, 2020
95deb4d
Added JavaDocs for all methods and classes
madhurgupta10 Aug 21, 2020
621c803
Added JavaDocs for all methods and classes
madhurgupta10 Aug 21, 2020
fb83594
Added More JavaDocs
madhurgupta10 Aug 26, 2020
00019b5
Revert string.xml
translatewiki Aug 17, 2020
04537ce
Revert "Revert string.xml"
madhurgupta10 Aug 26, 2020
0e56a11
Added protected
madhurgupta10 Aug 26, 2020
1a1ee20
Fixed strings.xml extra changes
madhurgupta10 Aug 26, 2020
06d0522
Revert codeStyle change
madhurgupta10 Aug 26, 2020
8cd3d68
Fixed extra string change
madhurgupta10 Aug 26, 2020
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
Prev Previous commit
Fixed extra string change
  • Loading branch information
madhurgupta10 committed Aug 26, 2020
commit 8cd3d6868f0176e0eb124706e0f46f4378474e02
7 changes: 0 additions & 7 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -593,10 +593,6 @@
<string name="category_edit_helper_make_edit_toast">Essai de mise à jour des catégories.</string>
<string name="category_edit_helper_show_edit_title">Mise à jour de la catégorie</string>
<string name="category_edit_helper_show_edit_title_success">Succès</string>
<plurals name="category_edit_helper_show_edit_message_if">
<item quantity="one">La catégorie %1$s est ajoutée.</item>
<item quantity="other">Les catégories %1$s sont ajoutées.</item>
</plurals>
<string name="category_edit_helper_edit_message_else">Impossible d\'ajouter des catégories.</string>
<string name="category_edit_button_text">Mettre à jour les catégories</string>
<string name="share_image_via">Partager l’image via</string>
Expand Down Expand Up @@ -634,9 +630,6 @@
<string name="use_location_from_similar_image">Avez-vous pris ces deux photos du même endroit ? Voulez-vous utiliser les latitude/longitude de l’image sur la droite ?</string>
<string name="load_more">Charger davantage</string>
<string name="nearby_no_results">Pas d’endroit trouvé, essayez de modifier vos critères de recherche.</string>
<string name="todo_improve">Améliorations suggérées :</string>
<string name="missing_category">- Ajouter des catégories à cette image pour améliorer son utilisation.</string>
<string name="missing_article">- Ajouter cette image à l’article Wikipédia associé qui n’a pas d’image.</string>
<string name="edit_category">Modifier les catégories</string>
<string name="add_picture_to_wikipedia_article_title">Ajouter une image à Wikipédia</string>
<string name="add_picture_to_wikipedia_article_desc">Voulez-vous ajouter cette image à l’article Wikipédia de langue %1$s ?</string>
Expand Down
13 changes: 0 additions & 13 deletions app/src/main/res/values-pt-rBR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -578,15 +578,6 @@
<string name="delete_helper_ask_reason_copyright_logo">Logótipo</string>
<string name="delete_helper_ask_reason_copyright_other">Outro</string>
<string name="delete_helper_ask_alert_set_positive_button_reason">Porque é</string>
<string name="category_edit_helper_make_edit_toast">Tentando atualizar categorias.</string>
<string name="category_edit_helper_show_edit_title">Atualização de categoria</string>
<string name="category_edit_helper_show_edit_title_success">Sucesso</string>
<plurals name="category_edit_helper_show_edit_message_if">
<item quantity="one">A categoria %1$s foi adicionada.</item>
<item quantity="other">As categorias %1$s foram adicionadas.</item>
</plurals>
<string name="category_edit_helper_edit_message_else">Não foi possível adicionar categorias.</string>
<string name="category_edit_button_text">Atualizar categorias</string>
<string name="share_image_via">Compartilhar imagem via</string>
<string name="no_achievements_yet">Você ainda não fez nenhuma contribuição</string>
<string name="account_created">Conta criada!</string>
Expand Down Expand Up @@ -622,10 +613,6 @@
<string name="use_location_from_similar_image">Você tirou essas duas fotos no mesmo lugar? Deseja usar a latitude/longitude da imagem à direita?</string>
<string name="load_more">Carregar mais</string>
<string name="nearby_no_results">Nenhum local encontrado, tente alterar seus critérios de pesquisa.</string>
<string name="todo_improve">Melhorias sugeridas:</string>
<string name="missing_category">- Adicione categorias a esta imagem para melhorar a usabilidade.</string>
<string name="missing_article">- Adicione esta imagem ao artigo da Wikipédia associado que não possui imagens.</string>
<string name="edit_category">Editar categorias</string>
<string name="add_picture_to_wikipedia_article_title">Adicionar imagem à Wikipédia</string>
<string name="add_picture_to_wikipedia_article_desc">Deseja adicionar esta imagem ao artigo da Wikipedia em %1$s?</string>
<string name="add_picture_to_wikipedia_instructions_title">Instruções</string>
Expand Down