Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-10-31 13:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
30843 commits 3 branches 64 tags 241 MiB
Commit graph

30843 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff
529d2fc74b DE update to the translation 2016-09-22 12:37:39 +02:00
Michael Vogel
c6f50d0468 Reworked ejabberd authentification 2016-09-22 02:57:40 +00:00
Michael Vogel
adb0c0c0a3 Merge pull request #2785 from tobiasd/20160921-msg 
regenerated messages.po
 2016-09-21 14:29:45 +02:00
Michael Vogel
d5b37c3dd0 Merge pull request #2784 from tobiasd/20160921-ptbr 
PT BR update to the strings
 2016-09-21 14:29:23 +02:00
Tobias Diekershoff
ac395c2136 regenerated messages.po 2016-09-21 12:13:32 +02:00
Tobias Diekershoff
754dc02753 PT BR update to the strings 2016-09-21 11:44:01 +02:00
Roland Haeder
c1a15befc5
Some improvements/fix: 
- fixed curly brace bug (introduced by myself)
- make all SQL keywords upper-case, column and table names lower-case
- used some more dbm::is_result

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-09-20 22:18:35 +02:00
Michael Vogel
225369230f Merge pull request #2782 from tobiasd/20160920-adm 
Show the worker queue count if the workers are active
 2016-09-20 19:25:45 +02:00
Michael Vogel
bb59acce80 Merge pull request #2783 from tobiasd/20160920-license 
it is 2016 by now
 2016-09-20 19:24:05 +02:00
Tobias Diekershoff
38c9a53da8 it is 2016 by now 2016-09-20 16:57:18 +02:00
Tobias Diekershoff
e5c2c66487 Show the worker queue count if the workers are active 2016-09-20 15:45:55 +02:00
Roland Haeder
50d168ab6b
Use more dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-09-19 22:13:33 +02:00
Roland Haeder
e171a1cd22
Some fixes: 
- avoids warning if no result is coming back
- brought back init variable before using it

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-09-18 23:39:07 +02:00
Roland Haeder
636164e9ef
Opps, wrong brace and removed invert of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-09-18 23:31:27 +02:00
Roland Haeder
c825cc8d0d
This merge brings back dbm::is_result() where I could find it. 
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-09-18 23:21:18 +02:00
Michael Vogel
8e6f9abedb Merge pull request #2779 from tobiasd/20160913-admin 
display current state of PHP logging in admin panel logging informations
 2016-09-14 07:00:38 +02:00
Tobias Diekershoff
88285b4cbf The info is not that important 2016-09-14 06:45:05 +02:00
Tobias Diekershoff
75ec222a31 Merge pull request #2778 from annando/1609-xmpp-auth 
XMPP authentification for multi domain systems
 2016-09-13 23:04:34 +02:00
Tobias Diekershoff
f85821839b display current state of PHP logging in admin panel logging informations 2016-09-13 22:52:21 +02:00
Michael Vogel
4f5997f30a XMPP authentification for multi domain systems 2016-09-13 20:29:47 +00:00
fabrixxm
bdd4aed9ba Bump version 2016-09-13 18:52:29 +02:00
fabrixxm
3d6e3cbb78 Merge branch 'master' into develop 2016-09-13 17:19:57 +02:00
fabrixxm
9702081722 Friendica 3.5 2016-09-13 16:46:11 +02:00
fabrixxm
4270c90584 Merge pull request #2776 from tobiasd/20160913-installtxt 
reflect requirements from install.md also in install.txt
 2016-09-13 15:48:23 +02:00
fabrixxm
e5825af04b Merge pull request #2777 from tobiasd/20160916-fr 
FR update to the strings, THX Damien Goutte-Gattat
 2016-09-13 15:48:07 +02:00
Tobias Diekershoff
4eec289522 FR update to the strings, THX Damien Goutte-Gattat 2016-09-13 15:41:38 +02:00
Tobias Diekershoff
ac9dca2d7f reflect requirements from install.md also in install.txt 2016-09-13 14:49:21 +02:00
Michael Vogel
0472f0594f Merge pull request #2768 from tobiasd/20160906-changes 
changes since 3.4.3
 2016-09-12 07:56:08 +02:00
Tobias Diekershoff
d6211c1839 missing bracket 2016-09-11 08:03:12 +02:00
Tobias Diekershoff
1807f13a6d work on forumdirectory 2016-09-09 23:22:59 +02:00
Tobias Diekershoff
949a5f722a Merge pull request #2774 from annando/1609-worker-processes 
New process table for a better detection of running workers
 2016-09-09 23:14:02 +02:00
Michael Vogel
1caa87dce6 Restructured the way, processes are inserted and removed 2016-09-09 20:55:49 +00:00
Michael Vogel
22f32d9721 New process table for a better detection of running workers 2016-09-09 20:33:54 +00:00
Tobias Diekershoff
b312e3591f two more issues closed 2016-09-09 12:06:21 +02:00
Michael Vogel
4d959f2f9d Merge pull request #2771 from rabuzarus/0709-frio-dropItem-fix 
frio: fix dropItem() didn't work for hubzila posts
 2016-09-07 06:53:53 +02:00
rabuzarus
d506b0906c frio: fix dropItem() didn't work for hubzila posts 2016-09-07 03:22:02 +02:00
Tobias Diekershoff
7b37a916a3 Merge branch '3.5rc' of https://github.com/friendica/friendica into 20160906-changes 2016-09-06 21:52:33 +02:00
Tobias Diekershoff
5ebeb7e85c Merge pull request #2770 from annando/sql-default-value 
No "NOT NULL" for text fields in database
 2016-09-06 21:37:28 +02:00
Michael Vogel
6b1b72e1fc Merge remote-tracking branch 'upstream/3.5rc' into sql-default-value 2016-09-06 19:10:57 +00:00
Michael Vogel
dcca992279 Merge pull request #2767 from tobiasd/20160906-credits 
new contributor to the docs
 2016-09-06 21:04:26 +02:00
Michael Vogel
0a50dbaece New database version 2016-09-06 19:01:05 +00:00
Tobias Diekershoff
43cbb02d99 Merge pull request #2769 from rabuzarus/0609-frio-attachment 
frio: show attachment icons in posts
 2016-09-06 16:33:31 +02:00
rabuzarus
ced8923323 frio: show attachment icons in posts 2016-09-06 16:21:14 +02:00
Tobias Diekershoff
af29294926 one missing issue 2016-09-06 08:39:47 +02:00
Tobias Diekershoff
cb0c8335fa changes since 3.4.2 2016-09-06 08:36:47 +02:00
Tobias Diekershoff
80ecb64f03 new contributor to the docs 2016-09-06 08:30:15 +02:00
Michael Vogel
ac1787d1e5 Merge remote-tracking branch 'upstream/3.5rc' into sql-default-value 2016-09-05 11:52:41 +00:00
rabuzarus
4f1f7c73ca Merge pull request #2765 from annando/1609-attachments 
Attachments are now displayed again.
 2016-09-05 12:50:31 +02:00
Michael Vogel
e6c5be18cc Merge pull request #2766 from ben-utzer/patch-1 
Update htconfig.md
 2016-09-05 05:18:21 +02:00
ben-utzer
2040cb4473 Update htconfig.md 
typo, siehe auch https://github.com/friendica/friendica/pull/2754
 2016-09-05 00:22:39 +02:00