Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -19/+31 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strings update | redmatrix | 2016-08-05 | 1 | -2270/+2333 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-05 | 38 | -121/+242 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #477 from git-marijus/dev | hubzilla | 2016-08-06 | 37 | -119/+200 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Revert "remove some logging"" | Mario Vavti | 2016-08-05 | 1 | -10/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "remove some logging" | Mario Vavti | 2016-08-05 | 1 | -1/+10 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove some logging | Mario Vavti | 2016-08-05 | 1 | -10/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multi acl: port /settings | Mario Vavti | 2016-08-05 | 3 | -5/+7 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multi acl: port /display | Mario Vavti | 2016-08-05 | 1 | -0/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multi acl: port /thing | Mario Vavti | 2016-08-05 | 4 | -7/+13 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multi acl: port /rpost | Mario Vavti | 2016-08-05 | 8 | -20/+18 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multiple acl work | Mario Vavti | 2016-08-03 | 11 | -43/+96 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minor cleanup on ratings - no real functional changes at this time | redmatrix | 2016-08-04 | 2 | -12/+20 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue #473 - unable to delete privacy groups | redmatrix | 2016-08-03 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |