Commit graph

734 commits

Author SHA1 Message Date
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
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
Adam Magness 14fde5dc9b Log function
implement log() function.
2018-10-30 09:57:14 -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
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
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
Ralf Thees 2f7f9ffdd8 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-20 04:40:48 +02:00
Hypolite Petovan afeb6df225
[frio] Enable click through image caption in file browser 2018-10-19 10:46:09 -04:00
Jeroen De Meerleer bad7d1a9dc updated to match coding styles 2018-10-19 09:45:00 +02:00
Jeroen De Meerleer 65f2fc39e2 fixed view of active embedded videos 2018-10-19 09:37:15 +02:00
vinzv 2b663ed2b6
Fix broken credits box
Otherwise the content is exceeding the box, both on desktop and mobile.
2018-10-18 22:49:03 +02:00
Ralf Thees 5201e9009d Inserted missing hidden input with form_security_token 2018-10-17 22:53:24 +02:00
Jonny Tischbein 3065d1c40a Add Link promt in comment + only add URL instead of attachement via parse_url 2018-10-17 21:05:45 +02:00
Adam Magness 2db8c7d64f Fix template urls from contacts/ to contact/
Update templates to match recent contact/ changes.
2018-10-17 07:25:23 -04:00
Jonny Tischbein 5fd4402074 code standards + fixing navigation links to /contact/... 2018-10-14 20:03:22 +02:00
Jonny Tischbein bfa05156ca change links from /contacts to /contact 2018-10-13 13:29:56 +02:00
Jonny Tischbein 738cb4ace6 finish refactoring to Module\Contact 2018-10-13 11:35:51 +02:00
Jonny Tischbein cdbddd0103 Renaming functions and class 2018-10-13 11:23:52 +02:00
Jonny Tischbein 80ea86113d Move mod Contacts to /src/Module 2018-10-11 23:14:12 +02:00
Philipp Holzer 307286fc47
parameters and getURLpath to getURLPath 2018-10-10 01:18:47 +02:00
Philipp Holzer 5a02e39a65
Rename App Methods
- renamed a lot of App methods to CamelCase
- replaced direct public variables with get-/set-Methods
2018-10-10 00:16:06 +02:00
Hypolite Petovan 903290a764
Revert "Word Wrap for long words in comments" 2018-10-09 15:09:51 -04:00
Jonny Tischbein c0fc3c9845 frio set working css property + adding fix for vier 2018-10-09 17:12:28 +02:00
Jonny Tischbein 05d27e48aa word-wrap for comments in frio style.css 2018-10-09 16:47:28 +02:00
Hypolite Petovan 58c6ef2bc0
Merge pull request #5841 from JonnyTischbein/issue_profile_edit_sexual_marital
Fix (short) profile editing showing 'e' for martial and sexual preferences
2018-10-06 07:13:04 -04:00
Jonny Tischbein 17019772a4 Fix (short) profile editing showing 'e' for martial and sexual preference 2018-10-06 11:37:15 +02:00
Jonny Tischbein 5a5a281ed2 css for submit button 2018-10-05 00:11:13 +02:00
Jonny Tischbein 2802f031d4 Submit button for rss poll 2018-10-05 00:08:16 +02:00
Michael Vogel 103535d620
Merge pull request #5773 from MrPetovan/task/rewrite-js-hooks
Rewrite JS hooks
2018-10-01 17:10:30 +00:00
Jonny Tischbein 1803862fc5 associative array + adding mysql value + removing table header 2018-09-27 19:46:28 +02:00