464 commits

Author	SHA1	Message	Date
Tobias Kaminsky	93a6fd4ce7	daily dev 20180201	2018-02-01 01:08:42 +01:00
tobiasKaminsky	3a7f5fc47c	3.0.0 RC3 ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-31 09:57:47 +01:00
Tobias Kaminsky	6dc5815276	daily dev 20180131	2018-01-31 00:55:05 +01:00
Tobias Kaminsky	1edd87fcc8	daily dev 20180130	2018-01-30 01:14:30 +01:00
tobiasKaminsky	601138099a	bump version ... fix webpage -> website Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-29 16:50:02 +01:00
Mario Danic	676d7d5d31	Update dependencies ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-29 08:57:07 +01:00
Mario Danic	091eb0b9d0	Update android job ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-28 21:32:13 +01:00
Tobias Kaminsky	8b4848cccd	daily dev 20180127	2018-01-27 01:04:58 +01:00
Tobias Kaminsky	608621bb80	daily dev 20180126	2018-01-26 01:05:32 +01:00
Tobias Kaminsky	9d288532a6	daily dev 20180125	2018-01-25 01:05:48 +01:00
Tobias Kaminsky	80a14c3381	daily dev 20180124	2018-01-24 01:15:34 +01:00
tobiasKaminsky	54b4da00d0	bump library	2018-01-23 15:48:21 +01:00
Tobias Kaminsky	3136661962	daily dev 20180123	2018-01-23 01:03:50 +01:00
tobiasKaminsky	fdc9abcd34	remove modified flavor ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-22 17:33:28 +01:00
Tobias Kaminsky	d612f90ccb	daily dev 20180121	2018-01-21 00:58:05 +01:00
Tobias Kaminsky	4a3424285c	daily dev 20180120	2018-01-20 01:04:32 +01:00
Tobias Kaminsky	9b9914b2ed	daily dev 20180119	2018-01-19 01:09:58 +01:00
Andy Scherzinger	d2a954b29b	Update build.gradle	2018-01-18 22:25:25 +01:00
AndyScherzinger	02a67c6f94	bump uiautomator	2018-01-18 21:37:55 +01:00
Tobias Kaminsky	fe3c9c2bb0	daily dev 20180118	2018-01-18 00:59:05 +01:00
Tobias Kaminsky	24eab27ebb	daily dev 20180117	2018-01-17 01:03:38 +01:00
Tobias Kaminsky	d403609a8f	daily dev 20180116	2018-01-16 01:18:26 +01:00
tobiasKaminsky	e28a4ab745	Version bump & changelog ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 14:13:45 +01:00
tobiaskaminsky	f54bfa1c90	needs gson ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-15 09:57:04 +01:00
tobiasKaminsky	28d5133473	use library ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 09:06:59 +01:00
tobiaskaminsky	12a6050867	add gson ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-15 09:06:55 +01:00
tobiasKaminsky	4ed6f1d3e1	temporary use lib branch ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 09:06:44 +01:00
tobiasKaminsky	23ab9bff67	revert versionCode/number to master ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:12:00 +01:00
tobiasKaminsky	de6e352ea1	bump library ... add gson Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:57 +01:00
tobiaskaminsky	4281a02314	do not use linked library	2018-01-15 08:11:56 +01:00
tobiaskaminsky	54ea7d9bcf	use nextcloud user agent for E2e calls	2018-01-15 08:11:56 +01:00
tobiasKaminsky	32b5a02e76	use e2e library branch also for lint (will both be reverted once PR in library is merged)	2018-01-15 08:11:54 +01:00
Jan-Christoph Borchardt	6caf0834ce	First release of E2E	2018-01-15 08:11:53 +01:00
tobiasKaminsky	0373182d36	use e2e library branch also for lint (will both be reverted once PR in library is merged)	2018-01-15 08:11:52 +01:00
tobiasKaminsky	8361848583	versionCode/versionName	2018-01-15 08:11:51 +01:00
Jan-Christoph Borchardt	b6e84b66fd	First release of E2E	2018-01-15 08:11:49 +01:00
Tobias Kaminsky	34c8f1688f	daily dev 20180114	2018-01-14 00:51:05 +01:00
Tobias Kaminsky	71d3a989b9	daily dev 20180113	2018-01-13 00:55:30 +01:00
Tobias Kaminsky	fae18e886a	daily dev 20180112	2018-01-12 00:52:56 +01:00
Tobias Kaminsky	b6dde61c28	daily dev 20180111	2018-01-11 00:52:49 +01:00
Tobias Kaminsky	5fd4ddc1bc	daily dev 20180110	2018-01-10 00:52:17 +01:00
Tobias Kaminsky	22a1a668d5	daily dev 20180109	2018-01-09 00:48:33 +01:00
tobiasKaminsky	1da1f11ea5	change sdk versions	2018-01-08 09:21:51 +01:00
Tobias Kaminsky	82cbe524c0	daily dev 20180108	2018-01-08 08:13:48 +01:00
Tobias Kaminsky	313354aa4c	daily dev 20180106	2018-01-06 00:49:38 +01:00
Tobias Kaminsky	b41962da42	Merge branch 'master' into screenshots	2018-01-05 09:15:10 +01:00
Tobias Kaminsky	6d026d30a8	daily dev 20180105	2018-01-05 00:49:19 +01:00
tobiaskaminsky	36253ccec2	Screenshots with fastlane screengrab	2018-01-02 09:37:20 +01:00
Tobias Kaminsky	736abe3770	daily dev 20171230	2017-12-30 00:55:36 +01:00
Tobias Kaminsky	40b879d5a5	daily dev 20171228	2017-12-28 00:51:56 +01:00
Tobias Kaminsky	261f032610	daily dev 20171223	2017-12-23 00:50:47 +01:00
Tobias Kaminsky	bf45f6b9a9	daily dev 20171220	2017-12-20 00:53:12 +01:00
Tobias Kaminsky	8fb08b66e2	daily dev 20171219	2017-12-19 00:48:03 +01:00
Tobias Kaminsky	697397ac26	daily dev 20171216	2017-12-16 00:56:33 +01:00
Tobias Kaminsky	e16e55acf2	daily dev 20171213	2017-12-13 00:46:12 +01:00
tobiasKaminsky	4f21d1a0ad	dev version: use always latest library	2017-12-12 11:51:59 +01:00
Tobias Kaminsky	d69fd2a981	daily dev 20171212	2017-12-12 00:49:16 +01:00
Tobias Kaminsky	4ab3d540e5	daily dev 20171211	2017-12-11 00:48:57 +01:00
Tobias Kaminsky	76495fd01c	daily dev 20171209	2017-12-09 00:44:11 +01:00
Tobias Kaminsky	3e0aef488c	daily dev 20171208	2017-12-08 11:30:38 +01:00
tobiaskaminsky	303ef83c4e	use latest stable lib	2017-12-06 14:07:29 +01:00
tobiaskaminsky	626f2b68a2	use own route for NC13 and parse status.php for NC12	2017-12-06 13:13:03 +01:00
AndyScherzinger	7159838b41	fix lint warnings	2017-12-04 19:08:11 +01:00
AndyScherzinger	7aaf4954bc	Update android gradle to 3.0.1	2017-12-04 19:08:10 +01:00
Mario Danic	d12af2a342	Update Android job ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-04 19:08:00 +01:00
Tobias Kaminsky	88aef982d7	daily dev 20171204	2017-12-04 08:30:44 +01:00
tobiaskaminsky	b35e2eaa92	auto detect encoding	2017-11-27 13:17:37 +01:00
tobiasKaminsky	86340913a8	versionDev as flavor	2017-11-27 12:15:38 +01:00
Tobias Kaminsky	e8c66578b3	Update build.gradle	2017-11-27 11:08:51 +01:00
tobiasKaminsky	66e0e835c1	no snapshot on library	2017-11-27 10:40:04 +01:00
Andy Scherzinger	c65b6b1ed9	move back to master-SNAPSHOT for lib to fix build	2017-11-27 08:47:31 +01:00
tobiasKaminsky	f9983558c9	Use text-color and element-color whenever possible (>=NC13)	2017-11-10 11:10:34 +01:00
AndyScherzinger	10d0c57e4f	update gradle android to 3.0.0	2017-10-25 23:18:10 +02:00
Marcus Hoffmann	c7e4bb0b01	remove all prebuilt jars ... This gets rid of all prebuilt jars in the repo. * libs/disklrucache-2.0.2.jar doesn't seem to be used anymore, app builds fine when removing it. * libs/touch-image-view.jar is indeed required but is not anywhere available via gradle. So instead we include the source of this long unmaintained library directly.	2017-10-25 18:00:53 +02:00
AndyScherzinger	d56d79ce14	update libs to latest versions to satisfy lint	2017-10-25 11:02:53 +02:00
AndyScherzinger	40537edf10	bump android gradle to 3.0.0-rc2	2017-10-24 14:22:29 +02:00
Andy Scherzinger	225cd2fda6	Merge pull request #1671 from nextcloud/update-gradle ... Update gradle	2017-10-18 15:25:13 +02:00
AndyScherzinger	f1c20398c6	centralize app's version code and name	2017-10-16 11:33:36 +02:00
Mario Danic	1506eaa587	Update gradle ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-10-15 21:29:06 +02:00
AndyScherzinger	4b30fb44da	updating gradle-plugin to 3.0.0-beta7 including foced move to buildToolsVersion 26.0.2	2017-10-09 07:18:22 +02:00
tobiaskaminsky	8c272da8c8	bump lib	2017-09-22 12:49:45 +02:00
tobiaskaminsky	0aa2aaaab1	use result code to determinate if old login	2017-09-22 12:49:45 +02:00
Andy Scherzinger	e725f61b45	update to gradle:3.0.0-beta6	2017-09-19 10:41:58 +02:00
AndyScherzinger	3b0bd82fd9	update to gradle:3.0.0-beta5	2017-09-13 09:52:16 +02:00
Tobias Kaminsky	e6f1ff0bdf	Update build.gradle ... Bump lib version	2017-09-11 08:54:17 +02:00
tobiaskaminsky	c80a5da0c6	bump lib	2017-09-11 08:54:17 +02:00
Mario Danic	d014d6b3cd	Fix for stuff ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-09-11 08:54:16 +02:00
AndyScherzinger	761c9f8ce9	bump to com.github.nextcloud:android-library:1.0.28 fixing chunked upload file modification date	2017-09-06 09:19:20 +02:00
Mario Danic	b353fb254d	Use old lib ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-09-06 09:19:19 +02:00
Mario Danic	f106872bbb	Fix sizing ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-09-06 09:19:13 +02:00
AndyScherzinger	603fc616f7	update to gradle:3.0.0-beta4	2017-09-04 10:02:09 +02:00
tobiaskaminsky	853350221f	- use nullable ... - only add non-null object to list	2017-08-31 13:03:40 +02:00
AndyScherzinger	077049d8ae	gradle update to beta 3	2017-08-25 12:55:50 +02:00
AndyScherzinger	be26905e36	fix push notifications for 12.0.2	2017-08-23 16:35:44 +02:00
Andy Scherzinger	efc0e0d119	Merge pull request #1368 from nextcloud/libBump ... bump to newest lib .25	2017-08-18 09:57:57 +02:00
tobiaskaminsky	880d688340	bump to newest lib	2017-08-18 09:37:52 +02:00
tobiaskaminsky	b0738fff2c	use gcm on gplay, modified as dependency	2017-08-18 08:08:50 +02:00
tobiaskaminsky	7298e0d936	bump to beta 2	2017-08-14 08:47:12 +02:00
Mario Danic	9a79bf2f03	Quotes ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-11 06:04:01 +02:00
Mario Danic	86322eda7a	Fix typo ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-11 05:57:10 +02:00
Mario Danic	82029e1de5	Version ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-10 21:18:58 +02:00
Mario Danic	a93cb06810	Add firebase ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-10 19:51:15 +02:00
AndyScherzinger	7d823beed5	android-library:1.0.24	2017-08-10 18:25:54 +02:00
AndyScherzinger	e30c6ba5ec	update test lib versions	2017-08-10 18:25:44 +02:00
AndyScherzinger	29f8b83df8	upgrade to gradle:3.0.0-beta1	2017-08-10 18:25:44 +02:00
AndyScherzinger	2e5444ceae	bumb support lib to 25.4.0	2017-08-10 18:25:43 +02:00
AndyScherzinger	2e4722ccb3	update to gradle gradle-4.1 & fixing deprecated gradle API calls	2017-08-08 13:00:05 +02:00
AndyScherzinger	cb35ef8d1d	update multidex version	2017-08-08 12:59:59 +02:00
AndyScherzinger	d7ed716468	fix further lint errors	2017-08-08 12:59:58 +02:00
Mario Danic	656d5c1ca9	Fix bugs ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:55 +02:00
Mario Danic	a122f64226	Add google repo ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:55 +02:00
Mario Danic	64c58a0306	Fix build ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:54 +02:00
Mario Danic	3338bead87	Update lib version ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:43 +02:00
Mario Danic	853d0bf197	Update library ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:41 +02:00
Mario Danic	77618aa6a8	Update gradle ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:41 +02:00
Mario Danic	157ceaba60	Bit of work on uploads ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:39 +02:00
Mario Danic	8959a72f81	Revert gradle ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:26 +02:00
AndyScherzinger	3180f4a088	gradle:3.0.0 fixes	2017-08-08 12:59:24 +02:00
AndyScherzinger	68622733a1	fix file display of custom folders	2017-08-08 12:59:19 +02:00
Mario Danic	cdf43866ea	Fix the build ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:17 +02:00
Mario Danic	4efb17fd1d	Work a bit on locking ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:10 +02:00
Mario Danic	5701d3bd13	Attempt to fix build ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:08 +02:00
Mario Danic	e78d36d2b5	Fix issues ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:07 +02:00
Mario Danic	1bdf7a8ece	Fix build ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:07 +02:00
Mario Danic	70637ba987	Change to 1.8 ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:07 +02:00
Mario Danic	6496d7267a	Some work on a new job for AU ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:06 +02:00
tobiasKaminsky	790652de3f	comment gms again	2017-07-28 12:24:10 +02:00
tobiasKaminsky	5c9870d3f3	split up play services to avoid support version conflict: All com.android.support libraries must use the exact same version specification (mixing versions can lead to runtime crashes). Found versions 25.0.0, 24.0.0.	2017-07-28 12:24:06 +02:00
AndyScherzinger	11f38044bb	use lib v1.0.22	2017-07-16 16:03:31 +02:00
tobiasKaminsky	ceb8d5fd63	use snapshot	2017-07-16 15:54:30 +02:00
tobiasKaminsky	4d571e7f82	use lib branch	2017-07-16 15:54:29 +02:00
tobiasKaminsky	d80ac412c0	use grey theme if no theming of elements is possible	2017-07-16 15:54:29 +02:00
tobiasKaminsky	db7f93fd14	use own FAB library to support colored FAB main button.	2017-06-14 07:56:55 +02:00
Andy Scherzinger	def4f5821c	update lib to 1.0.21	2017-05-31 21:45:15 +02:00
alejandro	fba1d38100	Header was added in ActivitiesView ... RichSubject was Added	2017-05-31 11:02:19 +02:00
Mario Đanić	343b65645c	Merge pull request #1041 from nextcloud/authInNC12 ... Multiple auth headers in NC12	2017-05-29 23:50:23 +02:00
Mario Danic	afb610fc03	Update lib version ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-05-29 23:28:36 +02:00
Mario Danic	c305d2e2e1	Updating to newest release ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-05-29 23:03:13 +02:00
tobiasKaminsky	7dc5cc7a94	remove non existing reference to lint config	2017-05-24 11:36:24 +02:00
tobiasKaminsky	599256d9c9	parse multiple auth headers and pick "basic" if exists	2017-05-24 10:32:18 +02:00
tobiaskaminsky	ab59cd784e	use 1.0.18	2017-05-15 13:03:33 +02:00
tobiasKaminsky	aeba233894	use app specific log folder	2017-05-15 09:08:19 +02:00
AndyScherzinger	3612523c12	Merge branch 'master' of https://github.com/nextcloud/android into lintConfig	2017-05-13 16:31:08 +02:00
AndyScherzinger	da4cebafd3	fix rebase	2017-05-13 14:11:18 +02:00
AndyScherzinger	f9719dc374	use lib master since lib pr got merged	2017-05-13 14:11:17 +02:00
AndyScherzinger	06a82e45f0	bump lib to v1.0.17	2017-05-13 13:52:34 +02:00
AndyScherzinger	0f7e51fc37	temp gradle dependency to library PR	2017-05-13 13:48:41 +02:00
tobiasKaminsky	6719fba5b9	disable 'MissingTranslation' as this is handled by transifex	2017-05-13 08:52:56 +02:00
AndyScherzinger	371ea460f1	bump lib version to 1.0.16	2017-05-12 15:51:59 +02:00
AndyScherzinger	bdc376d573	use temp jitpack snapshot for our lib	2017-05-12 15:45:53 +02:00
AndyScherzinger	8f07e4f201	add maintenance mode lib change	2017-05-12 15:45:47 +02:00
Mario Danic	7f1739f5f7	Improve push / remove push registration	2017-05-02 13:53:19 +02:00
tobiasKaminsky	50ffaaa993	- rename zstore to gplay ... - only one build.gradle, but with commented lines for gplay/modified	2017-04-28 09:26:16 +02:00
Mario Danic	9130635fa1	Progress on Analytics magic	2017-04-26 21:58:00 +02:00
tobiasKaminsky	726a02f39c	Revert "remove firebase from branding branch and put it into branch "analytics"" ... This reverts commit 71ea26df31.	2017-04-26 21:57:59 +02:00
tobiasKaminsky	197ccb7094	bump library ... unify build.gradle files	2017-04-21 08:02:49 +02:00
AndyScherzinger	cf7ccdfc65	Merge branch 'master' of https://github.com/nextcloud/android into contactBackupRestore ... # Conflicts: # src/main/res/values/strings.xml	2017-04-19 23:38:31 +02:00
AndyScherzinger	79a0a380eb	move to master snapshot of library	2017-04-19 18:08:54 +02:00
AndyScherzinger	a04b3e63dc	cleanups	2017-04-19 17:09:45 +02:00
Mario Danic	8ef8a68a86	Fix a few things	2017-04-19 15:54:55 +02:00
Mario Danic	047bd3cc8e	Work a bit more on notifications	2017-04-19 15:54:55 +02:00
Andy Scherzinger	53678207f0	WiP use notifications library branch	2017-04-19 15:54:52 +02:00
AndyScherzinger	febf476534	enforce refresh of SNAPSHOT lib dependencies	2017-04-19 15:54:50 +02:00
tobiasKaminsky	35e683546c	contact backup & import	2017-04-18 08:23:55 +02:00
Mario Danic	3e133deab1	Remove play services	2017-04-11 00:00:35 +02:00
AndyScherzinger	b3430f54d3	lib version 1.0.14	2017-03-31 09:20:30 +02: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
AndyScherzinger	279f783d6d	library 1.0.14	2017-03-31 01:04:11 +02:00
AndyScherzinger	ea6778a8fe	move to master snapshot of lib	2017-03-31 00:45:01 +02:00
AndyScherzinger	12b91c9064	set buildToolsVersion to "25.0.0"	2017-03-30 18:49:53 +02:00
Mario Danic	8099055fe9	Fix activity	2017-03-30 14:49:53 +02:00
alejandro	8a0974c656	Support for SVG icons with Glide and Android SVG	2017-03-29 12:04:35 -06:00
Mario Danic	cd17ac2c7a	Start working on shared filter	2017-03-29 10:38:43 +02:00
alejandro	bdde0db091	WiP use activities library branch	2017-03-28 15:53:56 -06:00
Mario Danic	6fdb67b593	Fix a few issues	2017-03-27 09:29:16 +02:00
AndyScherzinger	d84ff3917c	Merge branch 'master' of https://github.com/nextcloud/android into favourites ... # Conflicts: # build.gradle	2017-03-26 01:20:57 +01:00
AndyScherzinger	9e6faf28a5	added missing dependencies after rebase	2017-03-26 00:51:53 +01:00
AndyScherzinger	3831a59223	fix gradle, add missing cardview dependency	2017-03-26 00:51:29 +01:00
AndyScherzinger	bfe6dbe80a	move files for new project structure	2017-03-26 00:51:28 +01:00
AndyScherzinger	21d3df96e0	fix gradle after rebase	2017-03-26 00:51:28 +01:00
AndyScherzinger	f194025a2c	polished user info UI	2017-03-26 00:51:24 +01:00
Mario Danic	b2c27d38e2	Add comments and stuff	2017-03-26 00:51:24 +01:00
Mario Danic	51cd2672bf	Fix an issue with new support lib	2017-03-26 00:51:23 +01:00
Mario Danic	708b48c785	First bits of user info code	2017-03-26 00:51:20 +01:00
Mario Danic	9745b152e7	Don’t cache changing deps	2017-03-26 00:51:20 +01:00
Mario Danic	18918b515d	Add comments and stuff	2017-03-26 00:51:19 +01:00
Mario Danic	badef118ef	Fix an issue with new support lib	2017-03-26 00:51:19 +01:00
Mario Danic	5339fd7587	First bits of user info code	2017-03-26 00:51:14 +01:00
Mario Danic	3662aaa80f	Don’t cache changing deps	2017-03-26 00:51:14 +01:00
Mario Danic	d0e810777f	Add comments and stuff	2017-03-26 00:51:14 +01:00
Mario Danic	3a699326fd	Fix an issue with new support lib	2017-03-26 00:51:13 +01:00
Mario Danic	2ba88eed79	First bits of user info code	2017-03-26 00:51:11 +01:00
Mario Danic	acc5912e22	Don’t cache changing deps	2017-03-26 00:51:11 +01:00
Mario Danic	d3c9381455	Add comments and stuff	2017-03-26 00:51:10 +01:00
Mario Danic	b5bf9200a9	Fix an issue with new support lib	2017-03-26 00:51:09 +01:00
Mario Danic	38f1cc0e28	First bits of user info code	2017-03-26 00:51:07 +01:00
Mario Danic	1815ace4d1	Don’t cache changing deps	2017-03-26 00:51:07 +01:00
AndyScherzinger	5f0944ab78	Merge branch 'master' of https://github.com/nextcloud/android into favourites ... # Conflicts: # build.gradle	2017-03-26 00:50:02 +01:00
Mario Danic	0d24f87717	Merge branch 'master' into favourites ... # Conflicts: # src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java	2017-03-24 09:44:50 +01:00