friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
20,776 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

20776 Commits

Author SHA1 Message Date
Hypolite Petovan d019a87ecc Update version to 2018.12-dev 2018-09-23 19:02:11 -04:00
Hypolite Petovan a6996601d5
Merge pull request #5789 from friendica/master 
Update develop from master-2019.09
 2018-09-23 18:55:20 -04:00
Tobias Diekershoff c48fcd4a8f Welcome 2018.09 2018-09-23 21:12:10 +02:00
Tobias Diekershoff 71ec84f6dc Merge branch '2018.08-rc' 2018-09-23 21:08:30 +02:00
Tobias Diekershoff 18b20e8147
Changelog 2018.09 (#5685) 
* 1st batch of entries for the 2018.08 CHANGELOG file

* changes till the begin of RC phase

* updated the addon changes

* updated list of closed Issues

* updated at the end of the current RC phase

* last minute updates to the CHANGELOG

* missing stuff

* missing stuff ;-)

* other themes got enhancements as well
 2018-09-23 20:59:58 +02:00
Tobias Diekershoff 437a55a1f2
Merge pull request #5788 from MrPetovan/bug/php7-remove-pear-text_highlighter 
Add missing change to quattro main less file
 2018-09-23 19:07:41 +02:00
Hypolite Petovan c17a2b8a4e Add missing change to quattro main less file 2018-09-23 12:52:50 -04:00
Michael Vogel 939e6fc137
Merge pull request #5786 from tobiasd/20180923-toktan 
change the link to the DE wiki
 2018-09-23 10:59:48 +00:00
Tobias Diekershoff ebae440490 change the link to the DE wiki 2018-09-23 12:43:36 +02:00
Michael Vogel 649b1a94cc
Merge pull request #5784 from tobiasd/20180922-cs 
CS translation update THX Aditoo
 2018-09-23 09:41:43 +00:00
Tobias Diekershoff 780571bb68 CS translation update THX Aditoo 2018-09-22 19:30:26 +02:00
Hypolite Petovan 9386c54b9c
Merge pull request #5783 from annando/issue-5768 
Issue 5760: Avoid a non numeric value for "tt"
 2018-09-22 10:48:06 -04:00
Michael c6268ca0b7 Issue 5760: Avoid a non numeric value for "tt" 2018-09-22 14:17:14 +00:00
Tobias Diekershoff 684dfd5bbd
Merge pull request #5780 from annando/fix-relocation 
Hopefully fixes relocations that hadn't been executed
 2018-09-22 10:56:11 +02:00
Tobias Diekershoff 1a16876995
Merge pull request #5781 from annando/issue-5768 
Issue 5768: This logging should help finding the origin of the problem
 2018-09-22 10:54:10 +02:00
Michael b3e3147697 Issue 5768: This logging should help finding the origin of the problem 2018-09-22 07:09:27 +00:00
Michael 0dbb6313a5 Hopefully fixes relocations that hadn't been executed 2018-09-22 06:47:35 +00:00
rabuzarus fe0856e794
Merge pull request #5777 from JonnyTischbein/issue3870 
[frio] Formatbar in new Post and Share Button for Preview Post
 2018-09-21 18:51:35 +02:00
Jonny Tischbein b7e7850b75 disable formatbar in xs screens 2018-09-21 17:46:39 +02:00
Jonny Tischbein 08879298ea unique html id for share button in preview 2018-09-21 11:12:20 +02:00
Jonny Tischbein fedaf08bd1 remove old TODO 2018-09-20 17:26:19 +02:00
Jonny Tischbein 763ed35bc3 correct textarea id in insertFormattingToPost 2018-09-20 17:23:29 +02:00
Jonny Tischbein 9bc6238b59 Make formatbar work 2018-09-20 17:20:57 +02:00
Jonny Tischbein f590d31b4b Add format bar in new post jot 2018-09-20 17:14:32 +02:00
Jonny Tischbein 5edb124660 make share button visivle via theme js. Avoid illegal multiple use of html id 2018-09-20 17:09:39 +02:00
Jonny Tischbein 4c56724715 make share button visible in preview 2018-09-20 16:50:58 +02:00
Jonny Tischbein b1720c07ec Add Share button for preview new post 2018-09-20 16:20:33 +02:00
Hypolite Petovan 8dc5b04be7
Merge pull request #5776 from annando/fix-contact 
Fix: Update routine for conversations in contacts was missing
 2018-09-20 10:10:45 -04:00
