|
|
f4a87469b7
|
Merge branch 'feature/main-menu-refresh' into develop
|
2016-08-29 20:02:33 +02:00 |
|
|
|
43d70abb6c
|
Fixed bug in refreshing of main menu
|
2016-08-29 20:01:50 +02:00 |
|
|
|
999d717daf
|
Merge branch 'develop' into feature/main-menu-refresh
|
2016-08-28 22:18:30 +02:00 |
|
|
|
7c5efc0a1c
|
Merge pull request #230 from romilgildo/develop
fixes in adapters of userslist and frequentslist
|
2016-08-28 22:15:28 +02:00 |
|
Rubén Martín Hidalgo
|
43e92e181a
|
fixes in adapters of userslist and frequentslist
|
2016-08-28 22:07:23 +02:00 |
|
|
|
e7dfbb70ea
|
Merge branch 'develop' into feature/main-menu-refresh
# Conflicts:
# SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java
|
2016-08-28 12:20:51 +02:00 |
|
|
|
b29e6efe63
|
Encrypted frequent recipients
|
2016-08-28 12:17:46 +02:00 |
|
|
|
96b3aa58b2
|
Merge branch 'develop' into feature/main-menu-refresh
|
2016-08-27 20:18:33 +02:00 |
|
|
|
0e7b0ef2de
|
Now all tables except frequent_recipients are emptied during logout
|
2016-08-27 20:17:59 +02:00 |
|
|
|
c8d689615d
|
Merge branch 'develop' into feature/main-menu-refresh
|
2016-08-27 19:37:47 +02:00 |
|
|
|
582ce51307
|
Added a new contributor
|
2016-08-27 19:37:10 +02:00 |
|
|
|
99eaabc838
|
Merge branch 'develop' into feature/main-menu-refresh
|
2016-08-27 19:24:11 +02:00 |
|
|
|
016ac1286e
|
Merge pull request #229 from romilgildo/develop
Improvement of send message function
|
2016-08-27 19:17:42 +02:00 |
|
Rubén Martín Hidalgo
|
1b9ad36c90
|
corrections in pull request
|
2016-08-27 18:36:21 +02:00 |
|
|
|
e085497f7d
|
Fixed bug in refreshing of main menu
|
2016-08-27 11:30:58 +02:00 |
|
Rubén Martín Hidalgo
|
ed6d8e4df1
|
some changes in the code to optimize it
|
2016-08-26 00:29:23 +02:00 |
|
Rubén Martín Hidalgo
|
f9c26cc196
|
table multiuser in frequent recipients
|
2016-08-24 17:38:46 +02:00 |
|
Rubén Martín Hidalgo
|
d7b5fd3edf
|
Merge branch 'develop' of https://github.com/Amab/SWADroid into develop
|
2016-08-24 16:03:10 +02:00 |
|
|
|
dd45acb04d
|
Now login data is saved to SharedPreferences
|
2016-08-24 11:34:33 +02:00 |
|
Rubén Martín Hidalgo
|
b8c3ad989a
|
editing data of frequent users in memory
|
2016-08-24 00:08:11 +02:00 |
|
Rubén Martín Hidalgo
|
0c87120a4d
|
management of frequent users is working, including photo in users without photo
|
2016-08-23 18:23:14 +02:00 |
|
Rubén Martín Hidalgo
|
aa89726d2c
|
transaction code included
|
2016-08-22 17:32:37 +02:00 |
|
Rubén Martín Hidalgo
|
caf09722bf
|
some strings changed to file
|
2016-08-21 20:08:53 +02:00 |
|
Rubén Martín Hidalgo
|
a7ba54cd42
|
adding strings
|
2016-08-21 19:23:34 +02:00 |
|
Rubén Martín Hidalgo
|
b04dec9460
|
fix conflicts
|
2016-08-21 19:13:22 +02:00 |
|
Rubén Martín Hidalgo
|
0456b8461a
|
frequent recipient can be removed, and listener of users list has been corrected
|
2016-08-21 19:06:15 +02:00 |
|
Rubén Martín Hidalgo
|
e00e1a9a89
|
cleaning code
|
2016-08-21 14:43:27 +02:00 |
|
|
|
7f618d11be
|
Added no courses message to main menu
|
2016-08-21 13:46:51 +02:00 |
|
Rubén Martín Hidalgo
|
a0a52c877b
|
management of frequent users list is working
|
2016-08-21 13:06:13 +02:00 |
|
Rubén Martín Hidalgo
|
d93215a21f
|
add list of frequent recipients
|
2016-08-20 17:32:03 +02:00 |
|
Rubén Martín Hidalgo
|
a4f77bb489
|
create table and functions of frequent recipients (provisional)
|
2016-08-18 20:09:44 +02:00 |
|
Rubén Martín Hidalgo
|
f73036bf6b
|
Merge branch 'develop' of https://github.com/Amab/SWADroid into develop
|
2016-08-18 17:01:39 +02:00 |
|
|
|
78887f693e
|
Updated Android Support library
|
2016-08-18 09:58:50 +02:00 |
|
Rubén Martín Hidalgo
|
3d847ded04
|
some changes in reply message
|
2016-08-18 00:11:30 +02:00 |
|
Rubén Martín Hidalgo
|
93157ed02b
|
Merge branch 'develop' of https://github.com/Amab/SWADroid into develop
|
2016-08-17 15:44:57 +02:00 |
|
|
|
43707241ee
|
Updated Build Tools version
|
2016-08-17 10:19:09 +02:00 |
|
|
|
75958914eb
|
Updated Gradle version
|
2016-08-17 10:03:58 +02:00 |
|
Rubén Martín Hidalgo
|
2a1f56f5f5
|
introducing the frequent users
|
2016-08-15 12:42:14 +02:00 |
|
Rubén Martín Hidalgo
|
eba6e8ebac
|
error with margin in searchview corrected
|
2016-08-13 17:27:32 +02:00 |
|
Rubén Martín Hidalgo
|
903431b8e5
|
working dialog to discard receivers added
|
2016-08-13 17:09:17 +02:00 |
|
Rubén Martín Hidalgo
|
439dd9966b
|
discard dialog in users search
|
2016-08-12 19:39:36 +02:00 |
|
Rubén Martín Hidalgo
|
309cf298d6
|
adding again the confirm button in users list
|
2016-08-12 17:33:50 +02:00 |
|
Rubén Martín Hidalgo
|
e60e3fe883
|
Merge branch 'develop' of https://github.com/Amab/SWADroid into develop
|
2016-08-11 17:27:14 +02:00 |
|
Rubén Martín Hidalgo
|
1d2f52b1d2
|
adding underline to see all text in receivers
|
2016-08-10 19:02:55 +02:00 |
|
|
|
3a99adf716
|
Removed the preferences button from the action bar for all screens except for the main menu
|
2016-08-10 18:14:06 +02:00 |
|
Rubén Martín Hidalgo
|
aa41c98402
|
see all or less receivers in list
|
2016-08-09 20:39:37 +02:00 |
|
Rubén Martín Hidalgo
|
e4b6aee5c9
|
showReceivers methods
|
2016-08-09 19:00:28 +02:00 |
|
Rubén Martín Hidalgo
|
b966b422dc
|
sender of reply message doesn't appear in list users
|
2016-08-09 18:07:38 +02:00 |
|
Rubén Martín Hidalgo
|
000bf7274c
|
last change in messages
|
2016-08-09 00:00:40 +02:00 |
|
Rubén Martín Hidalgo
|
73d96a9791
|
Merge branch 'develop' of https://github.com/Amab/SWADroid into develop
|
2016-08-08 23:58:05 +02:00 |
|
