Skip to content

Beta #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tobiasKaminsky wants to merge 1,451 commits into from
Closed

Beta #169

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
1451 commits
Select commit Hold shift + click to select a range
0b7be2c
update to 20170206
tobiasKaminsky Feb 5, 2017
ab901a6
Use different models
mario Feb 6, 2017
93b7899
Revert "Use different models"
mario Feb 6, 2017
bb08dc7
Fix persistance
mario Feb 6, 2017
2d3ee4f
Optimize imports
mario Feb 6, 2017
ada7a6b
Attempt to fix HDR issues
mario Feb 6, 2017
9f7a4a3
Squashed commit of the following:
mario Feb 6, 2017
dcf99f8
Fix to aid in HDR stuff processing
mario Feb 6, 2017
9c39a6d
Some progress on auto-upload fixes
mario Feb 6, 2017
a7ee351
Partial revert "Some progress on auto-upload fixes"
mario Feb 6, 2017
f89659a
Re-arrange things a bit
mario Feb 6, 2017
e92f941
Fix a strange issue
mario Feb 6, 2017
dc99fc9
Properly separate auto upload settings by acc
mario Feb 6, 2017
ff8b1b7
Show upload for current account only
mario Feb 6, 2017
f57f522
Fix a typo
mario Feb 6, 2017
3a63cca
Some progress on mitigating persistance issues
mario Feb 6, 2017
33b8752
Progress on fixing persistance disk sync
mario Feb 6, 2017
b25d752
daily beta build
tobiasKaminsky Feb 6, 2017
efb82f8
update to 20170207
tobiasKaminsky Feb 6, 2017
36efc1f
Fix a crashing bug
mario Feb 7, 2017
a882210
Change to onStop
mario Feb 7, 2017
1da7be8
Hopefully fix double upload issue
mario Feb 7, 2017
c2013c7
Fix legacy sync folder entries
mario Feb 7, 2017
8e944c3
Fix build
mario Feb 7, 2017
42342f4
Fix cleanup
mario Feb 7, 2017
076b68c
Merge branch 'rewrite-auto-upload' into beta
mario Feb 7, 2017
b0fa583
Delete from runnable on delete
mario Feb 7, 2017
ee905ca
Merge branch 'rewrite-auto-upload' into beta
mario Feb 7, 2017
5d9e634
daily beta build
tobiasKaminsky Feb 7, 2017
ca25dd8
update to 20170208
tobiasKaminsky Feb 7, 2017
6c16192
Attempt to fix uploads with non-conf folders
mario Feb 8, 2017
634e7b9
:)
mario Feb 8, 2017
6225ea7
Attempt to fix duplicate entries
mario Feb 8, 2017
a8aca28
Increase delay slightly
mario Feb 8, 2017
4084d6d
Merge branch 'rewrite-auto-upload' into beta
mario Feb 8, 2017
b7bf879
daily beta build
tobiasKaminsky Feb 8, 2017
4086ab3
update to 20170209
tobiasKaminsky Feb 8, 2017
3fbcf71
Read modification time from the file in local filesystem and set it t…
davigonz Dec 14, 2016
9bcee66
update to snapshot of lib version
davigonz Dec 14, 2016
9ce69d5
Don’t cache changing deps
mario Jan 25, 2017
8487c17
First bits of user info code
mario Jan 25, 2017
635eb6a
Fix an error bug
mario Jan 26, 2017
10acd80
Add user display name support
mario Jan 26, 2017
b68aa0a
Implement user information magic
mario Jan 26, 2017
222dcbd
Fix a rotation bug
mario Jan 26, 2017
2b13b32
Fix an issue with new support lib
mario Jan 26, 2017
cc924a2
Fix codacy issues
mario Jan 27, 2017
9543077
Add comments and stuff
mario Jan 29, 2017
6673569
Don’t cache changing deps
mario Jan 25, 2017
5607110
First bits of user info code
mario Jan 25, 2017
8bda7f5
Implement user information magic
mario Jan 26, 2017
4f29f30
First bits of user info code
mario Jan 25, 2017
8d53487
Implement user information magic
mario Jan 26, 2017
5e55aa1
Fix an issue with new support lib
mario Jan 26, 2017
0e90fd6
Fix codacy issues
mario Jan 27, 2017
dfc31ee
Add comments and stuff
mario Jan 29, 2017
b644bfe
Quick fix to work with new library updates
mario Jan 24, 2017
2c23f00
Don’t cache changing deps
mario Jan 25, 2017
778b367
First bits of user info code
mario Jan 25, 2017
6680ef9
Fix an error bug
mario Jan 26, 2017
8e44c34
Add user display name support
mario Jan 26, 2017
375bf24
Implement user information magic
mario Jan 26, 2017
55ff1ef
Fix a rotation bug
mario Jan 26, 2017
4f09e57
First bits of user info code
mario Jan 25, 2017
d28e4d3
Fix an error bug
mario Jan 26, 2017
a4c3ed8
Add user display name support
mario Jan 26, 2017
7d8f511
Implement user information magic
mario Jan 26, 2017
e651105
Fix a rotation bug
mario Jan 26, 2017
7783c00
Fix an issue with new support lib
mario Jan 26, 2017
bc61a01
Fix codacy issues
mario Jan 27, 2017
436ccf2
Add comments and stuff
mario Jan 29, 2017
ce506c2
Quick fix to work with new library updates
mario Jan 24, 2017
95a34f3
Don’t cache changing deps
mario Jan 25, 2017
64f9356
First bits of user info code
mario Jan 25, 2017
4422b8e
Fix an error bug
mario Jan 26, 2017
80ca3b5
Add user display name support
mario Jan 26, 2017
97b3a0d
Implement user information magic
mario Jan 26, 2017
371fa72
Fix a rotation bug
mario Jan 26, 2017
705ae4a
Fix an issue with new support lib
mario Jan 26, 2017
1d7b456
Fix codacy issues
mario Jan 27, 2017
e386cbb
Add comments and stuff
mario Jan 29, 2017
de95571
polished user info UI
AndyScherzinger Feb 8, 2017
d8728b9
make method private
AndyScherzinger Feb 8, 2017
b3a130e
housekeeping, removing unused code
AndyScherzinger Feb 8, 2017
588ae0f
further housekeeping due to code review
AndyScherzinger Feb 8, 2017
33ddff0
First step towards text search
mario Jan 19, 2017
637a802
Restore search state
mario Jan 20, 2017
894838c
Fix codacy issues
mario Jan 20, 2017
c397fc4
Fix issues found by review
mario Jan 20, 2017
cb06177
Fix a review issue in FileDisplayActivity
mario Jan 20, 2017
1123343
use primary color for highlighting
AndyScherzinger Jan 22, 2017
fbd30a2
make finding bold
AndyScherzinger Jan 22, 2017
2ed072c
Fix issues brought up by review
mario Jan 23, 2017
ad4aaf0
Combine ifs
mario Jan 23, 2017
d421974
Fix a NPE
mario Jan 23, 2017
ca72db8
Fix a few tiny bugs
mario Jan 23, 2017
26d8b17
Remove search in the media preview
mario Jan 23, 2017
6b362ca
Remove an import that we dont need
mario Jan 23, 2017
a19fd6d
Fix review bugs
mario Jan 24, 2017
958016e
First step towards text search
mario Jan 19, 2017
904f53e
Restore search state
mario Jan 20, 2017
5687ed8
Fix codacy issues
mario Jan 20, 2017
bc10000
Fix issues found by review
mario Jan 20, 2017
189feee
Fix a review issue in FileDisplayActivity
mario Jan 20, 2017
8196b67
use primary color for highlighting
AndyScherzinger Jan 22, 2017
3955634
make finding bold
AndyScherzinger Jan 22, 2017
f437edd
Fix issues brought up by review
mario Jan 23, 2017
28458de
Combine ifs
mario Jan 23, 2017
f906549
Fix a NPE
mario Jan 23, 2017
48e527e
Fix a few tiny bugs
mario Jan 23, 2017
a782832
Remove an import that we dont need
mario Jan 23, 2017
8a06a0f
Fix review bugs
mario Jan 24, 2017
d9f12e2
Fix restore functionality
mario Jan 30, 2017
90f1fe4
Fix an issue with restoring search and UI
mario Jan 30, 2017
7e2332a
Fix a weird weird bug
mario Jan 30, 2017
2206d49
Add space
mario Feb 1, 2017
6fad9ba
fixes #457 - svg support
AndyScherzinger Dec 20, 2016
59941b5
updated lib references
AndyScherzinger Dec 20, 2016
ed6c97b
new sorting order dialog
AndyScherzinger Jan 22, 2017
a1eafba
add breaks and empty default to switch
AndyScherzinger Jan 23, 2017
54b8c68
default to alphabetical ascending
AndyScherzinger Jan 23, 2017
2feefb2
wired the new sorting order fragment
AndyScherzinger Jan 23, 2017
65e9ef1
minor tweaking and fixes for ordering
AndyScherzinger Jan 23, 2017
55576d7
change icons according to review
AndyScherzinger Jan 23, 2017
4141449
integrate new sorting dialog into Upload file activity
AndyScherzinger Jan 23, 2017
f063b68
remove PreferenceManager dependency and work on input parameters only
AndyScherzinger Jan 23, 2017
7d8f044
move image button icon coloring to DisplayUtils
AndyScherzinger Jan 23, 2017
b8f24c7
flip arrow according to design review
AndyScherzinger Jan 23, 2017
f135160
redesign of dialog according to design review/mock/feedback
AndyScherzinger Jan 25, 2017
997ef6c
slightly shorten code
AndyScherzinger Jan 25, 2017
401c213
make actual selection bold, for easier recognition in case of color b…
AndyScherzinger Jan 26, 2017
c2f79fb
Handle create, change and delete options in federated sharing in serv…
jabarros Sep 20, 2016
c710a9b
Fix var name in comment
jabarros Sep 20, 2016
ac84367
Remove always-true component in condition, from CR
davivel Nov 14, 2016
222de37
add missing code fragments
AndyScherzinger Nov 22, 2016
a9fc1da
temp gradle dependency to library PR
AndyScherzinger Nov 22, 2016
f8e7f4d
fix compile error after lib merges
AndyScherzinger Nov 22, 2016
d58fbf3
adaptes federated shares permission computation
AndyScherzinger Nov 22, 2016
bebce2a
fix import
AndyScherzinger Nov 22, 2016
73809fa
reintroduce account for federated sharing permission
AndyScherzinger Nov 22, 2016
3f36dfb
fix codacy warning
AndyScherzinger Nov 22, 2016
60d5253
Use master snapshot
mario Feb 9, 2017
4b20c7b
use lib master since lib pr got merged
AndyScherzinger Feb 9, 2017
cc2bae2
Merge remote-tracking branch 'nextcloud/fix_file_modification_date_on…
tobiasKaminsky Feb 9, 2017
68d1b52
daily beta build
tobiasKaminsky Feb 9, 2017
47aeccd
Introduce rewritten auto upload
mario Feb 2, 2017
c88e030
Revert a typo
mario Feb 2, 2017
a641dd1
Update a comment
mario Feb 2, 2017
d5f4d64
Enable menu item on 5.0
mario Feb 2, 2017
743c637
Silence codacy
mario Feb 3, 2017
cb06583
Remove strange <p> stuff
mario Feb 3, 2017
5e778bc
Update copyrights
mario Feb 3, 2017
d8ff63e
Small bugfix
mario Feb 4, 2017
9c8a3e4
Fix a bug with SyncedFolderProvider
mario Feb 4, 2017
e4fbbd3
Ignore temporary files
mario Feb 4, 2017
09b1d34
First step towards list persistance
mario Feb 5, 2017
8098b56
Preparation for persistance
mario Feb 5, 2017
f2ce658
Move to approach without reflection
mario Feb 5, 2017
df3729f
Add persistence layer on service start
mario Feb 5, 2017
50a13d3
Progress on implementing persistance
mario Feb 5, 2017
0870e2c
Fix a typo with tmp files
mario Feb 5, 2017
8bee5bb
Magical magical stuff
mario Feb 5, 2017
90adf59
Remove useless conditions
mario Feb 5, 2017
e317cd6
Revert "Remove useless conditions"
mario Feb 5, 2017
a7da1d6
Fix a bug
mario Feb 5, 2017
b808421
Create new file
mario Feb 5, 2017
8a31ffe
Fix a serialization bug
mario Feb 5, 2017
78c7e54
Use different models
mario Feb 6, 2017
6e95e05
Revert "Use different models"
mario Feb 6, 2017
69bb2dc
Fix persistance
mario Feb 6, 2017
7547d5a
Optimize imports
mario Feb 6, 2017
760b266
Attempt to fix HDR issues
mario Feb 6, 2017
ae5cec7
Fix to aid in HDR stuff processing
mario Feb 6, 2017
d7376c5
Some progress on auto-upload fixes
mario Feb 6, 2017
4faeaa3
Partial revert "Some progress on auto-upload fixes"
mario Feb 6, 2017
7362acb
Re-arrange things a bit
mario Feb 6, 2017
cc4a0b7
Fix a strange issue
mario Feb 6, 2017
4fa39e5
Properly separate auto upload settings by acc
mario Feb 6, 2017
38834a8
Show upload for current account only
mario Feb 6, 2017
2bac10f
Fix a typo
mario Feb 6, 2017
e2f842e
Some progress on mitigating persistance issues
mario Feb 6, 2017
e513e72
Progress on fixing persistance disk sync
mario Feb 6, 2017
9a977a0
Fix a crashing bug
mario Feb 7, 2017
0b07661
Change to onStop
mario Feb 7, 2017
6c4f0b3
Hopefully fix double upload issue
mario Feb 7, 2017
57e1be7
Fix legacy sync folder entries
mario Feb 7, 2017
c94f302
Fix build
mario Feb 7, 2017
4527c7b
Fix cleanup
mario Feb 7, 2017
8bb89f5
Delete from runnable on delete
mario Feb 7, 2017
7cbc7f8
Attempt to fix uploads with non-conf folders
mario Feb 8, 2017
8723ca2
:)
mario Feb 8, 2017
d40034f
Attempt to fix duplicate entries
mario Feb 8, 2017
33368c4
Increase delay slightly
mario Feb 8, 2017
fb6d154
Attempt to fix duplicate uploads again :P
mario Feb 10, 2017
0706893
revert android lib to beta branch, this will still lead to not buildi…
tobiasKaminsky Feb 10, 2017
2fb5b3c
Backup everything
mario Feb 10, 2017
3c75b2b
Merge branch 'rewrite-auto-upload' into beta
mario Feb 10, 2017
d2de1c8
force to use always new library beta snapshot
tobiasKaminsky Feb 11, 2017
6385990
update beta script and rename to updateBetaManually
tobiasKaminsky Feb 11, 2017
c3eb0d6
update beta script
tobiasKaminsky Feb 11, 2017
7cbc51c
update beta script
tobiasKaminsky Feb 11, 2017
a06eca6
Merge remote-tracking branch 'nextcloud/feature-user-information' int…
tobiasKaminsky Feb 11, 2017
4d73fe1
Merge remote-tracking branch 'nextcloud/newSortingLayout' into beta
tobiasKaminsky Feb 11, 2017
e854b6e
Merge remote-tracking branch 'nextcloud/bugfix-454' into beta
tobiasKaminsky Feb 11, 2017
dd83c83
Merge remote-tracking branch 'nextcloud/svgView' into beta
tobiasKaminsky Feb 11, 2017
a99fb9b
Merge remote-tracking branch 'nextcloud/federated_sharing_edit_option…
tobiasKaminsky Feb 11, 2017
1ab992e
Merge remote-tracking branch 'nextcloud/streaming' into beta
tobiasKaminsky Feb 11, 2017
0d3d1a2
Merge remote-tracking branch 'nextcloud/resizeCache' into beta
tobiasKaminsky Feb 11, 2017
f91e34e
Merge remote-tracking branch 'nextcloud/instant_upload_multi_account'…
tobiasKaminsky Feb 11, 2017
281fc07
Merge remote-tracking branch 'nextcloud/resizedImages' into beta
tobiasKaminsky Feb 11, 2017
98185a4
Merge remote-tracking branch 'nextcloud/master' into beta
tobiasKaminsky Feb 11, 2017
9095e59
show complete branch desc instead of branch name
tobiasKaminsky Feb 11, 2017
bc6b1b6
daily beta build
tobiasKaminsky Feb 11, 2017
c86d43d
minor code change
tobiasKaminsky Feb 11, 2017
c23100d
daily beta build
tobiasKaminsky Feb 11, 2017
37a942f
update to 20170211
tobiasKaminsky Feb 11, 2017
5a85b4e
fix crash on preferences due to wrong merge
tobiasKaminsky Feb 11, 2017
f706d05
Merge remote-tracking branch 'Flole998/master' into beta
tobiasKaminsky Feb 11, 2017
bf9eb49
daily beta build
tobiasKaminsky Feb 11, 2017
300939a
update to 20170211
tobiasKaminsky Feb 11, 2017
bceb892
daily beta build
tobiasKaminsky Feb 11, 2017
d038fd7
Fix for #448. Rotation change in FolderPicker caused app crash.
carstendev Feb 12, 2017
26dd990
Clean up cleaning
mario Feb 12, 2017
f18afe5
new sorting order dialog
AndyScherzinger Jan 22, 2017
73f0e3b
add breaks and empty default to switch
AndyScherzinger Jan 23, 2017
15f18b7
default to alphabetical ascending
AndyScherzinger Jan 23, 2017
22d258d
wired the new sorting order fragment
AndyScherzinger Jan 23, 2017
c8a01d2
minor tweaking and fixes for ordering
AndyScherzinger Jan 23, 2017
dd3f604
change icons according to review
AndyScherzinger Jan 23, 2017
6cd6324
integrate new sorting dialog into Upload file activity
AndyScherzinger Jan 23, 2017
2ec906f
remove PreferenceManager dependency and work on input parameters only
AndyScherzinger Jan 23, 2017
70ead72
move image button icon coloring to DisplayUtils
AndyScherzinger Jan 23, 2017
485634a
flip arrow according to design review
AndyScherzinger Jan 23, 2017
65d785c
redesign of dialog according to design review/mock/feedback
AndyScherzinger Jan 25, 2017
fb43577
slightly shorten code
AndyScherzinger Jan 25, 2017
1ef3550
make actual selection bold, for easier recognition in case of color b…
AndyScherzinger Jan 26, 2017
d1c081a
Merge remote-tracking branch 'carstendev/rotation-crash-fix' into beta
tobiasKaminsky Feb 12, 2017
811e95c
Merge remote-tracking branch 'nextcloud/newSortingLayout' into beta
tobiasKaminsky Feb 12, 2017
3f58517
daily beta build
tobiasKaminsky Feb 12, 2017
9975de9
update to 20170213
tobiasKaminsky Feb 12, 2017
0754e93
Simplify new auto upload code
mario Feb 13, 2017
0276dc1
Merge branch 'rewrite-auto-upload' into beta
mario Feb 13, 2017
600260e
Merge remote-tracking branch 'nextcloud/master' into beta
tobiasKaminsky Feb 13, 2017
aee15bb
daily beta build
tobiasKaminsky Feb 13, 2017
ce8d87a
update to 20170213
tobiasKaminsky Feb 13, 2017
d86e673
user last modification date for auto upload, e.g. take an image on 31…
tobiasKaminsky Feb 13, 2017
0d35a38
New build
mario Feb 13, 2017
74a307c
Merge branch 'rewrite-auto-upload' into beta
mario Feb 13, 2017
80069bb
daily beta build
tobiasKaminsky Feb 13, 2017
9ec2827
update to 20170213
tobiasKaminsky Feb 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Backup everything
  • Loading branch information
@mario
mario committed Feb 10, 2017
commit 2fb5b3c35703e4ec924fb25b1b82fa23c202794b
1 change: 0 additions & 1 deletion AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@

Copy link
Member

@AndyScherzinger AndyScherzinger Aug 8, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this now a double entry looking at lines 63/64?

Copy link
Member Author

@tobiasKaminsky tobiasKaminsky Aug 8, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not double, but triple ;)
Thanks for the catch!

<application
android:name=".MainApp"
android:fullBackupContent="@xml/my_backup_rules"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.ownCloud.Toolbar"
Expand Down
4 changes: 0 additions & 4 deletions res/xml/my_backup_rules.xml
View file
Open in desktop

This file was deleted.