Michael Vogel
|
bd619f3741
|
Merge pull request #4553 from tobiasd/20160305-enzh
updates to the ZH CN, EN GB and EN US translations
|
2018-03-05 19:15:08 +01:00 |
|
|
Michael Vogel
|
dfbcacf833
|
Merge pull request #4552 from tobiasd/20180305-messagespo
regenerated master messages.po file
|
2018-03-05 19:14:31 +01:00 |
|
 Tobias Diekershoff
|
a8baa65f63
|
updates to the ZH CN, EN GB and EN US translations
|
2018-03-05 16:48:21 +01:00 |
|
|
Tobias Diekershoff
|
a2860023db
|
regenerated master messages.po file
|
2018-03-05 16:38:01 +01:00 |
|
Hypolite Petovan
|
26f693fb80
|
Merge pull request #4547 from annando/multiple-accounts
Fix: Multiple accounts per mail address are allowed
|
2018-03-04 17:59:51 -05:00 |
|
 Michael
|
cd79ce3a57
|
Fix: Multiple accounts per mail address are allowed when not explicit forbidden
|
2018-03-04 22:23:52 +00:00 |
|
|
Hypolite Petovan
|
a141730e8d
|
Merge pull request #4546 from annando/twidere-crash
Bugfix: Avoid that Twidere is crashing
|
2018-03-04 14:58:08 -05:00 |
|
|
Michael
|
506f851b23
|
Bugfix: Avoid that Twidere is crashing
|
2018-03-04 19:25:02 +00:00 |
|
|
Hypolite Petovan
|
3f739d53c8
|
Merge pull request #4545 from rabuzarus/20180304_-_localize_datepicker
localize the datepicker
|
2018-03-04 09:07:31 -05:00 |
|
rabuzarus
|
2c7e8f35d4
|
localize the datepicker
|
2018-03-04 14:56:51 +01:00 |
|
|
Hypolite Petovan
|
c9d403bcb5
|
Merge pull request #4544 from annando/no-cache-maintenance
Bugfix: Don't cache when looking for maintenance mode
|
2018-03-04 08:29:33 -05:00 |
|
|
Michael
|
13df527d62
|
Bugfix: Don't cache when looking for maintenance mode
|
2018-03-04 13:01:46 +00:00 |
|
|
Tobias Diekershoff
|
5ff90c0971
|
Merge pull request #4542 from AndyHee/3.6-rc
Corrected typo
|
2018-03-04 10:05:41 +01:00 |
|
 Andy H
