Commit graph

4258 commits

Author SHA1 Message Date
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
friendica
cdc52ba884 change deletion behaviour of linked photo items. Previously deleting the visible item in the conversation deleted the photo as well. Now photos must be deleted in the photos module. Deleting the linked item removes any attached conversation elements (likes, etc.) and sets the conversation item to hidden. This may create an issue in the future if we move the photo tags, title, or other photo elements to the linked item rather than the photo. Noting here so this can potentially be discovered and remembered at that time. 2015-01-12 16:27:27 -08:00
Einer von Vielen
43b877caa1 Test
...with table of content.
jquery.tableofconent.js works bunt not properly
2015-01-13 00:06:44 +01:00
Stefan Parviainen
adc9564b5c Refactor mention code to make it more reusable 2015-01-12 20:01:07 +01:00
friendica
381f8a1b42 optionally use openssl encryption functions (higher performance over mcrypt, but potentially more likely to have been compromised) 2015-01-11 15:13:45 -08:00
friendica
6f7b1960af allow the use of openssl crypto 2015-01-11 14:58:47 -08:00
friendica
0259051a87 basic backend work for creating consensus items 2015-01-11 14:41:33 -08:00
Christian Vogeley
f0c7612bcd Merge remote-tracking branch 'upstream/master'
Conflicts:
	doc/html/classRedmatrix_1_1Import_1_1Import-members.html
	doc/html/classRedmatrix_1_1Import_1_1Import.js
2015-01-11 16:22:59 +01:00
Christian Vogeley
43f143a211 Fix for issue #763 Error creating new channel within the limits of the
subscription plan
2015-01-11 16:12:36 +01:00
friendica
10102ac2ac connection clone issues 2015-01-10 14:59:10 -08:00
marijus
978d78b953 basic changes for file activity 2015-01-09 15:18:45 +01:00
friendica
1b535ff8a5 clean up some url anomalies in dir_sort_links after security fix 2015-01-08 19:20:50 -08:00
friendica
af943f4569 double q argument could also cause issues 2015-01-08 19:13:13 -08:00
friendica
1e4e7ce2d3 SECURITY: dir_sort_links() exposes session cookie 2015-01-08 19:09:52 -08:00
friendica
aa490a39bb include channel clones in PM deliveries (also some whitespace edits) 2015-01-08 16:02:15 -08:00
friendica
087d6744fc Merge https://github.com/friendica/red into pending_merge 2015-01-07 14:39:07 -08:00
friendica
ce953e2f41 syncing connections issue, incorrect return_url after deleting connection 2015-01-07 14:35:03 -08:00