Michael
|
94c349a720
|
Don't use count
|
2018-01-15 14:02:34 +00:00 |
|
Michael Vogel
|
cc3b6a265c
|
Merge pull request #4244 from MrPetovan/develop
Composer: php-markdown updated to 1.8.0
|
2018-01-15 14:58:38 +01:00 |
|
Hypolite Petovan
|
53c5af0676
|
Composer: php-markdown updated to 1.8.0
- Classmaps updated
|
2018-01-15 08:56:45 -05:00 |
|
Adam Magness
|
edb8110555
|
Remove old file
remove include/attach.php
|
2018-01-15 08:33:12 -05:00 |
|
Adam Magness
|
a80705a836
|
Function calls
Rename function, update calls
|
2018-01-15 08:32:11 -05:00 |
|
Adam Magness
|
8e5e603008
|
Create mimetype class
move attach.php function to mimetype class
|
2018-01-15 08:30:12 -05:00 |
|
Hypolite Petovan
|
35d334dd26
|
Merge pull request #4240 from annando/sql-definition
SQL structure had changed
|
2018-01-15 07:37:13 -05:00 |
|
Hypolite Petovan
|
cb612c712d
|
Merge pull request #4237 from zeroadam/Profile-#3878
Move identity to src
|
2018-01-15 07:32:30 -05:00 |
|
Michael
|
5d03eb3dae
|
Some SQL servers report different lengths for unsigned types
|
2018-01-15 07:42:05 +00:00 |
|
Michael Vogel
|
7473b55961
|
Merge pull request #4238 from tobiasd/20180115-messages
regenerated master messages.po file
|
2018-01-15 08:04:16 +01:00 |
|
Michael Vogel
|
cbbd7be6b3
|
Merge pull request #4239 from tobiasd/20180115-2018
Happy new year!
|
2018-01-15 08:03:54 +01:00 |
|
Michael
|
f18d459e46
|
Update after comment on public post should now work on the network page
|
2018-01-15 06:59:20 +00:00 |
|
Tobias Diekershoff
|
b3eddc6881
|
Happy new year!
|
2018-01-15 07:45:12 +01:00 |
|
Michael
|
7af564442a
|
SQL structure had changed
|
2018-01-15 06:43:28 +00:00 |
|
Tobias Diekershoff
|
628016f378
|
regenerated master messages.po file
Signed-off-by: Tobias Diekershoff <tobias.diekershoff@gmx.net>
|
2018-01-15 07:37:47 +01:00 |
|
Michael Vogel
|
0e3fe14024
|
Merge pull request #4235 from MrPetovan/task/4116-remove-library-oauth2
Delete unused library/oauth2-php library
|
2018-01-15 07:33:26 +01:00 |
|
Adam Magness
|
430bd7c6ac
|
Review updates
Update function name, descriptive variable names.
|
2018-01-14 23:44:39 -05:00 |
|
Adam Magness
|
41159cd14f
|
use
|
2018-01-14 21:41:56 -05:00 |
|
Adam Magness
|
0c5cc291af
|
More use
more missing use statements
|
2018-01-14 21:38:26 -05:00 |
|
Adam Magness
|
2ef8d72b60
|
Missing use
missing use statement for profile
|
2018-01-14 21:29:19 -05:00 |
|
Adam Magness
|
a01a8a06f2
|
Remove requires
remove requires_once statment
|
2018-01-14 21:26:07 -05:00 |
|
Adam Magness
|
641ab5e247
|
Remove include/identity
remove no longer used file
|
2018-01-14 21:23:18 -05:00 |
|
Adam Magness
|
4fb2547df8
|
Update function calls
update function calls to use profile class
|
2018-01-14 21:22:39 -05:00 |
|
Adam Magness
|
4cfa46186a
|
Move include/identity to src
Copy functions from identity to Profile class
|
2018-01-14 20:13:02 -05:00 |
|
Michael Vogel
|
448ae08dd5
|
Merge pull request #4231 from MrPetovan/bug/3639-fix-diaspora-lf-in-code-blocks
Fix Diaspora LF in code blocks/Move php-markdown to composer
|
2018-01-15 01:37:13 +01:00 |
|
Hypolite Petovan
|
04481087a9
|
Delete unused library/oauth2-php library
|
2018-01-14 19:33:47 -05:00 |
|
Hypolite Petovan
|
fabbf810b0
|
Move library/markdown.php to src
|
2018-01-14 19:01:09 -05:00 |
|
Hypolite Petovan
|
903b960d4c
|
Improve babel page display
|
2018-01-14 19:01:09 -05:00 |
|
Hypolite Petovan
|
503e5847f9
|
Improve html2bbcode
- trim code blocks
- Add <code> conversion to <code> (from Diaspora)
|
2018-01-14 19:01:09 -05:00 |
|
Hypolite Petovan
|
f828afde83
|
Extend multi-line code blocks regular expression
- Covers the case where there's no new line after the [code] tag
|
2018-01-14 19:01:09 -05:00 |
|
Hypolite Petovan
|
3e56a63162
|
Remove library/php-markdown
|
2018-01-14 19:01:09 -05:00 |
|
Hypolite Petovan
|
53f3d54ad3
|
Add michelf/php-markdown to Composer
|
2018-01-14 19:01:09 -05:00 |
|
Hypolite Petovan
|
a81dc7f5a8
|
Update Composer version
|
2018-01-14 19:01:08 -05:00 |
|
Hypolite Petovan
|
9babf0befd
|
Merge pull request #4234 from annando/participation-2
On participation send all the old content of the thread
|
2018-01-14 18:57:05 -05:00 |
|
Michael
|
b7022963f3
|
On participation send all the old content of the thread
|
2018-01-14 22:53:00 +00:00 |
|
Hypolite Petovan
|
f45cde798a
|
Merge pull request #4232 from fabrixxm/frio-login
[WIP] Frio: restyle login page
|
2018-01-14 17:22:36 -05:00 |
|
Hypolite Petovan
|
64e3dbfaa4
|
Merge pull request #4225 from zeroadam/UserImport-#3878
Move include/uimport to src
|
2018-01-14 17:21:26 -05:00 |
|
Hypolite Petovan
|
b3c304c210
|
Merge pull request #4229 from annando/database
Reworked and unified database structure, added comments
|
2018-01-14 17:16:20 -05:00 |
|
Adam Magness
|
8be6989bd1
|
Review updates
self:: const and fix up callback function and array_walk
|
2018-01-14 15:56:36 -05:00 |
|
fabrixxm
|
5392f9eb8b
|
spaces to tabs
|
2018-01-14 21:53:37 +01:00 |
|
Michael Vogel
|
1ecfa49f4c
|
Merge pull request #4233 from MrPetovan/task/4116-move-smarty-to-composer
Move Smarty to composer
|
2018-01-14 20:05:52 +01:00 |
|
Michael
|
de7dbdff14
|
Removed test output
|
2018-01-14 19:02:27 +00:00 |
|
Hypolite Petovan
|
e412cd7c51
|
Fix formatting in include/friendica_smarty
|
2018-01-14 13:36:48 -05:00 |
|
Hypolite Petovan
|
03b16c449f
|
Remove library/Smarty
|
2018-01-14 13:36:27 -05:00 |
|
Hypolite Petovan
|
7f44736803
|
Add Smarty to Composer
|
2018-01-14 13:35:25 -05:00 |
|
fabrixxm
|
de227e305e
|
Frio: add input for login backround image in admin settings
|
2018-01-14 19:19:24 +01:00 |
|
fabrixxm
|
1064da1052
|
New home/login page style
|
2018-01-14 18:45:00 +01:00 |
|
Michael Vogel
|
4000e81f1b
|
Merge pull request #4223 from MrPetovan/task/fix-scrutinizer-issues
[Scrutinizer] Fix formatting in dfrn_confirm and a few other files
|
2018-01-14 16:20:23 +01:00 |
|
Michael
|
98edd826ac
|
Increased database version
|
2018-01-14 15:14:16 +00:00 |
|
Michael
|
fabe79a798
|
Reworked and unified database structure, added comments
|
2018-01-14 15:13:00 +00:00 |
|