|
8500bed8cc
|
Corrected typo
|
2018-03-04 15:07:34 +07:00 |
|
|
Hypolite Petovan
|
716747cc77
|
Merge pull request #4541 from rabuzarus/20180303_-_fix_directory_search
fix page counter in directory module
|
2018-03-03 14:13:51 -05:00 |
|
|
rabuzarus
|
d572738e95
|
directory - use dba::select_first()
|
2018-03-03 20:08:41 +01:00 |
|
|
rabuzarus
|
e18f3844da
|
fix page counter in directory module
|
2018-03-03 19:31:15 +01:00 |
|
|
Hypolite Petovan
|
861904e051
|
Merge pull request #4539 from tobiasd/20180303-docsDeadkinks
removed dead link
|
2018-03-03 10:29:06 -05:00 |
|
|
Tobias Diekershoff
|
04e6b32d4f
|
removed dead link
|
2018-03-03 15:47:36 +01:00 |
|
|
Tobias Diekershoff
|
2e02e88cf8
|
Merge pull request #4536 from MrPetovan/bug/fix-countable-warning
[PHP 7.2] Fix missing Countable warning
|
2018-03-03 15:39:28 +01:00 |
|
|
Tobias Diekershoff
|
8004a1bd93
|
Merge pull request #4538 from MrPetovan/bug/4535-user-not-found
Fix missing logical not in admin/users
|
2018-03-03 15:36:54 +01:00 |
|
|
Hypolite Petovan
|
9a13e67943
|
Fix missing logical not in admin/users
|
2018-03-03 09:34:48 -05:00 |
|
|
Hypolite Petovan
|
9cf2183524
|
Merge pull request #4537 from rabuzarus/20180303_-_fix_directory_search
Bugfix: search in local directory didn't work
|
2018-03-03 09:18:41 -05:00 |
|
|
Hypolite Petovan
|
b8fca5efe7
|
[PHP 7.2] Fix missing Countable warning
|
2018-03-03 08:48:30 -05:00 |
|
|
rabuzarus
|
c78572bf47
|
directory.php - code beautification (PSR)
|
2018-03-03 14:40:16 +01:00 |
|
|
rabuzarus
|
2efd4ba780
|
fix local directory search
|
2018-03-03 14:06:42 +01:00 |
|
|
Michael Vogel
|
aa36d7ff75
|
Merge pull request #4534 from tobiasd/20180303-zhcn
update to the zh-cn translation THX 朱陈锬
|
2018-03-03 11:44:53 +01:00 |
|
|
Michael Vogel
|
1f314b44ce
|
Merge pull request #4533 from tobiasd/20180303-typo
tyoi, found by 朱陈锬 thanks for that!
|
2018-03-03 11:44:37 +01:00 |
|
|
Tobias Diekershoff
|
a5049c7304
|
update to the zh-cn THX 朱陈锬
|
2018-03-03 11:13:14 +01:00 |
|
|
Tobias Diekershoff
|
1510b3d948
|
tyoi, found by 朱陈锬 thanks for that!
|
2018-03-03 11:02:40 +01:00 |
|
|
Michael Vogel
|
45a9902c83
|
Merge pull request #4531 from tobiasd/20180303-FAQ
added support channels to the FAQ
|
2018-03-03 09:55:42 +01:00 |
|
|
Tobias Diekershoff
|
80976e28d5
|
removed dead link
|
2018-03-03 09:50:42 +01:00 |
|
|
Tobias Diekershoff
|
6ca6193e04
|
added support channels to the FAQ
|
2018-03-03 08:13:46 +01:00 |
|
|
Tobias Diekershoff
|
fab9cb6825
|
Version 3.6-rc for the RC branch
|
2018-03-03 07:36:58 +01:00 |
|
|
Hypolite Petovan
|
38e5e64532
|
Merge pull request #4530 from annando/db-timestamp
Some more performance measuring for database stuff
|
2018-03-02 14:11:32 -05:00 |
|
|
Michael
|
1be5275eef
|
Some more performance measuring for database stuff
|
2018-03-02 13:37:49 +00:00 |
|
|
Michael Vogel
|
26c1926f1f
|
Merge pull request #4529 from tobiasd/20180302-msg
regenerated master messages.po file
|
2018-03-02 13:10:11 +01:00 |
|
|
Michael Vogel
|
9b18379b2a
|
Merge pull request #4528 from tobiasd/20180302-transl
translation updates for DE and ZH CN
|
2018-03-02 13:09:54 +01:00 |
|
|
Tobias Diekershoff
|
ac435126dd
|
regenerated master messages.po file
|
2018-03-02 12:02:54 +01:00 |
|
|
Tobias Diekershoff
|
eac13dea7a
|
update for DE translation THX hoergen oostende
|
2018-03-02 11:51:39 +01:00 |
|
|
Tobias Diekershoff
|
945c9ed802
|
update to the zh-cn THX 朱陈锬
|
2018-03-02 11:50:22 +01:00 |
|
|
Tobias Diekershoff
|
b5f8d73833
|
Merge pull request #4527 from annando/fix-no-constant-update
Bugfix: No constant update in "getIdForUrl"
|
2018-03-02 10:58:17 +01:00 |
|
|
Michael Vogel
|
e96bcb8512
|
Merge pull request #4526 from MrPetovan/task/4522-postpone-contact-update
Postpone contact update in Contact::getIdForURL
|
2018-03-02 05:43:04 +01:00 |
|
|
Michael
|
361af7bc78
|
Bugfix: No constant update in "getIdForUrl"
|
2018-03-02 03:55:24 +00:00 |
|
|
Hypolite Petovan
|
41678ec3cd
|
Add no_update flag to speed up Contact::getIdForURL instances
|
2018-03-01 19:54:45 -05:00 |
|
|
Hypolite Petovan
|
9f21e7f34f
|
Use default value for uid parameter in Contact::getIdForURL
|
2018-03-01 19:54:12 -05:00 |
|
|
Hypolite Petovan
|
01c7945b7a
|
Merge pull request #4525 from annando/fix-dfrn-delee
Bugfix: Deleting comments via DFRN had only partly worked
|
2018-03-01 16:58:35 -05:00 |
|
|
Michael
|
0cc121cf44
|
Bugfix: Deleting comments via DFRN had only partly worked
|
2018-03-01 21:52:36 +00:00 |
|
|
Hypolite Petovan
|
e54a7e7834
|
Merge pull request #4523 from annando/invitation-code
"Invitation ID" is now "invitation code" to unify the description
|
2018-03-01 15:53:10 -05:00 |
|
|
Hypolite Petovan
|
b088ef83c5
|
Merge pull request #4524 from annando/delete-dfrn
When deleting, don't send the parent via DFRN
|
2018-03-01 15:52:51 -05:00 |
|