Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #448 from Treer/avatars | hubzilla | 2016-07-04 | 4 | -2/+89 |
|\ | | | | | Force local cache update when user changes their profile picture | ||||
| * | force immediate avatar update | Treer | 2016-07-03 | 3 | -0/+87 |
| | | |||||
| * | Mark nickname as required field, if left empty then channel creation fails ↵ | Treer | 2016-07-03 | 1 | -2/+2 |
|/ | | | | silently | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-01 | 7 | -41/+30 |
|\ | |||||
| * | use visibility instead of display to hide elements | Mario Vavti | 2016-07-01 | 1 | -2/+2 |
| | | |||||
| * | ditch the change_view widget and make header fixed in fullscreen mode | Mario Vavti | 2016-07-01 | 6 | -39/+28 |
| | | |||||
* | | delivery invoked twice in mod_tagger, once in post_activity_item() and ↵ | redmatrix | 2016-07-01 | 2 | -14/+6 |
| | | | | | | | | another at the main module level | ||||
* | | use small photo for Diaspora attribution correction; the medium looks ↵ | redmatrix | 2016-07-01 | 2 | -2/+11 |
|/ | | | | awkward in the D* stream. | ||||
* | allow multiple apd's per plugin dir | redmatrix | 2016-07-01 | 3 | -3528/+3567 |
| | |||||
* | if cron is broken because the entire db or config table is crashed, don't ↵ | redmatrix | 2016-06-30 | 1 | -0/+9 |
| | | | | send a cron broken email - because we have no way of limiting it to just one email. We need a working config to do that. | ||||
* | disable wiki if feature disabled, sync updates of delayed publish posts | redmatrix | 2016-06-30 | 3 | -2/+17 |
| | |||||
* | sync flags even if post has not been edited | redmatrix | 2016-06-30 | 2 | -20/+24 |
| | |||||
* | Merge pull request #445 from anaqreon/wiki | hubzilla | 2016-07-01 | 3 | -3/+81 |
|\ | | | | | Table of contents with links is generated if [toc] is found in Markdown text | ||||
| * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-30 | 319 | -8242/+10673 |
| |\ | |/ |/| | |||||
* | | update moment.js to version 2.13 | Mario Vavti | 2016-06-30 | 4 | -50/+423 |
| | | |||||
* | | dreport: convert timestamp to channel localtime and get rid of old ↵ | redmatrix | 2016-06-29 | 1 | -11/+1 |
| | | | | | | | | pre-template code | ||||
* | | templatise the Dreport page and add a redeliver option for when things stuff ↵ | redmatrix | 2016-06-29 | 2 | -9/+64 |
| | | | | | | | | up badly. | ||||
* | | wiki featured disabled by default in UNO. | redmatrix | 2016-06-29 | 1 | -1/+1 |
| | | |||||
* | | provide wiki as a feature (default is on so there aren't any surprises) and ↵ | redmatrix | 2016-06-29 | 4 | -5/+29 |
| | | | | | | | | add to channel menu and profile tabs | ||||
* | | only request geolocation permission if we're creating a post. | redmatrix | 2016-06-29 | 1 | -1/+1 |
| | | |||||
* | | stream large photos through buffered I/O if possible | redmatrix | 2016-06-29 | 2 | -4/+28 |
| | | |||||
* | | Merge pull request #444 from git-marijus/dev | hubzilla | 2016-06-30 | 252 | -7354/+9154 |
|\ \ | | | | | | | Merge branch sabre32 into dev | ||||
| * \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-29 | 3 | -2/+43 |
| |\ \ | |||||
| * | | | update to sabre/dav to version 3.2.0 | Mario Vavti | 2016-06-28 | 21 | -224/+319 |
| | | | | |||||
| * | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 1 | -1/+7 |
| |\ \ \ | |||||
| * \ \ \ | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 10 | -71/+267 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 17 | -705/+555 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-27 | 1 | -8/+12 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-27 | 30 | -30/+98 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-26 | 5 | -36/+199 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-25 | 7 | -53/+59 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-24 | 26 | -3696/+3867 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-23 | 8 | -24/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-22 | 14 | -77/+842 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-21 | 10 | -50/+565 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 40 | -86788/+61549 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 21 | -42/+108 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | return something so we can make a conclusion | Mario Vavti | 2016-06-19 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-19 | 14 | -13/+21622 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-18 | 8 | -1084/+1160 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-17 | 3 | -3/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-17 | 4 | -8/+38 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-16 | 2 | -0/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | mrge branch 'dev' into sabre32 | Mario Vavti | 2016-06-16 | 2 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-16 | 9 | -536/+1491 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-16 | 60 | -17/+23584 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-15 | 2 | -1/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-15 | 6 | -10/+160 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | css fix | Mario Vavti | 2016-06-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |