Commit Graph

2098 Commits

Author SHA1 Message Date
3d2be659a5 Updated README.md 2016-09-30 20:11:44 +02:00
8c35204fba Updated Build Tools version 2016-09-30 20:05:47 +02:00
1e8d2ec084 Merge pull request #231 from Amab/feature/travis-ci
Added suport for Travis CI
2016-09-30 18:19:35 +02:00
3e4b2e2ce2 Modified the maximum heap size for the Gradle daemon 2016-09-30 17:49:50 +02:00
ac5da65e8a Increased the maximum heap size for the Gradle daemon 2016-09-30 17:35:52 +02:00
6293dd2ebe Tell build script to proceed with lint errors 2016-09-30 17:34:08 +02:00
b44c346193 Increased the maximum heap size for the Gradle daemon 2016-09-30 17:32:05 +02:00
799a30172c Added double quotes in reading of environment variables in Travis CI settings 2016-09-30 17:08:58 +02:00
2e33e16365 Added Telegram channel to Preferences screen 2016-09-30 16:51:53 +02:00
7ebf58a58c Fixed typo in Gradle script 2016-09-30 00:24:23 +02:00
2c4a6e45ef Fixed typo in Gradle script 2016-09-30 00:03:02 +02:00
8f57858587 Removed properties 2016-09-29 23:32:39 +02:00
b1711b862b Removed encrypted data from Travis CI settings 2016-09-29 23:21:31 +02:00
976ef1c9ba Added Telegram channel to README 2016-09-29 23:12:20 +02:00
cc06926ffa Updated README 2016-09-29 21:38:28 +02:00
92fb1f2386 Updated README 2016-09-29 21:36:46 +02:00
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