Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-19 20:23:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
17740 commits 3 branches 64 tags 249 MiB
Commit graph

17740 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Adam Magness
d1b003c694 Bug fix 
remove require for deleted file
 2018-01-20 09:23:45 -05:00
Michael
1649a12b84 Added documentation 2018-01-20 14:10:37 +00:00
Michael
1b74650807 Reworked mod/item - fixing wrong thread parent and mail stuff 2018-01-20 13:54:14 +00:00
Adam Magness
5d03735238 Update hook names 
update hook names and other plugin references.
 2018-01-20 08:22:18 -05:00
Adam Magness
ac374f7773 Review updates 2018-01-20 07:48:22 -05:00
Adam Magness
a7d887a68e CSS files 
update plugin references in css files.
 2018-01-20 07:48:22 -05:00
Adam Magness
20a16b0b35 Update docs 
changelog, install and doc folder
 2018-01-20 07:48:22 -05:00
Adam Magness
b86b04a81a Change plugin to addon 
change the use of plugin to addon where appropriate.
 2018-01-20 07:48:22 -05:00
Adam Magness
3bad83f24e Remove old file 
remove include/plugin.php
 2018-01-20 07:48:22 -05:00
Adam Magness
6c4c567319 Remove require 
remove require_once for plugins.php
 2018-01-20 07:48:22 -05:00
Adam Magness
d07536e032 Update Theme functions and calls 
Update function names and calls for Theme class.
 2018-01-20 07:48:22 -05:00
Adam Magness
11cf36105c Update Addon functions and calls 
Update function names and calls for Addon class.
 2018-01-20 07:48:22 -05:00
Adam Magness
213f6ae1a1 Create Addon and Theme classes 
Create Addon and Theme classes and functions from plugin.php to appropriate class.
 2018-01-20 07:48:22 -05:00
Michael
b5b298c8d6 Merge remote-tracking branch 'upstream/develop' into item-permissions 2018-01-20 10:17:04 +00:00
Michael Vogel
5d20bbaace
Merge pull request #4282 from MrPetovan/bug/3337-video-max-width 
[frio] Add max-width: 100% for video tags
 2018-01-20 09:25:17 +01:00
Michael Vogel
104a03e82a
Merge pull request #4283 from MrPetovan/bug/2487-fix-autolink-regex 
Fix autolink regular expression to include accents
 2018-01-20 09:24:16 +01:00
Michael Vogel
f0a23aa71c
Merge pull request #4284 from MrPetovan/bug/3020-change-siteinfo-to-servers 
Change /siteinfo to /servers for directory URL on follow page
 2018-01-20 09:19:51 +01:00