Commit graph

5109 commits

Author SHA1 Message Date
Andy Scherzinger
6a66b0a48f fix after rebase 2016-06-13 21:50:01 +02:00
Andy Scherzinger
af9c055f85 removed duplicate method call 2016-06-13 21:50:01 +02:00
Andy Scherzinger
3ca1033d7a fixed menu, since grid view hasn't been part of the uploader screen 2016-06-13 21:50:00 +02:00
Andy Scherzinger
cd0082c5e4 proper padding for the choose upload folder buttons 2016-06-13 21:49:59 +02:00
Andy Scherzinger
df013d2b9c Fixes after rebase 2016-06-13 21:49:59 +02:00
Andy Scherzinger
f2e93657e3 implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account 2016-06-13 21:49:58 +02:00
Andy Scherzinger
a3359d0a48 fix background color 2016-06-13 21:49:57 +02:00
Andy Scherzinger
cecab96b2f implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account 2016-06-13 21:49:57 +02:00
Marius Blüm
34c3f0b050 Merge pull request #13 from nextcloud/lgtm-noSelf
lgtm: not self assigning 👍
2016-06-13 20:35:30 +02:00
tobiasKaminsky
e0d499c4b2 lgtm: not self assigning 👍 2016-06-13 19:46:31 +02:00
Lukas Reschke
ad330b9a5a Merge pull request #8 from nextcloud/adjust-documentation-for-nc
Adjust documentation for nc
2016-06-12 18:26:44 +02:00
Lukas Reschke
5cf6c12705
Use Nextcloud naming 2016-06-12 18:07:05 +02:00
Lukas Reschke
821991868d
Use Nextcloud documentation 2016-06-12 18:07:04 +02:00
Andy Scherzinger
6af7558a7d Merge pull request #6 from nextcloud/lgtm
LGTM config + renamed Android ID
2016-06-12 14:53:55 +02:00
Andy Scherzinger
e32a491318 more official maintainers, to approve/review PRs 2016-06-12 14:37:35 +02:00
Andy Scherzinger
9222075066 version 1.0.0 2016-06-12 14:29:48 +02:00
Andy Scherzinger
780ab6b2bd lgtm config 2016-06-12 14:28:50 +02:00
Andy Scherzinger
2a0232ab6c beta launcher svg 2016-06-11 19:16:30 +02:00
Andy Scherzinger
34d9a4cd8b Merge branch 'master' of https://github.com/owncloud/android 2016-06-11 19:16:04 +02:00
Andy Scherzinger
e2ec8498b8 replaced login icon, reworked login now using card views 2016-06-11 18:09:54 +02:00
Andy Scherzinger
f63d421777 launcher icon replacement matching the server icon 2016-06-11 17:13:59 +02:00
Andy Scherzinger
683d4ee50d Merge branch 'master' of https://github.com/nextcloud/android 2016-06-11 17:08:01 +02:00
Andy Scherzinger
d93c50bab5 inverted launcher icon 2016-06-11 17:07:39 +02:00
tobiasKaminsky
3cabd02fc0 update version to 1.0.0 2016-06-11 00:12:46 +02:00
Jenkins for ownCloud
be93f8dbab [tx-robot] updated from transifex 2016-06-10 01:13:57 -04:00
Andy Scherzinger
c9a3397aac minor search provider config 2016-06-09 19:16:14 +02:00
Andy Scherzinger
3521017fb3 configure nc again 2016-06-09 19:15:52 +02:00
Andy Scherzinger
b28e9cd93e svg resources 2016-06-09 17:58:19 +02:00
Andy Scherzinger
8a2cf7ef38 Merge branch 'master' of https://github.com/nextcloud/android 2016-06-09 17:52:48 +02:00
Andy Scherzinger
f45d958c19 nextcloud notification icon 2016-06-09 17:52:37 +02:00
Andy Scherzinger
65775f1c6b adjusting the icon work to nextcloud + high resolution images 2016-06-09 17:52:37 +02:00
Andy Scherzinger
91682b616c replace launcher icon including seasonal icon removal 2016-06-09 17:52:35 +02:00
Andy Scherzinger
abf653f06f adjusting the icon work to nextcloud + high resolution images 2016-06-09 17:42:59 +02:00
Andy Scherzinger
0ac6c26c65 fix launcher icon references 2016-06-09 17:35:25 +02:00
Andy Scherzinger
87784eb52e replace launcher icon including seasonal icon removal 2016-06-09 16:46:58 +02:00
Andy Scherzinger
d176d2753b Update Android gradle plugin to 2.1.2 2016-06-09 10:49:36 +02:00
Jenkins for ownCloud
110ea08b36 [tx-robot] updated from transifex 2016-06-09 01:13:52 -04:00
David A. Velasco
b9e0c34fc3 Merge pull request #1706 from owncloud/stable
Merge version 2.0.1 from stable to master
2016-06-08 16:58:25 +02:00
Andy Scherzinger
8b0bab8feb nextcloud logo for login 2016-06-08 16:46:31 +02:00
David A. Velasco
758d21b6c0 Merge branch 'master' into stable 2016-06-08 16:33:46 +02:00
Andy Scherzinger
1533c6b52c corresponding primary dark color 2016-06-08 16:17:43 +02:00
David A. Velasco
7c8a60c1c3 Updated reference to version 0.9.12 of ownCloud library for Android 2016-06-08 15:42:39 +02:00
David A. Velasco
2bc528ceb2 Changelog update with 2.0.1 release 2016-06-08 15:37:27 +02:00
Andy Scherzinger
88cc66bf4d 1.0.0 2016-06-08 15:31:27 +02:00
Andy Scherzinger
7208a73cce Merge oC 'release_2.0.1' downstream 2016-06-08 15:28:16 +02:00
David A. Velasco
b5033ea205 Added changes of version 2.0.1 to incremental changelog 2016-06-08 10:40:58 +02:00
David A. Velasco
f453c158d7 Merge pull request #1705 from owncloud/release_2.0.1
Release 2.0.1
2016-06-08 10:37:48 +02:00
Juan Carlos González Cabrero
6aab804ec7 Changelog update 2.0.0 release 2016-06-08 09:56:27 +02:00
Jenkins for ownCloud
6d2747c199 [tx-robot] updated from transifex 2016-06-08 01:13:57 -04:00
tobiasKaminsky
1147778794 allow nextcloud to be parallel to owncloud 2016-06-07 21:58:37 +02:00