mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-28 02:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity
7017 commits 227 branches 1574 tags 621 MiB
Commit graph

7017 commits

This branch
This branch
All branches
Author SHA1 Message Date
AndyScherzinger
f9c0e1ca09
align text to the right 2017-04-19 18:31:20 +02:00
AndyScherzinger
8187a2582f
Merge branch 'master' of https://github.com/nextcloud/android into contactBackupRestore 
# Conflicts:
#	src/main/res/values/setup.xml
#	src/modified/res/values/setup.xml
 2017-04-19 18:25:51 +02:00
Andy Scherzinger
029b4a1a02 Merge pull request #805 from nextcloud/svgViewRedone 
Show SVG images
 2017-04-19 16:23:17 +02:00
Mario Danic
c0f4b80c43
Implement checkboards for svg 2017-04-19 16:06:23 +02:00
AndyScherzinger
320d991c19
show SVG images 2017-04-19 16:06:22 +02:00
AndyScherzinger
a0fd11b3c4
updated lib references 2017-04-19 16:06:13 +02:00
Mario Đanić
0677d536c0 Merge pull request #845 from nextcloud/fixNavigation 
bugfix for #798
 2017-04-19 15:16:18 +02:00
tobiasKaminsky
06275e0f79
and the last one... 2017-04-19 14:54:36 +02:00
tobiasKaminsky
0d29d949c5
fixed missing drawer events 2017-04-19 14:52:26 +02:00
Mario Đanić
1a18de8cc4 Merge pull request #826 from nextcloud/fix_bug_firstlogin 
Fix bug firstlogin
 2017-04-19 14:39:21 +02:00
Tobias Kaminsky
20e83d269b Merge pull request #830 from nextcloud/fix-fileprovider 
Fix fileprovider
 2017-04-19 14:07:57 +02:00
Tobias Kaminsky
751e5068d1 Merge pull request #828 from nextcloud/fix-branding 
Improve branding
 2017-04-19 14:02:09 +02:00
Andy Scherzinger
abe6f9fb42 Merge pull request #832 from nextcloud/remove-play-stuff 
Remove gcm stuff
 2017-04-19 13:42:50 +02:00
tobiasKaminsky
1a6b14c0ff
bugfix for #798 
checking cast if remote request is long running
preventing MissingActivityException if fragment is detached from Activity
 2017-04-19 13:41:31 +02:00
Tobias Kaminsky
2033b81f80 Merge pull request #829 from nextcloud/ignore-thumbnails 
Ignore thumbnail files
 2017-04-19 12:22:15 +02:00
Mario Đanić
e9c9884357 Merge pull request #827 from nextcloud/welcome-webview 
Implement webview welcome pages
 2017-04-19 09:05:17 +02:00
tobiasKaminsky
ae75177f75
smaller borders, vertical centered text 2017-04-19 08:45:46 +02:00
Nextcloud bot
9da87449d7
[tx-robot] updated from transifex 2017-04-19 00:21:05 +00:00
alejandro
7701b697a1 Revert "Bug #810 was Fixed" 
This reverts commit 845762f8d0.
 2017-04-18 10:13:48 -05:00
Mario Đanić
34f79b757f Merge pull request #825 from nextcloud/fix_bug_mediaplayer 
Bug #810 Media Control
 2017-04-18 16:54:52 +02:00
tobiasKaminsky
33544f65e7
hide search and option menu when showing contact list 2017-04-18 10:55:46 +02:00
tobiasKaminsky
54f8d3091c
use input stream reader for backward compatibility 2017-04-18 10:41:09 +02:00
tobiasKaminsky
57d210c49f
use collections sort to support older apis 2017-04-18 10:34:08 +02:00
tobiasKaminsky
c4e2e6a07f
prevent NPE if name is null 2017-04-18 09:33:24 +02:00
tobiasKaminsky
c47408d33c
Merge remote-tracking branch 'origin/master' into contactBackupRestore 2017-04-18 09:14:13 +02:00
tobiasKaminsky
e0a71f8810
Merge remote-tracking branch 'remotes/origin/contactBackupRestore' into contactBackupRestore 2017-04-18 09:07:41 +02:00
tobiasKaminsky
fa414c2a1b
"backup now" asks for permission 2017-04-18 09:01:44 +02:00
tobiasKaminsky
3186c21619
do not explicity start the service 
always unbind
 2017-04-18 08:50:19 +02:00
Mario Đanić
c76943803b Merge pull request #836 from nextcloud/UploadListCount 
Upload: count uploads
 2017-04-18 08:36:07 +02:00
tobiasKaminsky
84ff5832ba
satisfy codacy ;-) 2017-04-18 08:23:56 +02:00
tobiasKaminsky
0ab392a00d
use recyclerview 2017-04-18 08:23:56 +02:00
tobiasKaminsky
d058efc2de
contact list: text is now in line with header 
round images
 2017-04-18 08:23:56 +02:00
tobiasKaminsky
9aff159c16
make headlines bold 
set initial state of last backup to "never"
 2017-04-18 08:23:55 +02:00
tobiasKaminsky
72ee736184
expire files on daily backup is now working 2017-04-18 08:23:55 +02:00
tobiasKaminsky
b23b46dfe8
fix showing wrong jobs, only autoUploadJobs should be shown in UploadActivity 2017-04-18 08:23:55 +02:00
tobiasKaminsky
bdc549eee7
fix showing wrong badges 2017-04-18 08:23:55 +02:00
tobiasKaminsky
35e683546c
contact backup & import 2017-04-18 08:23:55 +02:00
Nextcloud bot
538ca93c5a
[tx-robot] updated from transifex 2017-04-18 00:20:54 +00:00
AndyScherzinger
708a261409
minor material design layout fixes 2017-04-17 20:12:27 +02:00
tobiasKaminsky
5c01f75c64
satisfy codacy ;-) 2017-04-17 19:45:17 +02:00
tobiasKaminsky
b5a9813cbc
use recyclerview 2017-04-17 19:45:17 +02:00
tobiasKaminsky
16296153de
contact list: text is now in line with header 
round images
 2017-04-17 19:45:16 +02:00
tobiasKaminsky
9c37334ef7
make headlines bold 
set initial state of last backup to "never"
 2017-04-17 19:45:16 +02:00
tobiasKaminsky
07e3fc524d
expire files on daily backup is now working 2017-04-17 19:45:16 +02:00
tobiasKaminsky
9d1f2666cd
fix showing wrong jobs, only autoUploadJobs should be shown in UploadActivity 2017-04-17 19:45:15 +02:00
tobiasKaminsky
778c4e9ec2
fix showing wrong badges 2017-04-17 19:45:15 +02:00
tobiasKaminsky
d1d01db7a1
contact backup & import 2017-04-17 19:45:12 +02:00
AndyScherzinger
c90354af17
For pending, failed, etc. show the item count 2017-04-17 19:25:12 +02:00
Nextcloud bot
8d3617a742
[tx-robot] updated from transifex 2017-04-17 00:20:39 +00:00
Nextcloud bot
d024dceb9e
[tx-robot] updated from transifex 2017-04-16 00:20:42 +00:00