| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-05 | 2 | -2/+42 |
| |\ |
|
| | * | Merge pull request #476 from anaqreon/wiki | hubzilla | 2016-08-05 | 2 | -2/+42 |
| | |\ |
|
| | | * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-08-04 | 1 | -11/+13 |
| | | |\
| | |/
| |/| |
|
| | | * | Parse bbcode when page loads | Andrew Manning | 2016-08-04 | 2 | -2/+8 |
| | | * | Convert select bbcode tags including [observer], [baseurl], [sitename] | Andrew Manning | 2016-08-03 | 2 | -0/+34 |
| * | | | multi acl: provide a acl-form-trigger class which comes handy in certain situ... | Mario Vavti | 2016-08-04 | 3 | -6/+7 |
| * | | | multi acl: port /wiki | Mario Vavti | 2016-08-04 | 2 | -11/+20 |
| * | | | multi acl: port /webpages and /mitem | Mario Vavti | 2016-08-04 | 4 | -3/+13 |
| * | | | multi acl: port /chat | Mario Vavti | 2016-08-04 | 2 | -1/+5 |
| * | | | multi acl: port /cloud and /filestorage | Mario Vavti | 2016-08-04 | 6 | -27/+14 |
| * | | | multi acl: port photos | Mario Vavti | 2016-08-04 | 3 | -8/+13 |
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-04 | 2 | -12/+14 |
| |\| | |
|
| | * | | issue #474 | redmatrix | 2016-08-03 | 1 | -11/+13 |
| | |/ |
|
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-03 | 4 | -4/+142 |
| | |\ |
|
| | * | | issue #473 - unable to delete privacy groups | redmatrix | 2016-08-03 | 1 | -1/+1 |
| * | | | multi acl: port events | Mario Vavti | 2016-08-03 | 5 | -10/+20 |
| * | | | multiple acl: store new data in update_view() | Mario Vavti | 2016-08-03 | 1 | -19/+23 |
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-03 | 37 | -3237/+4429 |
| |\ \ \
| | |/
| |/| |
|
| | * | | belongs to previous commit | jeroenpraat | 2016-08-03 | 1 | -0/+1 |
| | * | | Improved a few schemas - context help fix - dark schemas now have dark text a... | jeroenpraat | 2016-08-03 | 4 | -4/+141 |
| | |/ |
|
| | * | missing comma in atoken update sql | redmatrix | 2016-08-02 | 1 | -1/+1 |
| | * | comment policy permissions typo | redmatrix | 2016-08-02 | 1 | -1/+1 |
| | * | this should sort out likes showing up as wall-to-wall posts on diaspora | redmatrix | 2016-08-01 | 1 | -0/+2 |
| | * | This checkin should make all permission modes work correctly with atokens (th... | redmatrix | 2016-08-01 | 6 | -23/+136 |
| | * | /storeurl/cloudurl/ | redmatrix | 2016-08-01 | 3 | -4/+4 |
| | * | allow individual permissions on atokens | redmatrix | 2016-07-31 | 3 | -12/+98 |
| | * | add a few more path macros to portable menu elements (channelurl, pageurl, st... | redmatrix | 2016-07-31 | 5 | -15/+25 |
| | * | make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, ... | redmatrix | 2016-07-31 | 3 | -3184/+3151 |
| | * | Merge pull request #469 from anaqreon/website-import | hubzilla | 2016-08-01 | 15 | -1/+877 |
| | |\ |
|
| | | * | Added help content for webpages app. Corrected apparent bug with capitalized ... | Andrew Manning | 2016-07-31 | 4 | -0/+106 |
| | | * | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-31 | 3 | -3/+3 |
| | | |\
| | |/
| |/| |
|
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-30 | 10 | -5092/+5417 |
| | |\ \ |
|
| | * | | | issue #466, sql typo | redmatrix | 2016-07-28 | 3 | -3/+3 |
| | | | * | Remove scanned element column for existing element information which we are n... | Andrew Manning | 2016-07-31 | 1 | -3/+9 |
| | | | * | Improved UI. Removed logger statements. | Andrew Manning | 2016-07-31 | 5 | -45/+58 |
| | | | * | Import element selection page added to allow selective importing. | Andrew Manning | 2016-07-30 | 4 | -94/+307 |
| | | | * | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-30 | 38 | -12337/+12863 |
| | | | |\
| | | |/
| | |/| |
|
| | | | * | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-21 | 52 | -796/+1516 |
| | | | |\ |
|
| | | | * \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 2 | -3/+3 |
| | | | |\ \ |
|
| | | | * \ \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 9 | -15/+52 |
| | | | |\ \ \ |
|
| | | | * | | | | Starting to make the import selection page after element scan. | Andrew Manning | 2016-07-20 | 3 | -80/+176 |
| | | | * | | | | Importing webpage elements from manually entered cloud file path work. All de... | Andrew Manning | 2016-07-17 | 3 | -7/+26 |
| | | | * | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-17 | 5 | -21/+48 |
| | | | |\ \ \ \ |
|
| | | | * | | | | | Added functions to check cloud files path and return path with hashed names | Andrew Manning | 2016-07-17 | 4 | -56/+91 |
| | | | * | | | | | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 34 | -2397/+2326 |
| | | | |\ \ \ \ \ |
|
| | | | * | | | | | | Stash changes to merge from dev | Andrew Manning | 2016-07-16 | 3 | -30/+52 |
| | | | * | | | | | | Postpone remote folder import until filesystem mirroring matures. | Andrew Manning | 2016-07-16 | 3 | -6/+55 |
| | | | * | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-14 | 7 | -32/+80 |
| | | | |\ \ \ \ \ \ |
|
| | | | * | | | | | | | Refactored the scan and import functions to reduce redundant code and simplif... | Andrew Manning | 2016-07-14 | 2 | -373/+223 |
| | | | * | | | | | | | Blocks, pages, and layouts import from zip file. Layouts are not applied to p... | Andrew Manning | 2016-07-13 | 1 | -9/+190 |
