Commit graph

5202 commits

Author SHA1 Message Date
Michael
191c1a400a The expiry of conversations can now be configured in the admin panel 2018-11-19 06:58:46 +00:00
Hypolite Petovan
f5d58d07e1
Merge pull request #6154 from JonnyTischbein/issue_open_commentbox_post_with_replies
[frio] Fix opening comment box when Post has replies
2018-11-17 10:01:05 -05:00
Jonny Tischbein
dd7d556c86 Fix opening comment box when Post has replies 2018-11-17 15:53:34 +01:00
Alexandre Alapetite
4d092872a5 Escaping moved to template
https://github.com/friendica/friendica/pull/6147#pullrequestreview-176051481
2018-11-17 14:01:07 +01:00
Tobias Diekershoff
31d9be8337 CS, FR, PL translation updates 2018-11-16 20:08:31 +01:00
Adam Magness
218f0734be Rename removeTags to escapeTags
rename function and update calls.
2018-11-09 13:29:42 -05:00
Adam Magness
ffc406d819 normalise_link calls
implement normaliseLink function
2018-11-08 11:28:29 -05:00
Adam Magness
0efcbe5d15 protect_sprintf calls
implement protectSprintf function
2018-11-08 10:30:45 -05:00
Adam Magness
a0f65ca7a1 notags calls
implement removeTags function
2018-11-08 10:14:37 -05:00
Michael
077a96fb28 Using CSS for custom emojis 2018-11-08 07:42:19 +00:00
Jonny Tischbein
93d50af700 move live update: update_contacts to update_contact 2018-11-06 22:22:42 +01:00
Tobias Diekershoff
6dbe307a27 PL translation update THX waldis 2018-11-01 07:59:05 +01:00
Tobias Diekershoff
1ad5f2dc46 CS translation update THX Aditoo 2018-11-01 07:58:53 +01:00
Tobias Diekershoff
a4cd01a13a DE translation THX vinz 2018-11-01 07:58:43 +01:00
Jonny Tischbein
b73be5749b Add support for quattro 2018-10-31 20:17:11 +01:00
Jonny Tischbein
6b43174a74 Fix for vier theme / NonAjax Call 2018-10-31 20:09:44 +01:00
Jonny Tischbein
b66bcb20da Redirect to previous page after NON-AJAX Post delete via second parameter in /item/drop 2018-10-31 20:09:44 +01:00
Adam Magness
70f01d6c00 Template Engine and props to Renderer
move methods and props from App to Renderer
2018-10-31 13:25:38 -04:00
Adam Magness
35abc4bb64 get markup template
implement getMarkupTemplate function
2018-10-31 10:44:06 -04:00
Adam Magness
91facd2d0a replace macros
implement new replaceMacros function
2018-10-31 10:35:50 -04:00
Hypolite Petovan
f8ef92f84a
Merge pull request #6052 from rabuzarus/20181030_-_frio_fix_link_highlight
Frio - on mobiles the links in the thread will always have the link color (disabling thread hover effect)
2018-10-31 09:04:17 -04:00
rabuzarus
d02f940811 Frio - some cleanups for default.php 2018-10-31 10:22:32 +01:00
rabuzarus
bfe59b4054 Frio - on mobiles the links in thread will always have the link color (disabling thread hover effect) 2018-10-31 10:14:02 +01:00
rabuzarus
ec9f22de92 Frio - add desktop or mobile view class to the html body 2018-10-31 10:07:51 +01:00
Tobias Diekershoff
423b831f84 DE translation THX vinz 2018-10-31 09:36:49 +01:00
Adam Magness
50da89d861 Logger Levels
update logger levels in calls
2018-10-30 09:58:45 -04:00
Adam Magness
14fde5dc9b Log function
implement log() function.
2018-10-30 09:57:14 -04:00
Hypolite Petovan
f7147fae96
Merge pull request #6041 from nupplaphil/install_to_module
Install to Module
2018-10-30 08:17:26 -04:00
Jonny Tischbein
f4d2f78233 Enables error messages for files too 2018-10-29 23:28:20 +01:00
Jonny Tischbein
780d1edf04 Show error message if image exceeds limit + fix close button 2018-10-29 23:06:42 +01:00
Philipp Holzer
f0382ab919
Refactoring Installation
- centralized installation
- renamed Core\Install to Core\Installer
- avoid using $a->data[] for states
- removed unnecessary code
2018-10-29 18:44:39 +01:00
Hypolite Petovan
7ee8bdafc5
Merge pull request #5966 from JeroenED/theme/frio/oembed/view-active-class
fixed view of active embedded videos
2018-10-26 19:25:30 -04:00
Tobias Diekershoff
96d1664187 CS translation update THX Aditoo 2018-10-26 07:37:31 +02:00
Jonny Tischbein
e022bac339 Code Standard + renaming deleteAllTags + move its call and add type param 2018-10-25 21:47:10 +02:00
Jonny Tischbein
272eb5eb82 fix doxygen header + indent 2018-10-25 21:47:10 +02:00
Jonny Tischbein
fd2e06781d Fix adding / removing photo tags + tagrm delete via GET + Item::update / add Term::deleteAllTags 2018-10-25 21:47:10 +02:00
Michael Vogel
dbfe5c9d2a
Merge pull request #6017 from MrPetovan/task/move-pager-out-of-app
Road to Router Part 5: Move pager out of App
2018-10-25 21:21:23 +02:00
Ralf Thees
4ddf59e016 indents now with tabs 2018-10-25 09:33:01 +02:00
Hypolite Petovan
14237a9599 Move $pager and $page_offset out of App
- Move infinite scroll data output in a module hook
- Use Pager instead of paginate() and alt_pager()
2018-10-25 00:07:15 -04:00
Ralf Thees
dfbaa6e198 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-24 21:14:45 +02:00
Hypolite Petovan
9c9ebfc7c9
Merge pull request #6013 from JonnyTischbein/issue_comment_media_link_prompt
[frio] Add media / link prompt in comments
2018-10-24 12:17:58 -04:00
Jonny Tischbein
6cd17f2229 Code Standard: indent + renaming function in camelcase 2018-10-24 18:09:54 +02:00
Ralf Thees
722fd653ae Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-24 16:38:29 +02:00
Jonny Tischbein
d2b5f77be9 Add multimedia link for jot + enables hover text in jot + autosize in when paste link + renaming / Code Standards 2018-10-24 16:20:10 +02:00
Michael
95dc030926 Show deferred worker tasks in the admin interface and workerqueue logs 2018-10-23 20:38:28 +00:00
Jonny Tischbein
ee006bdc18 Code Standards 2018-10-23 20:12:53 +02:00
Jonny Tischbein
d0c43c5597 Add prompt for link and media in comment + remove video symbol 2018-10-23 19:50:19 +02:00
Ralf Thees
ff203c277d Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-22 23:20:00 +02:00
Hypolite Petovan
ac19a9cddc
Merge pull request #5959 from vinzv/patch-2
Fix broken credits box
2018-10-21 17:03:55 -04:00
Vinzenz Vietzke
934639654c reverted css changes, adapted credits.tpl from default theme for frio 2018-10-21 22:50:41 +02:00