Commit graph

18839 commits

Author SHA1 Message Date
Hypolite Petovan
c65883ed40
Merge pull request #4421 from rabuzarus/20180208_-_frio_disable_login_btn_in_home_mod
frio: disable nav login button on home and login module
2018-02-08 12:40:40 -05:00
rabuzarus
d59cd7dfa4 frio: disable nav login button on home and login module 2018-02-08 18:36:39 +01:00
Hypolite Petovan
06bce464ba
Merge pull request #4418 from annando/no-requeue
Don't add already queued items from Diaspora to the queue again
2018-02-08 10:17:41 -05:00
Michael
ac7b0661d2 Added documentation 2018-02-08 15:03:18 +00:00
Michael
8ea572ebd1 Added a config value to ignore server checks 2018-02-08 13:09:09 +00:00
Michael
0093f863fd Don't add already queued items from Diaspora to the queue again 2018-02-08 11:26:24 +00:00
Tobias Diekershoff
af55cd57f3
Merge pull request #4417 from annando/forgotten-use
Bugfix: a forgotten "use" in bbcode.php
2018-02-08 07:10:35 +01:00
Michael
87280ebf57 Bugfix: a forgotten "use" in bbcode.php 2018-02-08 06:08:07 +00:00
Hypolite Petovan
0a7843a303
Merge pull request #4416 from annando/item-update-fix
Bugfix: Forgotten "use"
2018-02-07 15:31:25 -05:00
Michael
c953784945 Forgotten "use" 2018-02-07 20:22:40 +00:00
Hypolite Petovan
55851f03bb
Merge pull request #4415 from annando/item-update-fix
Wrong function order in Item::update
2018-02-07 15:13:32 -05:00
Michael
3890dfee4a Wrong function order in Item::update 2018-02-07 20:09:37 +00:00
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