Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-20 | 18 | -11/+16 |
|\ | |||||
| * | Fixes regarding the new default profile photo size. The default profile ↵ | Mario Vavti | 2015-07-20 | 17 | -9/+9 |
| | | | | | | | | photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format. | ||||
| * | show icons instead of disabled checkboxes | Mario Vavti | 2015-07-20 | 1 | -2/+7 |
| | | |||||
* | | there is no stricmp() in php, use strcasecmp() - also only detect language ↵ | redmatrix | 2015-07-20 | 1 | -3/+6 |
| | | | | | | | | if we plan to use it. | ||||
* | | indicate where progress has been made | redmatrix | 2015-07-20 | 2 | -16/+20 |
|/ | |||||
* | allow per-connection content filter to specify a detected language to ↵ | redmatrix | 2015-07-20 | 2 | -1/+7 |
| | | | | include/exclude (in addition to text, tags, and regexes) | ||||
* | string update | redmatrix | 2015-07-19 | 2 | -986/+926 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-16 | 4 | -355/+406 |
|\ | |||||
| * | fix missing div and a regression introduced in ↵ | Mario Vavti | 2015-07-16 | 2 | -50/+37 |
| | | | | | | | | ec23a94b6d7f6db1e1d34275b8143cbc947db802 which broke tag removal for photos | ||||
| * | Merge pull request #376 from tuscanhobbit/master | Paolo T | 2015-07-16 | 2 | -305/+369 |
| |\ | | | | | | | Updated Italian strings | ||||
| | * | Updated Italian strings | Paolo Tacconi | 2015-07-16 | 2 | -305/+369 |
| | | | |||||
* | | | provide a way to export a single year of items (to potentially keep from ↵ | redmatrix | 2015-07-16 | 3 | -3/+40 |
|/ / | | | | | | | exhausting resources either on export or import) | ||||
* | | allow plugins to provide module handlers for arbitrary modules that haven't ↵ | redmatrix | 2015-07-15 | 2 | -0/+13 |
| | | | | | | | | been installed on the system. | ||||
* | | fix for empty recip array resulting from a mangled xchan | redmatrix | 2015-07-15 | 1 | -5/+8 |
| | | |||||
* | | clone sync fixes across red/hz | redmatrix | 2015-07-15 | 1 | -2/+7 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-15 | 9 | -15/+19 |
|\ \ | |||||
| * \ | Merge pull request #375 from zzottel/master | redmatrix | 2015-07-16 | 6 | -6/+6 |
| |\ \ | | | | | | | | | change sh to bash in shebang to make scripts work | ||||
| | * | | also change the update_ scripts | zottel | 2015-07-15 | 3 | -3/+3 |
| | | | | |||||
| | * | | change sh to bash in shebang to make scripts work | zottel | 2015-07-15 | 3 | -3/+3 |
| |/ / | |||||
| * | | provide info text for automatic permissions | Mario Vavti | 2015-07-15 | 1 | -1/+1 |
| | | | |||||
| * | | whitespace | Mario Vavti | 2015-07-15 | 1 | -4/+0 |
| | | | |||||
| * | | show inherited state in Connection Default Permissions | Mario Vavti | 2015-07-15 | 3 | -7/+15 |
| | | | |||||
* | | | revision update | redmatrix | 2015-07-15 | 1 | -1/+1 |
|/ / | |||||
* | | fix import of group members | redmatrix | 2015-07-14 | 1 | -1/+1 |
| | | |||||
* | | stream_perms_xchans() set to empty quoted string when no results rather than ↵ | redmatrix | 2015-07-14 | 1 | -0/+6 |
| | | | | | | | | return an empty string | ||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-14 | 10 | -518/+331 |
|\ \ | |||||
| * | | make strings translateable | Mario Vavti | 2015-07-14 | 2 | -6/+12 |
| | | | |||||
| * | | disable the inherited checkboxes for notself | Mario Vavti | 2015-07-14 | 1 | -1/+1 |
| | | | |||||
| * | | fix mod_connedit.js after cleanup | Mario Vavti | 2015-07-14 | 2 | -1/+35 |
| | | | |||||
| * | | revert this until further investigation | Mario Vavti | 2015-07-14 | 1 | -1/+1 |
| | | | |||||
| * | | revert provide inherited perms for connection default permissions | Mario Vavti | 2015-07-14 | 1 | -1/+1 |
| | | | |||||
| * | | remove dbg | Mario Vavti | 2015-07-14 | 1 | -2/+0 |
| | | | |||||
| * | | provide inherited perms for connection default permissions | Mario Vavti | 2015-07-14 | 1 | -1/+3 |
| | | | |||||
| * | | css fixes | Mario Vavti | 2015-07-14 | 1 | -5/+1 |
| | | | |||||
| * | | cleanup connedit | Mario Vavti | 2015-07-14 | 9 | -550/+309 |
| | | | |||||
| * | | Merge pull request #373 from zzottel/master | redmatrix | 2015-07-14 | 1 | -0/+18 |
| |\ \ | | | | | | | | | change account_default_channel if default channel is removed | ||||
| | * | | change account_default_channel if default channel is removed | zottel | 2015-07-13 | 1 | -0/+18 |
| |/ / | |||||
* / / | coverup and ignore the illegal string offset message that some sites have ↵ | redmatrix | 2015-07-14 | 3 | -3/+5 |
|/ / | | | | | | | been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled. | ||||
* | | Only let local logins install webpage elements | redmatrix | 2015-07-11 | 1 | -1/+5 |
| | | |||||
* | | allow sys editing of menu | redmatrix | 2015-07-11 | 1 | -0/+1 |
| | | |||||
* | | whitespace and comment out info again | Mario Vavti | 2015-07-12 | 2 | -3/+3 |
| | | |||||
* | | fix sys channel menu in a morre standard way | Mario Vavti | 2015-07-12 | 3 | -5/+5 |
| | | |||||
* | | menu_id is still needed | Mario Vavti | 2015-07-12 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-07-12 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-11 | 3 | -16/+23 |
| |\ \ | |||||
| * | | | revision update | redmatrix | 2015-07-11 | 1 | -1/+1 |
| | | | | |||||
* | | | | make menu creation for sys channel work | Mario Vavti | 2015-07-12 | 4 | -10/+5 |
| |/ / |/| | | |||||
* | | | fix issue with profile photo | Mario Vavti | 2015-07-11 | 1 | -6/+6 |
| | | | |||||
* | | | more revert | Mario Vavti | 2015-07-11 | 1 | -5/+0 |
| | | | |||||
* | | | revert moving section and aside padding to style.css - it brings trouble to ↵ | Mario Vavti | 2015-07-11 | 2 | -5/+14 |
| | | | | | | | | | | | | other layouts |