Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-05 | 1 | -1/+5 | |
|\ \ | ||||||
| * \ | Merge pull request #339 from anaqreon/autocomplete | redmatrix | 2016-04-06 | 1 | -1/+5 | |
| |\ \ | ||||||
| | * | | Improve (un)ordered list autocompletion for list construction | Andrew Manning | 2016-04-05 | 1 | -1/+5 | |
* | | | | add some doco on some of the issues and approaches to file/photo syncing and ... | redmatrix | 2016-04-05 | 1 | -0/+61 | |
|/ / / | ||||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-05 | 14 | -78/+297 | |
|\| | | ||||||
| * | | fix contextual help | Mario Vavti | 2016-04-05 | 2 | -4/+3 | |
| * | | use min version of justifiedGallery | Mario Vavti | 2016-04-05 | 1 | -1/+1 | |
| * | | expand list of bbcode in autocomplete | Mario Vavti | 2016-04-05 | 1 | -3/+6 | |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-04-05 | 9 | -5/+190 | |
| |\ \ | ||||||
| | * \ | Merge pull request #338 from anaqreon/contextual-help | redmatrix | 2016-04-05 | 9 | -5/+190 | |
| | |\ \ | ||||||
| | | * \ | Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextua... | Andrew Manning | 2016-04-03 | 292 | -61382/+62954 | |
| | | |\ \ | ||||||
| | | * | | | More help content for channel pages. Channel, photos, files, about. | Andrew Manning | 2016-03-26 | 4 | -1/+71 | |
| | | * | | | Search docs/context/ hierarchically for help.html files to reduce redundancy | Andrew Manning | 2016-03-26 | 6 | -42/+27 | |
| | | * | | | Added help for post permissions | Andrew Manning | 2016-03-26 | 2 | -3/+4 | |
| | | * | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextua... | Andrew Manning | 2016-03-23 | 31 | -3052/+2924 | |
| | | |\ \ \ | ||||||
| | | * | | | | Network page help with auto-scroll and element highlighting | Andrew Manning | 2016-03-23 | 1 | -0/+26 | |
| | | * | | | | Override navbar help button to open contextual help panel. Contextual help fo... | Andrew Manning | 2016-03-21 | 8 | -5/+108 | |
| * | | | | | | update upstream lib jusutifiedGallery | Mario Vavti | 2016-04-05 | 5 | -70/+102 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | revup issue #337 | redmatrix | 2016-04-05 | 1 | -1/+1 | |
* | | | | | | explain the two aspects of federation which need to be handled in core to pas... | redmatrix | 2016-04-04 | 1 | -2/+5 | |
| |/ / / / |/| | | | | ||||||
* | | | | | SECURITY: Do not link unknown and unverified code repositories to the project... | redmatrix | 2016-04-04 | 3 | -5/+36 | |
* | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-04 | 1 | -1/+1 | |
|\| | | | | ||||||
| * | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-04 | 3 | -6/+10 | |
| |\ \ \ \ | ||||||
| * | | | | | revup - issue #337 | redmatrix | 2016-04-04 | 1 | -1/+1 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge branch 'master' into dev | Mario Vavti | 2016-04-04 | 3 | -0/+43 | |
|\ \ \ \ \ | ||||||
| * | | | | | a simple autocomplete for bbcode or comanche - partly implemented | Mario Vavti | 2016-04-04 | 3 | -0/+43 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge branch 'master' into dev | Mario Vavti | 2016-04-04 | 1 | -1/+1 | |
|\| | | | | ||||||
| * | | | | do not use dropdown class if there is nothing to dropdown | Mario Vavti | 2016-04-04 | 1 | -1/+1 | |
* | | | | | Merge branch 'master' into dev | Mario Vavti | 2016-04-04 | 2 | -5/+9 | |
|\| | | | | ||||||
| * | | | | whitespace | Mario Vavti | 2016-04-04 | 1 | -2/+0 | |
| * | | | | whitespace | Mario Vavti | 2016-04-04 | 1 | -1/+0 | |
| * | | | | fullscreen mode for photo albums view | Mario Vavti | 2016-04-04 | 2 | -3/+10 | |
| |/ / / | ||||||
* | | | | For GNU-social discovery, use the URI in the feed (author.uri) rather than tr... | redmatrix | 2016-04-03 | 2 | -11/+21 | |
* | | | | provide a backup copy of prior notes widget content if the contents were just... | redmatrix | 2016-04-03 | 1 | -1/+11 | |
* | | | | Bug: "remember me" doesn't | redmatrix | 2016-04-03 | 5 | -5/+11 | |
* | | | | issue #138 ; make ajaxchat optional and configurable. For reasons we've discu... | redmatrix | 2016-04-03 | 5 | -3/+18 | |
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-03 | 0 | -0/+0 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'master' into dev | Mario Vavti | 2016-04-03 | 3 | -17/+16 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' into dev | Mario Vavti | 2016-04-03 | 1 | -2/+2 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into dev | Mario Vavti | 2016-04-03 | 13 | -1034/+2093 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into dev | Mario Vavti | 2016-04-03 | 5 | -5/+65 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-04-03 | 3 | -10/+10 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into dev | Mario Vavti | 2016-04-03 | 5 | -11/+20 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ | Merge branch 'master' into dev | redmatrix | 2016-04-03 | 25 | -1070/+2197 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-03 | 24 | -1069/+2196 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | various fixes | Mario Vavti | 2016-04-03 | 3 | -17/+16 | |
| | | |_|_|_|/ / / | | |/| | | | | | | ||||||
| | * | | | | | | | reduce chat-item-title fontsize to match wall-item-ago | Mario Vavti | 2016-04-03 | 1 | -2/+2 | |
| | | |_|_|/ / / | | |/| | | | | | ||||||
| | * | | | | | | update upstream libs fullcalendar and moment to a recent version | Mario Vavti | 2016-04-03 | 13 | -1034/+2093 | |
| | | |_|/ / / | | |/| | | | | ||||||
| | * | | | | | fullscreen mode for events | Mario Vavti | 2016-04-03 | 5 | -5/+65 | |
| | | |/ / / | | |/| | | |