marijus
2982212797
more work on photo upload
2014-10-31 14:33:41 +01:00
friendica
4e454656fe
Merge https://github.com/friendica/red into pending_merge
2014-10-30 19:29:28 -07:00
friendica
28a35261db
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-30 19:15:03 -07:00
marijus
0ff4d9015b
some work on photo upload
2014-10-30 14:10:55 +01:00
friendica
cfbfdca610
allow feed paging
2014-10-29 17:55:15 -07:00
friendica
7d9f785758
if any privacy tags are created on a top level post, restrict the post; since it could have been quite sensitive. If there were errors processing the actual tag restrict the post to the profile owner. Also make the "privacy tag over-rides ACL" behaviour configurable. Default is that privacy tags over-ride the ACL.
2014-10-28 20:01:44 -07:00
friendica
653305889c
Merge https://github.com/friendica/red into pending_merge
2014-10-28 04:18:35 -07:00
friendica
36110831cb
change photo tag bubble tip
2014-10-28 04:18:08 -07:00
marijus
ec8bab7784
change the way tagrm works to allow tag removal on the fly
2014-10-28 11:56:00 +01:00
friendica
9cc76cb33d
several unrelated things - auto_follow wasn't working for new accounts, error returned in private mention to a collection, and added auto-completion to photo tags; though it only matches people so the hover text is now wrong. Also made the photo edit form XHTML (XML) compliant.
2014-10-27 19:23:40 -07:00
friendica
1b53d1c1d3
Merge https://github.com/friendica/red into pending_merge
2014-10-27 16:20:59 -07:00
friendica
583b445bc0
add "repository" permissions role and make sure we have a sane "accept" default for the custom role.
2014-10-27 16:19:30 -07:00
marijus
d192bcad65
do not reload page for edit album and some minor cleanup
2014-10-27 21:31:54 +01:00
friendica
95de759766
a couple of photo tag issues
2014-10-26 21:37:59 -07:00
friendica
d4d44b7a87
couple of other places where we need to reset stuff completely if the role changes
2014-10-26 19:47:55 -07:00
friendica
812135bfab
reset ACL just in case it was custom already.
2014-10-26 19:41:53 -07:00
friendica
655c3e1b47
put privacy role selector in settings page. Change visibility of various permissions items accordingly.
2014-10-26 19:32:12 -07:00
friendica
d2af45d206
use intval rather than dbesc since these are ints. Should work regardless, but this makes it consistent with the way we do most other queries.
2014-10-26 15:49:00 -07:00
friendica
864fcd1da6
Merge https://github.com/friendica/red into pending_merge
...
Conflicts:
mod/like.php
2014-10-26 15:36:16 -07:00
friendica
5abd01f072
allow photos without comments to be liked
2014-10-26 15:34:18 -07:00
marijus
6497e78956
some work on photos like/dislike
2014-10-25 15:23:20 +02:00
zottel
5b04b9480e
make bbcode/html includes work in markdown help pages and vice versa
2014-10-24 21:17:56 +02:00
Thomas Willingham
38801f802f
Issue #661
2014-10-24 17:46:31 +01:00
friendica
1a9b8d4f0c
don't offer forum (@name+) completion in comments, since it won't do anything.
2014-10-23 22:00:16 -07:00
friendica
58c692e389
improved wall-to-wall detection for comments so we can handle Diaspora signing and wall-to-wall attribution correctly.
...
Do it at the point of submission. This also fixes a potential bug in yesterday's wall-to-wall permission setting,
if it was a local comment to a remote post.
2014-10-22 20:39:49 -07:00
RedMatrix
3fb0354a55
Merge pull request #655 from pafcu/master
...
Better handling of incorrect info entered in event
2014-10-22 12:02:22 +11:00
friendica
ed7712cfbf
private forum issues
2014-10-21 16:33:35 -07:00
Stefan Parviainen
c8666b9076
If entered event info is not valid, let user try again with the old info still there. Closes friendica/red#648
2014-10-21 18:28:47 +02:00
friendica
bac947c4dd
wrong template loaded issue
2014-10-20 20:10:23 -07:00
friendica
3d47285414
Merge https://github.com/friendica/red into pending_merge
2014-10-20 16:50:02 -07:00
friendica
cb15c73dae
move all theme initialisation to one place - just after calling module_init. Revert if there are serious issues, but please note the issues in as much detail as possible so we can work through them.
2014-10-20 16:47:58 -07:00
marijus
11e8fe3085
more work on photos
2014-10-20 15:05:33 +02:00
friendica
bae3029c63
merge madness
2014-10-19 16:12:05 -07:00
friendica
ae9e1fa688
missing event permissions
2014-10-15 18:35:56 -07:00
marijus
997ec0911c
$comments > $commentbox
2014-10-15 22:41:42 +02:00
marijus
04a254d94a
some work on single photo view comments
2014-10-15 22:23:38 +02:00
marijus
dc23030dcb
one more item_id > id
2014-10-15 21:17:07 +02:00
marijus
0c2d9edd83
it seems we do not have an key called item_id here so must be id only
2014-10-15 21:15:20 +02:00
friendica
aa0aa22b8a
chanman is now 'locs' and a couple of post handlers have been defined.
2014-10-14 20:33:38 -07:00
friendica
79684e05cc
fix import sql error
2014-10-13 21:24:06 -07:00
Klaus Weidenbach
bc2ad74813
When you delete something in /cloud stay in the right folder.
...
When you deleted a file in /cloud you was always jumped back to /cloud/[channel],
now you will stay in the parent folder.
Some more doxygen documentation.
Removed duplicate data from logging output and reduced logging in RedDAV in general.
2014-10-14 00:15:41 +02:00
Klaus
5aae5862f2
A fix, but I have no case to verify.
...
I could not find out under which conditions this is relevant and therefore have no test case, but it must be of instance RedDAV\RedFile.
2014-10-12 21:10:04 +02:00
Klaus Weidenbach
dc4593f5b5
Moved classes from reddav.php into own files.
...
Finished moving classes out from include/reddav.php into own files. Also
continued with namespace for RedDAV.
Improved some docs and added some todos and fixmes.
2014-10-12 00:33:37 +02:00
Thomas Willingham
82232c6916
Show tag in siteinfo. Not useful for us, quite useful for admins.
2014-10-11 17:24:58 +01:00
Thomas Willingham
b84b2d5aa5
FFS, another oops
2014-10-11 16:19:36 +01:00
Thomas Willingham
d46fd7917f
Fix webpages. Sycning between too many codebases...
2014-10-11 16:18:15 +01:00
Thomas Willingham
d132646915
Unbreak webpages
2014-10-11 15:42:31 +01:00
friendica
3d0d36b2bc
fix diaspora reshare tags
2014-10-10 19:14:37 -07:00
marijus
4e9bd8b8f0
This is a fix to not interfere the ongoing adding of .generic-content-wrapper with the ongoing styling of redbasic theme.
...
adding of .generic-content-wrapper is needed and useful for derivative themes but it should not contain any styling information for redbasic theme. therefor i added .generic-content-wrapper-styled as a quickfix for spots where redbasic is not finished yet.
Sidenote: please avoid opening a div in one *.tpl and close it in another or (even worse) open a div in a *.tpl and close it in an already templatified mod/*.php. This will really make the code and templates very, very confusing.
2014-10-10 15:52:56 +02:00
Jeroen
e06c3e5a91
Added and changed on some places div class generic-content-wrapper. And added to redbasic. Other thems can now also theme backgrounds of a lot of pages. I'm not completely done, but till now - this is it.
2014-10-09 14:54:04 +00:00