Commit graph

18605 commits

Author SHA1 Message Date
Michael Vogel
25fbdd21c5
Merge pull request #4429 from MrPetovan/bug/4426-handle-auth-exceptions
Handle authentication exceptions in Login module
2018-02-09 19:03:52 +01:00
1a8851ac38
Merge pull request #4430 from annando/import-check
Bugfix for check that the DFRN entry already exists
2018-02-09 07:31:04 +01:00
a2f172e084 Bugfix for check that the DFRN entry already exists 2018-02-09 06:20:01 +00:00
Hypolite Petovan
8a9917857e Handle authentication exceptions in Login module
- Break down large methods into smaller ones
- Add more authentication exception
- Add a legacy User::authenticate method
2018-02-09 00:08:01 -05:00
Hypolite Petovan
5c1fae2536
Merge pull request #4428 from annando/newlines
Line endings are converted to unix style
2018-02-08 23:06:50 -05:00
15a857e411 Line endings are converted to unix style 2018-02-09 03:49:49 +00:00
Hypolite Petovan
164f4f7cdf
Merge pull request #4424 from annando/manage-admin
We can now delegate again like before
2018-02-08 21:41:51 -05:00
Hypolite Petovan
d0c4df80b3
Merge pull request #4425 from MrPetovan/develop
[Hotfix] Add missing require in include/text
2018-02-08 20:00:57 -05:00
Hypolite Petovan
6f9c66b0bc Add missing require in include/text 2018-02-08 19:59:34 -05:00
d42f86e218 We can now delegate again like before 2018-02-08 22:18:34 +00:00
Hypolite Petovan
e651af2a0f
Merge pull request #4423 from annando/requeue
We now incrementally calculate the queue delivery time
2018-02-08 15:11:05 -05:00
1424559bee Forgotten "+" 2018-02-08 19:47:47 +00:00
70c31a6149 Improved date time formula thing. 2018-02-08 19:33:40 +00:00
d70a20a466 We now incrementally calculate the queue delivery time 2018-02-08 18:39:48 +00:00
Hypolite Petovan
b5a88c5b12
Merge pull request #4422 from rabuzarus/20180208_-_frio_rename_transparency_in_opacity
frio: renaming background transparency into background opacity
2018-02-08 12:55:16 -05:00
rabuzarus
143af5a6d5 frio: renaming background transparency into background opacity 2018-02-08 18:47:06 +01:00
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
ac7b0661d2 Added documentation 2018-02-08 15:03:18 +00:00
8ea572ebd1 Added a config value to ignore server checks 2018-02-08 13:09:09 +00:00
0093f863fd Don't add already queued items from Diaspora to the queue again 2018-02-08 11:26:24 +00:00
af55cd57f3
Merge pull request #4417 from annando/forgotten-use
Bugfix: a forgotten "use" in bbcode.php
2018-02-08 07:10:35 +01:00
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
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
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
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
f66a8606aa things that should not be here 2018-02-07 07:28:32 +01:00
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
4859a18ae4 Fixed wrong capitalation (or however this is written) 2018-02-06 23:17:18 +00:00
053cb31eea Forgotten commented out text 2018-02-06 22:57:56 +00:00
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
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
1ec6359faa Duplicate check 2018-02-06 16:44:48 +00:00
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
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