Michael Vogel
|
7e15a9f0f5
|
Merge pull request #4441 from tobiasd/20180212-de
update for DE translation
|
2018-02-12 10:46:24 +01:00 |
|
Tobias Diekershoff
|
d4fccc6ce8
|
update for DE translation
|
2018-02-12 08:46:14 +01:00 |
|
|
Michael Vogel
|
e90b3f606d
|
Merge pull request #4439 from MrPetovan/bug/4396-use-dba-exists-in-uimport
Add dba::exists usages to UserImport::importAccount
|
2018-02-12 06:02:30 +01:00 |
|
rabuzarus
|
049a4f5f86
|
some polishing
|
2018-02-12 04:10:11 +01:00 |
|
Hypolite Petovan
|
f68667e301
|
Merge pull request #4438 from rabuzarus/20180211_-_fix_variables_part_one
fix undeclared variables or wrong variable names (/include) - part 1
|
2018-02-11 22:00:42 -05:00 |
|
|
rabuzarus
|
5fe7a21482
|
add $no_photos parameter to add_page_info_data()
|
2018-02-12 03:56:20 +01:00 |
|
|
rabuzarus
|
2e03a3a47f
|
fix undeclared variables or wrong variable names (/mod)
|
2018-02-12 03:25:09 +01:00 |
|
|
Hypolite Petovan
|
1d035ae2ae
|
Add dba::exists usages to UserImport::importAccount
|
2018-02-11 19:28:39 -05:00 |
|
|
Hypolite Petovan
|
30e8361dcb
|
Merge pull request #4437 from annando/worker-cleanup
Some clean up for the worker, arrays are now supported as parameter
|
2018-02-11 18:21:28 -05:00 |
|
|
rabuzarus
|
26fd6b1c33
|
fix undeclared variables or wrong variable names (/include)
|
2018-02-11 22:13:29 +01:00 |
|
Michael
|
2a762868e9
|
Some clean up for the worker, arrays are now supported as parameter
|
2018-02-11 16:18:39 +00:00 |
|
|
Hypolite Petovan
|
ab7646016b
|
Merge pull request #4436 from tobiasd/20180211-support
added ways to get some help on EN and DE landing page of the documentation
|
2018-02-11 09:22:33 -05:00 |
|
|
Tobias Diekershoff
|
a8d1a9b6fc
|
typo
|
2018-02-11 10:48:29 +01:00 |
|
|
Tobias Diekershoff
|
d828375fd8
|
use the correct markup for 2nd level list elements
|
2018-02-11 10:41:46 +01:00 |
|
|
Tobias Diekershoff
|
062ab547cf
|
added ways to get some help on EN and DE landing page of the documentation
|
2018-02-11 10:29:30 +01:00 |
|
|
Hypolite Petovan
|
2dadbf3f72
|
Merge pull request #4435 from tobiasd/20180210-msg
regen master messages.po after moving functionality from addon to core
|
2018-02-10 12:24:23 -05:00 |
|
|
Tobias Diekershoff
|
3b46e9f389
|
regen master messages.po after moving functionality from addon to core
|
2018-02-10 18:18:23 +01:00 |
|
|
Hypolite Petovan
|
d3034b703a
|
Merge pull request #4434 from annando/api-no-attachments
Use a more simple HTML for API output
|
2018-02-10 09:22:11 -05:00 |
|
|
Michael
|
30cfca40d8
|
Use a more simple HTML for API output
|
2018-02-10 13:33:15 +00:00 |
|
|
Hypolite Petovan
|
8b557c3157
|
Merge pull request #4433 from annando/direct-block
Suppress content from hidden or blocked contacts
|
2018-02-10 07:49:34 -05:00 |
|
|
Michael
|
ee7c587693
|
Suppress content from hidden or blocked contacts
|
2018-02-10 12:34:10 +00:00 |
|
|
Hypolite Petovan
|
d0a7b0956d
|
Merge pull request #4432 from rabuzarus/20180209_-_move_membersince_to_core
Move membersince addon to core
|
2018-02-09 15:37:29 -05:00 |
|
|
rabuzarus
|
9a4d19e284
|
move membersince addon to core
|
2018-02-09 20:44:45 +01:00 |
|
|
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 |
|
|
Tobias Diekershoff
|
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 |
|
|
Michael
|
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 |
|
|
Michael
|
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 |
|
|
Michael
|
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 |
|
|
Michael
|
1424559bee
|
Forgotten "+"
|
2018-02-08 19:47:47 +00:00 |
|
|
Michael
|
70c31a6149
|
Improved date time formula thing.
|
2018-02-08 19:33:40 +00:00 |
|
|
Michael
|
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 |
|
|
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 |
|