Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | testing the new router/module code | redmatrix | 2016-04-15 | 1 | -1/+21 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | revup #337 | redmatrix | 2016-04-17 | 1 | -1/+1 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-16 | 1 | -1/+1 | |
|\| | | | | |_|/ / |/| | | | ||||||
| * | | | revup #337 | redmatrix | 2016-04-16 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-15 | 0 | -0/+0 | |
|\ \ \ | ||||||
| * | | | Merge branch 'master' into dev | Mario Vavti | 2016-04-15 | 9 | -7360/+7416 | |
| |\| | | ||||||
* | | | | Merge branch 'master' into dev | redmatrix | 2016-04-15 | 5 | -249/+238 | |
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | ||||||
| * | | 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 | |
| |\ \ | ||||||
| * | | | fix some slight crossbrowser rendering issues with jot | Mario Vavti | 2016-04-15 | 3 | -16/+16 | |
| | | | | ||||||
* | | | | Merge branch 'master' into dev | redmatrix | 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 | |
| |/ / | ||||||
* / / | filter out a bit more dreport noise - especially for private posts to ↵ | redmatrix | 2016-04-14 | 1 | -0/+11 | |
|/ / | | | | | | | multiple recipients. | |||||
* | | 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 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-10 | 4 | -3496/+3550 | |
| |\ \ | ||||||
| | * | | Update Dutch and Spanish | jeroenpraat | 2016-04-10 | 4 | -3496/+3550 | |
| | | | | ||||||
| * | | | revup | redmatrix | 2016-04-10 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | localise the opensearch link | redmatrix | 2016-04-10 | 3 | -6/+8 | |
| | | | ||||||
* | | | issue #331 use timeago.js for reshared publish date instead of ↵ | redmatrix | 2016-04-10 | 2 | -3/+8 | |
| | | | | | | | | | | | | relative_date() which does not play well with other networks. | |||||
* | | | move more session related stuff such as paranoia handling (IP address ↵ | redmatrix | 2016-04-10 | 2 | -38/+59 | |
| | | | | | | | | | | | | changes) into the session object and extend remember_me cookies once a day so that they will never expire (theoretically). The DB session driver will extend its expiration on every session write (in the case of persistent sessions). | |||||
* | | | when setting the session handler as an object using the auto register ↵ | redmatrix | 2016-04-10 | 2 | -2/+0 | |
| | | | | | | | | | | | | shutdown flag, explicitly calling session_write_close() should no longer be required. It shouldn't cause any issues if it is called twice, but the session driver interface has been known to sometimes act in unexpected ways and there are lots of "subtleties" which can often be difficult to debug. The mentioned flag implies PHP 5.4 minimum but I believe we require that anyway. | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-10 | 20 | -22/+67 | |
|\ \ \ |