rabuzarus
ee293f2ce2
Merge develop into 20170321_-_frio-fbbrowser
...
Conflicts:
view/theme/frio/js/filebrowser.js
view/theme/frio/js/theme.js
view/theme/frio/templates/filebrowser.tpl
view/theme/frio/templates/jot.tpl
2017-04-03 00:51:34 +02:00
rabuzarus
1ce5cc1b49
Merge pull request #3204 from Hypolite/improvement/frio-action-links-to-buttons
...
Frio: Turn action links into buttons
2017-04-02 23:15:57 +02:00
c574c317ef
Removed unneeded comment
2017-04-02 20:43:54 +00:00
884c75a350
Issue 3278: Attachments in Reshares should now work
2017-04-02 19:18:11 +00:00
Hypolite Petovan
3e51ebd499
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
2017-04-02 10:01:30 -04:00
Michael Vogel
d9451ef969
Merge pull request #3279 from Hypolite/improvement/add-composer
...
Add Composer
2017-04-02 14:57:37 +02:00
Hypolite Petovan
6a5b9dcd76
Merge pull request #3283 from annando/issue-2957-2
...
Issue 2957: The avatar problem with mastodon should now be solved
2017-04-02 08:56:35 -04:00
Hypolite Petovan
95a5740229
Add links to EN pages in DE help
2017-04-02 08:54:11 -04:00
94f3f0887b
Issue 2957: The avatar problem with mastodon should now finally be solved
2017-04-02 12:37:22 +00:00
ed3aa9fa73
Merge pull request #3282 from annando/1704-platform-name
...
Show real platform names
2017-04-02 10:03:57 +02:00
54f49169d4
Show real platform names
2017-04-02 07:53:55 +00:00
Hypolite Petovan
2952e2b3e4
Merge pull request #3281 from annando/issue-3206-2957
...
Mastodon: plink for reshares, missing hostnames for avatars
2017-04-01 21:24:28 -04:00
Hypolite Petovan
00577eab2c
Add EOF newline to composer.json
2017-04-01 21:09:36 -04:00
07fd61b912
Mastodon: plink for reshares, missing hostnames for avatars
2017-04-01 23:39:19 +00:00
Hypolite Petovan
7606ac5e32
frio: Fix help pages inline code display
2017-04-01 17:58:35 -04:00
Hypolite Petovan
1c276b5cd5
Add Composer documentation
2017-04-01 17:58:21 -04:00
Roland Häder
49527b70d3
Merge branch 'develop' into rewrites/coding-convention-split2
2017-04-01 22:16:08 +02:00
3cea176ef2
added spaces + used x ()
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-01 22:12:53 +02:00
Hypolite Petovan
7cd795d795
Merge pull request #3280 from annando/issue-3142-2
...
Issue 3142: mcrypt is no more (as well as phpseclib)
2017-04-01 14:32:27 -04:00
240a0961c6
Standards ...
2017-04-01 17:08:11 +00:00
648d5bd047
More mcrypt is removed
2017-04-01 10:07:12 +00:00
16d4392573
Documentation added
2017-04-01 09:05:56 +00:00
f6d7ee2781
Issue 3142: mcrypt is no more (as well as phpseclib)
2017-04-01 08:28:42 +00:00
Hypolite Petovan
806368f151
Move MobileDetect library to vendor
...
- Bumped the version to 2.8.25 (from 2.8.11)
2017-03-31 23:05:07 -04:00
Hypolite Petovan
799e60aa62
Replace existing autoloader with Composer-supplied
...
- Move Friendica namespace to `src`
- Move required `ezyang/htmlpurifier` to vendor
- Remove existing static autoloader
- Change boot.php reference to the autoloader
2017-03-31 23:02:38 -04:00
Hypolite Petovan
cae0543629
Composer: Add vendor directry
...
- Add gitignore to avoid committing libraries' .git folder
2017-03-31 22:34:30 -04:00
Hypolite Petovan
8c49a7b68f
Add composer.json
2017-03-31 22:33:18 -04:00
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
60552260e1
Continued with CR:
...
- added spaces as requested
- removed parentheses from include/require calls as they are no functions
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 21:04:39 +02:00
d4e67338d8
space-time contines ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:56:43 +02:00
18ca141f5c
space-time!
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:52:43 +02:00
44a137a8de
Continued a bit:
...
- converted multiple single-line comments into one multi-line comment
- added spaces (space-time!)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:51:47 +02:00
07a0d300c3
added space, marked rest 86 occurrences in todos.txt
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:49:58 +02:00
9cfcf8f7ca
added spaces, marked in todos.txt as usual
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:47:44 +02:00
eab654dd65
$tagged is being initialized but not written to until the foreach() loop is
...
being executed. Maybe here is old-lost code anyway?
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:45:15 +02:00
8bdc906013
Continued a bit:
...
- added 'array' type-hint which is valid for many versions back
- added spaces as requested by CR
- removed $a = get_app(); call, $a was no longer needed here
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:42:20 +02:00
8824da8962
Continued a bit:
...
- recommended way is to use foreach() instead of own looping through arrays
- even when you need the index:
<?php
foreach ($someArray as $key => $value) {
// Handle $key/$value somehow
}
?>
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:37:01 +02:00
6db3d72ee3
added spaces (space-time!) and TODO that x() is maybe proper way?
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:33:11 +02:00
d98ac6b42d
Continued a bit:
...
- removed parentheses from include/require as they are no functions
- added type-hint for $a which is unused btw.
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:31:00 +02:00
5db963a835
fixed parser error
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:05:40 +02: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
0bc15efef6
whoops, parser error fixed
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:51:42 +02:00
16415520e7
it is space-time! ;-)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:50:27 +02:00
192f6d7cf4
merged 2 if() into one three times
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:49:03 +02:00
de5125a4c7
merged 2 if() into one as requested by CR
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:45:49 +02:00
2a480df6fa
added spaces + removed parentheses (include/require are no functions)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:44:55 +02:00
