Hypolite Petovan
|
cf6005c260
|
Merge pull request #4308 from annando/bbcode-url-detection
Issue 4295: The url detection in BBCode is too greedy
|
2018-01-22 17:41:41 -05:00 |
|
 Michael
|
2e333dea8f
|
Code cleaned
|
2018-01-22 22:26:47 +00:00 |
|
|
Michael
|
3b6b672141
|
Merge remote-tracking branch 'upstream/develop' into bbcode-url-detection
|
2018-01-22 22:22:16 +00:00 |
|
Michael Vogel
|
e2e38fcd51
|
Merge pull request #4293 from MrPetovan/task/3942-switch-to-password-hash()
Migrate password hashing Part 3: Switch to password hash
|
2018-01-22 23:16:47 +01:00 |
|
|
Hypolite Petovan
|
b34e8e0193
|
Merge pull request #4307 from annando/mod-item-cleaning
Some clean up for mod/item.php
|
2018-01-22 17:15:10 -05:00 |
|
|
Michael
|
87db789e98
|
Corrected "attag" query
|
2018-01-22 21:59:27 +00:00 |
|
|
Michael
|
b4d14164bb
|
The url detection in BBCode is too greedy
|
2018-01-22 21:52:32 +00:00 |
|
|
Michael
|
812cb3b174
|
Some clean up for mod/item.php
|
2018-01-22 21:37:21 +00:00 |
|
|
Hypolite Petovan
|
0d697cffc7
|
Merge pull request #4305 from annando/tag-comment
Bugfix: Always comment on the correct entry
|
2018-01-22 12:25:45 -05:00 |
|
|
Michael
|
e8effad7f2
|
Bugfix: Always comment on the correct entry
|
2018-01-22 17:16:46 +00:00 |
|
|
Hypolite Petovan
|
4fb24d4ebb
|
Make the user.legacy_password field boolean
|
2018-01-22 07:48:30 -05:00 |
|
|
Michael Vogel
|
316d57d186
|
Merge pull request #4300 from MrPetovan/task/remove-network-nets-groups-from-config
Remove network nets and groups from config
|
2018-01-22 10:20:12 +01:00 |
|
 Tobias Diekershoff
