aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* pending flag not being reset when using autoperms from custom roleredmatrix2016-08-121-1/+4
|
* string updateredmatrix2016-08-122-3626/+3620
|
* Merge pull request #479 from git-marijus/devhubzilla2016-08-131-0/+6
|\ | | | | possible quickfix for multi-acl not honoring jotnets
| * possible quickfix for multi-acl not honoring jotnetsMario Vavti2016-08-121-0/+6
| |
* | fix auto-connect settingzottel2016-08-121-3/+0
| |
* | Merge remote-tracking branch 'upstream/dev' into devzottel2016-08-1214-232/+375
|\|
| * better method of dealing with api versionsredmatrix2016-08-111-23/+29
| |
| * more cleanup of apiredmatrix2016-08-112-110/+110
| |
| * move error processing back inside the functionredmatrix2016-08-111-22/+22
| |
| * embed filter adjustmentsredmatrix2016-08-111-13/+17
| |
| * A bit of api cleanup. Don't get excited. This is like a 0.005% cleanup but ↵redmatrix2016-08-114-117/+173
| | | | | | | | you have to start somewhere.
| * forum detection was off for forums with custom permsredmatrix2016-08-101-1/+3
| |
| * optimise Onepoll so it doesn't try and fetch posts for a channel that we've ↵redmatrix2016-08-101-0/+9
| | | | | | | | not given permission to send us their stream and posts. Currently the posts are fetched, processed, and ultimately discarded. Since we know they are going to be discarded, there's not much point fetching them in the first place.
| * initialise jot editor if it is used as a file drop target and isn't yet opened.redmatrix2016-08-101-1/+6
| |
| * update CHANGELOG for 1.12redmatrix2016-08-101-0/+25
| |
| * new versionredmatrix2016-08-101-1/+1
| |
| * implement acl for folder creationMario Vavti2016-08-104-17/+53
| |
* | Merge remote-tracking branch 'upstream/dev' into devzottel2016-08-1070-2514/+2837
|\|
| * open editor or comment window when linkdropping to a closed window. We ↵redmatrix2016-08-101-4/+18
| | | | | | | | probably also need this for filedropping.
| * allow dropping links on comments as well as postsredmatrix2016-08-092-2/+4
| |
| * function order reversedredmatrix2016-08-091-2/+2
| |
| * You can drag links to the editor (which will be parsed and inserted); as ↵redmatrix2016-08-092-2/+2
| | | | | | | | well as files (which will be uploaded)
| * bad code formatredmatrix2016-08-092-2/+27
| |
| * updates to hcard parsingredmatrix2016-08-071-4/+9
| |
| * diaspora vcard updatesredmatrix2016-08-072-5/+12
| |
| * server rolesredmatrix2016-08-071-6/+8
| |
| * use config system.server_role and deprecate 'UNO'redmatrix2016-08-0724-71/+135
| |
| * fix cloud pathredmatrix2016-08-071-1/+1
| |
| * fix /cloud upload for imagesMario Vavti2016-08-061-1/+1
| |
| * bring back acl for cloud file uploadsMario Vavti2016-08-064-19/+31
| |
| * strings updateredmatrix2016-08-051-2270/+2333
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-0538-121/+242
| |\
| | * Merge pull request #477 from git-marijus/devhubzilla2016-08-0637-119/+200
| | |\ | | | | | | | | Some work to make multiple acl forms per page work
| | | * Revert "Revert "remove some logging""Mario Vavti2016-08-051-10/+1
| | | | | | | | | | | | | | | | This reverts commit e67f5bc6bbb77d53867d7c03bda8410c59360dbe.
| | | * Revert "remove some logging"Mario Vavti2016-08-051-1/+10
| | | | | | | | | | | | | | | | This reverts commit 316b090433b7e415fd3c8ac6230f2df0277cdf8c.
| | | * remove some loggingMario Vavti2016-08-051-10/+1
| | | |
| | | * multi acl: port /settingsMario Vavti2016-08-053-5/+7
| | | |
| | | * multi acl: port /displayMario Vavti2016-08-051-0/+1
| | | |
| | | * multi acl: port /thingMario Vavti2016-08-054-7/+13
| | | |
| | | * multi acl: port /rpostMario Vavti2016-08-058-20/+18
| | | |
| | | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-08-052-2/+42
| | | |\ | | | |/ | | |/|
| | * | Merge pull request #476 from anaqreon/wikihubzilla2016-08-052-2/+42
| | |\ \ | | | | | | | | | | Wiki bbcode parsing
| | | * \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-08-041-11/+13
| | | |\ \ | | | |/ / | | |/| |
| | | * | Parse bbcode when page loadsAndrew Manning2016-08-042-2/+8
| | | | |
| | | * | Convert select bbcode tags including [observer], [baseurl], [sitename]Andrew Manning2016-08-032-0/+34
| | | | |
| | | | * multi acl: provide a acl-form-trigger class which comes handy in certain ↵Mario Vavti2016-08-043-6/+7
| | | | | | | | | | | | | | | | | | | | situations
| | | | * multi acl: port /wikiMario Vavti2016-08-042-11/+20
| | | | |
| | | | * multi acl: port /webpages and /mitemMario Vavti2016-08-044-3/+13
| | | | |
| | | | * multi acl: port /chatMario Vavti2016-08-042-1/+5
| | | | |
| | | | * multi acl: port /cloud and /filestorageMario Vavti2016-08-046-27/+14
| | | | |