clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
21,922 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

775 Commits

Author SHA1 Message Date
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
Jonny Tischbein 16d37acca1 fix indent 2018-09-27 19:00:24 +02:00
Jonny Tischbein 24117c24ce Get PHP Configuration for upload limit and display in /admin summary site 2018-09-27 18:53:16 +02:00
Hypolite Petovan 8b55bc5881 Normalize padding of inline code 
- [frio] Remove redundant CSS
 2018-09-24 08:32:17 -04:00
Hypolite Petovan be348cf8c8 Remove addon_hooks template variable 
- Update addon documentation
 2018-09-24 08:16:26 -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
Jonny Tischbein b7e7850b75 disable formatbar in xs screens 2018-09-21 17:46:39 +02:00
Benjamin Lorteau f0cdd25e34 Register Friendica stylesheet using App->registerStylesheet() 
- Remove mentions of {{$stylesheet}} in head.tpl templates
 2018-09-21 09:54:09 -04:00
Jonny Tischbein 08879298ea unique html id for share button in preview 2018-09-21 11:12:20 +02:00
Hypolite Petovan 2ae6556b32 Add new 'head' hook 
- Add new App->registerStylesheet method
- Reworked App->init_pagehead into App->initHead
 2018-09-20 21:30:51 -04:00
Hypolite Petovan 73c1ebc6fd [frio] Move relevant code to new footer.tpl 2018-09-20 21:02:55 -04: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 18c8a7f247 Fix inline code span display 2018-09-19 23:10:41 -04:00
Hypolite Petovan 7dd6fb3b3c Rewrite JS hooks 
- Use event listeners instead of homebrew hooks
- Remove view/js/addon-hooks.js and its references
- Update Addon docs
 2018-09-19 22:51:51 -04:00
Hypolite Petovan 8fbcbbda16 Remove references to Pear Text_Highlighter stylesheets 2018-09-19 21:36:21 -04:00
Michael 63b5cb4fc6 Issue 5721: Temporarily deactivate the picture upload from private mails 2018-09-13 15:46:37 +00:00
Hypolite Petovan 11a3b45957 [frio] Fix ACL selection in new event modal 
- Fix this.allow_cid.push isn't a function error
 2018-09-09 10:10:17 -04:00
rabuzarus 26607d4a27 Frio - bugfix - don't show new event button if the button isn't available 2018-09-06 14:40:34 +02:00
Hypolite Petovan 8a1581cadd
Merge pull request #5727 from rabuzarus/20180905_-_rise_frio_version 
Frio - rise frio version
 2018-09-05 12:52:42 -04:00
rabuzarus f9fe162f2f Frio - rise version 2018-09-05 18:31:09 +02:00
rabuzarus 7c5e964581 Frio - fix missing modal for editing albums 2018-09-05 18:24:04 +02:00
rabuzarus 85fed927c3 Frio - addToModal() can now be used with an element ID as a parameter 2018-09-05 17:30:07 +02:00
Hypolite Petovan 0d8e5eace5 [frio] Mobile: force input font size to 16px 2018-08-25 19:30:18 -04:00
Hypolite Petovan 3bfd0ceed6 [frio] Fix HTML warnings 
- Add missing space between attributes
- Add missing closing tag to logo SVG mask
 2018-08-25 19:30:18 -04:00
