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

18177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hypolite Petovan 96c7640441
Merge pull request #4413 from rabuzarus/20180207_-_frio_admin_summery_tpl 
Frio: add admin summary template
 2018-02-07 10:56:28 -05:00
rabuzarus 96d24af20f provide/fix adminpage div container for all admin pages 2018-02-07 16:23:19 +01:00
rabuzarus 764a9be90a Frio: add admin summary template 2018-02-07 16:14:12 +01:00
Hypolite Petovan daa9c2b2e1
Merge pull request #4411 from annando/exception-bugfix 
Quickfix: Removed exception since it blocked message delivery
 2018-02-07 08:34:57 -05:00
Michael b1e91f7401 Quickfix: Removed exception since it blocked message delivery 2018-02-07 13:31:17 +00:00
Michael Vogel 67300ae4c9
Merge pull request #4410 from tobiasd/20180207-nginxproxy 
things that should not be here
 2018-02-07 07:44:44 +01:00
Tobias Diekershoff f66a8606aa things that should not be here 2018-02-07 07:28:32 +01:00
Tobias Diekershoff 85c8bf0228
Merge pull request #4399 from MrPetovan/task/3878-move-include-bbcode-to-src 
Move include/bbcode to src/ part 1 : Everything but bbcode()
 2018-02-07 07:18:39 +01:00
Hypolite Petovan c21a0042ad
Merge pull request #4407 from annando/addon-unix 
Hook calls can now be forked into a worker queue entry
 2018-02-06 18:29:20 -05:00
Michael 4859a18ae4 Fixed wrong capitalation (or however this is written) 2018-02-06 23:17:18 +00:00
Michael 053cb31eea Forgotten commented out text 2018-02-06 22:57:56 +00:00
Michael 47d165cb25 Hook calls can now be forked into a worker queue entry 2018-02-06 22:52:36 +00:00
Hypolite Petovan 8f54266f9f
Merge pull request #4406 from annando/addon-unix 
Addon.php was in DOS format
 2018-02-06 14:41:05 -05:00
Michael 66e3c1836e Addon.php was in DOS format 2018-02-06 19:35:10 +00:00
Hypolite Petovan b0fe83216d
Merge pull request #4404 from annando/item-isolation 
Many item calls are now isolated in a single function
 2018-02-06 11:53:54 -05:00
Michael 1ec6359faa Duplicate check 2018-02-06 16:44:48 +00:00
Michael 7be59dbeab Priority and capitalisation 2018-02-06 16:32:00 +00:00
Hypolite Petovan eca960505f
Merge pull request #4405 from rabuzarus/20180206_-_frio_admin_plugin_template 
Frio: better styling for the admin addons/themes selection page
 2018-02-06 11:01:28 -05:00
rabuzarus d6a751bfd1 Frio: better styling for the admin addons/themes selection page 2018-02-06 16:13:19 +01:00
Michael e609de2957 Many item calls are now isolated in a single function 2018-02-06 12:40:22 +00:00
Hypolite Petovan c8cc7f13f1
Merge pull request #4403 from MrPetovan/develop 
Missing dba::selectFirst in Model\Item
 2018-02-05 20:46:42 -05:00
Hypolite Petovan 9a76a14778 Missing dba::selectFirst in Model\Item 2018-02-05 20:45:12 -05:00
Hypolite Petovan c1c4c32966
Merge pull request #4402 from rabuzarus/20180205_-_fix_get_addr_in_probe 
Bugfix: Probe - get the contact address from xrd 'subject' key
 2018-02-05 15:36:01 -05:00
rabuzarus 984bb2a808 Bugfix: Probe - get the contact address from xrd 'subject' key 2018-02-05 21:27:40 +01:00
Hypolite Petovan b6a345f0b2
Merge pull request #4401 from rabuzarus/20180205_-_fix_tagcloud 
fix tagcloud
 2018-02-05 15:09:46 -05:00
rabuzarus 91a346960a fix tagcloud 2018-02-05 21:05:11 +01:00
Hypolite Petovan a62b46375d Move PROTOCOL_* constants to Model\Conversation 2018-02-05 14:09:03 -05:00
Hypolite Petovan a0cdd9c674 Rename Core\Network to Core\Protocol 2018-02-05 12:57:41 -05:00
Hypolite Petovan 99aa9bedd0
Merge pull request #4400 from zeroadam/feature/Threads 
Move include/threads to src/
 2018-02-05 12:52:27 -05:00
Adam Magness 4c93b592a5 Rebase 
fix from rebase
 2018-02-05 12:49:03 -05:00
Adam Magness db8ef98537 Rename functions 
rename functions from review comments
 2018-02-05 12:48:22 -05:00
Adam Magness 992836e261 Some standards and dba 
update some calls to use dba functions and some standards updates
 2018-02-05 12:47:37 -05:00
Adam Magness 8906b98426 Remove old file 
remove old file
 2018-02-05 12:47:37 -05:00
Adam Magness 4be49e706b Remove requires 
remove require_once for old file
 2018-02-05 12:47:37 -05:00
Adam Magness 7ffcb25321 Update function names and calls 
update function names and calls from other files
 2018-02-05 12:47:04 -05:00
Adam Magness f4fa8f085b Functions to Item class 
copy functions to Item class
 2018-02-05 12:45:52 -05:00
Hypolite Petovan 544e11b134
Merge pull request #4398 from annando/search-posts 
Only show posts in the search
 2018-02-05 12:12:49 -05:00
Michael Vogel fa95911fdb
Merge pull request #4393 from MrPetovan/task/3878-move-include-tags-to-src 
Move include/tags to src/
 2018-02-05 18:11:29 +01:00
Michael 6cd72690c7 capitulated ... eh, capitalized :-) 2018-02-05 16:58:58 +00:00
Hypolite Petovan 157027a6f5 Improve BBCode documentation/comment 2018-02-05 11:42:06 -05:00
Hypolite Petovan d75bb8e970 Rename BBCode::removeAbstract() to BBCode::stripAbstract() 2018-02-04 23:38:40 -05:00
Hypolite Petovan ddcbe75f15 Add deprecation documentation in boot.php 2018-02-04 19:40:06 -05:00
Hypolite Petovan 6e53c615c4 Add missing requires in Text\BBCode 2018-02-04 19:33:39 -05:00
Hypolite Petovan 8b60cffcb5 Remove most moved functions from include/bbcode 2018-02-04 19:26:22 -05:00
Hypolite Petovan 010cf3b1e8 Update references to BBCode methods 
- Resolve name conflicts with Util\Network
 2018-02-04 19:26:22 -05:00
Hypolite Petovan b4651870db Add references to new methods and constants in include/bbcode 
- Remove all private callback functions from include/bbcode
 2018-02-04 19:25:22 -05:00
Hypolite Petovan f91ad28319 Copy include/bbcode functions to src methods 
- Add Core\Network class
 2018-02-04 19:25:22 -05:00
Hypolite Petovan 2a5431a59e Rename Model\Term methods 2018-02-04 16:48:50 -05:00
Michael 2a78a4db14 Only show posts in the search 2018-02-04 20:44:08 +00:00
Michael Vogel dad58e0f6f
Merge pull request #4387 from MrPetovan/task/3878-move-datetime-to-src 
Move include/datetime to src/ - Part 2
 2018-02-04 21:05:27 +01:00