mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity
3854 commits 226 branches 1571 tags 618 MiB
Commit graph

3854 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy Scherzinger
97b9932d81 changed color for hint text on login screens to 777 2015-08-05 13:36:12 +02:00
Andy Scherzinger
f289998946 removed unused listener (would only be useful in case of using toolbar instead of actionbar) 2015-08-05 13:01:37 +02:00
Andy Scherzinger
3956a50855 fixed deprecated getDrawable call 2015-08-05 12:58:40 +02:00
Andy Scherzinger
7c9c4a4ca6 remove two-times init of the drawer 2015-08-05 12:54:31 +02:00
masensio
9a0361945c Merge pull request #1068 from owncloud/conflictDialog_newWording 
Conflict dialog: new wording
 2015-08-05 12:53:03 +02:00
Andy Scherzinger
b5f8c0b087 changed alignment of drawer's content according to jan's suggestions 2015-08-04 19:02:36 +02:00
Andy Scherzinger
e36349f77e fixing the progressbar corner glitch, bumping style of indeterminate animation to material style via appcompat, fixing progress bar for folder picker too, see comment 2015-08-04 18:32:33 +02:00
David A. Velasco
156cb5e81b Updated conflict message (same as in web app) 2015-08-04 17:29:42 +02:00
Andy Scherzinger
f7f468b578 extracted color values for download fragment, see comments 172c3f56a3 2015-08-04 17:06:27 +02:00
Andy Scherzinger
a329d49ddf Fix for color reference in portrait 8f401a38d8 (comments) 2015-08-04 16:49:20 +02:00
David A. Velasco
3512eae861 Fixed double request for ConflictsResolveActivity 2015-08-04 16:47:46 +02:00
Andy Scherzinger
2636e07289 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar 2015-08-04 16:42:17 +02:00
Andy Scherzinger
10c5498879 extracted text colors for account setup to color.xml, see e72caebbce comments 2015-08-04 16:41:53 +02:00
Andy Scherzinger
f9a370e7e6 extracted text colors for account setup to color.xml, see e72caebbce comments 2015-08-04 16:04:28 +02:00
Andy Scherzinger
3e87ca193d Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar 
Conflicts:
	build.gradle
 2015-08-04 12:49:28 +02:00
tobiasKaminsky
e1ab4a41aa download file if "use server version" 2015-08-04 12:39:59 +02:00
tobiasKaminsky
d2df3f9b33 re-added values-tzl 2015-08-04 12:39:58 +02:00
tobiasKaminsky
c907f6a742 Partially revert 50819ce 2015-08-04 12:39:57 +02:00
tobiasKaminsky
1327ce7315 renamed string values 2015-08-04 12:39:56 +02:00
David A. Velasco
6698b2d5f1 Merge pull request #1086 from owncloud/update_buildTools_to_22_0_1 
Update buildTools version to 22.0.1
 2015-08-04 12:36:24 +02:00
David A. Velasco
2470ee9af2 Updated reference to library 2015-08-04 12:28:57 +02:00
Andy Scherzinger
3c78d4fcfb Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar 2015-08-04 11:47:44 +02:00
masensio
9d815b0187 Update buildTools version to 22.0.1 2015-08-04 11:14:51 +02:00
David A. Velasco
04f70fa8c9 Merge pull request #1083 from owncloud/update_jackrabbit_library 
Update JackRabbit library
 2015-08-04 10:38:15 +02:00
Jenkins for ownCloud
74d5911e56 [tx-robot] updated from transifex 2015-08-04 01:14:04 -04:00
Andy Scherzinger
a51fcd31a7 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar 2015-08-03 21:39:27 +02:00
Andy Scherzinger
6235022b56 Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar 2015-08-03 21:38:32 +02:00
masensio
d77f1d7ec0 Update build.gradle to 1.2.3 2015-08-03 15:07:20 +02:00
tobiasKaminsky
8b23c3a7a6 ignore hidden files also if they are images for counting 2015-08-02 08:19:28 +02:00
AndyScherzinger
5b6bde5efc now works for initial opening and browsing down once 2015-07-31 17:22:19 +02:00
masensio
1aa1a1fd50 Update library reference 2015-07-31 15:21:18 +02:00
masensio
4384d755a4 Update library refernce: Upgrade jackrabbit to 2.10.1 2015-07-31 12:36:42 +02:00
Jenkins for ownCloud
519ba0393c [tx-robot] updated from transifex 2015-07-31 01:14:01 -04:00
Jenkins for ownCloud
bacebffeb7 [tx-robot] updated from transifex 2015-07-30 01:14:02 -04:00
David A. Velasco
5d421b61e3 Merge pull request #1051 from owncloud/fix_send 
Fix sending of files to external apps when their pathname includes charactes requireing URL encoding.
 2015-07-29 08:47:14 +02:00
Jenkins for ownCloud
28284da055 [tx-robot] updated from transifex 2015-07-29 01:14:04 -04:00
gstraube
aec910ff83 Check if ETag for remote folder is null, i.e. it was not received from the server 2015-07-28 22:05:54 +02:00
purigarcia
65fe0be763 merge develop 2015-07-28 10:47:08 +02:00
purigarcia
f068a156c5 merge develop 2015-07-28 10:46:13 +02:00
Jenkins for ownCloud
2ac67e5e06 [tx-robot] updated from transifex 2015-07-28 01:14:02 -04:00
AndyScherzinger
bfea14e876 setting the username on the drawer header for startup and coming back from the preferences screen for account switching 2015-07-27 20:20:46 +02:00
AndyScherzinger
c49fbfb02c adding a new accent color see #1076 comment by @jancborchardt 2015-07-27 16:34:16 +02:00
AndyScherzinger
687318e549 changing the logo padding top/bottom according to #1076 comment by @jancborchardt 2015-07-27 16:33:36 +02:00
AndyScherzinger
8c0376229e changing the leight_height in order to get the screen backround color right mentioned by @jancborchardt in #1076 2015-07-27 16:33:10 +02:00
AndyScherzinger
ff2d55cede replaced hard coded background color with coresponding color-definition 2015-07-27 16:18:53 +02:00
AndyScherzinger
172c3f56a3 colored background black for image download #710 as proposed by @jancborchardt 2015-07-27 01:00:51 +02:00
AndyScherzinger
4b9190baea npe fix for file upload on instance saving since actionbar in list mode doesn't habe a title 2015-07-27 00:25:34 +02:00
AndyScherzinger
31160d2c4f Bump compile from 16-->22 in order to compile actual appcompat 2015-07-26 23:23:45 +02:00
AndyScherzinger
5d6ca092fb removed Android 16/19 to test drive 2015-07-26 23:16:35 +02:00
AndyScherzinger
9498385515 Android-22 for target 2015-07-26 23:11:46 +02:00