Hypolite Petovan be93676894
Merge pull request #5775 from JonnyTischbein/form_return_path 
mod/editpost fix return fallback to SESSION Variable
 2018-09-20 10:04:25 -04:00
Jonny Tischbein 0f63a62761 fix return fallback to SESSION Variable 2018-09-20 15:55:24 +02:00
Hypolite Petovan d039d95106
Merge pull request #5774 from JonnyTischbein/form_return_path 
Calculate form return_url for post and message instead of using SESSION Variable
 2018-09-20 09:41:03 -04:00
Michael 58d43ad576 Fix: Update routine for conversations in contacts was missing 2018-09-20 12:44:40 +00:00
Jonny Tischbein 58f26d195f adjust argc check in mod/editpost + relative path in mod/message 2018-09-20 14:41:52 +02:00
Michael Vogel 5881fa7229
Merge pull request #5772 from MrPetovan/bug/php7-remove-pear-text_highlighter 
Remove references to Pear Text_Highlighter stylesheets
 2018-09-20 09:24:04 +00:00
Hypolite Petovan 18c8a7f247 Fix inline code span display 2018-09-19 23:10:41 -04:00
Hypolite Petovan 8fbcbbda16 Remove references to Pear Text_Highlighter stylesheets 2018-09-19 21:36:21 -04:00
Jonny Tischbein 807ad14521 calculate form return_url for post and message instead of using SESSION var 2018-09-19 23:55:29 +02:00
Michael Vogel 6e77d4799e
Merge pull request #5769 from tobiasd/20150819-credits 
regen credits
 2018-09-19 13:08:33 +00:00
Tobias Diekershoff d5f00569f0 regen credits 2018-09-19 11:16:47 +02:00
Michael Vogel bd0515714c
Merge pull request #5765 from MrPetovan/bug/php7-remove-pear-text_highlighter 
[php7] Remove PHP code highlighting
 2018-09-18 18:34:46 +00:00
Michael Vogel 1fa37586ca
Merge pull request #5764 from MrPetovan/task/update-mrpetovan-email-address 
Update "mrpetovan" email address
 2018-09-18 14:26:58 +00:00
Hypolite Petovan 71575671a5 [Composer] Update league/html-to-markdown to version 4.8.0 2018-09-18 08:58:31 -04:00
Hypolite Petovan d6985baaed Improve mod/babel 
- Handle multiple line endings
- Conserve HTML special chars in input box on submit
- Add new result panel with HTML::toMarkdown result
 2018-09-17 23:18:34 -04:00
Hypolite Petovan 382a7f5acd Create new HTML::toMarkdown wrapper 2018-09-17 23:17:41 -04:00
Hypolite Petovan 6500d40f58
Merge pull request #5766 from tobiasd/20180917-lng 
translation updates CS, NL, ZH CN
 2018-09-17 14:26:22 -04:00
Tobias Diekershoff 2660882f1e NL translation update THX Jeroen 2018-09-17 19:43:39 +02:00
Tobias Diekershoff 9927e7a7bf update to the zh-cn translation THX tomacat 2018-09-17 19:43:06 +02:00
Tobias Diekershoff ee0fc167c9 CS translation update THX Aditoo 2018-09-17 19:42:12 +02:00
Michael Vogel e68c48e88f
Merge pull request #5763 from MrPetovan/task/improve-getsiteinfo 
Use OEmbed data when available no matter the type
 2018-09-17 06:40:04 +00:00
Hypolite Petovan c4ea3bfb3e
Merge pull request #5728 from rabuzarus/20180905_-_fix_lockview 
lockview - prevent notices
 2018-09-16 23:02:23 -04:00