Hypolite Petovan
|
c97b1d6c03
|
Add executable composer.phar in util
|
2017-04-01 01:24:10 +02:00 |
|
Hypolite Petovan
|
87aac45230
|
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
|
2017-03-31 19:14:27 -04:00 |
|
Hypolite Petovan
|
d301a363b0
|
Merge pull request #3277 from annando/issue-3142
Replaces mcrypt with phpsec.
|
2017-03-31 11:02:30 -04:00 |
|
|
|
3796a141c6
|
We don't need this include anymore
|
2017-03-31 06:25:48 +00:00 |
|
|
|
1560534621
|
Now it's openssl - and no copy&paste failure anymore
|
2017-03-31 06:22:43 +00:00 |
|
|
|
973fcd3624
|
Test with OpenSSL
|
2017-03-30 23:21:52 +00:00 |
|
|
|
54c8fb2bb8
|
Replaces mcrypt with phpsec.
|
2017-03-30 18:29:12 +00:00 |
|
Hypolite Petovan
|
3cb08c7458
|
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
|
2017-03-28 03:12:53 -04:00 |
|
Michael Vogel
|
a4255de1e2
|
Merge pull request #3275 from tobiasd/20170327-es
ES translation THX Albert
|
2017-03-28 06:18:58 +02:00 |
|
Hypolite Petovan
|
bb559aaf30
|
Merge pull request #3276 from annando/issue-2959
Reestablish the communication with Mastodon
|
2017-03-27 23:44:09 -04:00 |
|
Hypolite Petovan
|
ce4eb1deb0
|
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
|
2017-03-27 21:24:24 -04:00 |
|
|
|
4fc1ebd4ea
|
Doing some Hypolyzation
|
2017-03-27 21:02:56 +00:00 |
|
|
|
c85331d8ac
|
Reestablish the communication with Mastodon
|
2017-03-27 20:58:15 +00:00 |
|
|
|
4720778edc
|
ES translation THX Albert
|
2017-03-27 22:06:56 +02:00 |
|
|
|
8580cd87a6
|
Merge pull request #3271 from Hypolite/issue/#3189
Fix Diaspora code blocks being mangled
|
2017-03-27 09:26:39 +02:00 |
|
|
|
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 |
|
|
|
fa7721c735
|
Prevent Hypolite from doing comments about standards ;-)
|
2017-03-27 06:11:45 +00:00 |
|
|
|
364d88fa70
|
Only import new OStatus posts if they are from our followers
|
2017-03-27 05:33:43 +00: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 |
|
|
|
68cfe9c7fe
|
library/oauth.php is not in use as well.
|
2017-03-26 14:19:34 +00:00 |
|
|
|
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 |
|
|
|
8fe1fc2f52
|
Remove parendingsdas
|
2017-03-26 13:12:02 +00:00 |
|
|
|
92f5315320
|
We now return basic system data via nodeinfo at every time.
|
2017-03-26 12:51:25 +00:00 |
|
|
|
632be78b55
|
Merge pull request #3267 from annando/issue-3248
Issue 3248: Make communityhome work again.
|
2017-03-26 08:03:46 +02:00 |
|
|
|
4168d47ecd
|
Issue 3248: Make communityhome work again.
|
2017-03-26 05:29:24 +00: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
|
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 |
|
|
|
18a2b48d1d
|
Remove unneeded linefeeds
|
2017-03-25 19:31:32 +00:00 |
|
|
|
585c2119d7
|
Remove the "call by reference"
|
2017-03-25 18:00:56 +00:00 |
|
|
|
444de52859
|
Use of exceptions
|
2017-03-25 16:56:04 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
adf9ed64bb
|
Avoid API error when calling "/api/friendica/profile/show"
|
2017-03-25 14:16:21 +00:00 |
|
|
|
a9dfd1fcb7
|
One more API call added
|
2017-03-25 11:31:31 +00:00 |
|
|
|
4665cda00e
|
Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup
|
2017-03-25 11:25:47 +00:00 |
|
|
|
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 |
|
|
|
0d49143a63
|
"no_utf" wasn't in use anymore - it is now removed completely
|
2017-03-25 10:51:00 +00:00 |
|
|
|
a419bbe7c7
|
Hypolite is right (not always, but in this case)
|
2017-03-25 10:11:02 +00:00 |
|
|
|
5060300138
|
Reset the static variable $baseurl
|
2017-03-25 10:07:45 +00:00 |
|
|
|
3b28f5a992
|
Merge pull request #3259 from Hypolite/issue/#3256
Upgrade PHP-Markdown + enable hard_wrap
|
2017-03-25 10:14:43 +01:00 |
|
|
|
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 |
|
