Tobias Diekershoff
|
69300291f0
|
Merge pull request #5155 from MrPetovan/develop
Update develop
|
2018-06-01 13:48:18 +02:00 |
|
Hypolite Petovan
|
333e8d3512
|
Restore gitignore
|
2018-06-01 07:39:26 -04:00 |
|
Hypolite Petovan
|
93daf7883e
|
Merge branch 'master' into develop
- Updated new develop version label
- Incremented database build number
|
2018-06-01 07:30:04 -04:00 |
|
Hypolite Petovan
|
6d20785005
|
Fix version number in database.sql
|
2018-06-01 07:25:48 -04:00 |
|
Tobias Diekershoff
|
9553392c12
|
set the release date
|
2018-06-01 09:43:06 +02:00 |
|
Tobias Diekershoff
|
2a760bb770
|
Friendica 2018.05
|
2018-06-01 09:29:18 +02:00 |
|
Tobias Diekershoff
|
c598bf7d8f
|
Merge pull request #5096 from tobiasd/3.6.1
CHANGELOG
|
2018-06-01 09:25:49 +02:00 |
|
Michael
|
ae8d7267a0
|
"redir" is now centralized and works with the public contact
|
2018-06-01 06:46:34 +00:00 |
|
Tobias Diekershoff
|
ae897e5aeb
|
last minute bug fixes
|
2018-06-01 06:42:46 +02:00 |
|
Hypolite Petovan
|
dccf07c6d8
|
Merge pull request #5153 from tobiasd/20180531-nl
update to the NL translation THX Pascal Deklerck
|
2018-05-31 11:15:11 -04:00 |
|
Tobias Diekershoff
|
d1a27550fa
|
update to the NL translation THX Pascal Deklerck
|
2018-05-31 16:38:31 +02:00 |
|
Hypolite Petovan
|
71ab86d0c3
|
Merge pull request #5150 from abanink/5147
5147 Typo 'bandwith' should be 'bandwidth'
|
2018-05-31 10:35:24 -04:00 |
|
Michael Vogel
|
06e8d9db58
|
Merge pull request #5152 from tobiasd/20180531-regform
the detected language was not stored during user creation
|
2018-05-31 14:31:33 +02:00 |
|
Tobias Diekershoff
|
9ea6d4b26d
|
the detected language was not stored during user creation
|
2018-05-31 08:27:27 +02:00 |
|
Michael Vogel
|
a2d03e1826
|
Merge pull request #5151 from tobiasd/20180531-de
update DE translations
|
2018-05-31 08:26:19 +02:00 |
|
Pascal Deklerck
|
bdb82572ba
|
redo correct typo Bandwith to Bandwidth in mod/settings.php
|
2018-05-31 06:39:30 +02:00 |
|
Pascal Deklerck
|
de1e514be3
|
redo correct typo bandwith to bandwidth in mod/admin.php
|
2018-05-31 06:38:14 +02:00 |
|
Tobias Diekershoff
|
b130fad1c5
|
update DE translations
|
2018-05-31 06:37:54 +02:00 |
|
Pascal Deklerck
|
8fd33f89ea
|
undo change to mod/admin.php
|
2018-05-30 20:28:38 +02:00 |
|
Pascal Deklerck
|
307a19074f
|
undo changes to strings files
|
2018-05-30 20:22:34 +02:00 |
|
Hypolite Petovan
|
6bdcb6a15b
|
Merge pull request #5149 from tobiasd/20180530-msg
regen master messages.po
|
2018-05-30 13:15:46 -04:00 |
|
Pascal Deklerck
|
e1dd1aa358
|
5147 Typo 'bandwith' should be 'bandwidth'
|
2018-05-30 08:50:29 +02:00 |
|
Tobias Diekershoff
|
b86326e04a
|
regen master messages.po
|
2018-05-30 05:41:30 +02:00 |
|
Hypolite Petovan
|
2e97cbe728
|
Merge pull request #5144 from annando/deleted-item
Fix for not being able to delete items you don't own
|
2018-05-29 15:14:51 -04:00 |
|
Michael
|
c86111d193
|
Coding standards
|
2018-05-29 19:00:26 +00:00 |
|
Pascal
|
26927accb1
|
Merge pull request #1 from friendica/2018.05-rc
2018.05 rc
|
2018-05-29 20:57:43 +02:00 |
|
Michael
|
5bcb9daa43
|
Use local_user instead
|
2018-05-29 18:57:32 +00:00 |
|
Hypolite Petovan
|
ccbef51eff
|
Merge pull request #5143 from tobiasd/20180528-priv
hide profile help text clarification
|
2018-05-29 11:03:43 -04:00 |
|
Hypolite Petovan
|
3341deee6a
|
Merge pull request #5145 from abanink/4419
4419 Update the comments in src/Database/DBStructure.php from doc
|
2018-05-29 11:03:01 -04:00 |
|
Tobias Diekershoff
|
8eefe542df
|
rewording
|
2018-05-29 16:54:40 +02:00 |
|
Pascal Deklerck
|
99a88b16ff
|
4419 update DB version & database.sql
|
2018-05-29 16:11:25 +02:00 |
|
Pascal Deklerck
|
1853c5623b
|
4419 Update the comments in src/Database/DBStructure.php from doc/database/*
|
2018-05-29 10:24:36 +02:00 |
|
Michael
|
8329705eba
|
New function to delete items for users
|
2018-05-29 05:22:57 +00:00 |
|
Tobias Diekershoff
|
3f93b982b6
|
hide profile help text clarification
|
2018-05-28 16:16:23 +02:00 |
|
Michael Vogel
|
10ca9908a6
|
Merge pull request #5142 from tobiasd/20180528-it
IT translations THX Fabio
|
2018-05-28 14:00:14 +02:00 |
|
Tobias Diekershoff
|
703f886492
|
IT translations THX Fabio
|
2018-05-28 13:50:56 +02:00 |
|
Hypolite Petovan
|
ddc37a004f
|
Merge pull request #5140 from abanink/5066
Fix autoname output length
|
2018-05-27 09:10:46 -04:00 |
|
Hypolite Petovan
|
549020300f
|
Merge pull request #5139 from rabuzarus/20180527_-_frio_tos_background
Frio: fix tos page background for frio and move tos link to a another place in the nave menu
|
2018-05-27 09:04:14 -04:00 |
|
Michael
|
deb015be12
|
Changed documentation
|
2018-05-27 10:42:47 +00:00 |
|
Michael
|
c5a22f86c7
|
Merge remote-tracking branch 'upstream/2018.05-rc' into deleted-item
|
2018-05-27 10:38:49 +00:00 |
|
Pascal Deklerck
|
334aa40292
|
Fix autoname output length
|
2018-05-27 10:20:27 +02:00 |
|
rabuzarus
|
32c3762989
|
Merge pull request #5138 from annando/optimize-workerqueue
Possibly fixes 5137: Only execute "optimize table" when allowed
|
2018-05-27 10:10:11 +02:00 |
|
rabuzarus
|
9c9b82ba59
|
Frio: move tos link to a another place in the nave menu
|
2018-05-27 09:55:05 +02:00 |
|
rabuzarus
|
58f9498c7e
|
Frio: tos page background for frio
|
2018-05-27 09:48:27 +02:00 |
|
Michael
|
04fd6eff01
|
Possibly fixes 5137: Only execute "optimize table" when allowed
|
2018-05-27 06:23:18 +00:00 |
|
Michael
|
54136f3a74
|
Added the new parameter to the delete function.
|
2018-05-26 21:38:45 +00:00 |
|
Michael
|
708ddf2b02
|
Preparation for new deletion functionality
|
2018-05-26 20:23:49 +00:00 |
|
Michael
|
a6396dde55
|
Removed useless line
|
2018-05-26 20:08:42 +00:00 |
|
Michael
|
a50805c371
|
Grammar fix
|
2018-05-26 20:07:30 +00:00 |
|
Michael
|
4c36109f02
|
Some more places to add the user id
|
2018-05-26 20:03:30 +00:00 |
|