| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-21 | 1 | -12/+12 |
| |\ | |||||
| | * | Merge pull request #349 from HaakonME/master | git-marijus | 2016-04-21 | 1 | -12/+12 |
| | |\ | | | | | | | Updated Hubzilla on OpenShift deploy script to include unofficial repos | ||||
| | | * | Updated Hubzilla on OpenShift deploy script to include unofficial repos by ↵ | Haakon Meland Eriksen | 2016-04-19 | 1 | -19/+19 |
| | | | | | | | | | | | | | appending the 'insecure' argument | ||||
| | | * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-04-18 | 7 | -11602/+11633 |
| | | |\ | |||||
| | | * \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-04-16 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | * | | | Commented out extra repos except official addons | Haakon Meland Eriksen | 2016-04-16 | 1 | -12/+12 |
| | | | | | | |||||
| * | | | | | revup #337 | redmatrix | 2016-04-21 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | 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). | ||||
| * | | | | revup #337 | redmatrix | 2016-04-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-19 | 2 | -1/+4 |
| |\ \ \ \ | | |_|/ | |/| | | |||||
| | * | | | bring back bbcode buttons for mod/editpost | Mario Vavti | 2016-04-18 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | fix rpost bbcode buttons and autocomplete | Mario Vavti | 2016-04-18 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | revup #337 | redmatrix | 2016-04-19 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | revup #337 | redmatrix | 2016-04-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Spanish and Dutch strings update | jeroenpraat | 2016-04-17 | 4 | -11600/+11628 |
| | | | | |||||
| * | | | revup #337 | redmatrix | 2016-04-17 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | revup #337 | redmatrix | 2016-04-16 | 1 | -1/+1 |
| |/ | |||||
| * | 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 | 4 | -7111/+7178 |
| |\ | |||||
| | * | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-15 | 2 | -3091/+3147 |
| | |\ | |||||
| | | * | Merge pull request #343 from wave72/master | Wave | 2016-04-15 | 2 | -3091/+3147 |
| | | |\ | | | | | | | | | Updated Italian strings | ||||
| | | | * | Merge branch 'redmatrix-master' | Paolo Tacconi | 2016-04-15 | 532 | -91509/+104813 |
| | | | |\ | |||||
| | | | | * | Resolved conflict in view/it/hstrings.php | Paolo Tacconi | 2016-04-15 | 532 | -91509/+104813 |
| | | | |/| | | | |/ | | |/| | |||||
| | | | * | Updated Italian strings | Paolo Tacconi | 2016-04-15 | 2 | -3091/+3147 |
| | | | | | |||||
| | * | | | revup + strings #337 | redmatrix | 2016-04-15 | 2 | -4020/+4031 |
| | |/ / | |||||
| * / / | fix some slight crossbrowser rendering issues with jot | Mario Vavti | 2016-04-15 | 3 | -16/+16 |
| |/ / | |||||
| * | | commit 1.41.4 | redmatrix | 2016-04-14 | 2 | -1/+34 |
| | | | |||||
| * | | provide general purpose verification class, remove include/session.php (no ↵ | redmatrix | 2016-04-14 | 4 | -187/+48 |
| | | | | | | | | | longer used) | ||||
| * | | Merge branch 'master' into dev | redmatrix | 2016-04-14 | 1 | -2/+1 |
| |\ \ | |||||
| | * | | revup #337 | redmatrix | 2016-04-14 | 1 | -2/+1 |
| | | | | |||||
| * | | | fix marked bug in code | redmatrix | 2016-04-13 | 1 | -2/+1 |
| | | | | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-13 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | some bbcode autocomplete refinement for edit webpage | Mario Vavti | 2016-04-13 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | refactor the js detection into a checkjs class which is only enabled on ↵ | redmatrix | 2016-04-13 | 5 | -19/+50 |
| | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Merge branch 'master' into dev | redmatrix | 2016-04-13 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | issue #337 | redmatrix | 2016-04-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | reverse the logic of the jsenabled setting so that sessions without js are ↵ | redmatrix | 2016-04-12 | 8 | -26/+26 |
| | |/ / |/| | | | | | | | | performance penalised instead of regular sessions. | ||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-12 | 1 | -2/+3 |
| |\ \ \ | |||||
| | * | | | improve bbco autocomplete to not execute listNewLineAutocomplete() many ↵ | Mario Vavti | 2016-04-12 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | times after many ajax page reloads | ||||
| * | | | | Important work on the sessionhandler to maintain compatibility with php7 and ↵ | redmatrix | 2016-04-12 | 3 | -58/+65 |
| |\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | php5x (x > 4) Merge branch 'master' into dev | ||||
| | * | | revup issue #337 | redmatrix | 2016-04-12 | 1 | -1/+2 |
| | | | | |||||
| * | | | remove obsolete jotVideoURL() and jotAudioURL() | redmatrix | 2016-04-11 | 1 | -14/+0 |
| | | | | |||||
| * | | | when saving bookmarks from a post allow choice of bookmark to be saved ↵ | redmatrix | 2016-04-11 | 1 | -1/+10 |
| | | | | | | | | | | | | | (default is all of them); this implements the backend. Additional work will be required on the front end or within plugins to make this happen. | ||||
| * | | | move all DB session storage logic to SessionHandler where it belongs | redmatrix | 2016-04-11 | 2 | -4/+10 |
| | | | | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-11 | 1 | -10/+10 |
| |\ \ \ | |||||
| | * | | | whitespace | Mario Vavti | 2016-04-11 | 1 | -10/+10 |
| | | | | | |||||
| * | | | | remove references to ref_session_write - can't use | redmatrix | 2016-04-11 | 1 | -8/+1 |
| |/ / / | |||||
| * | | | Merge branch 'master' into dev | redmatrix | 2016-04-11 | 5 | -3497/+3552 |
| |\| | | |||||
| | * | | revup | redmatrix | 2016-04-11 | 1 | -1/+1 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |