clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • e2e38fcd51 Merge pull request #4293 from MrPetovan/task/3942-switch-to-password-hash() Michael Vogel 2018-01-22 23:16:47 +01:00
  • b34e8e0193 Merge pull request #4307 from annando/mod-item-cleaning Hypolite Petovan 2018-01-22 17:15:10 -05:00
  • 87db789e98 Corrected "attag" query Michael 2018-01-22 21:59:27 +00:00
  • b4d14164bb The url detection in BBCode is too greedy Michael 2018-01-22 21:52:32 +00:00
  • 812cb3b174 Some clean up for mod/item.php Michael 2018-01-22 21:37:21 +00:00
  • 0d697cffc7 Merge pull request #4305 from annando/tag-comment Hypolite Petovan 2018-01-22 12:25:45 -05:00
  • e8effad7f2 Bugfix: Always comment on the correct entry Michael 2018-01-22 17:16:46 +00:00
  • 4fb24d4ebb Make the user.legacy_password field boolean Hypolite Petovan 2018-01-22 07:48:30 -05:00
  • 316d57d186 Merge pull request #4300 from MrPetovan/task/remove-network-nets-groups-from-config Michael Vogel 2018-01-22 10:20:12 +01:00
  • 4af9c26fd3 Merge pull request #4303 from annando/bugfix-public-commenting Tobias Diekershoff 2018-01-22 10:16:33 +01:00
  • d588ef32e0 Bugfix: Commenting on public posts (that you don't follow) was not possible anymore Michael 2018-01-22 07:14:34 +00:00
  • 9853f552fb Merge pull request #4301 from MrPetovan/bug/3396-frio-fix-contact-autocomplete Michael Vogel 2018-01-22 00:03:10 +01:00
  • 1b2334745a Fix limit and search parameters in frio_acl_lookup Hypolite Petovan 2018-01-21 12:39:47 -05:00
  • d3fa7ae5ae Fix contact autocomplete template repeated picture Hypolite Petovan 2018-01-21 11:48:16 -05:00
  • 0a8e350e4b Remove PConfig nets.selected and group.selected from mod/network Hypolite Petovan 2018-01-21 10:49:05 -05:00
  • cb1e305970 Fix quote style for non-SQL, non-translation strings in mod/network Hypolite Petovan 2018-01-21 10:48:15 -05:00
  • 83124a8d57 Fix formatting in mod/network Hypolite Petovan 2018-01-21 10:26:05 -05:00
  • 3d617b9535 Merge pull request #4299 from MrPetovan/task/bump-code-font-size Michael Vogel 2018-01-21 15:12:22 +01:00
  • 801c00d906 Bump code font-size to .85em (85%) Hypolite Petovan 2018-01-21 08:50:29 -05:00
  • 0614bfb986 Fix indentation in global.css Hypolite Petovan 2018-01-21 08:50:00 -05:00
  • a5952e5425 Merge pull request #4297 from hoergen/develop Hypolite Petovan 2018-01-21 08:34:01 -05:00
  • d384b7b117 changed some spacing hoergen 2018-01-21 14:29:18 +01:00
  • 2bfd9f9d87 Add database update function to use new hashes Hypolite Petovan 2018-01-20 22:37:13 -05:00
  • b0a764b14c Use password_hash() for passwords Hypolite Petovan 2018-01-20 22:29:03 -05:00
  • c53c2fffa5 [database] Add user.legacy_password field Hypolite Petovan 2018-01-20 22:24:58 -05:00
  • 986e22d9e1 Merge pull request #4292 from annando/reduce-items.php Hypolite Petovan 2018-01-20 20:24:42 -05:00
  • a21c24bfc4 Merge pull request #4285 from MrPetovan/task/3942-centralize-password-update Michael Vogel 2018-01-21 01:25:30 +01:00
  • 004f46e600 Standards Michael 2018-01-21 00:18:31 +00:00
  • a827522f53 Update comment with updated expiration time Hypolite Petovan 2018-01-20 19:15:05 -05:00
  • 071b1c038a Update expiration delay to 60 minutes Hypolite Petovan 2018-01-20 19:14:41 -05:00
  • ed6f4cdbde Change password reset wording to acknowledge the expiration Hypolite Petovan 2018-01-20 19:12:14 -05:00
  • 0bacff3994 Update database.sql with user.pwdreset_time field Hypolite Petovan 2018-01-20 19:09:40 -05:00
  • efa8dbcfb3 Relocate functions in items.php into several classes Michael 2018-01-20 23:52:54 +00:00
  • 0888f51b4b Add password reset request expiration Hypolite Petovan 2018-01-20 18:15:55 -05:00
  • 391c591322 Add pwdreset_time field to user table Hypolite Petovan 2018-01-20 18:06:58 -05:00
  • 209c43ebbc Centralize password hashing in Model\User Hypolite Petovan 2018-01-19 22:49:06 -05:00
  • b1e3d09533 Fix formatting mod/lostpass Hypolite Petovan 2018-01-19 22:27:31 -05:00
  • 3ac1992237 Merge pull request #4291 from annando/dont-delete Hypolite Petovan 2018-01-20 17:21:26 -05:00
  • 7be49d9411 Don't delete - but only mark as deleted Michael 2018-01-20 22:16:43 +00:00
  • 352dd020a8 Merge pull request #4287 from annando/item-permissions Hypolite Petovan 2018-01-20 16:57:19 -05:00
  • 745bc7cf3f Merge remote-tracking branch 'upstream/develop' into item-permissions Michael 2018-01-20 19:51:23 +00:00
  • 670e2ad271 Some safety precautions Michael 2018-01-20 19:48:51 +00:00
  • 610f017b28 Merge pull request #4288 from zeroadam/Addon Hypolite Petovan 2018-01-20 14:36:23 -05:00
  • b8c4332a20 Only enable "pubmail" when it is enabled Michael 2018-01-20 19:31:47 +00:00
  • b57f455dc8 Removed test comment Michael 2018-01-20 17:34:53 +00:00
  • fb372877f6 Rename template and doc Adam Magness 2018-01-20 09:45:22 -05:00
  • 670578f799 Merge pull request #4289 from zeroadam/bugfix-nogroup Hypolite Petovan 2018-01-20 09:31:48 -05:00
  • d1b003c694 Bug fix Adam Magness 2018-01-20 09:23:45 -05:00
  • 1649a12b84 Added documentation Michael 2018-01-20 14:10:37 +00:00
  • 1b74650807 Reworked mod/item - fixing wrong thread parent and mail stuff Michael 2018-01-20 13:54:14 +00:00
  • 5d03735238 Update hook names Adam Magness 2018-01-20 08:22:18 -05:00
  • ac374f7773 Review updates Adam Magness 2018-01-17 19:38:14 -05:00
  • a7d887a68e CSS files Adam Magness 2018-01-17 19:18:00 -05:00
  • 20a16b0b35 Update docs Adam Magness 2018-01-17 19:07:07 -05:00
  • b86b04a81a Change plugin to addon Adam Magness 2018-01-17 14:22:38 -05:00
  • 3bad83f24e Remove old file Adam Magness 2018-01-17 13:56:12 -05:00
  • 6c4c567319 Remove require Adam Magness 2018-01-17 13:55:29 -05:00
  • d07536e032 Update Theme functions and calls Adam Magness 2018-01-17 13:52:25 -05:00
  • 11cf36105c Update Addon functions and calls Adam Magness 2018-01-17 13:42:40 -05:00
  • 213f6ae1a1 Create Addon and Theme classes Adam Magness 2018-01-17 12:03:10 -05:00
  • b5b298c8d6 Merge remote-tracking branch 'upstream/develop' into item-permissions Michael 2018-01-20 10:17:04 +00:00
  • 5d20bbaace Merge pull request #4282 from MrPetovan/bug/3337-video-max-width Michael Vogel 2018-01-20 09:25:17 +01:00
  • 104a03e82a Merge pull request #4283 from MrPetovan/bug/2487-fix-autolink-regex Michael Vogel 2018-01-20 09:24:16 +01:00
  • f0a23aa71c Merge pull request #4284 from MrPetovan/bug/3020-change-siteinfo-to-servers Michael Vogel 2018-01-20 09:19:51 +01:00
  • 64dc640565 Merge pull request #4286 from MrPetovan/task/fix-scrutinizer-issues Michael Vogel 2018-01-20 08:58:02 +01:00
  • 4cca8280b4 Fix undefined variables PHP Notice Hypolite Petovan 2018-01-19 00:32:37 -05:00
  • fee80a57bc Change /siteinfo to /servers for directory URL on follow page Hypolite Petovan 2018-01-19 21:51:42 -05:00
  • 491a1373e0 Fix autolink regular expression to include accents Hypolite Petovan 2018-01-19 21:39:57 -05:00
  • 4ed86adfab [frio] Add max-width: 100% for video tags Hypolite Petovan 2018-01-19 20:14:26 -05:00
  • f7e3b29819 Improved user id handling Michael 2018-01-19 22:46:24 +00:00
  • ce411da958 Merge pull request #4276 from MrPetovan/bug/4272-upgrade-php-encryption Michael Vogel 2018-01-19 23:45:37 +01:00
  • 98344a9d08 Remove reference to RINO version 2 Hypolite Petovan 2018-01-19 12:06:09 -05:00
  • 2c284f30c2 Revert bumping the site RSA key strength to 2048 Hypolite Petovan 2018-01-19 11:58:26 -05:00
  • dd07c47ab2 Code cleanup in Protocol\DFRN Hypolite Petovan 2018-01-19 11:50:43 -05:00
  • 035394cbf2 RINO code cleanup Hypolite Petovan 2018-01-19 11:34:56 -05:00
  • 633b133db6 [Composer] Remove defuse/php-encryption dependency Hypolite Petovan 2018-01-19 11:26:06 -05:00
  • 5bc7f4a442 Remove RINO2 and RINO3 Hypolite Petovan 2018-01-19 11:25:48 -05:00
  • 5db1717f46 Re-added missing RINO admin setting values Hypolite Petovan 2018-01-19 08:13:32 -05:00
  • 2e58120bbb Fix RINO admin setting values Hypolite Petovan 2018-01-19 08:10:59 -05:00
  • cadf8c5e5d Bump new users RSA key strength Hypolite Petovan 2018-01-18 23:47:54 -05:00
  • de70007a46 Update RINO settings Hypolite Petovan 2018-01-18 20:15:56 -05:00
  • 7af6cc8454 Add RINO version 3 encrypt/decrypt Hypolite Petovan 2018-01-18 20:15:26 -05:00
  • 6857392067 [Composer] Upgrade defuse/php-encryption to version ^2.0 Hypolite Petovan 2018-01-18 20:13:50 -05:00
  • 5e42577944 Merge pull request #4266 from MrPetovan/task/4116-move-chartjs-to-composer Tobias Diekershoff 2018-01-19 15:52:25 +01:00
  • 8c47df474d Merge pull request #4277 from annando/item-permissions Hypolite Petovan 2018-01-19 08:18:37 -05:00
  • d22adc98b2 Just some precaution Michael 2018-01-19 07:50:11 +00:00
  • a07670ac30 Ensure that the user id in a thread always stays the same Michael 2018-01-19 07:02:43 +00:00
  • 910fda2383 Fix formatting in federation.tpl Hypolite Petovan 2018-01-18 11:24:56 -05:00
  • b963e7cc38 Revert tabs into space in federation.tpl Hypolite Petovan 2018-01-18 11:16:16 -05:00
  • 269b3ee2a4 Delete library/Chart.js Hypolite Petovan 2018-01-16 22:51:31 -05:00
  • 383641f58f Migrate federation page to latest version of Chart.js Hypolite Petovan 2018-01-16 22:50:48 -05:00
  • ffa240dfde Add Chart.js to Composer Hypolite Petovan 2018-01-16 22:50:33 -05:00
  • 4f43d9e501 Merge pull request #4267 from MrPetovan/task/4116-move-colorbox-to-composer Michael Vogel 2018-01-18 22:34:20 +01:00
  • 380ae224a0 Merge pull request #4275 from annando/like-dislike Hypolite Petovan 2018-01-18 16:30:18 -05:00
  • 7b3e334f06 "save to folder" and "mark" can't work on global items Michael 2018-01-18 20:54:40 +00:00
  • 2df44eb084 Liking of your own stuff wasn't possible/enable dislike for Diaspora Michael 2018-01-18 20:16:14 +00:00
  • 271f0629f0 Merge pull request #4274 from annando/signature-atuff Hypolite Petovan 2018-01-18 14:50:23 -05:00
  • b6f15ec5ce Bugfix: The Diaspora signature wasn't stored by nested comments Michael 2018-01-18 19:38:51 +00:00
  • e210fdc625 Updated composer.lock Hypolite Petovan 2018-01-18 11:29:00 -05:00
  • c76fc26206 Remove js/jquery.js Hypolite Petovan 2018-01-17 19:45:45 -05:00