summaryrefslogtreecommitdiff
path: root/app/src/main/res
AgeCommit message (Collapse)Author
2018-08-17fix background image reference for tablets, related to #8917cyBerta
2018-08-17#8920 create round background image in donation dialogcyBerta
2018-08-17Merge branch 'customisation_feature' into 'master'cyberta
Customisation Feature See merge request leap/bitmask_android!78
2018-07-16Minor update according to received feedbackJanak Amarasena
2018-07-08Added custom layout for donation popupJanak Amarasena
2018-07-05#8921 fix validation handling for login/signup button as wellcyBerta
2018-07-05#8886 disable save button if url validation failscyBerta
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-07-01Renamed mask to logoJanak Amarasena
2018-07-01Renamed background imagesJanak Amarasena
2018-06-27Merge branch 'master' into add_providerlalottacontinua
2018-06-27#8886 implemented in insecure as welllalottacontinua
2018-06-23Added customisability to main colorsJanak Amarasena
2018-06-18solved merge conflictlalottacontinua
2018-06-14working version not insecure yetlalottacontinua
2018-06-14Merge branch 'mirror_0xacab_master' into #8889_revise_NavigationDrawercyBerta
fix merge conflict in NavigationDrawerFragment
2018-06-03Added donation remindersJanak Amarasena
2018-05-31Added donation button to navigation drawerJanak Amarasena
2018-05-12Merge branch 'master' into #8889_revise_NavigationDrawercyBerta
2018-05-12#8889 change navigation drawer introduction behavior - hide navigation ↵cyBerta
drawer after 1,5 sec and show a little blue dot at the burger menu after 3 sec
2018-05-12added NewProviderActivity basicsl
2018-03-06cleanup - rename layout filesFup Duck
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-278865 - smaller vertical paddingFup Duck
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-278865 - allow disconnect without connectionFup Duck
* revert last commit * dirty fix to disconnect - see #8876 * add padding in EipFragment
2018-02-27Revert "8865 - allow disconnecting without internet"Fup Duck
This reverts commit 44322f28b28676a8938f4c1066a75ba47397aa7d.
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-27Merge branch '8872_new_launcher_icon' into '0.9.8'cyberta
8872 - new launcher icon See merge request leap/bitmask_android!58
2018-02-278872 - new launcher iconFup Duck
2018-02-278871 - rename sign up/log inFup Duck
2018-02-268865 - allow disconnecting without internetFup Duck
* moved logic from MainActivity to EIP
2018-02-26Merge branch '#8754_reduce_battery_consumption' into '0.9.8'fupduck
#8754 reduce battery consumption See merge request leap/bitmask_android!54
2018-02-25Merge branch '0xacab_0.9.8' into 8865_cancel_without_internetFup Duck
2018-02-25Merge branch '8868_ui_lollipop' into 0xacab_0.9.8Fup Duck
* redo merge https://0xacab.org/leap/bitmask_android/merge_requests/53
2018-02-258865 - resolve discussionsFup Duck
2018-02-23#8754 don't let both navigation drawer lists eat each other on small displayscyBerta
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-228868 - fix lollipop ui issuesFup Duck
2018-02-228851 - remove options menuFup Duck
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-16Merge branch '#8831_progress_animation_when_connecting' into '0.9.8'cyberta
#8831 progress animation when connecting See merge request leap/bitmask_android!43