aboutsummaryrefslogtreecommitdiffstats
path: root/main/res/values
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release' into upstreamSamuel Tardieu2015-01-131-2/+2
|\
| * Changelog update and version brandingLars2015-01-121-2/+2
| |
| * Update changelog_release.xmlLars2015-01-121-0/+1
| | | | | | Manual alignment of branches as first commit was made on wrong branch.
* | Update changelog_release.xmlLars2015-01-121-0/+1
| | | | | | #3078
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-091-2/+2
|\ \ | |/
| * Use %d instead of %s for cache countSamuel Tardieu2015-01-091-2/+2
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-091-0/+1
|\ \ | |/
| * Merge branch 'release' of github.com:cgeo/cgeo into releaseSamuel Tardieu2015-01-091-0/+1
| |\
| | * Update changelog_release.xmlLars2015-01-091-0/+1
| | |
| * | Clear changelog_masterSamuel Tardieu2015-01-091-3/+0
|/ /
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-091-2/+7
|\ \ | |/
| * Remove doubled entry from changelogLars2015-01-091-1/+0
| |
| * Changlog update and resortingLars2015-01-091-2/+8
| |
* | Add plurals for caches_remove_{all,selected}_confirmMadanKumarB2015-01-091-2/+8
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-081-0/+1
|\ \ | |/
| * Merge changelogsSamuel Tardieu2015-01-082-3/+1
|/
* Merge branch 'release' into upstreamSamuel Tardieu2015-01-081-0/+1
|\
| * Update changelogSamuel Tardieu2015-01-081-0/+1
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-082-0/+3
|\ \ | |/
| * fix #4602: add system information in "about" and mailsSamuel Tardieu2015-01-081-0/+2
| |
| * Update changelog_release.xmlLars2015-01-071-0/+1
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-071-0/+1
|\ \ | |/
| * Update ChangeLog for releaseSamuel Tardieu2015-01-071-0/+1
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-061-0/+1
|\ \ | |/
| * Update changelog_release.xmlLars2015-01-061-0/+1
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2015-01-061-38/+3
|\ \ | |/
| * Update changelog_release.xmlLars2015-01-061-38/+3
| | | | | | | | | | - Remove old changes (as this is a new feature release) - Add changes - Remove limitation #4548
* | Reinitialize master changelogSamuel Tardieu2015-01-051-0/+3
|/
* Merge changelogsSamuel Tardieu2015-01-052-7/+5
|
* Update changelog_master.xmlLars2015-01-051-0/+1
|
* Do not use toasts for non-existing possibilitiesSamuel Tardieu2015-01-021-1/+0
|
* Merge remote-tracking branch 'origin/release'Bananeweizen2014-12-301-0/+4
|\
| * fix #4571: GCVote not stored locallyBananeweizen2014-12-301-0/+2
| |
| * forgot updating release notes on release branchBananeweizen2014-12-261-0/+2
| |
* | #4566 new voting dialogBananeweizen2014-12-302-0/+3
| | | | | | The tap handler for the rating stars will be implemented later.
* | Update changelog_master.xmlLars2014-12-301-1/+0
| | | | | | Fix has been moved to release.
* | have filters for ratingBananeweizen2014-12-281-0/+3
| |
* | Merge branch 'release'rsudev2014-12-231-0/+2
|\ \ | |/
| * Fixes #4559, opencaching: use language instead of country to retrieve ↵rsudev2014-12-231-0/+2
| | | | | | | | descriptions
* | Merge branch 'release' into upstreamSamuel Tardieu2014-12-221-1/+3
|\ \ | |/
| * Version code for bugfix releaseLars2014-12-211-1/+1
| |
| * Known limitation update for #4548Lars2014-12-211-0/+2
| |
* | Update changelog_master.xmlLars2014-12-211-0/+3
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2014-12-201-0/+1
|\ \ | |/
| * Update ChangelogSamuel Tardieu2014-12-201-0/+1
| |
* | Merge branch 'release' into upstreamSamuel Tardieu2014-12-191-0/+5
|\ \ | |/
| * Update ChangeLogSamuel Tardieu2014-12-191-0/+5
| |
* | Merge branch 'issue-4545' into upstreamSamuel Tardieu2014-12-191-0/+1
|\ \
| * | Add summary to services to explain what can be configured thereSamuel Tardieu2014-12-191-0/+1
| |/ | | | | | | Part of work on #4545.
* | Merge branch 'release' into upstreamSamuel Tardieu2014-12-161-0/+3
|\ \ | |/