Commit graph

3978 commits

Author SHA1 Message Date
masensio
1ef9c86b59 Merge pull request #995 from owncloud/navigationDrawer_basic
Navigation drawer basic
2015-06-15 14:30:57 +02:00
masensio
fbfb6dee90 Merge remote-tracking branch 'origin/develop' into navigationDrawer_basic
Conflicts:
	.travis.yml
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
2015-06-15 14:07:49 +02:00
masensio
0b567b9713 Merge pull request #1013 from owncloud/keep_permanent_redirections
Keep permanent redirections
2015-06-15 13:56:41 +02:00
masensio
d75cb8d6a0 Fix travis compilation 2015-06-15 13:49:00 +02:00
David A. Velasco
66f3a45d05 Merge branch 'develop' into navigationDrawer_basic
Conflicts FIXED:
	res/layout/files.xml
2015-06-15 13:43:17 +02:00
David A. Velasco
e81b00207f Removed unneeded dependency 2015-06-15 13:39:01 +02:00
David A. Velasco
e86dc8046e Prevent updating to last version of platform tools 2015-06-15 13:26:41 +02:00
David A. Velasco
516650d52c Trying different options to update support library project (fixing Travis build) 2015-06-15 13:19:50 +02:00
masensio
6fb489fd20 Update library reference 2015-06-15 13:19:44 +02:00
David A. Velasco
59f69dfa25 Adding binary dependencies for aapt 2015-06-15 13:04:38 +02:00
David A. Velasco
63457041d6 Fixed indentation in .travis.yml 2015-06-15 12:46:48 +02:00
David A. Velasco
fc124a8408 Added Android SDK Platform with API level 16 to Travis build file 2015-06-15 12:45:02 +02:00
David A. Velasco
d5f1dc8b45 Reviewed and updated project setup instructions 2015-06-15 12:33:03 +02:00
Jenkins for ownCloud
42da742d5e [tx-robot] updated from transifex 2015-06-15 01:13:52 -04:00
Jenkins for ownCloud
f4f0750b1a [tx-robot] updated from transifex 2015-06-14 01:13:39 -04:00
Jenkins for ownCloud
96f64863d1 [tx-robot] updated from transifex 2015-06-13 01:13:55 -04:00
Jenkins for ownCloud
d094ea108d [tx-robot] updated from transifex 2015-06-12 01:13:56 -04:00
David A. Velasco
d869cdeb6f Updated reference to correct commit in owncloud-android-library 2015-06-11 10:35:38 +02:00
David A. Velasco
d4390de111 Save target location of server behind a permanent redirection after password validation 2015-06-11 09:42:21 +02:00
Jenkins for ownCloud
486ad08e79 [tx-robot] updated from transifex 2015-06-11 01:13:55 -04:00
Jenkins for ownCloud
2075255313 [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
David A. Velasco
5160dc58dc Fixed bug of action bar position in PreviewImageActvitiy in Android <=4.2 2015-06-09 11:17:01 +02:00
purigarcia
2a217ad905 update -gitignore and readme 2015-06-08 15:02:29 +02:00
masensio
33fae4d071 Merge pull request #978 from owncloud/automationTest
Automation test
2015-06-08 12:53:15 +02:00
David A. Velasco
478ca7c205 Update link 2015-06-08 11:26:10 +02:00
David A. Velasco
e05346857a Merge remote-tracking branch 'origin/automationTest' into automationTest 2015-06-08 11:15:46 +02:00
David A. Velasco
7be0fd039b Quick instructions to use automation tests 2015-06-08 11:15:11 +02:00
Jenkins for ownCloud
d93eb752a1 [tx-robot] updated from transifex 2015-06-08 01:13:49 -04:00
purigarcia
8d5ffec8a5 add the test to smoke test 2015-06-05 13:26:19 +02:00
purigarcia
171ae0b574 new test cases about login and check that there are some files 2015-06-05 13:23:03 +02:00
masensio
6cf7c72ce3 Fix, Title is not correct when rotating the device 2015-06-05 12:26:12 +02:00
purigarcia
23af1d2310 Merge branch 'develop' into automationTest 2015-06-05 10:32:37 +02:00
Jenkins for ownCloud
e93502657c [tx-robot] updated from transifex 2015-06-05 01:13:53 -04:00
masensio
705d2eb773 Fix, the message is not correct when creating a folder with / 2015-06-04 19:01:13 +02:00
masensio
65ff5a374a Fix, title is not correct when menu is shown and rotate 2015-06-04 18:41:07 +02:00
purigarcia
f6870c5883 update the project structure 2015-06-04 12:29:27 +02:00
purigarcia
47b4e0db10 update project structure 2015-06-04 11:11:28 +02:00
purigarcia
1a06219e21 update the project structure 2015-06-04 11:08:59 +02:00
masensio
b6d7cd73c7 Fix issue #1000 2015-06-04 11:02:21 +02:00
purigarcia
dcd7b59151 update the project 2015-06-04 09:36:10 +02:00
purigarcia
e8d2f97698 update the project 2015-06-04 09:34:42 +02:00
purigarcia
78baa12777 update files of the project 2015-06-04 09:32:44 +02:00
purigarcia
dd9845bf80 update config 2015-06-04 09:30:29 +02:00
purigarcia
a555ed1a5a add config file 2015-06-04 08:49:30 +02:00
Jenkins for ownCloud
7194818bc0 [tx-robot] updated from transifex 2015-06-04 01:13:55 -04:00
David A. Velasco
88ded5540a Fixed home button in action bar for PreviewImageActvitiy when navigation drawer is shown 2015-06-03 13:36:09 +02:00
David A. Velasco
a45c0f57f9 Refactor method to update title and home (up) button of FileActivity 2015-06-03 13:29:11 +02:00
purigarcia
104df3e2aa WIP upload a big file 2015-06-03 12:32:14 +02:00
masensio
2462e8603d Parse error 500 and InvalidPathException for Uploads 2015-06-03 11:10:33 +02:00
David A. Velasco
4d7b5a1e50 Merge remote-tracking branch 'origin/navigationDrawer_basic' into navigationDrawer_basic 2015-06-03 11:09:19 +02:00