mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity
8120 commits 225 branches 1574 tags 621 MiB
Commit graph

8120 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
beb5d8d56b Merge 90d52a13b4 into cf897d6db2 2017-07-14 10:05:06 +00:00
Nextcloud bot
cf897d6db2
[tx-robot] updated from transifex 2017-07-14 10:04:56 +00:00
tobiaskaminsky
90d52a13b4
- delete signature, not needed anymore 
- fix secrets
 2017-07-14 11:58:24 +02:00
Andy Scherzinger
bcdcbcf21b Merge pull request #1188 from nextcloud/fixLinkForContributing 
fix missing / in contributing link
 2017-07-14 11:57:55 +02:00
tobiaskaminsky
05b4c4b9f5
fix missing / 2017-07-14 11:16:58 +02:00
tobiaskaminsky
930c64f0b1
fix done, part 2 2017-07-14 09:45:44 +02:00
Morris Jobke
f70c8fdb06 Fix drone yml escaping 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-14 09:35:04 +02:00
Nextcloud bot
3f59ac9554
[tx-robot] updated from transifex 2017-07-14 00:28:24 +00:00
Andy Scherzinger
8950a4f136 Merge pull request #1031 from nextcloud/userTheming 
[Theming] Dynamically use server color
 2017-07-13 12:03:56 +02:00
AndyScherzinger
9ab5338099
Merge branch 'master' of https://github.com/nextcloud/android into userTheming 2017-07-13 09:24:46 +02:00
Nextcloud bot
1e667a260a
[tx-robot] updated from transifex 2017-07-13 00:28:00 +00:00
Nextcloud bot
a365552596
[tx-robot] updated from transifex 2017-07-12 00:27:58 +00:00
Tobias Kaminsky
3b6355c3e5 Update CONTRIBUTING.md 
add bug handling
 2017-07-11 13:34:08 +02:00
tobiasKaminsky
05985f3186
api check 2017-07-11 12:45:19 +02:00
tobiasKaminsky
938e222e8f
themeable switch preference 2017-07-11 12:25:55 +02:00
tobiasKaminsky
3fbe9b89b8
proper licence 2017-07-11 11:59:02 +02:00
tobiasKaminsky
0bd03548f3
use darker fallback color 2017-07-11 11:49:27 +02:00
AndyScherzinger
1b64ac7abe
Merge branch 'master' of https://github.com/nextcloud/android into userTheming 2017-07-11 09:26:34 +02:00
AndyScherzinger
76779f9b2e
fix legacy sdk checks for pre-v14 sdks 2017-07-11 09:25:24 +02:00
tobiasKaminsky
2fd5e75975
remove unnecessary line wraps 2017-07-11 07:49:57 +02:00
tobiasKaminsky
466772ffbe
use fallback theme to color bullet points of upload behaviour 2017-07-11 07:49:11 +02:00
Nextcloud bot
36fa8691e4
[tx-robot] updated from transifex 2017-07-11 00:28:59 +00:00
AndyScherzinger
4dfad4b88f
use appcompat classes as parent 2017-07-10 16:44:43 +02:00
AndyScherzinger
bf35562785
Merge branch 'master' of https://github.com/nextcloud/android into userTheming 2017-07-10 14:37:45 +02:00
tobiasKaminsky
a98229d6fa
user server name instead of slogan 2017-07-10 14:17:42 +02:00
tobiasKaminsky
09435b49c9
remove wrong java doc 2017-07-10 13:56:24 +02:00
tobiasKaminsky
ac1984bf42
npe if toolbar null 2017-07-10 13:55:53 +02:00
Nextcloud bot
c493da52de
[tx-robot] updated from transifex 2017-07-10 00:27:56 +00:00
Andy Scherzinger
39ea8ebc27 Merge pull request #1169 from nextcloud/comradekingu-patch-1 
Spelling and language fixes
 2017-07-09 23:09:56 +02:00
Allan Nordhøy
d4de0af079 Spelling and language fixes 
As per https://oauth.net/2/
Tab removed from:

"Your search returned no files modified
+    <string name="file_list_empty_recently_modified_filter">Search returned no files modified the last 7 days.</string>
-        in the last 7 days."

/AutoUpload is now consistent with /InstantUpload
 2017-07-09 19:55:36 +02:00
Nextcloud bot
684dde1795
[tx-robot] updated from transifex 2017-07-08 00:27:28 +00:00
tobiasKaminsky
24c198fb32
If file is shared to NC now the correct color is set for the chosen account 2017-07-06 10:06:18 +02:00
Nextcloud bot
0d8b5090af
[tx-robot] updated from transifex 2017-07-06 00:27:38 +00:00
Nextcloud bot
a361088838
[tx-robot] updated from transifex 2017-07-05 00:27:15 +00:00
tobiaskaminsky
434e5315be
Drawer: use primary dark color for active item 2017-07-04 13:02:04 +02:00
tobiaskaminsky
26a1257857
theme folder in receiveFilesActivity 2017-07-04 10:53:43 +02:00
tobiaskaminsky
17fcbc6e89
checkbox in upload files activity 2017-07-04 10:40:23 +02:00
tobiaskaminsky
2ff2eefb9c
checkbox in details screen for set available offline is now themed 2017-07-04 10:19:28 +02:00
tobiaskaminsky
6c3ffc8901
actionbar is always grey 2017-07-04 10:15:28 +02:00
tobiaskaminsky
ebe483b3ef
- fix wrong ref 
- theme "choose date" button
 2017-07-04 10:11:57 +02:00
tobiaskaminsky
b85d7947b1
Merge remote-tracking branch 'remotes/origin/master' into userTheming 2017-07-04 10:03:12 +02:00
Nextcloud bot
cd9b12a99c
[tx-robot] updated from transifex 2017-07-04 00:26:48 +00:00
Nextcloud bot
3603ca1d40
[tx-robot] updated from transifex 2017-07-03 00:27:00 +00:00
Nextcloud bot
5d735a84ca
[tx-robot] updated from transifex 2017-07-02 00:26:31 +00:00
Tobias Kaminsky
0fc61f10cc Merge pull request #1157 from nextcloud/fixListView 
URGENT: fix list view by removing wrong breaks
 2017-07-01 08:44:01 +02:00
tobiaskaminsky
ac42e07c48
fix list view by removing wrong breaks 2017-07-01 08:27:58 +02:00
Nextcloud bot
8422555e6f
[tx-robot] updated from transifex 2017-07-01 00:27:19 +00:00
AndyScherzinger
c88d9205a2
Merge branch 'master' of https://github.com/nextcloud/android into userTheming 
# Conflicts:
#	scripts/lint/lint-results.txt
#	src/main/java/com/owncloud/android/ui/activity/ActivitiesListActivity.java
#	src/main/java/com/owncloud/android/ui/activity/FolderSyncActivity.java
#	src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java
 2017-06-30 22:43:37 +02:00
Andy Scherzinger
72e8888bd2 Merge pull request #1140 from nextcloud/autoUploadWithoutStoragePermission 
Prevent NPE when disabling "storage permission" and then access auto upload
 2017-06-30 22:25:27 +02:00
Andy Scherzinger
0c5f99a935 Merge pull request #1153 from nextcloud/activityListWrongClicks 
Clicking on link in activity list shows correct file/folder
 2017-06-30 22:22:05 +02:00