harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,535 Commits 6 Branches 36 Tags
56bc3bcdcee41d5ca6920c878aa8576dc673d039
Commit Graph

12535 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
friendica 56bc3bcdce provide correct permissions role default for old-timers that didn't have any role configured. 2015-01-14 19:27:55 -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 7a24943c34 some back-end code to support location activity objects. Work in progress. 2015-01-14 14:46:01 -08:00
friendica 25e090148d federate consensus items (in network only). Work in progress. 2015-01-14 14:15:04 -08:00
friendica 1005618faf honor disable_discover_tab in mod/home - it isn't a tab here but basically block public content from showing if it's set. 2015-01-14 13:52:34 -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 a93f2b1b8f now that's useful... 2015-01-13 18:41:11 -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 98acefe228 revert recent 3.0 changes to mod/cloud so we can work on this completely in another branch and not destabilise core 2015-01-13 18:12:04 -08:00
friendica bd5f00fa05 Merge branch 'pafcu-moretagging' 2015-01-13 18:08:13 -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
friendica e528483d81 hide friends broken, add parameter for item search by verb 2015-01-13 14:42:54 -08:00
Stefan Parviainen 47a2668b30 Allow tags in event description and location 2015-01-13 18:23:52 +01: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 2f9fe0280e document the pros and cons of the not-yet written hassle-free connection auto-permission setting. 2015-01-12 17:20:28 -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
friendica 9fc9af87e3 Merge https://github.com/friendica/red into pending_merge 2015-01-12 11:26:11 -08:00
friendica 962c6207ae double perms msg 2015-01-12 11:25:48 -08:00
pafcu a0134de28a Merge pull request #844 from pafcu/moretagging 
Refactor mention code to make it more reusable
 2015-01-12 21:07:54 +02:00
Stefan Parviainen adc9564b5c Refactor mention code to make it more reusable 2015-01-12 20:01:07 +01:00
pafcu 55eb6be308 Merge pull request #842 from pafcu/master 
Possibly fix issue with readmore.js collapse
 2015-01-12 18:16:47 +02:00
Stefan Parviainen cce51f5a49 Possibly fix issue with readmore.js collapse 2015-01-12 17:11:03 +01:00
friendica 580c30f516 another attempt to explain default permissions on connedit page 2015-01-11 21:18:29 -08:00
friendica a088a8f03c remove extraneous debug file left over from postgres work. 2015-01-11 20:02:24 -08:00
friendica 3f4f3e244a that was not intended to be merged with master yet. Put it under a define 2015-01-11 15:22:58 -08: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
friendica b018b39e64 Merge branch 'master' into trinidad 2015-01-11 14:02:27 -08:00
friendica 6599ae052b Merge https://github.com/friendica/red into pending_merge 2015-01-11 14:02:26 -08:00
friendica 152f250d2b revup 2015-01-11 14:02:07 -08:00
RedMatrix ff01505b36 Merge pull request #840 from cvogeley/master 
Fix for #Issue763
 2015-01-12 09:01:51 +11:00
Christian Vogeley 1e6fd90795 Correction 2015-01-11 22:59:50 +01:00
Christian Vogeley f6ec519686 Correction 2015-01-11 22:54:16 +01:00
Christian Vogeley f245a09023 Correction 2015-01-11 22:36:30 +01:00
Christian Vogeley 4e7e555a75 corrcetion 2015-01-11 22:30:59 +01:00
Christian Vogeley 63f189b453 Correct 2015-01-11 22:23:30 +01:00
Christian Vogeley f2ef89e697 Revert "put back in" 
This reverts commit 5beec923b4.
 2015-01-11 19:47:05 +01:00
Christian Vogeley 1f02700618 Revert "put back in" 
This reverts commit ab07857d9c.
 2015-01-11 19:44:18 +01:00
Christian Vogeley ab07857d9c put back in 2015-01-11 19:41:22 +01:00
Christian Vogeley 5beec923b4 put back in 2015-01-11 19:38:43 +01:00