Margaux Clerc
|
be8dc562ec
|
Fix error display
|
2016-01-19 11:27:36 +01:00 |
|
Margaux Clerc
|
72328025d2
|
Fix merge
|
2015-12-08 17:13:12 +01:00 |
|
Margaux Clerc
|
8793a506e3
|
Merge remote-tracking branch 'linphone-android/master' into obiane
Conflicts:
res/drawable-xhdpi/checkbox_checked.png
res/drawable-xhdpi/checkbox_unchecked.png
res/drawable-xhdpi/resizable_textfield.9.png
res/drawable/avatar_mask_chat.xml
res/layout/about.xml
res/layout/call.xml
res/layout/call_inactive_row.xml
res/layout/chat.xml
res/layout/chat_bubble_incoming.xml
res/layout/chat_bubble_outgoing.xml
res/layout/chatlist.xml
res/layout/contact.xml
res/layout/contacts_list.xml
res/layout/dialer.xml
res/layout/history.xml
res/layout/history_detail.xml
res/layout/main.xml
res/layout/search_contact_cell.xml
res/layout/side_menu_account_cell.xml
res/layout/side_menu_item_cell.xml
res/layout/side_menu_main_account.xml
res/values/non_localizable_custom.xml
res/values/strings.xml
res/values/styles.xml
src/org/linphone/ChatFragment.java
src/org/linphone/ContactsListFragment.java
src/org/linphone/DialerFragment.java
src/org/linphone/HistoryDetailFragment.java
src/org/linphone/LinphoneActivity.java
src/org/linphone/LinphoneService.java
|
2015-11-30 14:29:14 +01:00 |
|
Margaux Clerc
|
41d998beb9
|
Clean settings and add orientation preference
|
2015-11-19 15:08:50 +01:00 |
|
Margaux Clerc
|
d943c41fe5
|
Fix back in settings
|
2015-11-17 17:27:10 +01:00 |
|
Margaux Clerc
|
417b7d0a6a
|
Back to dialer in settings and about
|
2015-11-17 17:27:09 +01:00 |
|
Margaux Clerc
|
f2f12e1bdb
|
Rename assets
|
2015-11-17 17:27:09 +01:00 |
|
Margaux Clerc
|
756a183436
|
Add topbar in settings and about menu
add option for portrait orientation only
|
2015-11-17 10:24:16 +01:00 |
|
Margaux Clerc
|
410f168acf
|
Merge remote-tracking branch 'private/3.0.X' into obiane
Conflicts:
AndroidManifest.xml
res/drawable/status_level.xml
res/layout/call.xml
res/layout/chat.xml
res/layout/chat_bubble_outgoing.xml
res/layout/contact_control_row.xml
res/layout/search_contact_cell.xml
res/values/strings.xml
src/org/linphone/CallActivity.java
src/org/linphone/ChatFragment.java
src/org/linphone/ContactDetailsFragment.java
src/org/linphone/LinphoneService.java
|
2015-11-16 09:06:12 +01:00 |
|
Margaux Clerc
|
3aa9f829c9
|
Fix account delete in side menu and status bar
|
2015-11-13 16:47:48 +01:00 |
|
Margaux Clerc
|
d279336e33
|
fix small issues
|
2015-11-10 17:53:12 +01:00 |
|
Margaux Clerc
|
b6722d7a65
|
Add chat in call and fix call problems
|
2015-11-09 14:31:40 +01:00 |
|
Margaux Clerc
|
c3072beae1
|
Merge remote-tracking branch 'private/3.0.X' into obiane
Conflicts:
src/org/linphone/CallActivity.java
|
2015-11-09 14:16:42 +01:00 |
|
Margaux Clerc
|
ffb1eccb24
|
Interface update
|
2015-11-05 16:23:59 +01:00 |
|
Margaux Clerc
|
92c066d239
|
Add chat in call
|
2015-11-05 15:40:47 +01:00 |
|
Margaux Clerc
|
0ad181c1c3
|
Rename fragment
|
2015-10-26 19:43:34 +01:00 |
|
Margaux Clerc
|
dde619359b
|
Add delte contact in contact list
|
2015-10-26 19:35:22 +01:00 |
|
Margaux Clerc
|
24af401775
|
Rework and rename incoming call and outgoing call activity
|
2015-10-15 17:56:27 +02:00 |
|
Margaux Clerc
|
23e66f1c70
|
Refresh accounts works and remove about/assistant from settings
|
2015-10-15 16:31:39 +02:00 |
|
Margaux Clerc
|
237487cb58
|
Add topbar and hide tabbar in about
|
2015-10-15 15:05:53 +02:00 |
|
Margaux Clerc
|
b7869d703e
|
Update main view
|
2015-09-18 18:32:25 +02:00 |
|
Margaux Clerc
|
18d5706572
|
Update Linphone Main with side menu/ Dialer
|
2015-09-18 18:08:44 +02:00 |
|
Margaux Clerc
|
c3dc710337
|
Merge remote-tracking branch 'linphone/master' into 3.0.X
Conflicts:
AndroidManifest.xml
res/layout/chat_bubble_alt_incoming.xml
res/layout/chat_bubble_alt_outgoing.xml
res/layout/chat_bubble_incoming.xml
res/layout/chat_bubble_outgoing.xml
res/values/strings.xml
src/org/linphone/ContactsManager.java
src/org/linphone/compatibility/ApiFivePlus.java
src/org/linphone/ui/BubbleChat.java
|
2015-09-10 18:58:01 +02:00 |
|
Margaux Clerc
|
3eca96e3c5
|
Rework Incall view/Chat view/Edit Contact view
|
2015-08-25 17:23:07 +02:00 |
|
Margaux Clerc
|
90d9193aa7
|
Rework assistant
|
2015-08-17 15:04:59 +02:00 |
|
Margaux Clerc
|
690cfecbba
|
Fix merge
|
2015-08-14 15:31:39 +02:00 |
|
Margaux Clerc
|
6870dec8b1
|
Add relativeLayout for left menu
|
2015-08-14 11:26:22 +02:00 |
|
Margaux Clerc
|
a0738ca90d
|
Fix error reason for call and proxy config
|
2015-08-11 16:32:34 +02:00 |
|
Margaux Clerc
|
cabecb97b2
|
Update UI contacts/dialer/chatlist and remove old assets
|
2015-08-03 12:25:05 +02:00 |
|
Margaux Clerc
|
219b3005f8
|
Rework views history/contacts/chat with the new design
|
2015-07-30 15:46:28 +02:00 |
|
Margaux Clerc
|
f31f51661d
|
Update interface
|
2015-07-27 17:03:15 +02:00 |
|
Margaux Clerc
|
f9f9f7ddd5
|
Remove/add assets
Main and dialer view in progress
|
2015-07-27 16:26:26 +02:00 |
|
Margaux Clerc
|
2950bc1d91
|
Drop support api < 14
|
2015-07-23 13:47:05 +02:00 |
|
Margaux Clerc
|
4c92aa2ed6
|
Fix setup crash with sip:
|
2015-05-20 09:25:05 +02:00 |
|
Margaux Clerc
|
a37024d3c7
|
Add popup for debug logs
|
2015-05-12 14:50:54 +02:00 |
|
Margaux Clerc
|
9abe56939d
|
Settings selected when go in about page
|
2015-04-30 17:34:40 +02:00 |
|
Margaux Clerc
|
bfe4941c5c
|
Fix notification chat for tablets
|
2015-04-29 18:35:27 +02:00 |
|
Margaux Clerc
|
25144d93b7
|
Fix chat notifications on lollipop
|
2015-04-27 15:44:35 +02:00 |
|
Margaux Clerc
|
14c8510398
|
Fix contact picture
|
2015-04-23 14:28:57 +02:00 |
|
Margaux Clerc
|
82173a8985
|
Fix find contact again
|
2015-04-20 18:15:25 +02:00 |
|
Margaux Clerc
|
540a1c6fb4
|
Fix tablet chat && contacts fragment
|
2015-04-16 17:05:14 +02:00 |
|
Margaux Clerc
|
688dcebe42
|
Add parameter for linphone tag and fix chat dispaly
|
2015-04-15 16:38:55 +02:00 |
|
Margaux Clerc
|
3706b6ebe2
|
Fix problems in contacts and remove linphone tag
|
2015-04-14 17:07:34 +02:00 |
|
Margaux Clerc
|
bd0c2df61e
|
Add linphone friend management
|
2015-04-13 19:07:01 +02:00 |
|
Margaux Clerc
|
135361c563
|
Re-add sip contact address
Add linphone tag in native contact app
Add message to avoid delete contact too easily
Migrate old contact with im to sipAddress
|
2015-03-25 17:14:27 +01:00 |
|
Sylvain Berfini
|
af7048f125
|
Revert to using a chat fragment, but load it in a separated activity on phones to still have the rotation feature
|
2015-03-13 14:23:03 +01:00 |
|
Sylvain Berfini
|
459ba85533
|
Removed warnings in java code
|
2015-03-11 10:44:59 +01:00 |
|
Gautier Pelloux-Prayer
|
36c23ce372
|
Show error message only once - if the error is not handled, simply show "Unknown error: {error_reason}"
Revert "Display a toast in case of call error"
This reverts commit 63198bc591.
Conflicts:
src/org/linphone/LinphoneManager.java
|
2015-02-23 16:45:04 +01:00 |
|
Margaux Clerc
|
c656a35aef
|
Remove call to impl classes
|
2015-02-10 18:19:21 +01:00 |
|
Margaux Clerc
|
90ea41dd24
|
Rework linphoneListener
|
2015-02-03 17:01:05 +01:00 |
|