jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12795 commits 10 branches 58 tags 216 MiB
Commit graph

12795 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff
88285b4cbf The info is not that important 2016-09-14 06:45:05 +02:00
Tobias Diekershoff
f85821839b display current state of PHP logging in admin panel logging informations 2016-09-13 22:52:21 +02: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
Michael Vogel
1cb6043aea Attachments are now displayed again. 2016-09-04 18:06:07 +02:00
Michael Vogel
6e25077893 Merge pull request #2760 from gerhard6380/3.5rc 
API: change friendica_activities to include arrays of users
 2016-09-03 20:47:52 +02:00
Michael Vogel
6df40b1161 sQL: No "NOT NULL" on text fields. 2016-09-03 15:06:42 +00:00
rabuzarus
eec626f6bf Merge pull request #2762 from annando/1609-tagged 
The "tagged with" message now works again.
 2016-09-03 13:06:43 +02:00
Michael Vogel
c02b1c3f36 The "tagged with" message now works again. 2016-09-03 12:48:51 +02:00
gerhard6380
3a31619509 API: change friendica_activities to include arrays of users 2016-09-02 17:01:52 +02:00
Tobias Diekershoff
014fc5dccb Merge pull request #2758 from annando/1609-sql-charset 
Set the charset for the SQL connection for new installations
 2016-09-01 09:22:07 +02:00
Michael Vogel
35813ab377 Set the PHP requirements to php 5.4 2016-09-01 06:47:36 +00:00
Michael Vogel
59ff309ee5 Add the new charset parameter to the database creation 2016-09-01 04:44:29 +00:00
Michael Vogel
9209d88c4a Set the charset for the SQL connection for new installations 2016-09-01 03:50:41 +00:00
Tobias Diekershoff
02c29f1313 Merge pull request #2748 from rabuzarus/rabuzarus-pending 
best_link_url: don't use redirect for pending contacts
 2016-08-31 15:55:26 +02:00
Tobias Diekershoff
c62a28d95e Merge pull request #2755 from rabuzarus/theme-init-identity 
fix theme loading
 2016-08-31 15:53:42 +02:00
rabuzarus
aedd2cfa60 Update identity.php 2016-08-31 13:49:24 +02:00
rabuzarus
1bfe7b432a Merge pull request #2753 from annando/1608-sql-errors 
Bugfix: Fixed two bad sql queries
 2016-08-29 22:24:37 +02:00
Michael Vogel
41613ec55d Bugfix: Fixed two bad sql queries 2016-08-29 18:40:40 +00:00
rabuzarus
e0d329ece9 Merge pull request #2750 from annando/1608-worker-priority-again 
Prevent lowest priority calls from never being called
 2016-08-28 00:39:58 +02:00
rabuzarus
fde0665d6d Merge pull request #2749 from annando/1608-dbstructure 
dbstructure: Set the version when updating manually
 2016-08-28 00:39:15 +02:00
Michael Vogel
6a167cf8b1 Prevent lowest priority calls from never being called 2016-08-27 21:05:38 +00:00