clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
17,439 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

17439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Hypolite Petovan 39c036e6ba Fix implode Warning in Diaspora 2018-01-14 09:05:06 -05:00
Hypolite Petovan 4dafdda99e Fix Deprecated error message 2018-01-14 09:04:46 -05:00
Hypolite Petovan c89129ad20 Fix typo when referring to dba::exists 2018-01-13 23:46:59 -05:00
Hypolite Petovan c66af117b3 Fix Scrutinizer issues in contacts/credits/crepair 
- Add back uninitialized variables
- Fix formatting
- Use dba::selectFirst whenever possible
 2018-01-13 23:46:59 -05:00
Hypolite Petovan adfabeadb1 Rename param to condition in dba::delete 
- Fix formatting
- Use new array syntax
 2018-01-13 23:46:59 -05:00
Hypolite Petovan e3b69f97cf Fix formatting in mod/delegate 
- Remove parentheses from language construct
- Add missing braces
- Use dba::* when possible
- Capitalize SQL queries keywords
- Use new array syntax
 2018-01-13 23:46:58 -05:00
Hypolite Petovan f588adb511 Fix formatting in dfrn_confirm 
- Add missing braces
- Use dba::selectFirst whenever possible
- Initialize missing variables
- Remove unused variables
- Use defaults instead of ternary operator
- Simplify sprintf(t()) structure
 2018-01-13 23:46:58 -05:00
Adam Magness e70e48abaa constant 
move define to const
 2018-01-13 13:10:14 -05:00
Adam Magness 9e81d3dc40 Attempt anonymous 
Try anonymous function based on review suggestion.
 2018-01-13 13:08:18 -05:00
Hypolite Petovan f97752383a
Merge pull request #4226 from zeroadam/Redir-#3878 
Move redir to src
 2018-01-13 12:42:38 -05:00
Adam Magness 4e7657da99 Remove redir.php 
remove old file
 2018-01-13 09:41:26 -05:00
Adam Magness 7635421d78 Update function calls 
update function calls and remove require_once
 2018-01-13 09:40:34 -05:00
Adam Magness 771163e860 Move auto_redir function 
move function into dfrn, rename and update a db insert
 2018-01-13 09:36:21 -05:00
Adam Magness 88aeddab82 Remove old file 
Remove include/uimport.php
 2018-01-13 09:15:45 -05:00
Adam Magness c1baa5ed7d Update functions 
Update function names and calls. update database functions to dba class calls.
 2018-01-13 09:14:37 -05:00
Adam Magness f5d2b83938 Create UserImport 
Create new class and copy over functions
Add missed function
 2018-01-13 09:01:32 -05:00
Hypolite Petovan 44a2ec439e
Merge pull request #4220 from annando/receive_participation 
Receive participation messages and processes them
 2018-01-13 07:46:59 -05:00
Michael a78cbf6174 The changed field name has to be changed here as well 2018-01-13 09:19:57 +00:00
Michael 915419ace3 Merge remote-tracking branch 'upstream/develop' into receive_participation 2018-01-13 08:29:44 +00:00
Michael Vogel 725bb9641a
Merge pull request #4224 from friendica/fabrixxm-patch-api-login 
Fix api login
 2018-01-13 09:28:17 +01:00
fabrixxm 2d0fe7a30f
Fix api login 2018-01-13 09:22:40 +01:00
Michael ed9c50ea2e Merge remote-tracking branch 'upstream/develop' into receive_participation 2018-01-13 00:18:41 +00:00