Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | rename limited -> custom | Mario Vavti | 2016-08-16 | 1 | -1/+1 | |
| | | ||||||
* | | get rid of ugly code construct | redmatrix | 2016-08-16 | 1 | -8/+1 | |
|/ | ||||||
* | Merge pull request #487 from git-marijus/dev | hubzilla | 2016-08-16 | 1 | -107/+12 | |
|\ | | | | | implement groups in the acl select. | |||||
| * | provide group options serverside and minor cleanup | Mario Vavti | 2016-08-15 | 1 | -107/+12 | |
| | | ||||||
* | | fix attached photo/file permissions on clones | redmatrix | 2016-08-15 | 2 | -0/+138 | |
| | | ||||||
* | | event_store_event hook | redmatrix | 2016-08-14 | 1 | -0/+7 | |
|/ | ||||||
* | Context help for settings/features page | Andrew Manning | 2016-08-14 | 1 | -1/+1 | |
| | ||||||
* | Change text for submenu on small screens to be static toggle statement | Andrew Manning | 2016-08-14 | 1 | -0/+1 | |
| | ||||||
* | Replace hardcoded button title in javascript to translatable text | Andrew Manning | 2016-08-14 | 1 | -0/+2 | |
| | ||||||
* | Added a disable comments setting to the "Additional features" settings with ↵ | Andrew Manning | 2016-08-14 | 2 | -0/+8 | |
| | | | | a corresponding post editor toggle button | |||||
* | pending flag not being reset when using autoperms from custom role | redmatrix | 2016-08-12 | 1 | -1/+4 | |
| | ||||||
* | better method of dealing with api versions | redmatrix | 2016-08-11 | 1 | -23/+29 | |
| | ||||||
* | more cleanup of api | redmatrix | 2016-08-11 | 1 | -109/+109 | |
| | ||||||
* | move error processing back inside the function | redmatrix | 2016-08-11 | 1 | -22/+22 | |
| | ||||||
* | embed filter adjustments | redmatrix | 2016-08-11 | 1 | -13/+17 | |
| | ||||||
* | A bit of api cleanup. Don't get excited. This is like a 0.005% cleanup but ↵ | redmatrix | 2016-08-11 | 2 | -85/+126 | |
| | | | | you have to start somewhere. | |||||
* | forum detection was off for forums with custom perms | redmatrix | 2016-08-10 | 1 | -1/+3 | |
| | ||||||
* | implement acl for folder creation | Mario Vavti | 2016-08-10 | 1 | -0/+16 | |
| | ||||||
* | function order reversed | redmatrix | 2016-08-09 | 1 | -2/+2 | |
| | ||||||
* | bad code format | redmatrix | 2016-08-09 | 2 | -2/+27 | |
| | ||||||
* | updates to hcard parsing | redmatrix | 2016-08-07 | 1 | -4/+9 | |
| | ||||||
* | diaspora vcard updates | redmatrix | 2016-08-07 | 1 | -0/+1 | |
| | ||||||
* | use config system.server_role and deprecate 'UNO' | redmatrix | 2016-08-07 | 8 | -28/+24 | |
| | ||||||
* | fix /cloud upload for images | Mario Vavti | 2016-08-06 | 1 | -1/+1 | |
| | ||||||
* | bring back acl for cloud file uploads | Mario Vavti | 2016-08-06 | 1 | -1/+1 | |
| | ||||||
* | 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 | |
| |\ \ \ \ \ \ \ |