 Michael
|
60764b7bc3
|
Oops ...
|
2018-02-20 12:59:37 +00:00 |
|
|
Michael
|
3e46382459
|
Standard stuff
|
2018-02-20 11:20:28 +00:00 |
|
|
Michael
|
a3af6807ac
|
Improved resource id creation
|
2018-02-20 10:02:07 +00:00 |
|
|
Michael
|
d90b93cfda
|
Several more improvements to the database structure
|
2018-02-20 07:40:21 +00:00 |
|
|
Michael
|
6c26dcf1c7
|
The network is now just a 4 character field
|
2018-02-19 13:58:04 +00:00 |
|
Hypolite Petovan
|
dcd08c5236
|
Merge pull request #4474 from annando/issue-1312
Issue 1312: Improve account expiry
|
2018-02-18 17:37:01 -05:00 |
|
|
Michael
|
0062fede79
|
Issue 1312: Improve account expiry
|
2018-02-18 22:19:20 +00:00 |
|
|
Hypolite Petovan
|
2351e14e16
|
Merge pull request #4473 from annando/issue-4228
Don't post an item if it belongs to a picture upload without an post
|
2018-02-18 13:28:47 -05:00 |
|
|
Michael
|
d0fa80b195
|
Issue 4228: Don't post an item if it belongs to a picture upload without an post
|
2018-02-18 17:29:14 +00:00 |
|
|
Hypolite Petovan
|
281734d5dc
|
Merge pull request #4471 from annando/parent-uid
Frontend to set the parent-uid field
|
2018-02-18 11:48:39 -05:00 |
|
|
Hypolite Petovan
|
eac6168553
|
Merge pull request #4472 from annando/issue-4369
Issue 4369: Added logging to know why a post is stored
|
2018-02-18 11:46:04 -05:00 |
|
|
Michael
|
a9a85849f4
|
Issue 4369: Added logging to know why a post is stored
|
2018-02-18 16:43:18 +00:00 |
|
 Tobias Diekershoff
|
a62dd4debf
|
Merge pull request #4465 from MrPetovan/task/4463-frio-style-settings-addon
[frio] Style settings/addon
|
2018-02-18 17:12:15 +01:00 |
|
|
Michael
|
fd53b541e5
|
Frontend to set the parent-uid field
|
2018-02-18 13:19:47 +00:00 |
|
|
Hypolite Petovan
|
f0268c6142
|
Fix indentation in frio/css/style.css
|
2018-02-18 08:13:59 -05:00 |
|
|
Hypolite Petovan
|
96078a1fca
|
[frio] Make settings/addon look like settings/display
|
2018-02-18 08:13:59 -05:00 |
|
Michael Vogel
|
b52252bf39
|
Merge pull request #4470 from tobiasd/20180218-de
update for DE translation
|
2018-02-18 11:05:49 +01:00 |
|
|
Michael Vogel
|
a920896fa5
|
Merge pull request #4469 from tobiasd/20180218-missingL10n
missing L10n::t for date string formatting
|
2018-02-18 11:04:42 +01:00 |
|
|
Tobias Diekershoff
|
0611093d4e
|
update for DE translation
|
2018-02-18 10:14:55 +01:00 |
|
|
Tobias Diekershoff
|
59aed9533e
|
missing L10n::t for date string formatting
|
2018-02-18 09:56:27 +01:00 |
|
|
Hypolite Petovan
|
07c35935f9
|
Merge pull request #4468 from annando/issue-4396
Issue 4396: Avoid SQL error during UImport
|
2018-02-17 09:08:12 -05:00 |
|
|
Michael
|
d119beef3f
|
Issue 4396: Avoid SQL error during UImport
|
2018-02-17 10:37:14 +00:00 |
|
|
Hypolite Petovan
|
35974a9c7b
|
Merge pull request #4467 from friendica/revert-4464-develop
Revert "Fix PHP Warning: preg_replace(): Compilation failed in include/items"
|
2018-02-16 11:12:56 -05:00 |
|
|
Hypolite Petovan
|
e2d8c80f33
|
Revert "Fix PHP Warning: preg_replace(): Compilation failed in include/items"
|
2018-02-16 11:12:41 -05:00 |
|
|
Hypolite Petovan
|
171c052a1d
|
Merge pull request #4466 from tobiasd/20180216-entranslation
EN US and GB translation updates
|
2018-02-16 07:35:14 -05:00 |
|
|
Tobias Diekershoff
|
9fa274ff2f
|
Merge pull request #4464 from MrPetovan/develop
Fix PHP Warning: preg_replace(): Compilation failed in include/items
|
2018-02-16 11:05:36 +01:00 |
|
|
Tobias Diekershoff
|
a4ba2fcafa
|
EN US and GB translation updates
|
2018-02-16 10:33:10 +01:00 |
|
|
Hypolite Petovan
|
31831b9fdb
|
Remove partial preg_quote in include/items
|
2018-02-16 00:31:32 -05:00 |
|
|
Hypolite Petovan
|
f4d76d10b2
|
Fix PHP Warning: preg_replace(): Compilation failed in include/items
|
2018-02-15 22:13:45 -05:00 |
|
|
Michael Vogel
|
753f92c234
|
Merge pull request #4462 from MrPetovan/task/3878-move-include-bbcode-to-src
Move include/bbcode to src/ part 2: bbcode()
|
2018-02-15 21:35:27 +01:00 |
|
|
Hypolite Petovan
|
956ed54800
|
Remove IDE quirk in mod/register
|
2018-02-15 15:10:00 -05:00 |
|
|
Hypolite Petovan
|
71cb1523d5
|
Remove include/bbcode.php
|
2018-02-14 22:05:16 -05:00 |
|
|
Hypolite Petovan
|
9e3bae5caa
|
Remove references to include/bbcode.php
|
2018-02-14 22:01:14 -05:00 |
|
|
Hypolite Petovan
|
05a2ea4220
|
Refactor comments including "bbcode()"
|
2018-02-14 22:00:43 -05:00 |
|
|
Hypolite Petovan
|
4e4f5862b2
|
Remove unused $preserve_nl parameter from bb2diaspora()
|
2018-02-14 21:45:41 -05:00 |
|
|
Hypolite Petovan
|
0c52866693
|
Refactor bbcode() into BBCode::convert()
|
2018-02-14 21:33:55 -05:00 |
|
|
Hypolite Petovan
|
29f5270313
|
Remove unused parameter preserve_nl in BBCode::convert
|
2018-02-14 21:31:28 -05:00 |
|
|
Hypolite Petovan
|
ee380c3149
|
Fix undeclared variable in Content\Text\BBCode
|
2018-02-14 20:25:23 -05:00 |
|
|
Hypolite Petovan
|
029df40b87
|
Merge pull request #4461 from annando/bugfix-uimport
Issue 4396: WSOD with uimport
|
2018-02-14 18:32:11 -05:00 |
|
|
Michael
|
3e456ddcb8
|
Issue 4396: WSOD with uimport
|
2018-02-14 23:13:53 +00:00 |
|
|
Hypolite Petovan
|
bcd896c604
|
Merge pull request #4460 from annando/bugfix-dfrn-mail
DFRN: Bugfix for not storing mails
|
2018-02-14 17:11:47 -05:00 |
|
|
Michael
|
2f71a6f80f
|
DFRN: Bugfix for not storing mails
|
2018-02-14 22:08:16 +00:00 |
|
|
Hypolite Petovan
|
41cd5af54f
|
Merge pull request #4459 from annando/unmark-contact
Bugfix and improvements for unmarking potentially archived contacts
|
2018-02-14 17:01:17 -05:00 |
|
|
Michael Vogel
|
79696a19e5
|
Merge pull request #4455 from MrPetovan/task/4176-fix-undeclared-variables-2
[Scrutinizer] Fix undeclared variables part 6: src/ (except Protocol/)
|
2018-02-14 22:49:43 +01:00 |
|
|
Michael
|
43b1eccbcd
|
Bugfix and improvements for unmarking potentially archived contacts
|
2018-02-14 21:18:16 +00:00 |
|
|
Hypolite Petovan
|
cdc8a3b68d
|
Merge pull request #4457 from annando/accept-archived
Diaspora: Accept posts from archived contacts
|
2018-02-14 09:46:24 -05:00 |
|
|
Michael
|
878b2be63d
|
Diaspora: Accept posts from archived contacts
|
2018-02-14 14:29:28 +00:00 |
|
|
Michael Vogel
|
af0e10ee20
|
Merge pull request #4456 from MrPetovan/task/4176-fix-undeclared-variables-3
[Scrutinizer] Fix undeclared variables part 7: mod/ and view/
|
2018-02-14 07:48:35 +01:00 |
|
|
Michael Vogel
|
156bce737c
|
Merge pull request #4454 from MrPetovan/task/4176-fix-undeclared-variables-1
[Scrutinizer] Fix undeclared variables part 5: src/Protocol/
|
2018-02-14 07:30:20 +01:00 |
|
|
Hypolite Petovan
|
7a38fbf84b
|
[Scrutinizer] Fix undeclared variables part 7: mod/ and view/
- Remove unused function `salmon_return()`
|
2018-02-14 00:07:26 -05:00 |
|