summaryrefslogtreecommitdiff
path: root/app/src/main/res/values
AgeCommit message (Collapse)Author
2019-02-18Merge branch 'sp' into 'master'cyberta
Tried making the use of periods more consistent. See merge request leap/bitmask_android!84
2019-02-08Tried making the use of periods more consistent.kwadronaut
Resolves https://www.transifex.com/otf/bitmask-android/translate/#hr/strings/152743232 " Yeah, the use of a period is pretty inconsistent. It does seem like in most cases in which the imperative is used, no punctuation is used however. "Do not show again", "Open navigation drawer", "Please enter your password", "Remind me later" etc."
2018-12-29update sdk to version 28, update dependencies, fix potential memory leakscyBerta
2018-12-11Merge branch 'cyberta_master' into feature/gatewayselectioncyBerta
2018-12-07first shot gatewayselectioncyBerta
2018-10-25fix notification title of the custom branded versioncyBerta
2018-10-19#8919 update dependenciescyBerta
2018-10-08#8927 update languagescyBerta
2018-09-18Excessive quotation mark string Fixes #8932kwadronaut
2018-09-16remove unused string resourcecyBerta
2018-09-16[Bug] string rephrase (#8879)kwadronaut
fixes #8879 unclear string
2018-09-15change string about battery save moduscyBerta
2018-07-04#8886 add layout for tablets and improve tablet and phone layouts in general ↵cyBerta
by implementing dynamic layout changes when keyboard appears
2018-06-27Merge branch 'master' into add_providerlalottacontinua
2018-06-23Added customisability to main colorsJanak Amarasena
2018-06-18solved merge conflictlalottacontinua
2018-06-03Added donation remindersJanak Amarasena
2018-05-31Added donation button to navigation drawerJanak Amarasena
2018-05-12added NewProviderActivity basicsl
2018-03-02#8808 adds an optional dialog that shows instruction hints for always-on vpncyBerta
2018-02-28#8808 add dialog for always-on vpn infoscyBerta
2018-02-28#8808 add a link to android's vpn settings for API >= 24cyBerta
2018-02-27Merge branch '8865_cancel_without_internet' into '0.9.8'cyberta
8865 - allow disconnect without internet See merge request leap/bitmask_android!50
2018-02-27Merge branch '#8873_update_translations' into '0.9.8'fupduck
#8873 add new translations See merge request leap/bitmask_android!61
2018-02-27#8873 add new translationscyBerta
2018-02-27#8875 update licensescyBerta
2018-02-27Merge branch '8871_reword_login_signup' into '0.9.8'cyberta
8871 - rename sign up/log in See merge request leap/bitmask_android!57
2018-02-278871 - rename sign up/log inFup Duck
2018-02-258865 - resolve discussionsFup Duck
2018-02-23#8754 fix dialog cancellation handling and change dialog titlecyBerta
2018-02-23#8754 enable pause openvpn on device inactivity featurecyBerta
2018-02-19fix invalid vpn user messagecyBerta
2018-02-19add current translationscyBerta
2018-02-18Merge branch 'mirror_0xacab_0.9.8' into #8797_certificate_expirationcyBerta
* fix merge conflicts in: app/src/main/java/se/leap/bitmaskclient/EipFragment.java app/src/main/java/se/leap/bitmaskclient/eip/EIP.java app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java
2018-02-158797 - pair programming effortFup Duck
2018-02-13#8831 add a progress animation to EipFragment and don't start blocking vpn ↵cyBerta
when user triggered vpn start from UI
2018-02-08Merge branch '8823_cw_tablet_layout' into '0.9.8'fupduck
8823 cw tablet layout See merge request leap/bitmask_android!36
2018-02-07#8823 update configuration wizard layout for tabletscyBerta
2018-02-06Merge branch 'origin_0.9.8' into 8823_cw_tablet_layoutcyBerta
2018-02-06Merge branch 'origin_0.9.8' into fupduck_8826_custom_providercyBerta
2018-02-02#8832 add missing resource referencescyBerta
2018-02-01#8832 update resources and set to latest submodule commitscyBerta
2018-02-01#8832 add all ics-openvpn code changescyBerta
2018-01-28Merge remote-tracking branch '0xacab/0.9.8' into 8826_custom_providerFup Duck
2018-01-28Merge branch 'origin_0.9.8' into fupduck_8819_config_wizard_designcyBerta
2018-01-23add custom provider optionFup Duck
2018-01-23add tablet design for ConfigWizardFup Duck
based upon !28 I could not check this - starting emulator freezes my system and I have no tablet.
2018-01-23new UI for EipFragmentFup Duck
2018-01-21Merge remote-tracking branch '0xacab/0.9.8' into 8819_config_wizard_designFup Duck
2018-01-19#8799 fix confusing cancel dialogcyBerta