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

Commit Graph

  • 1a8d8e4c07 Merge pull request #4510 from tobiasd/20180227-zhcn Michael Vogel 2018-02-27 08:13:13 +01:00
  • 52049d4cb2 update to the zh-cn THX mytbk Tobias Diekershoff 2018-02-27 08:00:28 +01:00
  • 0e0ba4a2dd Merge pull request #4509 from annando/fix-network-update Tobias Diekershoff 2018-02-27 07:32:18 +01:00
  • 15cd4792b8 Bugfix: The network update after a post now works again Michael 2018-02-27 06:28:53 +00:00
  • 16a55a021c Merge pull request #4505 from annando/update-avatar Hypolite Petovan 2018-02-26 17:40:01 -05:00
  • 20368cbbf4 Fix for network update (number of maximum comments set to 0) Michael 2018-02-26 22:15:57 +00:00
  • d4c95e0032 Contact updates should now work more reliable Michael 2018-02-26 21:53:42 +00:00
  • 01d2f7d5fb Merge pull request #4504 from tobiasd/20180226-msg Hypolite Petovan 2018-02-26 12:01:48 -05:00
  • 324a2939c7 regen master messages.po with new help text in settings Tobias Diekershoff 2018-02-26 17:52:40 +01:00
  • ba560ff76c Merge pull request #4491 from tobiasd/20180224-settinghelp Hypolite Petovan 2018-02-26 11:30:23 -05:00
  • 56bd9ec148 not only the others Tobias Diekershoff 2018-02-26 17:27:00 +01:00
  • 1b7a307423 annon it is Tobias Diekershoff 2018-02-26 17:21:47 +01:00
  • 3dac937f22 Merge pull request #4501 from annando/fix-tag-search Hypolite Petovan 2018-02-26 11:13:51 -05:00
  • 04f48e4cf6 Merge pull request #4503 from tobiasd/20180226-ganggo Hypolite Petovan 2018-02-26 11:13:34 -05:00
  • 3950b2f8c6 added ganggo project to the federation statistics page Tobias Diekershoff 2018-02-26 17:10:47 +01:00
  • 2b9561a774 Merge pull request #4502 from annando/guid-from-mail Hypolite Petovan 2018-02-26 09:36:56 -05:00
  • a64e7a988c Merge pull request #4500 from annando/improve-network Hypolite Petovan 2018-02-26 09:35:23 -05:00
  • 9e721c0908 guid creation: Take the hostname from mail addresses for mail posts Michael 2018-02-26 11:48:05 +00:00
  • 84ea6cab32 Fix: Tag searches hadn't been stored as tags Michael 2018-02-26 11:45:53 +00:00
  • a700b3a729 Fix for fetching too old dates Michael 2018-02-26 10:44:54 +00:00
  • 9ac9481105 Flexible update timeout value Michael 2018-02-26 07:41:58 +00:00
  • fe68e99c7c The tag query should be much faster now Michael 2018-02-26 06:59:32 +00:00
  • d2728cad2e Children for the network page are now fetched correctly in the conversation Michael 2018-02-26 06:38:27 +00:00
  • 9308b7f2df inner join is better Michael 2018-02-25 21:58:21 +00:00
  • a1eb5a584f Improve the queries on the network page Michael 2018-02-25 21:33:15 +00:00
  • 28fa27ea0e some wording changes Tobias Diekershoff 2018-02-25 08:50:50 +01:00
  • b8114f4e9d Merge pull request #4493 from tobiasd/20180223-vagrant Michael Vogel 2018-02-24 13:31:20 +01:00
  • 8a844b1440 added some help texts to the Security and Privacy profile settings Tobias Diekershoff 2018-02-24 08:00:11 +01:00
  • b0b690ac94 the host name in the VM does not need the xenial anymore Tobias Diekershoff 2018-02-23 16:04:20 +01:00
  • 0efbbe18bf make /tmp writeable in the Vagrant VM Tobias Diekershoff 2018-02-23 16:02:37 +01:00
  • 9fc0e02bf9 Merge pull request #4490 from annando/item-enhanced Hypolite Petovan 2018-02-22 09:56:16 -05:00
  • d7442559e0 Merge remote-tracking branch 'upstream/develop' into item-enhanced Michael 2018-02-22 10:04:57 +00:00
  • 8a3927e12c Merge pull request #4489 from annando/missing-fid Hypolite Petovan 2018-02-22 05:03:30 -05:00
  • a74b5fdde8 When refreshing the fcontact, the returned array was incomplete Michael 2018-02-22 09:59:21 +00:00
  • 24a20fc294 Improved logging for salmon posts to check for missing contacts in item post Michael 2018-02-22 09:57:06 +00:00
  • f8cb18ff64 Merge pull request #4487 from annando/item-enhanced Hypolite Petovan 2018-02-22 04:55:31 -05:00
  • 2f2e7b9d5a fetch_first is now used / additional logging Michael 2018-02-22 09:51:59 +00:00
  • 046352606e Bugfix: $uid wasn't available in that context Michael 2018-02-22 07:05:56 +00:00
  • 2897333c28 Most queries are now done with the dba functions Michael 2018-02-22 06:52:58 +00:00
  • 8ad2ebbf47 $u is now $user Michael 2018-02-21 23:10:29 +00:00
  • 8e0496c040 Better naming of variables Michael 2018-02-21 22:55:23 +00:00
  • 5a91c746e9 $arr is now $item Michael 2018-02-21 21:39:07 +00:00
  • 82bd26edb9 The item class had been improved (e.g. database calls) Michael 2018-02-21 21:08:37 +00:00
  • 6067c29524 Merge pull request #4485 from annando/fewer-gcontact Hypolite Petovan 2018-02-21 00:26:18 -05:00
  • ae705261f1 Function is only used locally Michael 2018-02-21 05:21:55 +00:00
  • a59796d1d4 No gcontact-id anymore (It wasn't really used) Michael 2018-02-21 05:15:55 +00:00
  • eed35c3e69 Merge pull request #4484 from annando/item-guid Hypolite Petovan 2018-02-20 23:22:11 -05:00
  • 1fb82720be Merge pull request #4483 from annando/not-always-db-update Hypolite Petovan 2018-02-20 23:16:55 -05:00
  • cf74da9c86 Merge pull request #4480 from annando/better-resource-id Hypolite Petovan 2018-02-20 23:13:24 -05:00
  • 475969a1d3 The guid creation for posts is now done in a separate function Michael 2018-02-21 04:13:13 +00:00
  • ecc0395151 Only do a database update when the current system version is lower Michael 2018-02-21 04:06:17 +00:00
  • 6e642ad6d4 Only not generate prefix when parameter is false Michael 2018-02-21 03:37:20 +00:00
  • 5a30dfcf34 Merge remote-tracking branch 'upstream/develop' into better-resource-id Michael 2018-02-21 03:28:47 +00:00
  • dd0147bd01 Merge pull request #4479 from annando/db-structure Hypolite Petovan 2018-02-20 21:38:35 -05:00
  • 60764b7bc3 Oops ... Michael 2018-02-20 12:59:37 +00:00
  • 3e46382459 Standard stuff Michael 2018-02-20 11:20:28 +00:00
  • a3af6807ac Improved resource id creation Michael 2018-02-20 10:02:07 +00:00
  • d90b93cfda Several more improvements to the database structure Michael 2018-02-20 07:40:21 +00:00
  • 6c26dcf1c7 The network is now just a 4 character field Michael 2018-02-19 13:58:04 +00:00
  • dcd08c5236 Merge pull request #4474 from annando/issue-1312 Hypolite Petovan 2018-02-18 17:37:01 -05:00
  • 0062fede79 Issue 1312: Improve account expiry Michael 2018-02-18 22:19:20 +00:00
  • 2351e14e16 Merge pull request #4473 from annando/issue-4228 Hypolite Petovan 2018-02-18 13:28:47 -05:00
  • d0fa80b195 Issue 4228: Don't post an item if it belongs to a picture upload without an post Michael 2018-02-18 17:29:14 +00:00
  • 281734d5dc Merge pull request #4471 from annando/parent-uid Hypolite Petovan 2018-02-18 11:48:39 -05:00
  • eac6168553 Merge pull request #4472 from annando/issue-4369 Hypolite Petovan 2018-02-18 11:46:04 -05:00
  • a9a85849f4 Issue 4369: Added logging to know why a post is stored Michael 2018-02-18 16:43:18 +00:00
  • a62dd4debf Merge pull request #4465 from MrPetovan/task/4463-frio-style-settings-addon Tobias Diekershoff 2018-02-18 17:12:15 +01:00
  • fd53b541e5 Frontend to set the parent-uid field Michael 2018-02-18 13:19:47 +00:00
  • f0268c6142 Fix indentation in frio/css/style.css Hypolite Petovan 2018-02-16 10:47:34 -05:00
  • 96078a1fca [frio] Make settings/addon look like settings/display Hypolite Petovan 2018-02-15 23:22:50 -05:00
  • b52252bf39 Merge pull request #4470 from tobiasd/20180218-de Michael Vogel 2018-02-18 11:05:49 +01:00
  • a920896fa5 Merge pull request #4469 from tobiasd/20180218-missingL10n Michael Vogel 2018-02-18 11:04:42 +01:00
  • 0611093d4e update for DE translation Tobias Diekershoff 2018-02-18 10:14:55 +01:00
  • 59aed9533e missing L10n::t for date string formatting Tobias Diekershoff 2018-02-18 09:56:27 +01:00
  • 07c35935f9 Merge pull request #4468 from annando/issue-4396 Hypolite Petovan 2018-02-17 09:08:12 -05:00
  • d119beef3f Issue 4396: Avoid SQL error during UImport Michael 2018-02-17 10:37:14 +00:00
  • 35974a9c7b Merge pull request #4467 from friendica/revert-4464-develop Hypolite Petovan 2018-02-16 11:12:56 -05:00
  • e2d8c80f33 Revert "Fix PHP Warning: preg_replace(): Compilation failed in include/items" Hypolite Petovan 2018-02-16 11:12:41 -05:00
  • 171c052a1d Merge pull request #4466 from tobiasd/20180216-entranslation Hypolite Petovan 2018-02-16 07:35:14 -05:00
  • 9fa274ff2f Merge pull request #4464 from MrPetovan/develop Tobias Diekershoff 2018-02-16 11:05:36 +01:00
  • a4ba2fcafa EN US and GB translation updates Tobias Diekershoff 2018-02-16 10:33:10 +01:00
  • 31831b9fdb Remove partial preg_quote in include/items Hypolite Petovan 2018-02-16 00:31:32 -05:00
  • f4d76d10b2 Fix PHP Warning: preg_replace(): Compilation failed in include/items Hypolite Petovan 2018-02-15 22:13:45 -05:00
  • 753f92c234 Merge pull request #4462 from MrPetovan/task/3878-move-include-bbcode-to-src Michael Vogel 2018-02-15 21:35:27 +01:00
  • 956ed54800 Remove IDE quirk in mod/register Hypolite Petovan 2018-02-15 15:10:00 -05:00
  • 71cb1523d5 Remove include/bbcode.php Hypolite Petovan 2018-02-14 22:05:16 -05:00
  • 9e3bae5caa Remove references to include/bbcode.php Hypolite Petovan 2018-02-14 22:01:14 -05:00
  • 05a2ea4220 Refactor comments including "bbcode()" Hypolite Petovan 2018-02-14 22:00:43 -05:00
  • 4e4f5862b2 Remove unused $preserve_nl parameter from bb2diaspora() Hypolite Petovan 2018-02-14 21:45:41 -05:00
  • 0c52866693 Refactor bbcode() into BBCode::convert() Hypolite Petovan 2018-02-14 21:33:55 -05:00
  • 29f5270313 Remove unused parameter preserve_nl in BBCode::convert Hypolite Petovan 2018-02-14 20:28:10 -05:00
  • ee380c3149 Fix undeclared variable in Content\Text\BBCode Hypolite Petovan 2018-02-14 20:25:23 -05:00
  • 029df40b87 Merge pull request #4461 from annando/bugfix-uimport Hypolite Petovan 2018-02-14 18:32:11 -05:00
  • 3e456ddcb8 Issue 4396: WSOD with uimport Michael 2018-02-14 23:13:53 +00:00
  • bcd896c604 Merge pull request #4460 from annando/bugfix-dfrn-mail Hypolite Petovan 2018-02-14 17:11:47 -05:00
  • 2f71a6f80f DFRN: Bugfix for not storing mails Michael 2018-02-14 22:08:16 +00:00
  • 41cd5af54f Merge pull request #4459 from annando/unmark-contact Hypolite Petovan 2018-02-14 17:01:17 -05:00
  • 79696a19e5 Merge pull request #4455 from MrPetovan/task/4176-fix-undeclared-variables-2 Michael Vogel 2018-02-14 22:49:43 +01:00
  • 43b1eccbcd Bugfix and improvements for unmarking potentially archived contacts Michael 2018-02-14 21:18:16 +00:00
  • cdc8a3b68d Merge pull request #4457 from annando/accept-archived Hypolite Petovan 2018-02-14 09:46:24 -05:00