Commit graph

3796 commits

Author SHA1 Message Date
tobiasKaminsky
a5c2cc0fb6
display external links, disabled by default
stored in database
2017-04-06 11:45:54 +02:00
tobiasKaminsky
843b76333e
config webview 2017-04-06 11:45:54 +02:00
tobiasKaminsky
dfbfd051f4
added webview support 2017-04-06 11:45:53 +02:00
AndyScherzinger
a9a029fcc5
a 2017-04-03 23:27:33 +02:00
AndyScherzinger
de825e2238
Merge branch 'master' of https://github.com/nextcloud/android into integration-with-master
# Conflicts:
#	src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
#	src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java
#	src/main/res/values-en-rGB/strings.xml
2017-04-03 23:20:30 +02:00
AndyScherzinger
8f265b4c9e
use fav strings as used on the webUI 2017-03-31 11:21:06 +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
Andy Scherzinger
7706fdb8fc Merge pull request #784 from nextcloud/activities
Activities
2017-03-31 01:12:06 +02:00
AndyScherzinger
10c6bf1d98
add another missing break; 2017-03-30 23:36:59 +02:00
AndyScherzinger
32ea8d2769
fix codacy 2017-03-30 23:24:37 +02:00
AndyScherzinger
5bc727e5cb
proper use of generics for view holder 2017-03-30 23:21:01 +02:00
AndyScherzinger
472f300e26
minor layout changes 2017-03-30 23:08:01 +02:00
Mario Danic
c023e3f92f Fix fab again 2017-03-30 16:42:39 +02:00
Mario Danic
fb478debab Progress on fixing activities for older versions 2017-03-30 15:43:42 +02:00
Mario Danic
8099055fe9 Fix activity 2017-03-30 14:49:53 +02:00
Mario Danic
a57cb2e368 Working on everything 2017-03-30 12:10:11 +02:00
Mario Danic
5da789e253 Remove stacktrace 2017-03-30 10:31:12 +02:00
Mario Danic
a553590a24 Add empty view 2017-03-30 10:29:52 +02:00
AndyScherzinger
146bfd63d6
remove paragraph entities and stackTrace calls 2017-03-29 23:37:04 +02:00
AndyScherzinger
72e87810bf
fixed empty fav list icon 2017-03-29 22:58:23 +02:00
alejandro
8a0974c656 Support for SVG icons with Glide and Android SVG 2017-03-29 12:04:35 -06:00
Mario Danic
8b7ecc4392 Implement shared files 2017-03-29 18:21:56 +02:00
Mario Danic
cd17ac2c7a Start working on shared filter 2017-03-29 10:38:43 +02:00
Mario Danic
6bdb618014 Implement favorites 2017-03-29 09:55:23 +02:00
alejandro
6e993b6641 Message to Empty List 2017-03-28 16:54:47 -06:00
alejandro
67c8cafeda UI Implementation displaying activities 2017-03-28 15:21:50 -06:00
Mario Danic
94daa19dc4 Fix fabmain 2017-03-28 18:53:38 +02:00
AndyScherzinger
84c265d8c6
added license header 2017-03-27 23:40:58 +02:00
AndyScherzinger
04679b12f8
initial menu add and empty activity 2017-03-27 23:40:58 +02:00
AndyScherzinger
e828cc701b
Merge branch 'master' of https://github.com/nextcloud/android into favourites 2017-03-27 23:35:04 +02:00
Mario Danic
d4ad5da980
Delete if not found 2017-03-27 21:59:45 +02:00
Mario Danic
7a1a84cb50
Clean update 2017-03-27 21:59:44 +02:00
Mario Danic
0d7298326a
Fix media provider 2017-03-27 21:59:42 +02:00
AndyScherzinger
4144cae6d5
remove javaDoc <p> 2017-03-27 21:42:15 +02:00
Mario Danic
54453bd21d Fix 2017-03-27 21:28:14 +02:00
Mario Danic
6bf7476081 Add support for web login 2017-03-27 21:27:14 +02:00
Mario Danic
99104058de List item 2017-03-27 19:14:54 +02:00
AndyScherzinger
bae932ea82
removed nested if statements 2017-03-27 18:08:12 +02:00
AndyScherzinger
9ffb4c6639
#781 add icons to website/twitter on user info screen, cleanup 2017-03-27 17:45:00 +02:00
AndyScherzinger
b433178914
Merge branch 'master' of https://github.com/nextcloud/android into favourites
# Conflicts:
#	src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
2017-03-27 13:16:53 +02:00
Mario Danic
b4ed6a8d78 Fix issue with fab 2017-03-27 10:28:31 +02:00
Mario Danic
6fdb67b593 Fix a few issues 2017-03-27 09:29:16 +02:00
AndyScherzinger
933dbccba6
Merge branch 'master' of https://github.com/nextcloud/android into favourites 2017-03-26 16:15:07 +02:00
AndyScherzinger
a5e5cb85c2
move to new folder structure after branding 2017-03-26 16:11:04 +02:00
AndyScherzinger
a28a0e9d90
slightly shorten code 2017-03-26 16:11:03 +02:00
AndyScherzinger
6086ff81c6
redesign of dialog according to design review/mock/feedback 2017-03-26 16:11:02 +02:00
AndyScherzinger
c1867c0509
move image button icon coloring to DisplayUtils 2017-03-26 16:11:02 +02:00
AndyScherzinger
d13d064d62
integrate new sorting dialog into Upload file activity 2017-03-26 16:11:01 +02:00
AndyScherzinger
0490d52270
minor tweaking and fixes for ordering 2017-03-26 16:11:00 +02:00
AndyScherzinger
d0a6e6ea26
wired the new sorting order fragment 2017-03-26 16:11:00 +02:00
AndyScherzinger
4a14e0fae6
default to alphabetical ascending 2017-03-26 16:10:59 +02:00
AndyScherzinger
8e884b8cf5
new sorting order dialog 2017-03-26 16:10:58 +02:00
tobiasKaminsky
0ebdb7e343
remove unnecessary textview 2017-03-26 15:56:30 +02:00
tobiasKaminsky
2cbdddffc3
add image for downloading nightly
fix url
2017-03-26 15:56:25 +02:00
tobiasKaminsky
354e008665
showing introduction screen is now customizable by setup.xml, enabled by default 2017-03-26 15:32:40 +02:00
AndyScherzinger
0a83e7d3ee
fix 120 character line margin 2017-03-26 15:17:39 +02:00
AndyScherzinger
fae9d48784
remove paragraph entities from javaDoc 2017-03-26 15:15:29 +02:00
AndyScherzinger
deb9c23173
fix codacy warning 2017-03-26 03:00:01 +02:00
AndyScherzinger
7d7e6bdc74
move due to new project structure 2017-03-26 01:34:12 +01:00
Mario Danic
e73091a212
Use constants 2017-03-26 01:34:12 +01:00
Mario Danic
d079808c6d
Fix password change 2017-03-26 01:34:11 +01:00
AndyScherzinger
53e67c431e
fix codacy warnings and formatting 2017-03-26 01:34:11 +01:00
Mario Danic
e6adc4fd95
Add support for various server types 2017-03-26 01:34:10 +01:00
Mario Danic
bd16eb7146
Partly works 2017-03-26 01:34:10 +01: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
782654a314
remove unneeded full qualified calls name use 2017-03-26 01:04:30 +01:00
AndyScherzinger
681f8adc25
organize imports 2017-03-26 01:03:21 +01:00
AndyScherzinger
f0a4db8877
move members to the top 2017-03-26 01:01:52 +01:00
AndyScherzinger
bfe6dbe80a
move files for new project structure 2017-03-26 00:51:28 +01:00
AndyScherzinger
0b9f9f8bf2
fix CR and UI glitches 2017-03-26 00:51:26 +01:00
Mario Danic
a4138da5d0
Fix codacy issues 2017-03-26 00:51:23 +01:00
Mario Danic
fad7f9f4d5
Implement user information magic 2017-03-26 00:51:22 +01:00
Mario Danic
64ccfe8c0d
Add user display name support 2017-03-26 00:51:21 +01:00
Mario Danic
708b48c785
First bits of user info code 2017-03-26 00:51:20 +01:00
Mario Danic
db02da1409
Fix codacy issues 2017-03-26 00:51:19 +01:00
Mario Danic
df44118185
Implement user information magic 2017-03-26 00:51:18 +01:00
Mario Danic
d010a71308
Add user display name support 2017-03-26 00:51:17 +01:00
Mario Danic
3ec59a89a0
First bits of user info code 2017-03-26 00:51:16 +01:00
Mario Danic
e507f06606
Implement user information magic 2017-03-26 00:51:16 +01:00
Mario Danic
28d6ccb7d6
Add user display name support 2017-03-26 00:51:15 +01:00
Mario Danic
5339fd7587
First bits of user info code 2017-03-26 00:51:14 +01:00
Mario Danic
eaae09877f
Fix codacy issues 2017-03-26 00:51:13 +01:00
Mario Danic
3e21b5b0dd
Implement user information magic 2017-03-26 00:51:12 +01:00
Mario Danic
e224cb0f2a
First bits of user info code 2017-03-26 00:51:12 +01:00
Mario Danic
98782994f0
Implement user information magic 2017-03-26 00:51:12 +01:00
Mario Danic
2ba88eed79
First bits of user info code 2017-03-26 00:51:11 +01:00
Mario Danic
7ccac590f0
Fix codacy issues 2017-03-26 00:51:10 +01:00
Mario Danic
f4ab569226
Implement user information magic 2017-03-26 00:51:09 +01:00
Mario Danic
5c94246275
Add user display name support 2017-03-26 00:51:08 +01:00
Mario Danic
38f1cc0e28
First bits of user info code 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
Andy Scherzinger
feddb43c5d Merge pull request #773 from nextcloud/update-android-job
Update android job
2017-03-26 00:43:44 +01:00
Mario Danic
7f0fb21ae8 Fix files search icon 2017-03-24 23:31:21 +01:00
Mario Danic
36b4e168d7 Fix favorites 2017-03-24 19:23:51 +01:00
Mario Danic
a8ed34fe97 Fix list view clicks 2017-03-24 19:12:37 +01:00
Mario Danic
0258811e85 Fix video upload path 2017-03-24 14:04:21 +01:00
Mario Danic
13d62e651e Remove analytics instance 2017-03-24 09:46:35 +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
Mario Danic
3e7e7b38fe Fix a few codacy issues 2017-03-24 09:37:29 +01:00
Mario Danic
7ed5dd7d78 Fix menu stuff 2017-03-24 09:30:03 +01:00
Mario Danic
393e64fcff Fix menu setup 2017-03-24 02:36:04 +01:00
Mario Danic
2bc4d29f98 Clean up 2017-03-24 02:27:36 +01:00
Mario Danic
c6d6fc82f0 Update android job 2017-03-23 20:58:55 +01:00
tobiasKaminsky
71ea26df31
remove firebase from branding branch and put it into branch "analytics" 2017-03-22 20:18:37 +01:00
Mario Danic
a046fead8f Fix favorites toggle 2017-03-20 00:43:13 +01:00
Mario Danic
62d39e7654 Fix a few favorite things 2017-03-20 00:23:34 +01:00
Mario Danic
d887c08897 Fix loading 2017-03-20 00:18:16 +01:00
Mario Danic
3579c02cee Fix recently modified sort 2017-03-20 00:06:54 +01:00
Mario Danic
171544c6bb Progress on search 2017-03-19 23:47:56 +01:00
Mario Danic
58e1208c51 Store favorites in database 2017-03-19 23:02:36 +01:00
Mario Danic
705ea85060 Work a bit on favorites 2017-03-19 22:12:44 +01:00
AndyScherzinger
ca0f1bbb2d
partial click fix 2017-03-19 14:05:50 +01:00
Mario Danic
59c5eccf6a Grid image favourite focus 2017-03-19 11:18:38 +01:00
Mario Danic
d4af7441fc Merge branch 'branding' into favourites
# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
2017-03-17 18:26:26 +01:00
Mario Danic
105f609a3f Properly remove add account 2017-03-17 17:13:25 +01:00
Mario Danic
8a04689e92 Fix sharing 2017-03-16 18:04:21 +01:00
Mario Danic
3c68e865e2 Fix layout issues 2017-03-15 01:18:14 +01:00
Mario Danic
926001bbe7 Hide videos if search isn’t supported 2017-03-15 00:17:17 +01:00
Mario Danic
274aa7e9a8 Fix UI issues 2017-03-15 00:12:17 +01:00
Mario Danic
d950e92805 Fix loading view 2017-03-14 22:18:14 +01:00
Mario Danic
aa53f63197
Add favorite buttons 2017-03-14 21:59:28 +01:00
Mario Danic
d6eadb1d33
Fix menu items 2017-03-14 21:59:28 +01:00
Mario Danic
b13b155054
Sort favorites and recently modified 2017-03-14 21:59:27 +01:00
Mario Danic
3058682268
Continue work 2017-03-14 21:59:27 +01:00
Mario Danic
3a3c4767fd
Progress on number of things 2017-03-14 21:59:24 +01:00
Mario Danic
9f94104eed
Save current search type 2017-03-14 21:59:23 +01:00
Mario Danic
0ac0610e13
Unset items on settings & home click 2017-03-14 21:59:23 +01:00
Mario Danic
b0700a38e9
Progress on all fronts 2017-03-14 21:59:23 +01:00
Mario Danic
1e16812ab3
Select home on home back 2017-03-14 21:59:22 +01:00
Mario Danic
b0835b981f
Significant progress on various things 2017-03-14 21:59:22 +01:00
Mario Danic
add50e3149
Use favourite 2017-03-14 21:59:22 +01:00
Mario Danic
bb3dfac2d4
Some progress on search 2017-03-14 21:59:21 +01:00
Mario Danic
3fa0c5ca32
Refactor available offline 2017-03-14 21:59:19 +01:00
Mario Danic
f14d340dae Add all required screen names 2017-03-06 12:08:51 +01:00
Mario Danic
1732f7dc73 Some work on Firebase integration 2017-03-06 09:58:50 +01:00
Mario Danic
21e8f5530b Merge branch 'master' into branding 2017-03-06 08:10:16 +01:00
Mario Danic
b7e41eeff1 Fix gradle and supresswarnings issue 2017-03-05 21:20:54 +01:00
Mario Danic
db829c5e56 Remove useless files 2017-03-05 21:11:29 +01:00
Mario Danic
0ffb67c506 Merge branch 'branding' into bring-branding-to-master
# Conflicts:
#	.drone.yml
#	build.gradle
#	src/main/java/com/owncloud/android/services/SyncedFolderJobService.java
#	src/main/java/com/owncloud/android/services/observer/SyncedFolderObserver.java
#	src/main/java/com/owncloud/android/utils/RecursiveFileObserver.java
2017-03-05 21:09:36 +01:00
Mario Danic
364d82c0c0 Clean up things 2017-02-27 11:10:34 +01:00
Mario Danic
1052986243 Fix authorities 2017-02-25 03:43:08 +01:00
Mario Danic
7b57687fed Remove majority of custom folder 2017-02-25 02:44:32 +01:00
Mario Danic
749cbcf31c Move the generic MainApp 2017-02-25 02:44:31 +01:00
Mario Danic
dba8c4ed6e Move things around 2017-02-25 02:44:31 +01:00
Mario Danic
06d3f89f20 Add third parties properly 2017-02-25 02:44:31 +01:00
Mario Danic
16f1243da6 Fix project structure and prepare for branding 2017-02-25 02:44:31 +01:00