marijus
ed09513bb2
Merge branch 'master' of https://github.com/friendica/red
2015-01-24 12:23:26 +01:00
marijus
e4e990df06
the old item must be removed before the new is created
2015-01-24 12:22:04 +01:00
friendica
34b5072ccf
Merge https://github.com/friendica/red into pending_merge
2015-01-23 21:49:48 -08:00
friendica
befe77a93f
onedirsync issue reported by habeas codice
2015-01-23 21:48:34 -08:00
marijus
4379354021
disable notices
2015-01-24 01:15:54 +01:00
marijus
0cbe64c360
some more kiss
2015-01-24 01:13:02 +01:00
marijus
ea209a84ab
typo
2015-01-23 15:06:30 +01:00
marijus
b4f1cc5044
we get the object info before it is deleted now
2015-01-23 15:03:19 +01:00
marijus
884d542d4b
Merge branch 'master' of https://github.com/friendica/red
2015-01-23 14:51:15 +01:00
marijus
8789c96e78
some code restructure
2015-01-23 14:50:39 +01:00
friendica
c49c96962f
provide pref to set default photo resolution for posts to something other than 2. The only acceptable option is 1. (640)
2015-01-23 03:25:40 -08:00
Habeas Codice
660ed058bf
Merge branch 'master' of https://github.com/friendica/red
2015-01-22 09:29:13 -08:00
Habeas Codice
9d9be768c5
fix dir server query take 2
...
rationale: use latest entry rather than latest update. update timestamp is updated for all entries upon success so they
are equivalent. prevents dupes from fake null dates.
2015-01-22 09:25:34 -08:00
marijus
d94114ec98
add some mimetypes
2015-01-22 12:12:42 +01:00
friendica
7d0e0366b9
Merge https://github.com/friendica/red into pending_merge
2015-01-21 20:09:51 -08:00
friendica
76fe9dc702
zot_finger second arg is optional but function declaration didn't specify this - causes issue with check_upstream_directory
2015-01-21 20:08:10 -08:00
marijus
3731ff97ff
make $links an array of links
2015-01-22 04:57:59 +01:00
marijus
4ff71fc0c7
change mod/sharedwithme backend to use activity object - this is not backwards compatible
2015-01-22 02:34:38 +01:00
Habeas Codice
90fbfb313e
Rework directory server update selection query
2015-01-20 20:59:08 -08:00
friendica
7875b79f2f
get rid of really old poco records once weekly
2015-01-20 14:04:44 -08:00
friendica
9d5e972013
poco rating variable getting over-written before local storage.
2015-01-19 20:36:13 -08:00
friendica
ced0685d67
Change link label from Feature settings to Feature/Addon settings to more accurately describe its purpose, since we currently use it exclusively for addons (though this will not always be true).
2015-01-19 15:18:44 -08:00
friendica
ec6e147935
put cloud back in get_cloudpath - just have to be careful where we use it.
2015-01-19 14:31:45 -08:00
friendica
21da3443f3
Merge https://github.com/friendica/red into pending_merge
2015-01-18 19:25:10 -08:00
friendica
4c45068d70
typo
2015-01-18 19:24:59 -08:00
Habeas Codice
aeed498752
fix postgres escaping
2015-01-18 18:40:33 -08:00
friendica
89a2012f7f
remove all hardwired references to 'cloud' in the files interfaces and replace with $a->module. It's OK to leave them in the RedBrowser component because this will remain under /cloud. All the DAV bits need to be abstracted as they will eventually end up under /dav. $a->module will contain the correct string to use.
2015-01-18 17:52:09 -08:00
friendica
673556a847
don't unset a directory server which has no active channels and hence will never have a site table update. Do this by probing the sys channel of that directory weekly and checking the directory status returned by it.
2015-01-18 16:43:46 -08:00
marijus
1c2d956d7f
basic proof of concept file activity support - will send activity via the filestorage module and via attach_delete()
2015-01-18 14:44:58 +01:00
pafcu
203c345bde
Merge pull request #856 from pafcu/master
...
Fix some issues with tagging.
2015-01-16 20:27:26 +02:00
Stefan Parviainen
334d496bb1
Fix some issues with tagging.
2015-01-16 19:10:34 +01:00
friendica
9bedb38621
validate poco chatrooms before storing
2015-01-15 20:59:26 -08:00
friendica
dfe31dc3b7
more heavy lifting on poco rep
2015-01-15 19:05:42 -08:00
friendica
6cd26c3590
Merge branch 'pocorate'
2015-01-15 17:34:53 -08:00
friendica
35276c2da9
backend for mailhost addon
2015-01-15 14:40:00 -08:00
friendica
1c9299ed42
more backend work on poco rating
2015-01-15 14:05:18 -08:00
friendica
2e89c13229
Merge https://github.com/friendica/red into pending_merge
2015-01-14 18:37:28 -08:00
friendica
168b67fa41
correct some activity object types (for comments), also fix a foreach warning resulting from recent tag work
2015-01-14 18:36:23 -08:00
RedMatrix
b37915a40e
Merge pull request #850 from einervonvielen/toc
...
Added a table of content as bbcode element [toc] for webpages
2015-01-15 11:22:57 +11:00
friendica
d6ae124bbd
ignore bbcode open tag (left bracket) in hash and mention tag regexes and turn it into a tag delimiter
2015-01-14 16:00:21 -08:00
friendica
25e090148d
federate consensus items (in network only). Work in progress.
2015-01-14 14:15:04 -08:00
Einer von Vielen
dfab241692
Merge remote-tracking branch 'upstream/master' into toc
2015-01-14 22:49:16 +01:00
09129cbe5f
Added a table of content as bbcode element [toc] for webpages
...
- Included jquery.toc.js (http://www.apache.org/licenses/LICENSE-2.0 )
- Modified jquery.toc.js to work with the webpages of the red#matrix
- Added info to the help
2015-01-14 22:47:54 +01:00
friendica
7090b58f68
check mentions against the appropriate xchan_url and not a hard-coded /channel/ string
2015-01-13 20:54:27 -08:00
friendica
dfdef0af0d
provide a setting to control ALLOWCODE permissions at the channel level - it isn't always appropriate to apply this to all channels in an account.
2015-01-13 18:30:30 -08:00
friendica
111bbe65d9
Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging
...
Conflicts:
mod/profiles.php
2015-01-13 18:07:49 -08:00
Stefan Parviainen
93735df2c7
Allow tags in mail, many profile fields, and admin info
2015-01-13 17:54:40 +01:00
friendica
2fc0d64139
uninitialised theme parent in mod/cloud
2015-01-12 19:29:43 -08:00
friendica
1b3e52af2d
theme toggle issue when viewing mod/cloud of another channel
2015-01-12 18:33:39 -08:00
friendica
66cef7531a
don't wipe out the item body of a linked item to a photo when doing a normal delete and not forced
2015-01-12 16:36:10 -08:00