Michael Vogel edcd0a3744 Issue 4960: Ignoring and blocking of contacts should work again (#5657) 
* Issue 4960: Ignoring and blocking of contacts should work again

* Renamed functions

* This function should be renamed as well.

* We now have a frontend to block and ignore public contacts

* Hide some parts for public contacts

* Removed notices, public contact is now accessible from dirfind as well

* We now show contact conversations and contact posts

* We now use a new conversation mode

* The update functionality is disabled until it will work completely

* Fixing tabs chaos

* Update after posts on the contacts page will now work

* Show connect link
 2018-08-25 09:48:00 -04:00
Michael Vogel 29b73877a9 Fix the settings in frio (#5650) 2018-08-22 00:14:16 -04:00
Michael 334c628511 And again ... notices 2018-08-20 21:20:21 +00:00
rabuzarus dd2d680258 Frio: new photos upload template (#5637) 
* frio - add missing page template to various photo pages (fix missing background)

* frio - rework photo upload album selection

* frio - rework photo upload button

* frio - fix photo upload button and acl
 2018-08-20 00:29:50 -04:00
rabuzarus 47c2565917
Merge pull request #5634 from astifter/photo_view_page_icons 
[frio] Add icons on photo view page.
 2018-08-19 23:04:28 +02:00
Andreas Neustifter 66d8a67884 Add icons on photo view page. 
This page still had textual links, change them to icons. Also remove missleading header.
 2018-08-19 21:53:32 +02:00
Andreas Neustifter fc3aa9e58b [frio] Vertically align toolbar items. (#5633) 2018-08-19 02:19:36 +00:00
rabuzarus e1d2ee3400 frio - add missing page template to various photo pages (fix missing background) (#5613) 2018-08-14 23:58:51 +00:00
Michael Vogel 1283b99c6f Removed notices in the frio theme (#5610) 
* Removed notices in the frio theme

* And fixed notices in the notifications

* And some more in frio

* Null is the default value

* And some small notice in the probing removed

* Added note

* Clarified note

* And a removed notice in OStatus
 2018-08-14 19:37:44 +00:00
Michael Vogel 880b7177c8 And again, and again, and again, ... some more notices removed (#5601) 
* And again, and again, and again, ... some more notices removed

* And some more notices ...

* Some more place
 2018-08-11 23:05:42 +02:00
rabuzarus 7cecc5a24c frio - improve some hover effects to action link/buttons 2018-08-11 13:41:55 +02:00
rabuzarus 8789aedf6b Frio - Bring back some padding space (#5585) 
* frio - bring back the optical dividing space in the profile widget

* frio - bring back the optical dividing space between the profile picture and the separator line
 2018-08-08 12:58:58 +02:00
Tobias Diekershoff 8b804fa1a2 frio: common_tabs.tpl has now accesskeys as well 2018-08-07 12:55:37 +02:00
Tobias Diekershoff 083fcd3c9a frio implemented accesskeys to the nav.tpl 2018-08-07 10:28:41 +02:00
Michael Vogel 8ab661aaed
Merge pull request #5553 from MrPetovan/task/improve-frio-mobile-display 
[frio] Increase content space on <600px width devices
 2018-08-04 23:11:27 +02:00
Michael Vogel 793a4bf803
Merge pull request #5554 from MrPetovan/bug/5544-fix-private-message-js-interactions 
[frio/vier] Fix JS errors in compose private message page
 2018-08-04 23:09:56 +02:00
Hypolite Petovan e76ddd7745 [frio] Fix shared posts avatars size/position between desktop/mobile 2018-08-04 21:54:02 +02:00
hoergen b7b6194297 removing vertical spaces under the notification button (#5555) 
[frio] Removing vertical spaces under the notification button
 2018-08-04 21:45:30 +02:00
Hypolite Petovan ea09a51dff [frio] Fix JS error in compose private message page 2018-08-04 21:14:29 +02:00
Hypolite Petovan 6cf5fd56e5 [frio] Increase content space on <600px width devices 2018-08-04 20:54:58 +02:00
Michael Vogel 810c108297 Fix: Notes can be posted again. Never use "defaults" with "false" (#5551) 2018-08-04 16:06:36 +02:00
Michael Vogel c72c64a6d8 Notices again (#5543) 
* And again notices

* Notices in the directory

* Much more places

* Fix some double $

* Notice in ping

* Missing field

* Fix: We now remove deleted users from the directory

* Some more stuff

* Notices when removing users

* Added logging

* More logging

* Two more
 2018-08-02 07:21:01 +02:00
Andreas Neustifter 7e761fa514 [frio] Fix wrongly removed content wrapper and fix CSS instead. (#5496) (#5505) 2018-07-26 11:42:26 -04:00
Andreas Neustifter 830b2edc35 [frio] Remove frame around recent photos. (#5496) (#5499) 
Also layout file properly.
 2018-07-25 16:21:43 -04:00
Andreas Neustifter e8effeb3ae [frio] Fix layout of profile aside. (#5497) (#5498) 
See issue (#5497)[https://github.com/friendica/friendica/issues/5497] for details.
 2018-07-25 16:12:30 -04:00
Andreas Neustifter b6c254eede [frio] Fix profile edit links. [#5474] (#5475) 2018-07-24 10:20:16 -04:00
Jeroen De Meerleer a44eeda463 Added bootstrap tables to queues (#5484) 
* Added bootstrap tables to queues

* Changed to double quotes
 2018-07-24 08:10:20 -04:00
Hypolite Petovan a6fb3568f9 Rename dbesc to DBA::escape 2018-07-23 15:30:54 -04:00
Hypolite Petovan ecea7425f8 Rename DBA::is_result to DBA::isResult 2018-07-23 11:04:14 -04:00
Hypolite Petovan 0ec44f3e8a Rename DBM method calls to DBA method calls 2018-07-23 11:02:24 -04:00