Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-14 20:22:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
15269 commits 3 branches 64 tags 246 MiB
Commit graph

15269 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roland Haeder
5a28eae59d
Opps, fixed parser error ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 22:20:19 +02:00
Roland Haeder
737a6670af
Continued a bit: 
- more spaces added
- more curly braces added
- let's use x($_FOO, 'bar') and not isset($_FOOT['bar'])

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 22:18:03 +02:00
Roland Haeder
2a2e55e53d
overworked api.php: 
- added 'new' keyword because 'throw Exception' won't work
- removed self-advertisement
- added tons of spaces
- added tons of curly braces
- removed parentheses from require/include
- more usage of dbm::is_result()
- still there is a lot todo

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 22:11:09 +02:00
Michael Vogel
98a7bdf791 Merge pull request #3290 from Hypolite/issue/#3274 
Add Text_highlighter to Composer
 2017-04-05 21:39:10 +02:00
Roland Haeder
33e938a837
added spaces + used x() the proper way 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 19:36:01 +02:00
Roland Haeder
57b6e4c636
added spaces (CR) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 19:34:38 +02:00
Roland Haeder
849e56e3a5
added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 19:27:44 +02:00
Roland Haeder
64cf909ca2
added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 19:26:37 +02:00
rabuzarus
c3b975e516 change fbrowser image margin and box-shadow 2017-04-05 12:46:09 +02:00
rabuzarus
190b03e706 add aria attributes for filebrowser 2017-04-05 12:34:00 +02:00
rabuzarus
0542cd6a14 add aria attributes + restructure some js to change the aria attributes 2017-04-05 11:46:42 +02:00
Hypolite Petovan
1ab28bbe03 Add Text_Highlighter to Composer 
- Fixes critical mistake in boot.php regarding set_include_path
- Fixes minor mistake in text.php regarding strpos order of arguments

Note: This change significantly increases Composer running time because
Text_Highlither is a PEAR package. I'm already planning to replace it
with scrivo/highlight.php.
 2017-04-05 00:31:49 -04:00
Michael Vogel
3c6d976d31 Merge pull request #3289 from Hypolite/improvement/add-composer 
Add Composer FAQ
 2017-04-05 05:21:15 +02:00
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
Roland Haeder
03571f6e74
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-04 19:46:56 +02: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 Haeder
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