|
4af9c26fd3
|
Merge pull request #4303 from annando/bugfix-public-commenting
Bugfix: Commenting on public posts was not possible anymore
|
2018-01-22 10:16:33 +01:00 |
|
|
Michael
|
d588ef32e0
|
Bugfix: Commenting on public posts (that you don't follow) was not possible anymore
|
2018-01-22 07:14:34 +00:00 |
|
|
Michael Vogel
|
9853f552fb
|
Merge pull request #4301 from MrPetovan/bug/3396-frio-fix-contact-autocomplete
[frio] Fix contact autocomplete
|
2018-01-22 00:03:10 +01:00 |
|
|
Hypolite Petovan
|
1b2334745a
|
Fix limit and search parameters in frio_acl_lookup
|
2018-01-21 12:39:47 -05:00 |
|
|
Hypolite Petovan
|
d3fa7ae5ae
|
Fix contact autocomplete template repeated picture
- Use <template> to prevent wrong src lookup
|
2018-01-21 11:48:16 -05:00 |
|
|
Hypolite Petovan
|
0a8e350e4b
|
Remove PConfig nets.selected and group.selected from mod/network
|
2018-01-21 10:49:05 -05:00 |
|
|
Hypolite Petovan
|
cb1e305970
|
Fix quote style for non-SQL, non-translation strings in mod/network
|
2018-01-21 10:48:15 -05:00 |
|
|
Hypolite Petovan
|
83124a8d57
|
Fix formatting in mod/network
|
2018-01-21 10:26:05 -05:00 |
|
|
Michael Vogel
|
3d617b9535
|
Merge pull request #4299 from MrPetovan/task/bump-code-font-size
Bump code font size to .85em (85%)
|
2018-01-21 15:12:22 +01:00 |
|
|
Hypolite Petovan
|
801c00d906
|
Bump code font-size to .85em (85%)
|
2018-01-21 08:50:29 -05:00 |
|
|
Hypolite Petovan
|
0614bfb986
|
Fix indentation in global.css
|
2018-01-21 08:50:00 -05:00 |
|
|
Hypolite Petovan
|
a5952e5425
|
Merge pull request #4297 from hoergen/develop
[vier] changed some spacing
|
2018-01-21 08:34:01 -05:00 |
|
 hoergen
|
d384b7b117
|
changed some spacing
|
2018-01-21 14:29:18 +01:00 |
|
|
Hypolite Petovan
|
2bfd9f9d87
|
Add database update function to use new hashes
|
2018-01-20 22:37:13 -05:00 |
|
|
Hypolite Petovan
|
b0a764b14c
|
Use password_hash() for passwords
- Use legacy_password to update double-hashed passwords
|
2018-01-20 22:29:03 -05:00 |
|
|
Hypolite Petovan
|
c53c2fffa5
|
[database] Add user.legacy_password field
|
2018-01-20 22:24:58 -05:00 |
|
|
Hypolite Petovan
|
986e22d9e1
|
Merge pull request #4292 from annando/reduce-items.php
Relocate functions in items.php into several classes
|
2018-01-20 20:24:42 -05:00 |
|
|
Michael Vogel
|
a21c24bfc4
|
Merge pull request #4285 from MrPetovan/task/3942-centralize-password-update
Centralize password update
|
2018-01-21 01:25:30 +01:00 |
|
|
Michael
|
004f46e600
|
Standards
|
2018-01-21 00:18:31 +00:00 |
|
|
Hypolite Petovan
|
a827522f53
|
Update comment with updated expiration time
|
2018-01-20 19:15:05 -05:00 |
|
|
Hypolite Petovan
|
071b1c038a
|
Update expiration delay to 60 minutes
|
2018-01-20 19:14:41 -05:00 |
|
|
Hypolite Petovan
|
ed6f4cdbde
|
Change password reset wording to acknowledge the expiration
|
2018-01-20 19:12:14 -05:00 |
|
|
Hypolite Petovan
|
0bacff3994
|
Update database.sql with user.pwdreset_time field
|
2018-01-20 19:09:40 -05:00 |
|
|
Michael
|
efa8dbcfb3
|
Relocate functions in items.php into several classes
|
2018-01-20 23:52:54 +00:00 |
|
|
Hypolite Petovan
|
0888f51b4b
|
Add password reset request expiration
- Change password reset link to /lostpass/[pwdreset]
|
2018-01-20 18:15:55 -05:00 |
|
|
Hypolite Petovan
|
391c591322
|
Add pwdreset_time field to user table
|
2018-01-20 18:06:58 -05:00 |
|
|
Hypolite Petovan
|
209c43ebbc
|
Centralize password hashing in Model\User
|
2018-01-20 17:32:24 -05:00 |
|
|
Hypolite Petovan
|
b1e3d09533
|
Fix formatting mod/lostpass
|
2018-01-20 17:31:13 -05:00 |
|
|
Hypolite Petovan
|
3ac1992237
|
Merge pull request #4291 from annando/dont-delete
Don't delete - but only mark as deleted
|
2018-01-20 17:21:26 -05:00 |
|
|
Michael
|
7be49d9411
|
Don't delete - but only mark as deleted
|
2018-01-20 22:16:43 +00:00 |
|
|
Hypolite Petovan
|
352dd020a8
|
Merge pull request #4287 from annando/item-permissions
Overhauled mod/item - fixing wrong thread parent and mail stuff
|
2018-01-20 16:57:19 -05:00 |
|
|
Michael
|
745bc7cf3f
|
Merge remote-tracking branch 'upstream/develop' into item-permissions
|
2018-01-20 19:51:23 +00:00 |
|
|
Michael
|
670e2ad271
|
Some safety precautions
|
2018-01-20 19:48:51 +00:00 |
|
|
Hypolite Petovan
|
610f017b28
|
Merge pull request #4288 from zeroadam/Addon
Move plugins to Addon
|
2018-01-20 14:36:23 -05:00 |
|
|
Michael
|
b8c4332a20
|
Only enable "pubmail" when it is enabled
|
2018-01-20 19:31:47 +00:00 |
|
|
Michael
|
b57f455dc8
|
Removed test comment
|
2018-01-20 17:34:53 +00:00 |
|
Adam Magness
|
fb372877f6
|
Rename template and doc
Rename admin/plugins.tpl to admin/addons.tpl and update references. Rename doc/de/Plugins.md to Addons.md
|
2018-01-20 09:45:22 -05:00 |
|
|
Hypolite Petovan
|
670578f799
|
Merge pull request #4289 from zeroadam/bugfix-nogroup
Bug fix
|
2018-01-20 09:31:48 -05:00 |
|