keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
17660 commits 4 branches 0 tags 179 MiB
Commit graph

4275 commits

Author SHA1 Message Date
Michael
87db789e98 Corrected "attag" query 2018-01-22 21:59:27 +00:00
Michael
812cb3b174 Some clean up for mod/item.php 2018-01-22 21:37:21 +00:00
Michael
e8effad7f2 Bugfix: Always comment on the correct entry 2018-01-22 17:16:46 +00: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
Michael
d588ef32e0 Bugfix: Commenting on public posts (that you don't follow) was not possible anymore 2018-01-22 07:14:34 +00: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
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
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
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
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
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
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
b86b04a81a Change plugin to addon 
change the use of plugin to addon where appropriate.
 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
Michael
b5b298c8d6 Merge remote-tracking branch 'upstream/develop' into item-permissions 2018-01-20 10:17:04 +00: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
Hypolite Petovan
4cca8280b4 Fix undefined variables PHP Notice 
- $order_string in include/dba
- $limit_string in include/dba
- $search in mod/search
- $lang_list in include/pgettext.php
 2018-01-19 22:52:49 -05:00
Hypolite Petovan
fee80a57bc Change /siteinfo to /servers for directory URL on follow page 2018-01-19 21:51:42 -05:00
Michael
f7e3b29819 Improved user id handling 2018-01-19 22:46:24 +00:00
Hypolite Petovan
035394cbf2 RINO code cleanup 
- Restore original use Friendica\Util\Crypto
- Remove RINO1 deprecation comments
- Fix undefined variable $rino_remote_version
 2018-01-19 11:34:56 -05:00
Hypolite Petovan
5bc7f4a442 Remove RINO2 and RINO3 2018-01-19 11:27:53 -05:00
Hypolite Petovan
5db1717f46 Re-added missing RINO admin setting values 2018-01-19 11:27:53 -05:00
Hypolite Petovan
2e58120bbb Fix RINO admin setting values 2018-01-19 11:27:53 -05:00
Hypolite Petovan
de70007a46 Update RINO settings 2018-01-19 11:27:53 -05:00
Hypolite Petovan
7af6cc8454 Add RINO version 3 encrypt/decrypt 
- Add legacy decrypt of RINO2
- Add fallback to RINO1 to encrypt
 2018-01-19 11:27:53 -05:00
Michael
d22adc98b2 Just some precaution 2018-01-19 07:50:11 +00:00
Michael
a07670ac30 Ensure that the user id in a thread always stays the same 2018-01-19 07:02:43 +00:00
Michael
b6f15ec5ce Bugfix: The Diaspora signature wasn't stored by nested comments 2018-01-18 19:38:51 +00:00
Michael
034d46196f "last-child" is not used anymore 2018-01-18 06:54:44 +00:00
Michael
2d66242b4f The delete function is now changed to the new function 2018-01-17 23:22:01 +00:00
fabrixxm
f51fda7911 fix for coding standars 2018-01-17 17:27:27 +01:00
fabrixxm
fc8e8feec1 Frio: add login background color admin option 2018-01-17 16:33:27 +01:00
fabrixxm
0aafdab810 Use template home.tpl for mod/home 2018-01-17 13:27:41 +01:00
Hypolite Petovan
f193f01a7d Fix issues in changed files 
- Initializes $return in Process::insert
- Update the type hint of dba::fetch
- Remove unused $a parameter in worker_init()
- Fix uses
 2018-01-17 00:17:58 -05:00