mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-26 23:27:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
1679 commits 20 branches 167 tags 36 MiB
Commit graph

1679 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stefan Niedermann
5e04817640 Merge branch 'master' into branding 
# Conflicts:
#	app/src/main/res/values/strings.xml
 2020-06-01 14:28:24 +02:00
Stefan Niedermann
558f68e201 version bump to 2.12.2 2020-06-01 14:15:15 +02:00
Stefan Niedermann
09ac1d5287 Prepare release 2020-06-01 14:11:45 +02:00
Stefan Niedermann
200a70cd2e Enhance layout of create note widget 2020-06-01 14:01:46 +02:00
Stefan Niedermann
ef0f535c27 Limit NLW title to one line (ellipsized) 2020-06-01 13:53:37 +02:00
Daniel Bailey
9377485eec Add appWidgetId to PendingIntent's request code 
Ensures uniqueness with multiple widgets.

Signed-off-by: Daniel Bailey <daniel.bailey@grappleIT.co.uk>
 2020-06-01 13:31:49 +02:00
IF-ACT
f6467ca972 Revert "Revert "Revert "Add comment for final pre""" 
This reverts commit 61a8fc25c7.
 2020-05-30 18:20:49 +08:00
IF-ACT
75516dc2f3 Revert "Revert "Revert "Add comment on test""" 
This reverts commit 98c1d96d34.
 2020-05-30 18:20:28 +08:00
IF-ACT
98c1d96d34 Revert "Revert "Add comment on test"" 
This reverts commit 431983af8d.
 2020-05-30 18:07:41 +08:00
IF-ACT
61a8fc25c7 Revert "Revert "Add comment for final pre"" 
This reverts commit fab225710e.
 2020-05-30 18:07:35 +08:00
IF-ACT
fab225710e Revert "Add comment for final pre" 
This reverts commit de6ad5c8ea.
 2020-05-30 17:52:41 +08:00
IF-ACT
431983af8d Revert "Add comment on test" 
This reverts commit b81b6cdfab.
 2020-05-30 17:52:37 +08:00
IF-ACT
b81b6cdfab Add comment on test 2020-05-30 17:44:54 +08:00
IF-ACT
de6ad5c8ea Add comment for final pre 2020-05-30 17:42:05 +08:00
Daniel Bailey
e8f93754bc
Small bugfix when retreiving category count 
Signed-off-by: Daniel Bailey <daniel.bailey@grappleIT.co.uk>
 2020-05-29 22:44:49 +01:00
Peter S
54007cc8e8
Merge branch 'master' into 603-sorting-method 2020-05-29 15:15:22 +08:00
Peter S
41e393c117 fix the version conflict bug in AbstractNotesDatabase.java 2020-05-29 15:05:42 +08:00
Stefan Niedermann
b328fb1b8b Update gradle plugin to 4.0 2020-05-28 21:14:11 +02:00
Stefan Niedermann
592e45ce71 Merge branch 'master' into 603-sorting-method 2020-05-26 23:45:47 +02:00
Nextcloud bot
196e64151d [tx-robot] updated from transifex 2020-05-26 22:20:15 +02:00
Stefan Niedermann
1f4a17e5d2 Fix ID 2020-05-26 14:29:33 +02:00
Stefan Niedermann
3a5c3311cf Fix ID 2020-05-26 14:29:19 +02:00
Stefan Niedermann
1519efb011 Merge branch 'master' into 832-nlw-to-db 
# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidget.java
#	app/src/main/res/layout/widget_note_list.xml
 2020-05-26 14:28:46 +02:00
Stefan Niedermann
ce54629029 Upgrade note list widget style 2020-05-26 14:27:25 +02:00
Stefan Niedermann
ba4ac3e7de Add final keyword and @Nullable 2020-05-26 13:00:13 +02:00
Stefan Niedermann
81f71ca574 Fix #841 "Link" functionality in text menu causes error 2020-05-26 12:59:08 +02:00
Stefan Niedermann
85021909f3 Update create note widget 2020-05-25 21:23:04 +02:00
Stefan Niedermann
f9bf0841af Update splashscreen and launcher icon 2020-05-25 20:48:43 +02:00
Stefan Niedermann
3e534f8a88 Add widgets to description 2020-05-25 19:40:15 +02:00
Stefan Niedermann
196e677b76 Adapt new icon 2020-05-25 19:32:32 +02:00
Peter S
9558374632 Merge branch 'master' of https://github.com/stefan-niedermann/nextcloud-notes into 603-sorting-method 2020-05-24 23:07:16 +08:00
Daniel Bailey
2ff81a67dc
Re-added setData() to serviceIntent in updateAppWidget 
This is necessary so that multiple calls to the RemoteViews service are
detected.

Signed-off-by: Daniel Bailey <daniel.bailey@grappleIT.co.uk>
 2020-05-24 15:56:59 +01:00
IF-ACT
22a4776948 Add test & document 2020-05-24 21:56:57 +08:00
IF-ACT
25dddd1dc8 Merge branch '814-normalize-database' into 603-sorting-method 2020-05-24 20:53:33 +08:00
IF-ACT
9e677e52a6 Seperates function getCategoryOrder & modifyCategoryOrder 2020-05-24 20:29:25 +08:00
IF-ACT
5b0ec91c86 Fixed wrong icon on activity start 2020-05-24 19:10:56 +08:00
Daniel Bailey
d4f740d64a Fixes #817 
Added a unique request code to each of the pending intents used by NoteListWidget.

Signed-off-by: Daniel Bailey <daniel.bailey@grappleIT.co.uk>
 2020-05-23 17:34:46 +02:00
Stefan Niedermann
7ef59df1cb #832 Move note list widget preferences to database 2020-05-23 16:36:10 +02:00
IF-ACT
b4eaefd6d4 Fixed sort 2020-05-23 21:38:24 +08:00
IF-ACT
fdf0adb5b8 Add sorting method to special categories 2020-05-23 21:15:17 +08:00
Stefan Niedermann
afce9831a6 #832 Move note list widget preferences to database 
Create table and migrate existing values
 2020-05-23 13:57:16 +02:00
IF-ACT
87b3fb03ba Can sort by certern sorting method now 2020-05-23 19:40:04 +08:00
Stefan Niedermann
302f988495 Revert #817 2020-05-23 13:20:51 +02:00
IF-ACT
248233f670 Fixed wrong icon on activity start 2020-05-23 19:19:26 +08:00
Stefan Niedermann
7729d27b0b Merge branch '814-normalize-database' 2020-05-23 13:18:46 +02:00
Isc
116ce2a49a Remove useless foreign key 2020-05-23 18:29:40 +08:00
Isc
910f465fc8 Bug fixed: incorrect accountID in category table 2020-05-23 18:28:29 +08:00
Isc
c045948f81 Merge 2020-05-23 18:28:01 +08:00
Isc
16aabd8629 Merge 2020-05-23 17:32:27 +08:00
Stefan Niedermann
e0e0033efa Fix table creation 2020-05-23 11:30:45 +02:00