Commit Graph

14855 Commits

Author SHA1 Message Date
Hypolite Petovan 6494d05dde Merge branch 'develop' of https://github.com/Hypolite/friendica into develop 2017-04-04 21:48:36 -04:00
Hypolite Petovan b09553a71b Add Composer FAQ 2017-04-04 20:34:06 -04:00
Tobias Diekershoff bebff8ebbb Merge pull request #3286 from annando/issue-1720
Issue 1720: Group filter and new tab don't like each other
2017-04-04 07:50:33 +02:00
Michael 407e25e7d6 Some little standard stuff 2017-04-04 05:39:43 +00:00
Michael a0216af4bb Issue 1720: Group filter and new tab don't like each other 2017-04-04 05:35:04 +00:00
Hypolite Petovan 500f0985f8 Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop 2017-04-03 22:06:09 -04:00
rabuzarus dd919b7f80 small css fix 2017-04-03 15:04:54 +02:00
rabuzarus 0bb1466723 use buttons for mobile jot nav 2017-04-03 14:32:54 +02:00
rabuzarus 0b280219c6 use box-shadow instead of border 2017-04-03 14:20:34 +02:00
rabuzarus 9f37acc6d4 add href attribute to jot links 2017-04-03 14:00:27 +02:00
rabuzarus 036c18be7b use height: 0 instead of display: none to hide jot sections 2017-04-03 13:38:07 +02:00
rabuzarus 68659c7740 add missing overflow to css 2017-04-03 12:55:06 +02:00
rabuzarus 4dfdbeba54 fix max-height for screens bigger than 768px 2017-04-03 12:46:31 +02:00
Hypolite Petovan 48dde02e75 Merge pull request #3254 from Quix0r/rewrites/coding-convention-split2
Rewrites/coding convention split2
2017-04-03 06:38:10 -04:00
Hypolite Petovan 9237b2611a Merge branch 'develop' into rewrites/coding-convention-split2 2017-04-03 06:35:27 -04:00
Hypolite Petovan e4917503da Merge pull request #3284 from annando/issue-3278
Issue 3278: Attachments in Reshares should now work
2017-04-02 22:49:07 -04:00
rabuzarus 80f5a026be re-enabel browser for small screens 2017-04-03 02:04:13 +02:00
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
Michael c574c317ef Removed unneeded comment 2017-04-02 20:43:54 +00:00
Michael 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
Michael 94f3f0887b Issue 2957: The avatar problem with mastodon should now finally be solved 2017-04-02 12:37:22 +00:00
Tobias Diekershoff ed3aa9fa73 Merge pull request #3282 from annando/1704-platform-name
Show real platform names
2017-04-02 10:03:57 +02:00
Michael 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
Michael 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
Roland Häder 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
Michael 240a0961c6 Standards ... 2017-04-01 17:08:11 +00:00
Michael 648d5bd047 More mcrypt is removed 2017-04-01 10:07:12 +00:00
Michael 16d4392573 Documentation added 2017-04-01 09:05:56 +00:00
Michael 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
Roland Häder 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
Roland Häder d4e67338d8
space-time contines ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:56:43 +02:00
Roland Häder 18ca141f5c
space-time!
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:52:43 +02:00
Roland Häder 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