| Commit message (Expand) | Author | Age | Files | Lines |
* | Revert "missing release file" | redmatrix | 2016-08-22 | 1 | -236/+0 |
* | missing release file | redmatrix | 2016-08-22 | 1 | -0/+236 |
* | Merge branch '1.12RC' | redmatrix | 2016-08-22 | 21 | -439/+1036 |
|\ |
|
| * | public forum fallback checking (when custom/expert permissions are applied) w... | redmatrix | 2016-08-22 | 1 | -5/+4 |
| * | pending flag not being reset when using autoperms from custom role | redmatrix | 2016-08-12 | 1 | -1/+4 |
| * | embed filter adjustments | redmatrix | 2016-08-11 | 1 | -13/+17 |
| * | 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 (th... | redmatrix | 2016-08-01 | 4 | -16/+121 |
| | * | /storeurl/cloudurl/ | redmatrix | 2016-08-01 | 2 | -3/+3 |
| | * | add a few more path macros to portable menu elements (channelurl, pageurl, st... | redmatrix | 2016-07-31 | 3 | -12/+18 |
| | * | make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, ... | redmatrix | 2016-07-31 | 2 | -0/+37 |
| | * | 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 de... | Andrew Manning | 2016-07-17 | 2 | -5/+5 |
| | * | | | | | 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 simplif... | Andrew Manning | 2016-07-14 | 1 | -0/+200 |
| | * | | | | | | | 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 |
| | |_|_|_|_|_|_|/ /
| |/| | | | | | | | |
|
* / | | | | | | | | | Revert "Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1... | redmatrix | 2016-07-28 | 18 | -881/+549 |
|/ / / / / / / / / |
|
* | | | | | | | / | translate mime types to icons, update some icons, move file preview (upload p... | Mario Vavti | 2016-07-28 | 2 | -16/+18 |
| |_|_|_|_|_|_|/
|/| | | | | | | |
|
* | | | | | | | | missing s | redmatrix | 2016-07-26 | 1 | -1/+1 |
* | | | | | | | | issue #460 - remove reference to $a which was passed by value since it doesn'... | redmatrix | 2016-07-26 | 1 | -53/+53 |
* | | | | | | | | issue #460 | redmatrix | 2016-07-25 | 1 | -1/+3 |
* | | | | | | | | string update and some minor comment edits | redmatrix | 2016-07-24 | 1 | -0/+1 |