Commit graph

5878 commits

Author SHA1 Message Date
3d4ace7a9d Merge branch 'no-term3' into no-term2 2020-05-05 16:09:50 +00:00
b7e25d16e7 Removed usage of "tag" field 2020-05-05 05:11:59 +00:00
875d6b36e9 File and category aren't using "term" anymore 2020-05-03 15:13:40 +00:00
b0cb6536dd The old tag handling is removed 2020-05-02 05:08:05 +00:00
729c6b67aa the "term" field now is called "name", workaround removed 2020-05-01 15:18:48 +00:00
74081a71ff Removed unused "use" 2020-05-01 13:26:13 +00:00
029a379060 Move "isType" to Tag.php 2020-05-01 12:39:41 +00:00
ac2957c4dd Some more "term" to "tag" conversion 2020-05-01 10:57:32 +00:00
1f64e672ba Subscribed tags are now based on the tags as well 2020-05-01 07:18:15 +00:00
8c44f535b7 Merge remote-tracking branch 'upstream/develop' into write-tags 2020-04-29 02:38:33 +00:00
10ffd3a374 Iissue 8560: Wrong value for parent in mail notification 2020-04-28 20:32:39 +00:00
70e5639e29 Merge 2020-04-28 13:33:03 +00:00
f75009c20c Some more forgotten DBA::close 2020-04-28 07:10:18 +00:00
7f5f68a904 More preparations for term to tag transition 2020-04-26 16:15:39 +00:00
a5aa43469b Some more places with owner-view 2020-04-24 13:41:11 +00:00
c4f7f3e26e And some more view calls added 2020-04-24 12:59:19 +00:00
0950e4bada Another view 2020-04-24 12:09:51 +00:00
4181eb37f5 More joins replaced by view calls 2020-04-24 11:55:46 +00:00
43b8bdea07
Merge pull request #8520 from annando/term2tag
We now store tags in "tag"
2020-04-22 22:56:07 -04:00
16f48731b1 Remove album name bin2hex conversion in file browser
- Avoids Javascript hex2bin() limitation to Latin-1 string encoding
2020-04-21 22:14:11 -04:00
Michael Vogel
ee098277b9
Merge pull request #8530 from MrPetovan/task/8498-move-poke-to-src
Move poke module to src/
2020-04-21 05:56:59 +02:00
7f04aea8b1 Move poke module to src/
- Add new route contact/<cid>/poke and update all references
- Rework template with form field includes
- [frio] Enable modal behavior
2020-04-20 11:47:08 -04:00
9e9a104320 Tags can now be added and removed from photos 2020-04-18 20:46:41 +00:00
060503eb44 Tagger is now storing the tag as well 2020-04-17 13:36:55 +00:00
3ff607deee Store tags for locally created posts 2020-04-15 19:46:47 +00:00
661dd43b0d Term constants updated 2020-04-13 19:24:22 +00:00
1e32f74b0b Rework Module/Objects
- Merge two item queries into one
- Add ETag check
- Use Router parameter
2020-04-05 18:00:46 -04:00
594db70a72
Merge pull request #8500 from lynn-stephenson/develop
Fix Password Reset Token Security
2020-04-05 08:15:31 -04:00
Lynn Stephenson
6cbcea1aac
Update lostpass.php
reduce info leakage on password reset tokens
2020-04-04 08:10:39 +00:00
Lynn Stephenson
f459a35cf4
Update lostpass.php
use CSPRNG for password reset token generation
2020-04-04 08:06:49 +00:00
40a7a43bd2 [frio] Add link to Compose page in jot 2020-04-03 16:33:00 -04:00
5ce404f517 Refactor user settings page
- Fix header hierarchy
- [frio] Fix panel display
- Move checkbox sub-template calls to template
2020-04-01 19:06:00 -04:00
3c50f985a9 Remove modal window for default post permission setting 2020-04-01 09:21:26 -04:00
d3722c945b Improved Mime Type detection 2020-04-01 05:42:44 +00:00
Steffen K9
6ea9c1764c
remove default from match.php 2020-03-29 11:37:23 +02:00
Steffen K9
0ddda6160b
Remove multi profile mention in settings
Remove multi/default profile mention in settings privacy.
2020-03-29 11:17:08 +02:00
7fabafdce6 Enable visibility request parameter to override default user permissions in mod/item 2020-03-24 16:34:19 -04:00
8bde222fca Issue 8371: Use correct user id for photo upload 2020-03-22 14:07:34 +00:00
505aa95c3d Fixed wrong contact permisssion 2020-03-22 10:05:52 +00:00
6de2b0f6d4 Reworked permission stuff 2020-03-21 18:30:40 +00:00
2234a095c6 Issue 8371 again: Fallback for item permissions 2020-03-20 04:52:04 +00:00
29bd37cda2 Issue 8371: Ensure to always have permissions 2020-03-19 21:55:31 +00:00
37376fa715 Issue 8371: Improvements for picture permissions 2020-03-08 13:16:59 +00:00
a55057d974 Function renamed to better reflect the purpose 2020-03-05 08:03:05 +00:00
825a7f9f93 Issue 8321: Follow items now work again 2020-03-05 07:16:47 +00:00
55f43be92a Changed setting description 2020-03-03 04:03:37 +00:00
a19151fa6a Improved description, support for "unlisted" via DFRN as well. 2020-03-02 22:35:25 +00:00
72c198990e Merge remote-tracking branch 'upstream/develop' into private 2020-03-02 15:05:00 +00:00
31f912b78e Warning removed 2020-03-02 14:51:53 +00:00
4bf04dd6ee Fixed fatal error 2020-03-02 12:29:08 +00:00