tobias/friendica
1
0
Fork 0
Code Pull requests Activity
14626 commits 2 branches 61 tags 203 MiB
Commit graph

14626 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan 359c246ef9 Various fixes 
- Removed superfluous CSS rule
- Fixed whitespace
- Restored separators in search_item.tpl
 2017-03-25 20:43:33 -04:00
Hypolite Petovan d7f80bf7e7 Merge branch 'develop' into improvement/frio-action-links-to-buttons 
# Conflicts:
#	view/theme/frio/js/filebrowser.js
#	view/theme/frio/templates/filebrowser.tpl
 2017-03-25 20:27:26 -04:00
Hypolite Petovan 7850abcee3 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2017-03-25 20:16:27 -04:00
Hypolite Petovan 632d77cfb1 Merge pull request #3251 from rabuzarus/20170320_-_fix_fbrowser 
Bugfix: fbrowser did insert 2 Pictures instead of only 1
 2017-03-25 16:13:31 -04:00
rabuzarus 8bbf43b9dd Remove the AjaxUpload element when jot modal is closed 2017-03-25 21:10:57 +01:00
Hypolite Petovan d78acd5408 Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons 2017-03-25 16:09:46 -04:00
Hypolite Petovan f6ef6f0c7a Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop 2017-03-25 16:09:10 -04:00
Hypolite Petovan 91eeb30bf9 Merge pull request #3265 from annando/1703-remove-linefeeds 
Remove unneeded linefeeds in HTML output
 2017-03-25 16:06:53 -04:00
Hypolite Petovan f1a75a57fe Merge pull request #3257 from annando/1703-gcontact 
Improved gcontact handling
 2017-03-25 15:35:41 -04:00
Michael 18a2b48d1d Remove unneeded linefeeds 2017-03-25 19:31:32 +00:00
Michael 585c2119d7 Remove the "call by reference" 2017-03-25 18:00:56 +00:00
Michael 444de52859 Use of exceptions 2017-03-25 16:56:04 +00:00
Tobias Diekershoff 6e35c49cb9 Merge pull request #3263 from annando/1601-api-statuses-lookup 
More GNU Social compatibility for the API
 2017-03-25 16:26:21 +01:00
Tobias Diekershoff 81eec6b2b5 Merge pull request #3264 from annando/1703-avoid-api-error 
Avoid API error when calling "/api/friendica/profile/show"
 2017-03-25 16:25:20 +01:00
Michael adf9ed64bb Avoid API error when calling "/api/friendica/profile/show" 2017-03-25 14:16:21 +00:00
Michael a9dfd1fcb7 One more API call added 2017-03-25 11:31:31 +00:00
Michael 4665cda00e Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup 2017-03-25 11:25:47 +00:00
Tobias Diekershoff eb482c3acf Merge pull request #3262 from annando/1703-no-no-utf 
"no_utf" wasn't in use anymore - it is now removed completely
 2017-03-25 12:01:53 +01:00
Michael 0d49143a63 "no_utf" wasn't in use anymore - it is now removed completely 2017-03-25 10:51:00 +00:00
Michael a419bbe7c7 Hypolite is right (not always, but in this case) 2017-03-25 10:11:02 +00:00
Michael 5060300138 Reset the static variable $baseurl 2017-03-25 10:07:45 +00:00
Tobias Diekershoff 3b28f5a992 Merge pull request #3259 from Hypolite/issue/#3256 
Upgrade PHP-Markdown + enable hard_wrap
 2017-03-25 10:14:43 +01:00
Tobias Diekershoff d8d2bc8456 Merge pull request #3261 from Hypolite/issue/#3260 
Remove Embedly integration
 2017-03-25 10:13:20 +01:00
Hypolite Petovan 86ed5caab7 Cleanup + Standards for library/markdown.php 2017-03-25 02:03:47 -04:00
Hypolite Petovan 29fb28de43 Remove Embedly integration 
- Remove admin setting input
 2017-03-25 01:57:19 -04:00
Hypolite Petovan b9f4a6e4f0 Code cleanup + standards 2017-03-25 01:54:16 -04:00
Hypolite Petovan 85144908fa Improve display feedback on like actions 
- Move rotator in sight
- Preventively change display class before next item update
 2017-03-23 22:47:56 -04:00
Hypolite Petovan 87bf6d39dd More display fixes 
See
https://github.com/friendica/friendica/pull/3204#issuecomment-288908490
 2017-03-23 22:45:40 -04:00
Hypolite Petovan 839a457ab2 Enable hard_wrap for Markdown parser to match Diaspora parsing 2017-03-23 21:23:00 -04:00
Hypolite Petovan c9214c2051 Upgraded PHP Markdown library to version 1.7.0 2017-03-23 21:19:24 -04:00
Michael b7242c3fa0 poco_last_updated is optimized 2017-03-23 22:56:22 +00:00
Michael 2ce5ab1467 removed commented out line 2017-03-23 07:36:22 +00:00
Michael 5b6215d7bd Better server_url handling 2017-03-23 07:34:45 +00:00
Michael c25af197c9 baseurl should now be set correctly at all the time. 2017-03-23 07:10:22 +00:00
Michael 26ec56dfa5 server_url was forgotten 2017-03-23 06:45:00 +00:00
Michael 9e5bec1bc8 "poco_check" is now replaced and removed 2017-03-23 06:23:23 +00:00
Michael 8e240a1e8c New function to validate gcontact array data 2017-03-22 23:13:32 +00:00
Hypolite Petovan b2cded0758 Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons 2017-03-22 07:29:13 -04:00
Hypolite Petovan d799662992 Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop 2017-03-22 07:28:22 -04:00
Michael 1d6910277d Remove more deprecated "poco_check" calls 2017-03-22 07:11:58 +00:00
Michael bc517ef3d2 Remove reduncancies 2017-03-22 05:26:44 +00:00
Hypolite Petovan 991b62784a Remove spaces confusing jSmart in contact_template 
- Fix two missing button closing tags
 2017-03-21 22:39:29 -04:00
Hypolite Petovan 8752ce6254 Merge pull request #3252 from annando/1703-worker-splitting 
The worker processes in cron.php are now split into many small parts
 2017-03-21 20:29:35 -04:00
Michael a376f55c1f Linefeed added 2017-03-21 22:06:57 +00:00
Michael Vogel 4ebebe96fe Merge branch 'develop' into 1703-worker-splitting 2017-03-21 17:08:07 +01:00
Hypolite Petovan 61a01141d7 Merge pull request #3253 from friendica/revert-3112-rewrites/coding-convention 
Revert "Coding convention applied - part 1"
 2017-03-21 12:04:19 -04:00
Hypolite Petovan 7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Michael Vogel 5a6da8b447 Merge branch 'develop' into 1703-worker-splitting 2017-03-21 16:38:59 +01:00
Michael f7b0c2082b Some standards 2017-03-21 15:24:49 +00:00
Michael 9c16b47f55 Strange comment removed 2017-03-21 15:15:58 +00:00