Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into dev | redmatrix | 2016-04-20 | 2 | -3/+9 |
|\ | |||||
| * | some crossbrowser rendering work on the comment box | Mario Vavti | 2016-04-20 | 1 | -1/+3 |
| | | |||||
| * | Use stopImmidiatePropagation() only if we are in a list to not interfere ↵ | Mario Vavti | 2016-04-20 | 1 | -2/+6 |
| | | | | | | | | with other keypress listeners (e.g. chat). | ||||
* | | module updates | redmatrix | 2016-04-18 | 1 | -5/+5 |
| | | |||||
* | | Merge branch 'master' into dev | redmatrix | 2016-04-18 | 4 | -11600/+11628 |
|\| | |||||
| * | Spanish and Dutch strings update | jeroenpraat | 2016-04-17 | 4 | -11600/+11628 |
| | | |||||
* | | Making sure the great new context help works with all thmes and schema's ↵ | jeroenpraat | 2016-04-18 | 6 | -6/+62 |
| | | | | | | | | (3rd party themes: maybe abit of tweaking is still needed). Also fixing some minor cosmetic things. | ||||
* | | New help panel that slides in from the top and pushes the content down so it ↵ | Andrew Manning | 2016-04-17 | 3 | -205/+254 |
|/ | | | | is not covered. Panel toggles with help button. Still some bugs with small screen viewing. | ||||
* | nav: move js and css out of template, provide a help button in the panel on ↵ | Mario Vavti | 2016-04-15 | 3 | -233/+222 |
| | | | | small screens and lots of whitespace cleanup | ||||
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-04-15 | 2 | -3091/+3147 |
|\ | |||||
| * | Resolved conflict in view/it/hstrings.php | Paolo Tacconi | 2016-04-15 | 195 | -77438/+81476 |
| |\ | |||||
| * | | Updated Italian strings | Paolo Tacconi | 2016-04-15 | 2 | -3091/+3147 |
| | | | |||||
* | | | fix some slight crossbrowser rendering issues with jot | Mario Vavti | 2016-04-15 | 3 | -16/+16 |
| |/ |/| | |||||
* | | refactor the js detection into a checkjs class which is only enabled on ↵ | redmatrix | 2016-04-13 | 1 | -12/+1 |
| | | | | | | | | demand (currently only the channel and display pages). Will probably require a bit more work to hide/disable the cover photo when js is disabled. Have not actually tested without js to discover any other potential page issues. Have only confirmed that the detection class works and redirects to set a jsdisabled cookie and reload the page with that cookie+variable set if called from the channel page. | ||||
* | | reverse the logic of the jsenabled setting so that sessions without js are ↵ | redmatrix | 2016-04-12 | 1 | -0/+1 |
| | | | | | | | | performance penalised instead of regular sessions. | ||||
* | | improve bbco autocomplete to not execute listNewLineAutocomplete() many ↵ | Mario Vavti | 2016-04-12 | 1 | -2/+3 |
| | | | | | | | | times after many ajax page reloads | ||||
* | | remove obsolete jotVideoURL() and jotAudioURL() | redmatrix | 2016-04-11 | 1 | -14/+0 |
| | | |||||
* | | Merge branch 'master' into dev | redmatrix | 2016-04-11 | 4 | -3496/+3550 |
|\ \ | |||||
| * | | Update Dutch and Spanish | jeroenpraat | 2016-04-10 | 4 | -3496/+3550 |
| | | | |||||
* | | | localise the opensearch link | redmatrix | 2016-04-10 | 1 | -1/+1 |
| | | | |||||
* | | | issue #331 use timeago.js for reshared publish date instead of ↵ | redmatrix | 2016-04-10 | 1 | -0/+7 |
| | | | | | | | | | | | | relative_date() which does not play well with other networks. | ||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-10 | 9 | -4/+26 |
|\ \ \ | |||||
| * | | | some work on comanche autocomplete | Mario Vavti | 2016-04-09 | 4 | -2/+18 |
| | | | | |||||
| * | | | enable bbcode autocomplete for other places | Mario Vavti | 2016-04-09 | 5 | -2/+8 |
| | | | | |||||
* | | | | log if the session handler fails and surface the ssl_cookie config setting | redmatrix | 2016-04-08 | 1 | -0/+1 |
|/ / / | |||||
* | | | translate the most common bbcodes to their *real name*. finally we should ↵ | Mario Vavti | 2016-04-07 | 2 | -1/+19 |
| | | | | | | | | | | | | probably use an array for each bbcode containing the bbcode the real name and possibly a template for use as a peview in the dropdown | ||||
* | | | some more autocompletion for bbcode tables - leave it open if we wanna use ↵ | Mario Vavti | 2016-04-07 | 1 | -0/+3 |
| | | | | | | | | | | | | th or td though | ||||
* | | | move li back in the list since it will be used far less than list | Mario Vavti | 2016-04-07 | 1 | -1/+1 |
| | | | |||||
* | | | automate bbcode list creation even further | Mario Vavti | 2016-04-07 | 1 | -0/+57 |
| | | | |||||
* | | | adjust the regex to also work with asteriks and use the simpler syntax for lists | Mario Vavti | 2016-04-06 | 1 | -6/+7 |
| | | | |||||
* | | | Improve (un)ordered list autocompletion for list construction | Andrew Manning | 2016-04-05 | 1 | -1/+5 |
| | | | |||||
* | | | fix contextual help | Mario Vavti | 2016-04-05 | 1 | -1/+1 |
| | | | |||||
* | | | 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 | 1 | -2/+48 |
|\ \ \ | |||||
| * \ \ | Merge pull request #338 from anaqreon/contextual-help | redmatrix | 2016-04-05 | 1 | -2/+48 |
| |\ \ \ | | | | | | | | | | | Contextual help | ||||
| | * \ \ | Merge branch 'master' of https://github.com/redmatrix/hubzilla into ↵ | Andrew Manning | 2016-04-03 | 73 | -52197/+52580 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | contextual-help | ||||
| | * | | | | Added help for post permissions | Andrew Manning | 2016-03-26 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into ↵ | Andrew Manning | 2016-03-23 | 15 | -2116/+2135 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | contextual-help | ||||
| | * | | | | | Override navbar help button to open contextual help panel. Contextual help ↵ | Andrew Manning | 2016-03-21 | 1 | -2/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | for mail written. | ||||
* | | | | | | | update upstream lib jusutifiedGallery | Mario Vavti | 2016-04-05 | 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 |
| | |_|/ / | |/| | | | |||||
* / | | | | Bug: "remember me" doesn't | redmatrix | 2016-04-03 | 1 | -1/+1 |
|/ / / / |