Hypolite Petovan
|
903d1e1172
|
Merge pull request #4580 from annando/parent-password
Security: You have to enter the password of the parent for delegations
|
2018-03-11 09:42:56 -04:00 |
|
|
Hypolite Petovan
|
efedc5c2b2
|
Merge pull request #4579 from annando/fix-diaspora-link
Links to Diaspora had sometimes been cut
|
2018-03-11 09:41:12 -04:00 |
|
Michael
|
eaf4fdefac
|
Security: You have to enter the password of the parent to delegate to this account
|
2018-03-11 13:12:15 +00:00 |
|
|
Hypolite Petovan
|
0e6ada2462
|
Merge pull request #4578 from annando/bugfix-directory
Bugfix: Old dba function was used
|
2018-03-11 08:23:16 -04:00 |
|
|
Michael
|
26a6846467
|
Bugfix: Old dba function was used
|
2018-03-11 12:19:41 +00:00 |
|
|
Michael
|
fbb38837b0
|
Shortener deactivated, due to Diaspora problems
|
2018-03-11 12:16:17 +00:00 |
|
|
Michael
|
229fb0439e
|
Links to Diaspora had sometimes been cut
|
2018-03-11 10:54:02 +00:00 |
|
Michael Vogel
|
28615ae24b
|
Merge pull request #4576 from MrPetovan/bug/fix-attach-display
Formatting changes to Protocol/Feed
|
2018-03-11 00:43:16 +01:00 |
|
|
Hypolite Petovan
|
9b14165cc8
|
Formatting changes to Protocol/Feed
- Change attribute name condition
- Singularize $attributes variable name
|
2018-03-10 18:35:24 -05:00 |
|
|
Michael Vogel
|
2009c06195
|
Merge pull request #4573 from MrPetovan/bug/fix-attach-display
Add support for Atom enclosure
|
2018-03-11 00:34:26 +01:00 |
|
|
Hypolite Petovan
|
a80d77f328
|
Add support for Atom enclosure
|
2018-03-10 12:40:21 -05:00 |
|
|
Hypolite Petovan
|
95f8423b4b
|
Merge pull request #4570 from annando/issue-4556
Issue 4556: Adding index hints to improve the notifications speed
|
2018-03-09 21:07:37 -05:00 |
|
|
Michael
|
fa496d3e5f
|
Issue 4556: Adding index hints to improve the notifications speed (hopefully)
|
2018-03-09 22:53:19 +00:00 |
|
|
Hypolite Petovan
|
f0c9b4cdf8
|
Merge pull request #4569 from annando/bugfix-diaspora-reshare
Bugfix: Reshare with added content to Diaspora looked ugly
|
2018-03-09 15:23:11 -05:00 |
|
|
Michael
|
7706616640
|
Bugfix: Reshare with added content to Diaspora looked ugly
|
2018-03-09 20:04:31 +00:00 |
|
|
Michael Vogel
|
fc3b1b0aba
|
Merge pull request #4566 from MrPetovan/bug/fix-attach-display
Display attach with missing title
|
2018-03-09 14:17:30 +01:00 |
|
|
Hypolite Petovan
|
73a8654296
|
Merge pull request #4568 from tobiasd/20180309-invites
documentation of invitation based registration
|
2018-03-09 08:01:14 -05:00 |
|
Tobias Diekershoff
|
518ee6595c
|
Merge pull request #4567 from annando/diaspora-key
Diaspora: Avoid warning "supplied key param cannot be coerced …"
|
2018-03-09 10:10:39 +01:00 |
|
|
Tobias Diekershoff
|
d3b872d589
|
help not doc
|
2018-03-09 10:06:53 +01:00 |
|
|
Tobias Diekershoff
|
c6abfa27c1
|
documentation of invitation based registration
|
2018-03-09 09:53:08 +01:00 |
|
|
Michael
|
3e51fa73b1
|
Additional checks
|
2018-03-09 05:38:15 +00:00 |
|
|
Michael
|
c9095386c8
|
Diaspora: Avoid warning "supplied key param cannot be coerced into a public key"
|
2018-03-09 05:31:13 +00:00 |
|
|
Hypolite Petovan
|
9f693cc443
|
Display attach with missing title
- Rework preg_match_all call to remove 3 indentation levels
|
2018-03-08 23:52:01 -05:00 |
|
|
Hypolite Petovan
|
3ecc53b448
|
Merge pull request #4564 from annando/avoid-duplicate
Avoid SQL errors due to duplicate entries in the "participation" table
|
2018-03-08 18:22:18 -05:00 |
|
|
Hypolite Petovan
|
54b6b8d24d
|
Merge pull request #4563 from annando/bugfix-xml-class
Bugfix: missing "use"
|
2018-03-08 16:10:27 -05:00 |
|
|
Michael
|
f23596421d
|
Avoid SQL errors due to duplicate entries in the "participation" table
|
2018-03-08 21:04:11 +00:00 |
|
|
Michael
|
480fde7ca8
|
Bugfix: missing "use"
|
2018-03-08 20:48:00 +00:00 |
|
|
Hypolite Petovan
|
63ec8cdbf7
|
Merge pull request #4559 from tobiasd/20160307-lng
translations (DE, EN-GB, EN-US, ZH-CN)
|
2018-03-07 12:15:52 -05:00 |
|
|
Tobias Diekershoff
|
dd9f7544cf
|
update for DE translation
|
2018-03-07 17:32:45 +01:00 |
|
|
Tobias Diekershoff
|
218888d550
|
update to the en gb and us translations THX Andy H3
|
2018-03-07 17:30:08 +01:00 |
|
|
Tobias Diekershoff
|
6f0fa37500
|
update to the zh-cn translation THX 朱陈锬
|
2018-03-07 17:27:50 +01:00 |
|
|
Tobias Diekershoff
|
cfb00d811d
|
Merge pull request #4554 from annando/avoid-deflate
Fix: In combination with "showmore" long posts aren't shrinked anymore
|
2018-03-06 09:52:12 +01:00 |
|
|
Michael
|
23c2db2ebc
|
Fix: In combination with "showmore" long posts aren't shrinked anymore every few seconds
|
2018-03-06 07:12:58 +00:00 |
|
|
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 |
|
AndyHee
|
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 |
|