Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-01 16:09:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
36918 commits 3 branches 64 tags 242 MiB
Commit graph

36918 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pierre Rudloff
2ea2c4b87b In standalone mode, open links to source in a new tab (fixes #3359) 2017-04-19 23:27:11 +02:00
Roland Häder
9739758c42
added curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-04-19 23:07:59 +02:00
Roland Häder
b9d8587f41 Merge branch 'develop' into rewrites/coding-convention-split2-1-2 2017-04-19 23:06:01 +02:00
Roland Häder
98edbde05c
added braces, opps 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-04-19 23:03:44 +02:00
Hypolite Petovan
5432af3414 Merge pull request #3363 from sesom42/develop 
displays the correct profile for contacts that have set the default profile
 2017-04-19 15:45:38 -04:00
Alexandre Alapetite
6cc4f8b0a9 Delete frio dynamic.php 
https://github.com/friendica/friendica/pull/3326#discussion_r112116929
 2017-04-19 21:44:13 +02:00
Jens Tautenhahn
a8c20013c4 displays the correct profile for contacts that have set the default profile 2017-04-19 20:25:25 +01:00
Michael Vogel
da9bbc25cf Merge pull request #3361 from Hypolite/issue/#3053 
Change default directory URL
 2017-04-19 19:00:42 +02:00
Hypolite Petovan
02a5d3fdb7 Change default directory URL 2017-04-19 12:27:51 -04:00
Michael Vogel
d95acdeab8 Merge pull request #3355 from Hypolite/issue/fix-language-guess 
Skip lang file search if lang=en
 2017-04-19 16:24:30 +02:00
Hypolite Petovan
bf1199f2ea Standards 2017-04-19 10:14:43 -04:00
rabuzarus
2785b9d5e2 Merge pull request #3357 from Hypolite/issue/fix-frio-comment-box 
Fix Issues with frio comment box
 2017-04-19 14:14:35 +02:00
Hypolite Petovan
941dd48b53 Add explicit parentheses in condition 2017-04-19 07:05:48 -04:00
Michael Vogel
901c757069 Merge pull request #3356 from Hypolite/issue/fix-notifications-display 
Remove extra htmlentities in notifications
 2017-04-19 07:10:31 +02:00
Hypolite Petovan
f15bb6c516 Add autosize call for all external textarea value changes 2017-04-18 22:04:23 -04:00
Hypolite Petovan
5c3abe0ca6 Prevent comment UI from closing when using BBCode buttons with empty textarea 2017-04-18 22:03:49 -04:00
Hypolite Petovan
2c69d36886 Remove extra htmlentities in notifications 2017-04-18 19:34:46 -04:00
Hypolite Petovan
83ab3e3307 Skip lang file search if lang=en 2017-04-18 19:21:26 -04:00
Hypolite Petovan
d94e930065 Merge pull request #3354 from annando/issue-3157 
Issue 3157: No fulltext anymore
 2017-04-18 16:31:15 -04:00
Hypolite Petovan
f1aed292db Merge pull request #3353 from annando/1704-empty-contacts 
Handle the case when the given contact url or address is empty
 2017-04-18 16:20:33 -04:00
Michael
33d5e5b818 Issue 3157: No fulltext anymore 2017-04-18 20:09:05 +00:00
Alexandre Alapetite
08924b9c59 Revert unneeded changes in third-party libraries 
https://github.com/friendica/friendica/pull/3326#discussion_r112039526
https://github.com/friendica/friendica/pull/3326#discussion_r112039589
 2017-04-18 21:21:29 +02:00
Michael
828ae671f0 Handle the case when the given contact url or address is empty 2017-04-18 18:50:01 +00:00
Hypolite Petovan
08209419aa Merge pull request #3352 from annando/issue-3351 
Issue 3351: Check if resource was created
 2017-04-18 13:48:47 -04:00
Michael
806f395724 Issue 3351: Check if resource was created 2017-04-18 17:17:15 +00:00
Hypolite Petovan
c02d801440 Merge pull request #3350 from annando/1704-resubmit-directory 
Resubmit all profiles on directory change
 2017-04-18 00:03:22 -04:00
Michael
47fd9226c3 Resubmit all profiles on directory change 2017-04-17 21:39:11 +00:00
Hypolite Petovan
1955d3d1b8 Merge pull request #3349 from annando/1704-api-owner 
API: The "friendica-owner" has only to be different from the user on starting posts
 2017-04-17 13:00:58 -04:00
Michael
1681d18693 API: The "friendica-owner" has only to be different from the user on starting posts 2017-04-17 14:38:13 +00:00
Hypolite Petovan
7cfe83fd24 Merge pull request #3348 from Alkarex/SQL-messages-AS 
SQL AS for messages
 2017-04-17 09:03:20 -04:00
Alexandre Alapetite
d1888ac05c SQL AS for messages 
Fix bug introduced in https://github.com/friendica/friendica/pull/3323
 2017-04-17 15:01:05 +02:00
rabuzarus
6a7a4591d3 Merge pull request #3333 from Rudloff/feature/theme-color 
theme-color meta
 2017-04-17 13:51:37 +02:00
Pierre Rudloff
6cd6e886db Updated theme-color code 
Add comment explaining what the code does
Remove unused include
Code standards
 2017-04-17 13:38:55 +02:00
Michael Vogel
a941199760 Merge pull request #3344 from tobiasd/20170412-doc 
some words about the workers
 2017-04-17 08:11:18 +02:00
Tobias Diekershoff
d5c2b9d4cd Ham 2017-04-17 07:33:12 +02:00
Alexandre Alapetite
07faa14361 Merge branch 'develop' into utf8mb4 2017-04-16 22:08:48 +02:00
Hypolite Petovan
457cec3e0d Merge pull request #3321 from Alkarex/MySQL5.7 
Fix for MySQL 5.7+ NO_ZERO_DATE
 2017-04-16 16:03:13 -04:00
Hypolite Petovan
afa70bf74e Merge pull request #3345 from annando/1704-db-update-error 
Print out database error messages
 2017-04-16 16:03:06 -04:00
Alexandre Alapetite
a2a03c3f70 Default UTF8MB4 for CREATE DATABASE 2017-04-16 16:04:38 +02:00
Alexandre Alapetite
5d3bf9307f More replaces UTF8 to UTF8MB4 2017-04-16 15:53:48 +02:00
Michael
d80a09c9e5 Doxygen header added 2017-04-16 13:37:42 +00:00
Alexandre Alapetite
c35eef625a More general date test for dob 2017-04-16 15:36:01 +02:00
Alexandre Alapetite
62768a1bb4 Bump version to 1219 
https://github.com/friendica/friendica/pull/3321#pullrequestreview-32528437
 2017-04-16 15:23:57 +02:00
Michael
3e6f501bc0 Print out database error messages 2017-04-16 13:21:49 +00:00
Alexandre Alapetite
6b250d3ae9 Merge branch 'develop' into MySQL5.7 2017-04-16 15:16:58 +02:00
Tobias Diekershoff
f3393106ae typos 2017-04-16 13:59:52 +02:00
Tobias Diekershoff
5a0af71ade remote_self paragraph was missing in DE 2017-04-16 13:54:12 +02:00
Tobias Diekershoff
09da31442e Worker auf Deutsch 2017-04-16 13:47:57 +02:00
Tobias Diekershoff
f4466b86e3 some EN doc about the worker 2017-04-16 13:32:41 +02:00
Tobias Diekershoff
4e5b926d23 Merge pull request #3343 from annando/1704-mastodon 
Discover Mastodon servers
 2017-04-16 10:23:07 +02:00