Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-05 | 1 | -0/+39 |
|\ | |||||
| * | Parse bbcode when page loads | Andrew Manning | 2016-08-04 | 1 | -0/+6 |
| | | |||||
| * | Convert select bbcode tags including [observer], [baseurl], [sitename] | Andrew Manning | 2016-08-03 | 1 | -0/+33 |
| | | |||||
* | | multi acl: port events | Mario Vavti | 2016-08-03 | 1 | -2/+0 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-03 | 12 | -24/+494 |
|\| | |||||
| * | comment policy permissions typo | redmatrix | 2016-08-02 | 1 | -1/+1 |
| | | |||||
| * | This checkin should make all permission modes work correctly with atokens ↵ | redmatrix | 2016-08-01 | 4 | -16/+121 |
| | | | | | | | | (they should be able to post content if allowed to). It also removes the strict linkage between permissions and connections so any individual permission can be set for any xchan; even those for which you have no connections. | ||||
| * | /storeurl/cloudurl/ | redmatrix | 2016-08-01 | 2 | -3/+3 |
| | | |||||
| * | add a few more path macros to portable menu elements (channelurl, pageurl, ↵ | redmatrix | 2016-07-31 | 3 | -12/+18 |
| | | | | | | | | storeurl and baseurl) | ||||
| * | make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, ↵ | redmatrix | 2016-07-31 | 2 | -0/+37 |
| | | | | | | | | and PERMS_CONTACTS; or everything but PERMS_SPECIFIC. PERMS_SITE could be contentious, but we're currently denying them as they are a guest and don't actually have a channel on this site. We can't easily make PERMS_SPECIFIC work without providing an abook entry for the guest since we would need to set specific permissions for the guest login, but unfortunately this could be the most desirable setting to use in many cases. There is also an update of hmessages.po in this commit. | ||||
| * | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-31 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-30 | 2 | -16/+18 |
| | |\ | |||||
| | * | | issue #466, sql typo | redmatrix | 2016-07-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | Improved UI. Removed logger statements. | Andrew Manning | 2016-07-31 | 2 | -8/+5 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-30 | 7 | -77/+91 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-21 | 21 | -566/+913 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 2 | -1/+2 |
| |\ \ \ \ | |||||
| * | | | | | Importing webpage elements from manually entered cloud file path work. All ↵ | Andrew Manning | 2016-07-17 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | detected elements are automatically imported. | ||||
| * | | | | | Added functions to check cloud files path and return path with hashed names | Andrew Manning | 2016-07-17 | 2 | -5/+85 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 5 | -26/+126 |
| |\ \ \ \ \ | |||||
| * | | | | | | Stash changes to merge from dev | Andrew Manning | 2016-07-16 | 1 | -4/+3 |
| | | | | | | | |||||
| * | | | | | | Postpone remote folder import until filesystem mirroring matures. | Andrew Manning | 2016-07-16 | 1 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-14 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Refactored the scan and import functions to reduce redundant code and ↵ | Andrew Manning | 2016-07-14 | 1 | -0/+200 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplify logic. Import of pages, layouts, and blocks works. | ||||
| * | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-13 | 2 | -19/+11 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-12 | 4 | -175/+7 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Clearer import control interface | Andrew Manning | 2016-07-10 | 1 | -2/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | First draft of website import tools | Andrew Manning | 2016-07-10 | 2 | -0/+38 |
| | | | | | | | | | | |||||
* | | | | | | | | | | multiple acl work | Mario Vavti | 2016-08-03 | 2 | -0/+12 |
| |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
* | | | | | | | | | translate mime types to icons, update some icons, move file preview (upload ↵ | Mario Vavti | 2016-07-28 | 2 | -16/+18 |
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | progress) below table header | ||||
* | | | | | | | | missing s | redmatrix | 2016-07-26 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | issue #460 - remove reference to $a which was passed by value since it ↵ | redmatrix | 2016-07-26 | 1 | -53/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn't exist. Ultimately $a needs to be removed completely but that's a bit messier. | ||||
* | | | | | | | | issue #460 | redmatrix | 2016-07-25 | 1 | -1/+3 |
| | | | | | | | | |||||
* | | | | | | | | string update and some minor comment edits | redmatrix | 2016-07-24 | 1 | -0/+1 |
| | | | | | | | | |||||
* | | | | | | | | fix birthday addtocal | redmatrix | 2016-07-21 | 1 | -3/+3 |
| | | | | | | | | |||||
* | | | | | | | | zat URL auth updated to match changes to the atoken_login interface | redmatrix | 2016-07-21 | 2 | -3/+12 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | fail oembed if it is attempted and less than 80% of the original content is ↵ | redmatrix | 2016-07-21 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | left after html filtering. For the original poster, this will fall back to linkinfo results. If the embed gets through their site but is filtered downstream (with more than 20% of the content removed), it will result in just a link. | ||||
* | | | | | | | typo | redmatrix | 2016-07-21 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | issue #453 and a bug noted from the logfiles related to the schema change ↵ | redmatrix | 2016-07-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | last month | ||||
* | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-20 | 6 | -85/+105 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix vevent multi-line formatting | redmatrix | 2016-07-20 | 1 | -1/+3 |
| | | | | | | | | |||||
| * | | | | | | | sort out some of the authentication mess - with luck this may fix the DAV ↵ | redmatrix | 2016-07-20 | 5 | -84/+102 |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | auth issue which I simply could not duplicate or find a reason for. | ||||
* | | | | | | | fix the forum detection in include/zot | redmatrix | 2016-07-19 | 2 | -5/+16 |
| | | | | | | | |||||
* | | | | | | | another couple of minor perms fixes | redmatrix | 2016-07-19 | 2 | -8/+10 |
| | | | | | | | |||||
* | | | | | | | permission fixes | redmatrix | 2016-07-19 | 2 | -7/+7 |
| | | | | | | | |||||
* | | | | | | | fixes to perms | redmatrix | 2016-07-19 | 1 | -3/+3 |
| | | | | | | | |||||
* | | | | | | | translate more old perms calls | redmatrix | 2016-07-19 | 2 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-19 | 1 | -0/+1 |
|\| | | | | | | |||||
| * | | | | | | issue #411 | redmatrix | 2016-07-19 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | yet more grungy perms work. | redmatrix | 2016-07-19 | 1 | -37/+36 |
| | | | | | | |