Hypolite Petovan
|
f104817967
|
Merge pull request #5967 from annando/ap-nick
Fix function naming
|
2018-10-19 10:38:51 -04:00 |
|
Michael
|
bedab33e0b
|
Fix function naming
|
2018-10-19 13:08:46 +00:00 |
|
Hypolite Petovan
|
ec0d3a6eac
|
Merge pull request #5946 from JonnyTischbein/move_include_security
Move and Split include/security
|
2018-10-19 08:55:08 -04:00 |
|
Hypolite Petovan
|
6e164ed09f
|
Merge pull request #5965 from annando/ap-nick
Use nickname based mentions for AP
|
2018-10-19 08:51:38 -04:00 |
|
Jonny Tischbein
|
cafd5ca781
|
update function names in logger and comments
|
2018-10-19 10:03:52 +02:00 |
|
Jeroen De Meerleer
|
bad7d1a9dc
|
updated to match coding styles
|
2018-10-19 09:45:00 +02:00 |
|
Jeroen De Meerleer
|
65f2fc39e2
|
fixed view of active embedded videos
|
2018-10-19 09:37:15 +02:00 |
|
Michael
|
cdeb4682ef
|
Use nickname based mentions for AP
|
2018-10-19 05:27:54 +00:00 |
|
Hypolite Petovan
|
ee5f86d836
|
Merge pull request #5964 from annando/item-thread
Use item class instead of direct call
|
2018-10-18 23:52:40 -04:00 |
|
Michael Vogel
|
8cecc9fb97
|
Merge pull request #5962 from friendica/bug/5960-fix-register-email-translation-params
Remove superfluous L10n::t() parameter in Model\user
|
2018-10-19 05:34:24 +02:00 |
|
Michael Vogel
|
45156652cc
|
Merge pull request #5963 from MrPetovan/bug/5956-catch-more-diaspora-magic-links
Diaspora: Widen the magic link regular expression
|
2018-10-19 05:30:52 +02:00 |
|
Michael
|
4ae37c6196
|
Merge remote-tracking branch 'upstream/develop' into item-thread
|
2018-10-19 03:19:34 +00:00 |
|
Hypolite Petovan
|
d0681075bf
|
Add itemsource module
|
2018-10-18 22:49:25 -04:00 |
|
Hypolite Petovan
|
eb714f0487
|
Diaspora: Widen the magic link regular expression
|
2018-10-18 22:39:06 -04:00 |
|
Hypolite Petovan
|
8315940c39
|
Merge pull request #5961 from annando/simpler-item
The handling with item-content and item-activity had been simplified
|
2018-10-18 18:24:09 -04:00 |
|
Hypolite Petovan
|
18763e32af
|
Remove superfluous L10n::t() parameter in Model\user
|
2018-10-18 18:22:48 -04:00 |
|
Michael
|
0628b44f8e
|
The handling with item-content and item-activity had been simplified
|
2018-10-18 21:35:48 +00:00 |
|
Hypolite Petovan
|
50531d1c1d
|
Merge pull request #5958 from vinzv/patch-1
Fix app/client links
|
2018-10-18 16:52:44 -04:00 |
|
vinzv
|
2b663ed2b6
|
Fix broken credits box
Otherwise the content is exceeding the box, both on desktop and mobile.
|
2018-10-18 22:49:03 +02:00 |
|
vinzv
|
9f0c039b6b
|
Fix app/client links
|
2018-10-18 22:34:19 +02:00 |
|
Ralf Thees
|
fc4d01c088
|
Merge branch 'develop' of https://github.com/friendica/friendica into develop
|
2018-10-18 21:22:13 +02:00 |
|
Michael Vogel
|
ca86a9e1d6
|
Merge pull request #5957 from friendica/bug/5955-restore-preshare
Restore preshare prepending in BBCode::convertShare
|
2018-10-18 19:34:29 +02:00 |
|
Hypolite Petovan
|
ee32cf6b92
|
Restore preshare prepending in BBCode::convertShare
Fixes #5955
Follow-up to #5942
|
2018-10-18 11:23:48 -04:00 |
|
Hypolite Petovan
|
a1919992b9
|
Merge pull request #5954 from annando/fix-null-receiver
AP: Fix "null" receiver
|
2018-10-18 10:05:05 -04:00 |
|
Michael Vogel
|
2a3d5da8d6
|
Merge pull request #5953 from MrPetovan/task/5891-contacts-follow-up
Replace remaining instances of "contacts/"
|
2018-10-18 16:02:02 +02:00 |
|
Michael
|
688174e6c0
|
AP: Fix "null" receiver
|
2018-10-18 12:25:57 +00:00 |
|
Hypolite Petovan
|
6d5b2c484d
|
Replace remaining instances of "contacts/"
|
2018-10-18 07:48:34 -04:00 |
|
Ralf Thees
|
fdac992b6b
|
Merge branch 'develop' of https://github.com/friendica/friendica into develop
|
2018-10-18 10:42:10 +02:00 |
|
Tobias Diekershoff
|
e2f005f68c
|
Merge pull request #5952 from annando/ap-fixes
AP: Fix a notice / avoid an error when fetched content hadn't been an array
|
2018-10-18 08:02:27 +02:00 |
|
Michael
|
8035bad8e2
|
AP: Fix a notice / avoid an error when fetched content hadn't been an array
|
2018-10-18 05:54:44 +00:00 |
|
Hypolite Petovan
|
da2a17495d
|
Merge pull request #5951 from annando/endless-contact
Avoid endless loop when trying to fetch contact id
|
2018-10-18 00:44:07 -04:00 |
|
Hypolite Petovan
|
6d420dfe9e
|
Merge pull request #5950 from annando/no-polling
For test purposes we can now deactivate polling
|
2018-10-18 00:43:35 -04:00 |
|
Michael
|
92816dc725
|
Improved loop detection
|
2018-10-18 03:33:08 +00:00 |
|
Michael
|
35da40c2cb
|
Avoid endless loop when trying to fetch contact id
|
2018-10-18 03:01:34 +00:00 |
|
Michael
|
d307aa1484
|
For test purposes we can now deactivate polling
|
2018-10-18 02:46:02 +00:00 |
|
Ralf Thees
|
5201e9009d
|
Inserted missing hidden input with form_security_token
|
2018-10-17 22:53:24 +02:00 |
|
Jonny Tischbein
|
a937cf06a3
|
add remaning/moving to files not touch by refactoring because of typo
|
2018-10-17 22:35:49 +02:00 |
|
Michael Vogel
|
a19f8d642d
|
Merge pull request #5942 from MrPetovan/feature/3218-add-convert-share-callback
Add BBCode::convertShare callback parameter
|
2018-10-17 22:01:02 +02:00 |
|
Jonny Tischbein
|
0c0e17b7a7
|
Remove unneeded Util/Security includings + Resolve including merge conflict with develop
|
2018-10-17 21:52:08 +02:00 |
|
Jonny Tischbein
|
f3fc1f36ca
|
Renaming functions + moving functions from security to Model/Item and BaseModule + fix multiline comments
|
2018-10-17 21:30:41 +02:00 |
|
Ralf Thees
|
a298a1f8d5
|
Merge branch 'develop' of https://github.com/friendica/friendica into develop
|
2018-10-17 21:19:52 +02:00 |
|
Jonny Tischbein
|
3065d1c40a
|
Add Link promt in comment + only add URL instead of attachement via parse_url
|
2018-10-17 21:05:45 +02:00 |
|
Michael Vogel
|
389685e099
|
Merge pull request #5920 from MrPetovan/bug/remove-password-from-register
Avoid storing plaintext password in register table
|
2018-10-17 21:04:11 +02:00 |
|
Hypolite Petovan
|
e254ace9d5
|
Merge pull request #5947 from annando/uri-id
Use "uri-id" for item relations
|
2018-10-17 14:45:40 -04:00 |
|
Michael
|
62ad755980
|
Use "uri-id" for item relations
|
2018-10-17 18:34:24 +00:00 |
|
Jonny Tischbein
|
ce2b1f5715
|
Rename function Authentication::authenticate_success to Authentication::success
|
2018-10-17 18:45:32 +02:00 |
|
Jonny Tischbein
|
45e5a7f59f
|
remove unsed require_onces of security.php
|
2018-10-17 18:39:27 +02:00 |
|
Hypolite Petovan
|
057385a4ec
|
Add $is_quote_share parameter to convert share callback
- Restore former behavior when content is present before [share] block
|
2018-10-17 08:20:56 -04:00 |
|
Jonny Tischbein
|
05be2db725
|
Move include/security tp /src/Core/Authentication and /src/Util/Security
|
2018-10-17 14:19:58 +02:00 |
|
Hypolite Petovan
|
55e4b5943c
|
Merge pull request #5945 from zeroadam/More-5493
Remaining contacts to contact
|
2018-10-17 07:52:47 -04:00 |
|