Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-18 06:23:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
26940 commits 3 branches 64 tags 248 MiB
Commit graph

5871 commits

Author SHA1 Message Date
Michael
ac2957c4dd Some more "term" to "tag" conversion 2020-05-01 10:57:32 +00:00
Michael
1f64e672ba Subscribed tags are now based on the tags as well 2020-05-01 07:18:15 +00:00
Michael
8c44f535b7 Merge remote-tracking branch 'upstream/develop' into write-tags 2020-04-29 02:38:33 +00:00
Michael
10ffd3a374 Iissue 8560: Wrong value for parent in mail notification 2020-04-28 20:32:39 +00:00
Michael
70e5639e29 Merge 2020-04-28 13:33:03 +00:00
Michael
f75009c20c Some more forgotten DBA::close 2020-04-28 07:10:18 +00:00
Michael
7f5f68a904 More preparations for term to tag transition 2020-04-26 16:15:39 +00:00
Michael
a5aa43469b Some more places with owner-view 2020-04-24 13:41:11 +00:00
Michael
c4f7f3e26e And some more view calls added 2020-04-24 12:59:19 +00:00
Michael
0950e4bada Another view 2020-04-24 12:09:51 +00:00
Michael
4181eb37f5 More joins replaced by view calls 2020-04-24 11:55:46 +00:00
Hypolite Petovan
43b8bdea07
Merge pull request #8520 from annando/term2tag 
We now store tags in "tag"
 2020-04-22 22:56:07 -04:00
Hypolite Petovan
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
Hypolite Petovan
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
Michael
9e9a104320 Tags can now be added and removed from photos 2020-04-18 20:46:41 +00:00
Michael
060503eb44 Tagger is now storing the tag as well 2020-04-17 13:36:55 +00:00
Michael
3ff607deee Store tags for locally created posts 2020-04-15 19:46:47 +00:00
Michael
661dd43b0d Term constants updated 2020-04-13 19:24:22 +00:00
Hypolite Petovan
1e32f74b0b Rework Module/Objects 
- Merge two item queries into one
- Add ETag check
- Use Router parameter
 2020-04-05 18:00:46 -04:00
Hypolite Petovan
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
Hypolite Petovan
40a7a43bd2 [frio] Add link to Compose page in jot 2020-04-03 16:33:00 -04:00
Hypolite Petovan
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
Hypolite Petovan
3c50f985a9 Remove modal window for default post permission setting 2020-04-01 09:21:26 -04:00
Michael
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
Hypolite Petovan
7fabafdce6 Enable visibility request parameter to override default user permissions in mod/item 2020-03-24 16:34:19 -04:00
Michael
8bde222fca Issue 8371: Use correct user id for photo upload 2020-03-22 14:07:34 +00:00
Michael
505aa95c3d Fixed wrong contact permisssion 2020-03-22 10:05:52 +00:00
Michael
6de2b0f6d4 Reworked permission stuff 2020-03-21 18:30:40 +00:00
Michael
2234a095c6 Issue 8371 again: Fallback for item permissions 2020-03-20 04:52:04 +00:00
Michael
29bd37cda2 Issue 8371: Ensure to always have permissions 2020-03-19 21:55:31 +00:00
Michael
37376fa715 Issue 8371: Improvements for picture permissions 2020-03-08 13:16:59 +00:00
Michael
a55057d974 Function renamed to better reflect the purpose 2020-03-05 08:03:05 +00:00
Michael
825a7f9f93 Issue 8321: Follow items now work again 2020-03-05 07:16:47 +00:00
Michael
55f43be92a Changed setting description 2020-03-03 04:03:37 +00:00
Michael
a19151fa6a Improved description, support for "unlisted" via DFRN as well. 2020-03-02 22:35:25 +00:00
Michael
72c198990e Merge remote-tracking branch 'upstream/develop' into private 2020-03-02 15:05:00 +00:00
Michael
31f912b78e Warning removed 2020-03-02 14:51:53 +00:00
Michael
4bf04dd6ee Fixed fatal error 2020-03-02 12:29:08 +00:00
Michael
ca1b92bb34 Support unlisted public posts 2020-03-02 07:57:23 +00:00
Philipp
27b60b200e
Merge pull request #8352 from MrPetovan/bug/8002-album-drop-cancel 
Use sensible URLs for return after album actions instead of $_SESSION['photo_return'] in mod/photos
 2020-03-01 22:21:33 +01:00
Michael Vogel
057df09ffb
Merge pull request #8353 from MrPetovan/bug/8219-frio-fix-contact-csv-import 
[frio] Enable file upload in settings form
 2020-03-01 21:08:19 +01:00
Hypolite Petovan
ad2b9198a4 Remove last on/off data occurrences in additional features 
- Address https://github.com/friendica/friendica/issues/7999#issuecomment-589808923
 2020-03-01 14:15:08 -05:00
Hypolite Petovan
7ef3308a8d Improve feedback in mod/settings 2020-03-01 10:15:35 -05:00
Hypolite Petovan
f814ca30d3 Use sensible URLs for return after album actions instead of $_SESSION['photo_return'] in mod/photos 2020-03-01 09:56:02 -05:00
nupplaPhil
4f2bea5cb1
Move "regmod" functionality into Admin Users page 2020-02-29 17:10:29 +01:00