 Michael
|
c85331d8ac
|
Reestablish the communication with Mastodon
|
2017-03-27 20:58:15 +00:00 |
|
 Tobias Diekershoff
|
4720778edc
|
ES translation THX Albert
|
2017-03-27 22:06:56 +02:00 |
|
|
Tobias Diekershoff
|
8580cd87a6
|
Merge pull request #3271 from Hypolite/issue/#3189
Fix Diaspora code blocks being mangled
|
2017-03-27 09:26:39 +02:00 |
|
|
Tobias Diekershoff
|
0cf000469e
|
Merge pull request #3272 from annando/issue-2364
Only import new OStatus posts if they are from our followers
|
2017-03-27 09:24:41 +02:00 |
|
|
Michael
|
fa7721c735
|
Prevent Hypolite from doing comments about standards ;-)
|
2017-03-27 06:11:45 +00:00 |
|
|
Michael
|
364d88fa70
|
Only import new OStatus posts if they are from our followers
|
2017-03-27 05:33:43 +00:00 |
|
Hypolite Petovan
|
909439e59f
|
Fix contacts "View" link color
- Fixed whitespaces in `event.tpl`
|
2017-03-26 19:22:19 -04:00 |
|
|
Hypolite Petovan
|
55e4bab00e
|
Improve babel page display for diaspora2bb mode
- Fix formatting
|
2017-03-26 19:06:22 -04:00 |
|
|
Hypolite Petovan
|
3e285a690a
|
Fix Diaspora code blocks being mangled
- Remove whitespace removal code from `diaspora2bb()`
- Add code block skipping the HTML transforms removing whitespace in
`htm2bbcode()`
|
2017-03-26 19:00:04 -04:00 |
|
|
Hypolite Petovan
|
b952b22735
|
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
|
2017-03-26 18:59:32 -04:00 |
|
|
Hypolite Petovan
|
9dd6998126
|
Merge pull request #3270 from annando/1703-no-spam
The "spam" libary is not in use, so we remove it completely
|
2017-03-26 10:35:42 -04:00 |
|
|
Michael
|
68cfe9c7fe
|
library/oauth.php is not in use as well.
|
2017-03-26 14:19:34 +00:00 |
|
|
Michael
|
a06bbd809a
|
The "spam" libary is not in use, so we remove it completely
|
2017-03-26 14:06:26 +00:00 |
|
|
Hypolite Petovan
|
8cb9d51fa8
|
Merge pull request #3269 from annando/1703-nodeinfo
We now return basic system data via nodeinfo at every time.
|
2017-03-26 09:24:42 -04:00 |
|
|
Michael
|
8fe1fc2f52
|
Remove parendingsdas
|
2017-03-26 13:12:02 +00:00 |
|
|
Michael
|
92f5315320
|
We now return basic system data via nodeinfo at every time.
|
2017-03-26 12:51:25 +00:00 |
|
rabuzarus
|
5e54fb3a5f
|
css: border for images, min-with for folders list
|
2017-03-26 14:00:00 +02:00 |
|
|
Tobias Diekershoff
|
632be78b55
|
Merge pull request #3267 from annando/issue-3248
Issue 3248: Make communityhome work again.
|
2017-03-26 08:03:46 +02:00 |
|
|
Michael
|
4168d47ecd
|
Issue 3248: Make communityhome work again.
|
2017-03-26 05:29:24 +00:00 |
|
|
Hypolite Petovan
|
9375438216
|
Restore separator margins
|
2017-03-25 22:58:17 -04:00 |
|
|
Hypolite Petovan
|
8db4437ed7
|
Restores bold text for text dropdown button
|
2017-03-25 21:33:34 -04:00 |
|
|
Hypolite Petovan
|
fa9ce4721a
|
Fix superfluous comment box top margin
|
2017-03-25 21:29:13 -04:00 |
|
|
Hypolite Petovan
|
c01c7ad746
|
Fix .btn-link hover/focus color
|
2017-03-25 21:28:53 -04:00 |
|
|
Hypolite Petovan
|
5b7c8d8631
|
Fix indent in search_item.tpl
|
2017-03-25 20:45:03 -04:00 |
|
|
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 |
|
|
rabuzarus
|
aeb999c4d9
|
enable fbrowser for mobile view
|
2017-03-25 23:33:53 +01:00 |
|
 Roland Häder
|
fda99e39c1
|
used ltrim() for removing (any) trailing space
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2017-03-25 21:22:05 +01:00 |
|
|
Roland Häder
|
b97561e0c4
|
added spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2017-03-25 21:20:20 +01: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 |
|
|
rabuzarus
|
b6ab3bdd36
|
make use of Config class
|
2017-03-25 21:07:12 +01: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 |
|
|
rabuzarus
|
a2ad013830
|
some work on code standards compliance
|
2017-03-25 19:12:16 +01:00 |
|
|
Michael
|
585c2119d7
|
Remove the "call by reference"
|
2017-03-25 18:00:56 +00:00 |
|
|
Roland Häder
|
9ddb032bf2
|
strange that this curly brace didn't make it in. now it is, thanks to @annando
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2017-03-25 18:32:33 +01:00 |
|
|
Roland Häder
|
33fa1e79af
|
some spaces ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2017-03-25 18:32:21 +01: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 |
|
|
Roland Häder
|
66f5e104b1
|
and without self:: ;-(
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2017-03-25 15:13:38 +01:00 |
|
|
Roland Häder
|
952f2218ed
|
there is already $this->backend around, needs renaming
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2017-03-25 15:12:41 +01:00 |
|
|
Roland Häder
|
0e6b009425
|
fixed another parser error, opps
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2017-03-25 15:04:07 +01:00 |
|
|
Roland Häder
|
fccdc63964
|
Opps, fixed parser error. indending was confusing here
+ added much more curly braces
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2017-03-25 14:56:23 +01:00 |
|