Commit Graph

2082 Commits

Author SHA1 Message Date
52dd79d3a9 Updated README 2016-09-29 21:34:10 +02:00
e7b7e56ae7 Fixed encrypted API keys in Travis CI settings 2016-09-29 21:31:02 +02:00
6249a348f2 Added CI status to README 2016-09-29 21:24:07 +02:00
17dfe871ea Updated Travis CI settings 2016-09-29 21:16:16 +02:00
2d7b4cf4b3 Updated Travis CI settings 2016-09-29 21:14:22 +02:00
abc0997f0c Updated licenses to Travis CI settings 2016-09-29 21:05:38 +02:00
390c562a40 Added licenses to Travis CI settings 2016-09-29 21:02:40 +02:00
28cdaf7424 Setted JDK 8 version in Travis CI settings 2016-09-29 20:48:41 +02:00
e57e0bce26 Added exec permission to gradlew 2016-09-29 20:43:09 +02:00
70a14ce4ce Added exec permission to gradlew 2016-09-29 20:42:26 +02:00
9d3addda9d Enabled CI through Travis-CI 2016-09-29 20:35:34 +02:00
ae16570491 Enabled CI through Travis-CI 2016-09-29 20:33:53 +02:00
9591295f32 Merge branch 'feature/hide-action-bar-capture-qr' into develop 2016-09-28 23:22:51 +02:00
284c3aa280 Hided action bar on codes scanner 2016-09-28 23:22:33 +02:00
8c4782ab73 Replaced NULL value for strings returned by the webservice with the empty string 2016-09-28 23:16:32 +02:00
938597b845 Updated Analytics library 2016-09-28 19:55:12 +02:00
044e9a5563 Updated Analytics library 2016-09-22 22:02:58 +02:00
c98242e6e7 Updated Gradle plugin 2016-09-19 20:13:02 +02:00
425e5dbde5 Updated Android Support library 2016-09-13 22:23:01 +02:00
73f62b675b Merge tag '1.5.0' into develop
1.5.0
2016-09-01 17:07:49 +02:00
c29b55bb9e Merge branch 'release/1.5.0' 2016-09-01 17:06:36 +02:00
b70ca95660 Updated changelog 2016-09-01 17:06:24 +02:00
ee5ae23821 Merge branch 'feature/toast-mark-notif-read' into develop 2016-08-30 23:47:07 +02:00
7d7ce178dc Removed toast 2016-08-30 23:44:44 +02:00
7b282fa220 Updated build tools 2016-08-30 23:36:19 +02:00
9bbeb0f8aa Added Google Analytics to SearchUsers activity 2016-08-29 22:25:39 +02:00
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