aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Commented out extra repos except official addonsHaakon Meland Eriksen2016-04-161-12/+12
* nav: move js and css out of template, provide a help button in the panel on s...Mario Vavti2016-04-153-233/+222
* Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-04-154-7111/+7178
|\
| * Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-04-152-3091/+3147
| |\
| | * Merge pull request #343 from wave72/masterWave2016-04-152-3091/+3147
| | |\
| | | * Merge branch 'redmatrix-master'Paolo Tacconi2016-04-15532-91509/+104813
| | | |\
| | | | * Resolved conflict in view/it/hstrings.phpPaolo Tacconi2016-04-15532-91509/+104813
| | | |/| | | | |/ | | |/|
| | | * Updated Italian stringsPaolo Tacconi2016-04-152-3091/+3147
| * | | revup + strings #337redmatrix2016-04-152-4020/+4031
| |/ /
* / / fix some slight crossbrowser rendering issues with jotMario Vavti2016-04-153-16/+16
|/ /
* | commit 1.41.4redmatrix2016-04-142-1/+34
* | provide general purpose verification class, remove include/session.php (no lo...redmatrix2016-04-144-187/+48
* | Merge branch 'master' into devredmatrix2016-04-141-2/+1
|\ \
| * | revup #337redmatrix2016-04-141-2/+1
* | | fix marked bug in coderedmatrix2016-04-131-2/+1
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-131-2/+2
|\ \ \
| * | | some bbcode autocomplete refinement for edit webpageMario Vavti2016-04-131-2/+2
* | | | refactor the js detection into a checkjs class which is only enabled on deman...redmatrix2016-04-135-19/+50
* | | | Merge branch 'master' into devredmatrix2016-04-131-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | issue #337redmatrix2016-04-131-1/+1
* | | | reverse the logic of the jsenabled setting so that sessions without js are pe...redmatrix2016-04-128-26/+26
| |/ / |/| |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-121-2/+3
|\ \ \
| * | | improve bbco autocomplete to not execute listNewLineAutocomplete() many times...Mario Vavti2016-04-121-2/+3
* | | | Important work on the sessionhandler to maintain compatibility with php7 and ...redmatrix2016-04-123-58/+65
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | revup issue #337redmatrix2016-04-121-1/+2
* | | remove obsolete jotVideoURL() and jotAudioURL()redmatrix2016-04-111-14/+0
* | | when saving bookmarks from a post allow choice of bookmark to be saved (defau...redmatrix2016-04-111-1/+10
* | | move all DB session storage logic to SessionHandler where it belongsredmatrix2016-04-112-4/+10
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-111-10/+10
|\ \ \
| * | | whitespaceMario Vavti2016-04-111-10/+10
* | | | remove references to ref_session_write - can't useredmatrix2016-04-111-8/+1
|/ / /
* | | Merge branch 'master' into devredmatrix2016-04-115-3497/+3552
|\| |
| * | revupredmatrix2016-04-111-1/+1
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-04-104-3496/+3550
| |\ \
| | * | Update Dutch and Spanishjeroenpraat2016-04-104-3496/+3550
| * | | revupredmatrix2016-04-101-1/+1
| |/ /
* | | localise the opensearch linkredmatrix2016-04-103-6/+8
* | | issue #331 use timeago.js for reshared publish date instead of relative_date(...redmatrix2016-04-102-3/+8
* | | move more session related stuff such as paranoia handling (IP address changes...redmatrix2016-04-102-38/+59
* | | when setting the session handler as an object using the auto register shutdow...redmatrix2016-04-102-2/+0
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-1020-22/+67
|\ \ \
| * | | fix autocomplete for /channel and /displayMario Vavti2016-04-092-1/+5
| * | | some work on comanche autocompleteMario Vavti2016-04-0914-19/+54
| * | | enable bbcode autocomplete for other placesMario Vavti2016-04-095-2/+8
* | | | a few issues: block public not blocking mod_cal, typo in sql for one clone fi...redmatrix2016-04-107-15/+50
* | | | log if the session handler fails and surface the ssl_cookie config settingredmatrix2016-04-083-1/+5
|/ / /
* | | objectify all the session management stuffredmatrix2016-04-087-12/+181
* | | Merge branch 'master' into devredmatrix2016-04-082-1281/+1303
|\| |
| * | revupredmatrix2016-04-082-1281/+1303
* | | send file sync packets for all known file operationsredmatrix2016-04-077-47/+112