Michael
|
318de2f590
|
Merge remote-tracking branch 'upstream/3.6-rc' into url-shorten-ostatus
|
2018-03-22 20:42:29 +00:00 |
|
Hypolite Petovan
|
c5c0887f59
|
Merge pull request #4649 from annando/fix-thr-parent
Fix: Items with "uid=0" always had the "parent-uri" as "thr-parent"
|
2018-03-22 12:24:37 -04:00 |
|
|
Michael
|
b171fb1f24
|
Fix: Items with "uid=0" always had the "parent-uri" as "thr-parent"
|
2018-03-22 16:18:49 +00:00 |
|
|
Hypolite Petovan
|
0d60f1a7d3
|
Merge pull request #4646 from Andi-K/3.6-rc
vier: replace hard coded style paths
|
2018-03-21 21:12:04 -04:00 |
|
Andi
|
97840abdd6
|
|
2018-03-22 01:25:43 +01:00 |
|
|
Andi
|
1e2820805b
|
vier: replace hard coded style path
|
2018-03-22 01:15:59 +01:00 |
|
|
Hypolite Petovan
|
f3358b7af4
|
Merge pull request #4645 from Andi-K/3.6-rc
frio: removed "Illegal string offset" Warnings
|
2018-03-21 20:01:01 -04:00 |
|
|
Andi
|
c69fa859c4
|
Merge branch '3.6-rc' of https://github.com/Andi-K/friendica into 3.6-rc
|
2018-03-22 00:34:38 +01:00 |
|
|
Andi
|
e473be01db
|
frio: removed "Illegal string offset" Warnings
|
2018-03-21 23:53:41 +01:00 |
|
rabuzarus
|
7c78a92183
|
Merge pull request #4644 from annando/event-date
Event: Prevent SQL errors with events without end
|
2018-03-21 21:21:26 +01:00 |
|
|
Michael
|
e74f186b34
|
Event: Prevent SQL errors with events without end
|
2018-03-21 20:16:43 +00:00 |
|
Tobias Diekershoff
|
6b7f5960dc
|
Merge pull request #4642 from annando/updated-faq
Added linebreaks in the FAQ.
|
2018-03-21 08:07:20 +01:00 |
|
|
Michael
|
54405eb6fd
|
Added linebreaks in the FAQ.
|
2018-03-21 07:01:40 +00:00 |
|
|
Hypolite Petovan
|
9ec102cf3c
|
Merge pull request #4641 from annando/updated-faq
The FAQ had been updated to reflect the latest changes
|
2018-03-21 02:27:38 -04:00 |
|
|
Michael
|
c6d4d416b1
|
The FAQ had been updated to reflect the latest changes
|
2018-03-21 06:23:07 +00:00 |
|
|
Hypolite Petovan
|
417239be65
|
Merge pull request #4638 from annando/incorrect-datetime
Fix for incorrect datetime values
|
2018-03-21 01:24:50 -04:00 |
|
|
Michael
|
73efdb99e3
|
Fix for incorrect datetime values
|
2018-03-21 05:20:55 +00:00 |
|
|
Tobias Diekershoff
|
f082f0da4f
|
Merge pull request #4636 from annando/event-diaspora
Fix: Events on Diaspora now should look fine
|
2018-03-20 08:48:37 +01:00 |
|
|
Michael
|
f4ba5d9799
|
Fix: Events on Diaspora now should look fine
|
2018-03-20 06:32:17 +00:00 |
|
|
Hypolite Petovan
|
55614320b4
|
Merge pull request #4635 from fabrixxm/3.6-rc-it
Update IT strings
|
2018-03-19 16:53:48 -04:00 |
|
fabrixxm
|
05552e2a2f
|
Update IT strings
|
2018-03-19 20:39:19 +01:00 |
|
|
Hypolite Petovan
|
97d31255e5
|
Merge pull request #4634 from tobiasd/20180319-de
update for DE translation THX utzer
|
2018-03-19 13:50:37 -04:00 |
|
|
Tobias Diekershoff
|
08ed310d83
|
update for DE translation THX utzer
|
2018-03-19 18:38:47 +01:00 |
|
|
Hypolite Petovan
|
7f01ee066c
|
Merge pull request #4631 from friendica/fabrixxm-36rc-patch-1
Small fix to translatable string
|
2018-03-19 08:39:50 -04:00 |
|
|
fabrixxm
|
d9aca508cd
|
Fix another closing bracket in translatable string
|
2018-03-19 11:19:09 +01:00 |
|
|
fabrixxm
|
e6c59b0593
|
fix docstring of get_poke_verbs()
|
2018-03-19 10:20:01 +01:00 |
|
|
fabrixxm
|
8a2a4510ec
|
Small fixes to translatable string
and some small cosmetic fixup to docstring for `notification()`
|
2018-03-19 10:15:09 +01:00 |
|
|
Hypolite Petovan
|
9c5f2ad0fc
|
Merge pull request #4625 from annando/ostatus-groups
OStatus: Forum feeds now look like OStatus group feeds
|
2018-03-18 10:33:53 -04:00 |
|
Michael Vogel
|
188ef4f2e6
|
Merge pull request #4626 from tobiasd/20180318-installer
installer checks for POSIX functions
|
2018-03-18 15:31:52 +01:00 |
|
|
Tobias Diekershoff
|
5fad0cd123
|
count from zero...
|
2018-03-18 14:30:51 +01:00 |
|
|
Michael
|
d8824cc3bc
|
Improved similarity to ostatus group feeds
|
2018-03-18 11:18:25 +00:00 |
|
|
Michael
|
3ff6520ed5
|
OStatus: Forum feeds now look like OStatus group feeds
|
2018-03-18 10:31:12 +00:00 |
|
|
Tobias Diekershoff
|
a6845c0180
|
added check for POSIX kill to the installation wizard
|
2018-03-18 10:36:28 +01:00 |
|
|
Hypolite Petovan
|
25635295c7
|
Merge pull request #4624 from tobiasd/20180317-credits2
regen credits
|
2018-03-18 03:43:55 -04:00 |
|
|
Hypolite Petovan
|
cdcfabfd74
|
Merge pull request #4623 from tobiasd/20180318-installdocs
added note about POSIX to the installation docs
|
2018-03-18 03:43:44 -04:00 |
|
|
Tobias Diekershoff
|
c08c2bc37c
|
regen credits
|
2018-03-18 07:42:16 +01:00 |
|
|
Tobias Diekershoff
|
608e034a15
|
added note about POSIX to the installation docs
|
2018-03-18 07:21:22 +01:00 |
|
|
Hypolite Petovan
|
e970bbdca8
|
Merge pull request #4621 from annando/not-null
Avoid storing "null" values
|
2018-03-17 18:40:31 -04:00 |
|
|
Michael
|
9930c61263
|
Same same but different
|
2018-03-17 20:56:56 +00:00 |
|
|
Michael
|
c42c121e51
|
Fewer Defaults
|
2018-03-17 20:54:56 +00:00 |
|
|
Michael
|
8700d2a8ad
|
Avoid storing "null" values
|
2018-03-17 13:09:21 +00:00 |
|
|
Hypolite Petovan
|
d1c93e7a60
|
Merge pull request #4614 from annando/dir-own-contact
Fix: In the contact search you had been able to delete your own contact
|
2018-03-17 08:42:51 -04:00 |
|
|
rabuzarus
|
0f9af5d193
|
Merge pull request #4619 from annando/missing-doxygen
Added missing doxygen header
|
2018-03-17 10:47:03 +01:00 |
|
|
Michael
|
cd2c9722b0
|
Added missing doxygen header
|
2018-03-17 09:42:29 +00:00 |
|
|
Michael Vogel
|
bf0b98017d
|
Merge pull request #4618 from tobiasd/210180317-htconfig
activate the frio theme during installation
|
2018-03-17 10:40:09 +01:00 |
|
|
Tobias Diekershoff
|
fea18c11ea
|
Merge pull request #4617 from annando/issue-4611
Possible fix issue 4611: Don't write to database before it is created
|
2018-03-17 10:29:55 +01:00 |
|
|
Michael
|
537ef83a24
|
If we aren't connected to the database, we shouldn't return "true" on connect
|
2018-03-17 09:21:06 +00:00 |
|
|
Tobias Diekershoff
|
7a13ede69f
|
activate the frio theme during installation
|
2018-03-17 10:14:19 +01:00 |
|
|
Michael
|
782d692b5a
|
Possible fix issue 4611: Don't write to database before it is created
|
2018-03-17 09:04:38 +00:00 |
|
|
Michael
|
8053172398
|
Issue 4610: The query is simplified and shouldn't fail again
|
2018-03-17 07:50:49 +00:00 |
|