Commit graph

8 commits

Author SHA1 Message Date
Erwan Croze
4d323c7c09 Clean layout warnings and errors 2017-04-21 16:41:01 +02:00
Margaux Clerc
59be616a43 Add notification for trial account and add boolean for interface customization 2016-08-11 13:59:13 +02:00
Margaux Clerc
5b264a6685 Add inapp purchase
Add account creator
2016-08-09 13:22:07 +02:00
Margaux Clerc
9143a61ad0 Update in_app ui
[--force]
2016-06-28 16:22:11 +02:00
Margaux Clerc
0da687df64 Merge branch 'master' into dev_in_app_purchase
Conflicts:
	AndroidManifest.xml
	res/raw/linphonerc_factory
	res/values/non_localizable_custom.xml
	res/xml/preferences.xml
	src/org/linphone/LinphonePreferences.java
	src/org/linphone/SettingsFragment.java
	src/org/linphone/compatibility/ApiFivePlus.java
	src/org/linphone/setup/SetupActivity.java
	src/org/linphone/xmlrpc/XmlRpcHelper.java
	src/org/linphone/xmlrpc/XmlRpcListener.java
	src/org/linphone/xmlrpc/XmlRpcListenerBase.java
2016-06-28 14:56:42 +02:00
Sylvain Berfini
d7e2ba79e0 Added recover account, removed password fields and added email field 2015-05-11 16:34:53 +02:00
Sylvain Berfini
5270bd8a5f In-app view ask user for phone number and password 2015-04-28 16:47:58 +02:00
Sylvain Berfini
3d24d20194 Started in-app purchase 2015-04-21 13:18:37 +02:00