]>
git.mxchange.org Git - friendica.git/log
Adam Magness [Wed, 24 Jan 2018 03:03:57 +0000 (22:03 -0500)]
Avoid branch conflict
Adam Magness [Wed, 24 Jan 2018 02:59:16 +0000 (21:59 -0500)]
Review sprintf
remove more sprintf calls
Michael Vogel [Wed, 24 Jan 2018 00:08:11 +0000 (01:08 +0100)]
Merge pull request #4318 from MrPetovan/bug/4314-fix-addon-reload
Fix addon reload
Hypolite Petovan [Tue, 23 Jan 2018 23:57:51 +0000 (18:57 -0500)]
Add update function to reload addons after hook renaming
Hypolite Petovan [Tue, 23 Jan 2018 23:57:33 +0000 (18:57 -0500)]
Add missing dba::inArray to Addon::reload
Hypolite Petovan [Tue, 23 Jan 2018 23:44:19 +0000 (18:44 -0500)]
Merge pull request #4317 from annando/birthday
Birthdays are now transmitted reliably to Diaspora
Michael [Tue, 23 Jan 2018 22:51:30 +0000 (22:51 +0000)]
Birthdays are now transmitted reliably to Diaspora
Adam Magness [Tue, 23 Jan 2018 17:47:30 +0000 (12:47 -0500)]
Update function and sprintf
Update variable to static function and remove sprintf wrappers
Michael Vogel [Tue, 23 Jan 2018 08:44:28 +0000 (09:44 +0100)]
Merge pull request #4313 from tobiasd/
20180123-vier
Config::get returns null if value not set, so the check needs to be adopted
Tobias Diekershoff [Tue, 23 Jan 2018 07:15:53 +0000 (08:15 +0100)]
Config::get returns null if value not set, so the check needs to be adopted
Michael Vogel [Tue, 23 Jan 2018 05:44:05 +0000 (06:44 +0100)]
Merge pull request #4311 from MrPetovan/task/4265-delete-video.js
Delete video.js
Adam Magness [Tue, 23 Jan 2018 03:30:45 +0000 (22:30 -0500)]
Update variable
update based on error log
Adam Magness [Tue, 23 Jan 2018 03:20:35 +0000 (22:20 -0500)]
Adjust for templates
Use new t() for template button text
Hypolite Petovan [Tue, 23 Jan 2018 02:07:10 +0000 (21:07 -0500)]
Remove videojs reference from js/main
Hypolite Petovan [Tue, 23 Jan 2018 01:45:54 +0000 (20:45 -0500)]
Remove video.js from library/
Hypolite Petovan [Tue, 23 Jan 2018 01:45:42 +0000 (20:45 -0500)]
Remove references to video.js
Adam Magness [Mon, 22 Jan 2018 23:47:25 +0000 (18:47 -0500)]
Admin t()
update t() in admin
Adam Magness [Mon, 22 Jan 2018 23:38:34 +0000 (18:38 -0500)]
Theme t() uses
Updatee t() calls in themes
Adam Magness [Mon, 22 Jan 2018 21:59:31 +0000 (16:59 -0500)]
Hopefully all t()
hopefully the last of the t()
Adam Magness [Mon, 22 Jan 2018 21:17:21 +0000 (16:17 -0500)]
More missing t()
update t() calls
Adam Magness [Mon, 22 Jan 2018 20:21:43 +0000 (15:21 -0500)]
Security t()
missed t() calls in security
Adam Magness [Mon, 22 Jan 2018 19:17:36 +0000 (14:17 -0500)]
More missed use
a few more missed use statements for L10n
Adam Magness [Mon, 22 Jan 2018 19:08:58 +0000 (14:08 -0500)]
Missing use
missed use statement for L10n
Adam Magness [Mon, 22 Jan 2018 14:58:51 +0000 (09:58 -0500)]
Remove old file and requires
Remove pgettext.php and remove require_once calls
Adam Magness [Mon, 22 Jan 2018 14:54:13 +0000 (09:54 -0500)]
Finish t() for src
Update t() calls in src folder
Adam Magness [Mon, 22 Jan 2018 14:16:25 +0000 (09:16 -0500)]
Finish t() for mod
finished mod folder
Adam Magness [Mon, 22 Jan 2018 12:29:50 +0000 (07:29 -0500)]
More t()
Update more t() calls
Adam Magness [Sun, 21 Jan 2018 22:15:52 +0000 (17:15 -0500)]
Updat tt() calls
update function calls for tt()
Adam Magness [Sun, 21 Jan 2018 18:33:59 +0000 (13:33 -0500)]
Many t() calls
modify many t() calls.
Adam Magness [Sun, 21 Jan 2018 17:06:27 +0000 (12:06 -0500)]
Functions and Calls
finish the other functions before returning to t() and tt()
Adam Magness [Sun, 21 Jan 2018 16:38:01 +0000 (11:38 -0500)]
Update functions and calls
Update function names and calls.
Adam Magness [Sat, 20 Jan 2018 14:41:50 +0000 (09:41 -0500)]
Create L10n class
Create L10n class and functions from pgettext.php
Hypolite Petovan [Mon, 22 Jan 2018 23:01:51 +0000 (18:01 -0500)]
Merge pull request #4310 from annando/rino-fix
When RINO is set to a (now) invalid value, we set it to a valid one
Michael [Mon, 22 Jan 2018 22:58:03 +0000 (22:58 +0000)]
When RINO is set to a (now) invalid value, we set it to a valid one
Hypolite Petovan [Mon, 22 Jan 2018 22:41:41 +0000 (17:41 -0500)]
Merge pull request #4308 from annando/bbcode-url-detection
Issue 4295: The url detection in BBCode is too greedy
Michael [Mon, 22 Jan 2018 22:26:47 +0000 (22:26 +0000)]
Code cleaned
Michael [Mon, 22 Jan 2018 22:22:16 +0000 (22:22 +0000)]
Merge remote-tracking branch 'upstream/develop' into bbcode-url-detection
Michael Vogel [Mon, 22 Jan 2018 22:16:47 +0000 (23:16 +0100)]
Merge pull request #4293 from MrPetovan/task/3942-switch-to-password-hash()
Migrate password hashing Part 3: Switch to password hash
Hypolite Petovan [Mon, 22 Jan 2018 22:15:10 +0000 (17:15 -0500)]
Merge pull request #4307 from annando/mod-item-cleaning
Some clean up for mod/item.php
Michael [Mon, 22 Jan 2018 21:59:27 +0000 (21:59 +0000)]
Corrected "attag" query
Michael [Mon, 22 Jan 2018 21:52:32 +0000 (21:52 +0000)]
The url detection in BBCode is too greedy
Michael [Mon, 22 Jan 2018 21:37:21 +0000 (21:37 +0000)]
Some clean up for mod/item.php
Hypolite Petovan [Mon, 22 Jan 2018 17:25:45 +0000 (12:25 -0500)]
Merge pull request #4305 from annando/tag-comment
Bugfix: Always comment on the correct entry
Michael [Mon, 22 Jan 2018 17:16:46 +0000 (17:16 +0000)]
Bugfix: Always comment on the correct entry
Hypolite Petovan [Mon, 22 Jan 2018 12:48:30 +0000 (07:48 -0500)]
Make the user.legacy_password field boolean
Michael Vogel [Mon, 22 Jan 2018 09:20:12 +0000 (10:20 +0100)]
Merge pull request #4300 from MrPetovan/task/remove-network-nets-groups-from-config
Remove network nets and groups from config
Tobias Diekershoff [Mon, 22 Jan 2018 09:16:33 +0000 (10:16 +0100)]
Merge pull request #4303 from annando/bugfix-public-commenting
Bugfix: Commenting on public posts was not possible anymore
Michael [Mon, 22 Jan 2018 07:14:34 +0000 (07:14 +0000)]
Bugfix: Commenting on public posts (that you don't follow) was not possible anymore
Michael Vogel [Sun, 21 Jan 2018 23:03:10 +0000 (00:03 +0100)]
Merge pull request #4301 from MrPetovan/bug/3396-frio-fix-contact-autocomplete
[frio] Fix contact autocomplete
Hypolite Petovan [Sun, 21 Jan 2018 17:39:47 +0000 (12:39 -0500)]
Fix limit and search parameters in frio_acl_lookup
Hypolite Petovan [Sun, 21 Jan 2018 16:48:16 +0000 (11:48 -0500)]
Fix contact autocomplete template repeated picture
- Use <template> to prevent wrong src lookup
Hypolite Petovan [Sun, 21 Jan 2018 15:49:05 +0000 (10:49 -0500)]
Remove PConfig nets.selected and group.selected from mod/network
Hypolite Petovan [Sun, 21 Jan 2018 15:48:15 +0000 (10:48 -0500)]
Fix quote style for non-SQL, non-translation strings in mod/network
Hypolite Petovan [Sun, 21 Jan 2018 15:26:05 +0000 (10:26 -0500)]
Fix formatting in mod/network
Michael Vogel [Sun, 21 Jan 2018 14:12:22 +0000 (15:12 +0100)]
Merge pull request #4299 from MrPetovan/task/bump-code-font-size
Bump code font size to .85em (85%)
Hypolite Petovan [Sun, 21 Jan 2018 13:50:29 +0000 (08:50 -0500)]
Bump code font-size to .85em (85%)
Hypolite Petovan [Sun, 21 Jan 2018 13:50:00 +0000 (08:50 -0500)]
Fix indentation in global.css
Hypolite Petovan [Sun, 21 Jan 2018 13:34:01 +0000 (08:34 -0500)]
Merge pull request #4297 from hoergen/develop
[vier] changed some spacing
hoergen [Sun, 21 Jan 2018 13:29:18 +0000 (14:29 +0100)]
changed some spacing
Hypolite Petovan [Sun, 21 Jan 2018 03:37:13 +0000 (22:37 -0500)]
Add database update function to use new hashes
Hypolite Petovan [Sun, 21 Jan 2018 03:29:03 +0000 (22:29 -0500)]
Use password_hash() for passwords
- Use legacy_password to update double-hashed passwords
Hypolite Petovan [Sun, 21 Jan 2018 03:24:58 +0000 (22:24 -0500)]
[database] Add user.legacy_password field
Hypolite Petovan [Sun, 21 Jan 2018 01:24:42 +0000 (20:24 -0500)]
Merge pull request #4292 from annando/reduce-items.php
Relocate functions in items.php into several classes
Michael Vogel [Sun, 21 Jan 2018 00:25:30 +0000 (01:25 +0100)]
Merge pull request #4285 from MrPetovan/task/3942-centralize-password-update
Centralize password update
Michael [Sun, 21 Jan 2018 00:18:31 +0000 (00:18 +0000)]
Standards
Hypolite Petovan [Sun, 21 Jan 2018 00:15:05 +0000 (19:15 -0500)]
Update comment with updated expiration time
Hypolite Petovan [Sun, 21 Jan 2018 00:14:41 +0000 (19:14 -0500)]
Update expiration delay to 60 minutes
Hypolite Petovan [Sun, 21 Jan 2018 00:12:14 +0000 (19:12 -0500)]
Change password reset wording to acknowledge the expiration
Hypolite Petovan [Sun, 21 Jan 2018 00:09:40 +0000 (19:09 -0500)]
Update database.sql with user.pwdreset_time field
Michael [Sat, 20 Jan 2018 23:52:54 +0000 (23:52 +0000)]
Relocate functions in items.php into several classes
Hypolite Petovan [Sat, 20 Jan 2018 23:15:55 +0000 (18:15 -0500)]
Add password reset request expiration
- Change password reset link to /lostpass/[pwdreset]
Hypolite Petovan [Sat, 20 Jan 2018 23:06:58 +0000 (18:06 -0500)]
Add pwdreset_time field to user table
Hypolite Petovan [Sat, 20 Jan 2018 03:49:06 +0000 (22:49 -0500)]
Centralize password hashing in Model\User
Hypolite Petovan [Sat, 20 Jan 2018 03:27:31 +0000 (22:27 -0500)]
Fix formatting mod/lostpass
Hypolite Petovan [Sat, 20 Jan 2018 22:21:26 +0000 (17:21 -0500)]
Merge pull request #4291 from annando/dont-delete
Don't delete - but only mark as deleted
Michael [Sat, 20 Jan 2018 22:16:43 +0000 (22:16 +0000)]
Don't delete - but only mark as deleted
Hypolite Petovan [Sat, 20 Jan 2018 21:57:19 +0000 (16:57 -0500)]
Merge pull request #4287 from annando/item-permissions
Overhauled mod/item - fixing wrong thread parent and mail stuff
Michael [Sat, 20 Jan 2018 19:51:23 +0000 (19:51 +0000)]
Merge remote-tracking branch 'upstream/develop' into item-permissions
Michael [Sat, 20 Jan 2018 19:48:51 +0000 (19:48 +0000)]
Some safety precautions
Hypolite Petovan [Sat, 20 Jan 2018 19:36:23 +0000 (14:36 -0500)]
Merge pull request #4288 from zeroadam/Addon
Move plugins to Addon
Michael [Sat, 20 Jan 2018 19:31:47 +0000 (19:31 +0000)]
Only enable "pubmail" when it is enabled
Michael [Sat, 20 Jan 2018 17:34:53 +0000 (17:34 +0000)]
Removed test comment
Adam Magness [Sat, 20 Jan 2018 14:45:22 +0000 (09:45 -0500)]
Rename template and doc
Rename admin/plugins.tpl to admin/addons.tpl and update references. Rename doc/de/Plugins.md to Addons.md
Hypolite Petovan [Sat, 20 Jan 2018 14:31:48 +0000 (09:31 -0500)]
Merge pull request #4289 from zeroadam/bugfix-nogroup
Bug fix
Adam Magness [Sat, 20 Jan 2018 14:23:45 +0000 (09:23 -0500)]
Bug fix
remove require for deleted file
Michael [Sat, 20 Jan 2018 14:10:37 +0000 (14:10 +0000)]
Added documentation
Michael [Sat, 20 Jan 2018 13:54:14 +0000 (13:54 +0000)]
Reworked mod/item - fixing wrong thread parent and mail stuff
Adam Magness [Sat, 20 Jan 2018 13:22:18 +0000 (08:22 -0500)]
Update hook names
update hook names and other plugin references.
Adam Magness [Thu, 18 Jan 2018 00:38:14 +0000 (19:38 -0500)]
Review updates
Adam Magness [Thu, 18 Jan 2018 00:18:00 +0000 (19:18 -0500)]
CSS files
update plugin references in css files.
Adam Magness [Thu, 18 Jan 2018 00:07:07 +0000 (19:07 -0500)]
Update docs
changelog, install and doc folder
Adam Magness [Wed, 17 Jan 2018 19:22:38 +0000 (14:22 -0500)]
Change plugin to addon
change the use of plugin to addon where appropriate.
Adam Magness [Wed, 17 Jan 2018 18:56:12 +0000 (13:56 -0500)]
Remove old file
remove include/plugin.php
Adam Magness [Wed, 17 Jan 2018 18:55:29 +0000 (13:55 -0500)]
Remove require
remove require_once for plugins.php
Adam Magness [Wed, 17 Jan 2018 18:52:25 +0000 (13:52 -0500)]
Update Theme functions and calls
Update function names and calls for Theme class.
Adam Magness [Wed, 17 Jan 2018 18:42:40 +0000 (13:42 -0500)]
Update Addon functions and calls
Update function names and calls for Addon class.
Adam Magness [Wed, 17 Jan 2018 17:03:10 +0000 (12:03 -0500)]
Create Addon and Theme classes
Create Addon and Theme classes and functions from plugin.php to appropriate class.
Michael [Sat, 20 Jan 2018 10:17:04 +0000 (10:17 +0000)]
Merge remote-tracking branch 'upstream/develop' into item-permissions
Michael Vogel [Sat, 20 Jan 2018 08:25:17 +0000 (09:25 +0100)]
Merge pull request #4282 from MrPetovan/bug/3337-video-max-width
[frio] Add max-width: 100% for video tags
Michael Vogel [Sat, 20 Jan 2018 08:24:16 +0000 (09:24 +0100)]
Merge pull request #4283 from MrPetovan/bug/2487-fix-autolink-regex
Fix autolink regular expression to include accents