| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-16 | 5 | -35/+83 |
| |\ |
|
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-15 | 1 | -14/+1 |
| | |\ |
|
| | * | | move schema settings into the display settings main so we can set theme:schem... | redmatrix | 2016-08-15 | 5 | -35/+83 |
| * | | | rename limited -> custom | Mario Vavti | 2016-08-16 | 3 | -17/+17 |
| * | | | remove unneeded function | Mario Vavti | 2016-08-16 | 1 | -26/+1 |
| | |/
|/| |
|
| * | | only check settings-form for dirty state and remove redundant javascript | Mario Vavti | 2016-08-16 | 1 | -14/+1 |
| |/ |
|
| * | Use double quotes for strings passed via templates to javascript. Some transl... | redmatrix | 2016-08-15 | 1 | -5/+5 |
| * | Merge pull request #487 from git-marijus/dev | hubzilla | 2016-08-16 | 3 | -128/+79 |
| |\ |
|
| | * | provide group options serverside and minor cleanup | Mario Vavti | 2016-08-15 | 3 | -124/+30 |
| | * | implement groups in the acl select. please notice that selecting *custom sele... | Mario Vavti | 2016-08-15 | 1 | -17/+62 |
| * | | fix attached photo/file permissions on clones | redmatrix | 2016-08-15 | 3 | -134/+140 |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-15 | 2 | -47/+7 |
| |\ \ |
|
| | * \ | Merge pull request #488 from einervonvielen/dev_homeinstall_merge_master-dev | hubzilla | 2016-08-16 | 2 | -47/+7 |
| | |\ \
| | |/
| |/| |
|
| | | * | Merge dev with last changes of homeinstall script in master | Einer von Vielen | 2016-08-15 | 2 | -47/+7 |
| | |/ |
|
| * | | s/$rr/$rv/ | redmatrix | 2016-08-14 | 1 | -22/+22 |
| * | | event_store_event hook | redmatrix | 2016-08-14 | 3 | -0/+21 |
| |/ |
|
| * | Merge pull request #484 from anaqreon/settings-context | hubzilla | 2016-08-15 | 2 | -1/+13 |
| |\ |
|
| | * | Context help for settings/features page | Andrew Manning | 2016-08-14 | 2 | -1/+13 |
| |/ |
|
| * | Merge pull request #482 from anaqreon/nocomment | hubzilla | 2016-08-14 | 5 | -0/+35 |
| |\ |
|
| | * | Change text for submenu on small screens to be static toggle statement | Andrew Manning | 2016-08-14 | 2 | -1/+2 |
| | * | Replace hardcoded button title in javascript to translatable text | Andrew Manning | 2016-08-14 | 2 | -2/+4 |
| | * | Added a disable comments setting to the "Additional features" settings with a... | Andrew Manning | 2016-08-14 | 5 | -0/+32 |
| * | | fix javascript error if not logged in | Mario Vavti | 2016-08-14 | 1 | -2/+2 |
| |/ |
|
| * | update bootstrap 3.3.5 > 3.3.7 | Mario Vavti | 2016-08-14 | 6 | -138/+111 |
| * | btn/dropdown rendering issue | Mario Vavti | 2016-08-14 | 1 | -24/+30 |
| * | remove js debugging | Mario Vavti | 2016-08-13 | 1 | -1/+0 |
| * | fix #480, enable bbcode autocomplete for photo comments and remove some redun... | Mario Vavti | 2016-08-13 | 4 | -16/+3 |
| * | pending flag not being reset when using autoperms from custom role | redmatrix | 2016-08-12 | 1 | -1/+4 |
| * | string update | redmatrix | 2016-08-12 | 2 | -3626/+3620 |
| * | Merge pull request #479 from git-marijus/dev | hubzilla | 2016-08-13 | 1 | -0/+6 |
| |\ |
|
| | * | possible quickfix for multi-acl not honoring jotnets | Mario Vavti | 2016-08-12 | 1 | -0/+6 |
| * | | fix auto-connect setting | zottel | 2016-08-12 | 1 | -3/+0 |
| * | | Merge remote-tracking branch 'upstream/dev' into dev | zottel | 2016-08-12 | 14 | -232/+375 |
| |\| |
|
| | * | better method of dealing with api versions | redmatrix | 2016-08-11 | 1 | -23/+29 |
| | * | more cleanup of api | redmatrix | 2016-08-11 | 2 | -110/+110 |
| | * | move error processing back inside the function | redmatrix | 2016-08-11 | 1 | -22/+22 |
| | * | embed filter adjustments | redmatrix | 2016-08-11 | 1 | -13/+17 |
| | * | A bit of api cleanup. Don't get excited. This is like a 0.005% cleanup but yo... | redmatrix | 2016-08-11 | 4 | -117/+173 |
| | * | forum detection was off for forums with custom perms | redmatrix | 2016-08-10 | 1 | -1/+3 |
| | * | optimise Onepoll so it doesn't try and fetch posts for a channel that we've n... | redmatrix | 2016-08-10 | 1 | -0/+9 |
| | * | initialise jot editor if it is used as a file drop target and isn't yet opened. | redmatrix | 2016-08-10 | 1 | -1/+6 |
| | * | update CHANGELOG for 1.12 | redmatrix | 2016-08-10 | 1 | -0/+25 |
| | * | new version | redmatrix | 2016-08-10 | 1 | -1/+1 |
| | * | implement acl for folder creation | Mario Vavti | 2016-08-10 | 4 | -17/+53 |
| * | | Merge remote-tracking branch 'upstream/dev' into dev | zottel | 2016-08-10 | 70 | -2514/+2837 |
| |\| |
|
| | * | open editor or comment window when linkdropping to a closed window. We probab... | redmatrix | 2016-08-10 | 1 | -4/+18 |
| | * | allow dropping links on comments as well as posts | redmatrix | 2016-08-09 | 2 | -2/+4 |
| | * | function order reversed | redmatrix | 2016-08-09 | 1 | -2/+2 |
| | * | You can drag links to the editor (which will be parsed and inserted); as well... | redmatrix | 2016-08-09 | 2 | -2/+2 |
| | * | bad code format | redmatrix | 2016-08-09 | 2 | -2/+27 |
