 Tobias Diekershoff
|
ca0b0e92c8
|
indentation
|
2018-04-03 06:58:21 +02:00 |
|
|
Tobias Diekershoff
|
4f221d6334
|
indentation
|
2018-04-03 06:57:27 +02:00 |
|
|
Tobias Diekershoff
|
3ec4e28af6
|
updated the privacy statement text and added some headers to the functions
|
2018-04-03 06:55:25 +02:00 |
|
Hypolite Petovan
|
933042f26d
|
Merge pull request #4728 from annando/dfrn-send
The Diaspora transport layer is now the default for DFRN
|
2018-04-02 18:08:42 -04:00 |
|
 Michael
|
d668b967c9
|
Misspelling
|
2018-04-02 22:06:31 +00:00 |
|
|
Michael
|
becc86a960
|
Changed logging text
|
2018-04-02 22:02:43 +00:00 |
|
|
Michael
|
8ff6a31512
|
Sending does now work
|
2018-04-02 21:59:30 +00:00 |
|
|
Michael
|
eeadd2f9d6
|
The Diaspora transport layer is now the default for DFRN
|
2018-04-02 21:46:10 +00:00 |
|
|
Tobias Diekershoff
|
01a1e1b451
|
regenerated master messages.po file
|
2018-04-02 18:50:27 +02:00 |
|
|
Tobias Diekershoff
|
6f5b6a073a
|
register template may link to the TOS as well
|
2018-04-02 18:41:16 +02:00 |
|
|
Tobias Diekershoff
|
6cef0fbaeb
|
added link to delete the account to the registration mail text
|
2018-04-02 18:40:52 +02:00 |
|
|
Tobias Diekershoff
|
6c20b4507d
|
Added /tos module
|
2018-04-02 18:40:30 +02:00 |
|
|
Hypolite Petovan
|
4972b82807
|
Merge pull request #4725 from annando/dfrn-2
DFRN payload can now be transported via the Diaspora transport layer
|
2018-04-02 09:47:31 -04:00 |
|
|
Michael
|
f89904ed77
|
Treatment, Treating, whatever :-)
|
2018-04-02 13:44:45 +00:00 |
|
|
Michael
|
0594f13c35
|
Receiving was tested, sending is implemented and tested as well, currently unused
|
2018-04-02 12:53:48 +00:00 |
|
|
Tobias Diekershoff
|
348ee3625d
|
BBCode support in register_text
|
2018-04-02 08:42:11 +02:00 |
|
|
Hypolite Petovan
|
fc8e095154
|
Merge pull request #4724 from tobiasd/20180401-lng
update for PL translation THX waldis
|
2018-04-01 14:53:29 -04:00 |
|
|
Tobias Diekershoff
|
bd1a48b61b
|
update for PL translation THX waldis
|
2018-04-01 20:15:50 +02:00 |
|
|
Hypolite Petovan
|
0bb277d62a
|
Merge pull request #4723 from tobiasd/20180401-lng
update for PL translation THX waldis
|
2018-04-01 10:44:20 -04:00 |
|
|
Tobias Diekershoff
|
91e9b464e5
|
update for PL translation THX waldis
|
2018-04-01 11:22:36 +02:00 |
|
|
Michael
|
f51a254ed0
|
Public contacts are not permitted for suggestions or mails
|
2018-04-01 05:07:35 +00:00 |
|
|
Michael
|
7dd64dd465
|
Merge remote-tracking branch 'upstream/develop' into dfrn-2
|
2018-04-01 04:49:28 +00:00 |
|
|
Tobias Diekershoff
|
15adc5a7fd
|
Merge pull request #4719 from annando/fix-missing-arg
Fixes missing command line argument
|
2018-03-31 14:36:32 +02:00 |
|
|
Tobias Diekershoff
|
08fd6734ae
|
Merge pull request #4720 from annando/fix-sorting
Fix the version sorting in the federation statistics
|
2018-03-31 14:35:34 +02:00 |
|
|
Michael
|
3eb7ab2d9e
|
Fix the version sorting in the federation statistics
|
2018-03-31 09:34:36 +00:00 |
|
|
Michael
|
3d487c263e
|
Fixes missing command line argument
|
2018-03-31 08:19:19 +00:00 |
|
Michael Vogel
|
4724c7de72
|
Merge pull request #4718 from MrPetovan/bug/fix-console-url-argument
Console: Use $argv instead of $_SERVER['argv']
|
2018-03-31 06:02:23 +02:00 |
|
|
Hypolite Petovan
|
bdacaa424e
|
Merge pull request #4717 from annando/fix-profiles
Fix: Avoid a WSOD when saving the profile
|
2018-03-30 23:52:03 -04:00 |
|
|
Michael
|
80cca09a53
|
Fix: Avoid a WSOD when saving the profile
|
2018-03-31 03:33:19 +00:00 |
|
|
Hypolite Petovan
|
3b81c66150
|
Use $argv instead of $_SERVER['argv']
|
2018-03-30 22:56:04 -04:00 |
|
|
Hypolite Petovan
|
bcf974a995
|
Merge pull request #4716 from annando/password-console
New functionality to set a password for a given user
|
2018-03-30 16:00:07 -04:00 |
|
|
Michael
|
491db963db
|
Changed comments
|
2018-03-30 19:57:14 +00:00 |
|
|
Michael
|
2eb4912dbf
|
New functionality to set a password for a given user
|
2018-03-30 19:17:12 +00:00 |
|
|
Michael
|
1613f2a1c4
|
Ensure that public contacts can't create toplevel posts
|
2018-03-30 06:20:00 +00:00 |
|
|
Michael
|
c9f02d534e
|
Merge remote-tracking branch 'upstream/develop' into dfrn-2
|
2018-03-30 05:45:29 +00:00 |
|
|
Michael Vogel
|
ca37b34333
|
Merge pull request #4713 from MrPetovan/bug/suppress-profile-message-follow
Suppress confusing error message in mod/follow
|
2018-03-30 07:39:00 +02:00 |
|
|
Michael Vogel
|
a2b6ff7b25
|
Merge pull request #4712 from MrPetovan/task/improve-text-highlight
Improve text highlight
|
2018-03-30 07:27:42 +02:00 |
|
|
Hypolite Petovan
|
d13f36938c
|
Suppress error message for non-existing contacts in mod/follow
|
2018-03-29 23:29:41 -04:00 |
|
|
Hypolite Petovan
|
3a58fe48bd
|
Fix formatting in mod/follow
|
2018-03-29 23:28:48 -04:00 |
|
|
Hypolite Petovan
|
80b6dc5787
|
Add fallback to regular code if language doesn't exist
|
2018-03-29 19:29:36 -04:00 |
|
|
Hypolite Petovan
|
586b0b6e57
|
Add bash to text_highlight language list
|
2018-03-29 19:29:09 -04:00 |
|
|
Hypolite Petovan
|
8a2d41e53f
|
Merge pull request #4711 from rabuzarus/20180329_-_cropperjs
update javascript cropper library
|
2018-03-29 14:40:51 -04:00 |
|
rabuzarus
|
515ef66c52
|
cropperjs: fix composer.lock
|
2018-03-29 20:30:26 +02:00 |
|
|
rabuzarus
|
4efa2109ee
|
cropperjs: use npm-asset for composer
|
2018-03-29 18:39:26 +02:00 |
|
|
rabuzarus
|
51841ab148
|
cropperjs: fix indention
|
2018-03-29 18:06:56 +02:00 |
|
|
rabuzarus
|
34204ca580
|
update javascript cropper library
|
2018-03-29 17:57:06 +02:00 |
|
|
Hypolite Petovan
|
5f40b306b8
|
Merge pull request #4707 from tobiasd/20180329-vagrant
make sure that the VM has php-zip installed that is needed by composer
|
2018-03-29 08:07:44 -04:00 |
|
|
Hypolite Petovan
|
1db6c42aa8
|
Merge pull request #4706 from tobiasd/20180329-installation
added a hint to the htconfig file
|
2018-03-29 08:07:20 -04:00 |
|
|
Tobias Diekershoff
|
399344a1f8
|
make sure that the VM has php-zip installed that is needed by composer
|
2018-03-29 12:06:16 +02:00 |
|
|
Tobias Diekershoff
|
2cc2b886b2
|
little wording change
|
2018-03-29 11:49:40 +02:00 |
|