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

3935 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jenkins for ownCloud
00c6d8bffe [tx-robot] updated from transifex 2015-10-29 01:13:42 -04:00
Jenkins for ownCloud
3918ec18a8 [tx-robot] updated from transifex 2015-10-27 01:13:47 -04:00
Jenkins for ownCloud
2702951056 [tx-robot] updated from transifex 2015-10-23 01:13:41 -04:00
David A. Velasco
08443f90c5 Merge pull request #1177 from owncloud/notification_coloring 
Add ownCloud color to notifications for lollipop
 2015-10-22 09:10:10 +02:00
Andy Scherzinger
dffd81e00c removed primary color usage for textColor of the input fields on the loginscreen 2015-10-21 11:31:58 +02:00
Jenkins for ownCloud
8269b6dee6 [tx-robot] updated from transifex 2015-10-21 01:13:40 -04:00
Jenkins for ownCloud
1db483d521 [tx-robot] updated from transifex 2015-10-20 01:13:41 -04:00
Jenkins for ownCloud
d1dfc9958d [tx-robot] updated from transifex 2015-10-19 01:13:44 -04:00
Jenkins for ownCloud
47e74b6271 [tx-robot] updated from transifex 2015-10-18 01:13:42 -04:00
Jenkins for ownCloud
185b670e5c [tx-robot] updated from transifex 2015-10-17 01:13:48 -04:00
Maria Asensio
be3b6a53b9 Merge pull request #1199 from owncloud/display_thumbnails_details_view_PR_1065 
Display thumbnails details view pr 1065
 2015-10-16 09:03:34 +02:00
tobiasKaminsky
960ea3ceac fixed missing refresh of thumbnail after sync 2015-10-15 16:20:14 +02:00
masensio
8e87cc2bf4 Merge remote-tracking branch 'origin/develop' 2015-10-15 16:17:32 +02:00
masensio
fc40765890 Merge branch 'zmatsuo-detailThumbnail' into develop 2015-10-15 16:12:06 +02:00
masensio
1f964a79dd Merge branch 'detailThumbnail' of git://github.com/zmatsuo/android into zmatsuo-detailThumbnail 
Conflicts:
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
 2015-10-15 16:10:55 +02:00
Andy Scherzinger
c56b3568c5 Merge branch 'master' of https://github.com/owncloud/android into notification_coloring 2015-10-14 10:34:48 +02:00
Jenkins for ownCloud
c47b0ab77a [tx-robot] updated from transifex 2015-10-14 01:13:38 -04:00
Jenkins for ownCloud
28198ee983 [tx-robot] updated from transifex 2015-10-13 01:13:37 -04:00
Jenkins for ownCloud
a317483f44 [tx-robot] updated from transifex 2015-10-12 01:13:37 -04:00
Jenkins for ownCloud
42f38fe876 [tx-robot] updated from transifex 2015-10-11 01:13:36 -04:00
Jenkins for ownCloud
f206eaaeb4 [tx-robot] updated from transifex 2015-10-10 01:13:37 -04:00
Andy Scherzinger
4b4c323810 actual lib reference 2015-10-09 15:46:35 +02:00
Andy Scherzinger
a61f862677 directly link owncloud_blue color ID to setup.xml's actionbar_start_color to enable proper color manipulation. Technical debt: setup should rename the actionbar_start_color (and actionbar_end_color) since it is basically the primary-oiiod value due to material design terms. 2015-10-09 15:04:39 +02:00
Andy Scherzinger
5db8c47b8a Merge branch 'master' of https://github.com/owncloud/android into notification_coloring 2015-10-09 14:45:32 +02:00
Jenkins for ownCloud
f9b7cbd2d5 [tx-robot] updated from transifex 2015-10-09 01:13:37 -04:00
Maria Asensio
567355eed0 Merge pull request #1190 from owncloud/1182_Open_With_Fix 
Fix for #1182 on Android 5
 2015-10-07 11:19:16 +02:00
Jenkins for ownCloud
8ba051f851 [tx-robot] updated from transifex 2015-10-07 01:13:37 -04:00
Maria Asensio
72e588b6b7 Merge pull request #1117 from owncloud/sortAccents 
Sort accents
 2015-10-06 14:51:14 +02:00
Andy Scherzinger
75e2349e5b Code review 2015-10-06 09:58:16 +02:00
Jenkins for ownCloud
435d4969fe [tx-robot] updated from transifex 2015-10-06 01:13:31 -04:00
Andy Scherzinger
8f0ea82efd Fix for #1182 on Android 5 2015-10-05 18:44:50 +02:00
Jenkins for ownCloud
eddd3aa450 [tx-robot] updated from transifex 2015-10-04 01:13:38 -04:00
Jenkins for ownCloud
f056247e75 [tx-robot] updated from transifex 2015-10-03 01:13:37 -04:00
tobiasKaminsky
7579d3daf7 Merge remote-tracking branch 'remotes/upstream/master' into sortAccents 2015-10-02 16:04:18 +02:00
masensio
99d7e18916 Merge pull request #839 from fluffy88/develop 
Trigger media scan after file upload
 2015-10-01 18:45:01 +02:00
masensio
8090269d55 Merge branch 'master' of github.com:owncloud/android 
Conflicts:
	CHANGELOG.md
 2015-09-30 10:49:47 +02:00
masensio
5a8f605ed9 Merge branch 'stable' 2015-09-30 10:45:20 +02:00
masensio
df1f824e13 Update Changelog for 1.8 version 2015-09-30 10:43:56 +02:00
Raquel Pérez Bartolomé
6a9f1ad08c Update CHANGELOG.md 
Updated 1.8.0 changelog
 2015-09-29 15:53:57 +02:00
Jenkins for ownCloud
b6c5188fd0 [tx-robot] updated from transifex 2015-09-29 01:13:58 -04:00
masensio
4316d7082f Remove strings for values-en_DE 2015-09-28 13:57:22 +02:00
masensio
ee9aa68d23 Merge branch 'release-1.8' 2015-09-28 12:33:47 +02:00
Jenkins for ownCloud
9a3872d003 [tx-robot] updated from transifex 2015-09-28 02:33:53 -04:00
Andy Scherzinger
796b1bd297 Add ownCloud color to notifications (only works on lollipop and up) for progress bar and icon background 2015-09-27 21:40:52 +02:00
David A. Velasco
a38461aaa5 Same style for log-in buttons in potrait and landscape 2015-09-25 13:54:53 +02:00
David A. Velasco
c44ed4980c Fixed lost background color for icon in login view 2015-09-25 11:11:46 +02:00
masensio
9948180550 Merge pull request #1174 from owncloud/release_bug_fixes 
Fixed a couple of tiny bugs
 2015-09-24 17:33:22 +02:00
David A. Velasco
0c8dfb6e8d Close dangling Cursors in FileContentProvider 2015-09-24 17:06:54 +02:00
David A. Velasco
c7a29bc07b Set default static values to prevent weird crash 2015-09-24 17:06:39 +02:00
David A. Velasco
c8c3e84268 Fix repetition of already finished access to root folder (AsyncTask) on rotation, in log-in view 2015-09-24 16:13:58 +02:00