Commit graph

6966 commits

Author SHA1 Message Date
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
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
Nextcloud bot
c5744c61b5
[tx-robot] updated from transifex 2017-04-15 00:22:23 +00:00
Nextcloud bot
e781d20704
[tx-robot] updated from transifex 2017-04-14 00:21:31 +00:00
Nextcloud bot
392d51f19b
[tx-robot] updated from transifex 2017-04-13 00:21:57 +00:00
Mario Đanić
e3d1d229a8 Merge pull request #819 from nextcloud/remove-play-services
Remove play services
2017-04-12 07:49:42 +02:00
Nextcloud bot
f3343748f5
[tx-robot] updated from transifex 2017-04-12 00:21:00 +00:00
Nextcloud bot
5d3f5eb698
[tx-robot] updated from transifex 2017-04-11 00:20:47 +00:00
Mario Danic
3e133deab1 Remove play services 2017-04-11 00:00:35 +02:00
Nextcloud bot
55106ec8a7
[tx-robot] updated from transifex 2017-04-10 00:22:04 +00:00
Nextcloud bot
190d3b0075
[tx-robot] updated from transifex 2017-04-09 00:21:20 +00:00
Nextcloud bot
af1ea3758e
[tx-robot] updated from transifex 2017-04-08 00:21:29 +00:00
Nextcloud bot
c05abb6952
[tx-robot] updated from transifex 2017-04-07 00:22:55 +00:00
Nextcloud bot
5b6ecabae8
[tx-robot] updated from transifex 2017-04-06 00:21:41 +00:00
Tobias Kaminsky
8ff753f623 Merge pull request #607 from nextcloud/integration-with-master
PNG files have full-screen checkerboard background & Better emptycontent view for file types which can not be shown
2017-04-05 08:35:56 +02:00
Nextcloud bot
0d43197c9c
[tx-robot] updated from transifex 2017-04-05 00:22:13 +00:00
Andy Scherzinger
7e9cb46dde Merge pull request #800 from nextcloud/issue-template
Update issue_template.md
2017-04-04 17:01:11 +02:00
Jos Poortvliet
4e5d725e33 Update issue_template.md 2017-04-04 14:51:24 +02:00
Nextcloud bot
9ade2f8a46
[tx-robot] updated from transifex 2017-04-04 00:20:53 +00:00
AndyScherzinger
a9a029fcc5
a 2017-04-03 23:27:33 +02:00
AndyScherzinger
de825e2238
Merge branch 'master' of https://github.com/nextcloud/android into integration-with-master
# Conflicts:
#	src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
#	src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java
#	src/main/res/values-en-rGB/strings.xml
2017-04-03 23:20:30 +02:00
Nextcloud bot
7e4b3fb858
[tx-robot] updated from transifex 2017-04-03 00:21:37 +00:00
Nextcloud bot
1ae9d87da6
[tx-robot] updated from transifex 2017-04-02 00:21:26 +00:00
Nextcloud bot
bfe0dea784
[tx-robot] updated from transifex 2017-04-01 00:21:41 +00:00
Mario Đanić
0668b58cc5 Merge pull request #789 from nextcloud/userInfoLayoutAlignment
User info layout alignment
2017-03-31 16:18:54 +02:00
AndyScherzinger
89b5554276
fix UI glitch 2017-03-31 16:11:16 +02:00
AndyScherzinger
91f984eff6
design optimized layout changes 2017-03-31 16:11:16 +02:00
Andy Scherzinger
2fdbf5d8e7 Merge pull request #742 from nextcloud/favourites
Search and others
2017-03-31 16:10:31 +02:00
AndyScherzinger
8f265b4c9e
use fav strings as used on the webUI 2017-03-31 11:21:06 +02:00
AndyScherzinger
ed771603ef
menu ordering 2017-03-31 11:09:33 +02:00
AndyScherzinger
a0f1b15b81
add proper star icon for menus 2017-03-31 11:02:44 +02:00
AndyScherzinger
6b2e0f54ce
fix menu 2017-03-31 10:07:20 +02:00
AndyScherzinger
b3430f54d3
lib version 1.0.14 2017-03-31 09:20:30 +02:00
Nextcloud bot
9f2a8158f6
[tx-robot] updated from transifex 2017-03-31 00:21:57 +00:00
AndyScherzinger
67fa10f8fa
support lib 25.0.0 2017-03-31 02:03:15 +02:00
AndyScherzinger
3d17ac886b
Merge branch 'master' of https://github.com/nextcloud/android into favourites
# Conflicts:
#	build.gradle
#	src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
#	src/main/res/menu/drawer_menu.xml
2017-03-31 01:57:38 +02:00
Andy Scherzinger
7706fdb8fc Merge pull request #784 from nextcloud/activities
Activities
2017-03-31 01:12:06 +02:00
AndyScherzinger
279f783d6d
library 1.0.14 2017-03-31 01:04:11 +02:00
Andy Scherzinger
98540e4693 Merge pull request #772 from nextcloud/fix-snapchat-etc
Fix snapchat etc
2017-03-31 00:47:00 +02:00
AndyScherzinger
ea6778a8fe
move to master snapshot of lib 2017-03-31 00:45:01 +02:00
AndyScherzinger
28cb271d72
fit message according to the webUI 2017-03-31 00:36:04 +02:00
AndyScherzinger
10c6bf1d98
add another missing break; 2017-03-30 23:36:59 +02:00
AndyScherzinger
32ea8d2769
fix codacy 2017-03-30 23:24:37 +02:00
AndyScherzinger
5bc727e5cb
proper use of generics for view holder 2017-03-30 23:21:01 +02:00
AndyScherzinger
472f300e26
minor layout changes 2017-03-30 23:08:01 +02:00