| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch '3.8RC'3.8 | Mario Vavti | 2018-10-19 | 31 | -928/+1012 |
|\ |
|
| * | Merge branch 'dev' into 'dev' | Mario | 2018-10-18 | 1 | -1/+2 |
| * | Merge branch 'dev' into 'dev' | Mario | 2018-10-15 | 1 | -3/+4 |
| * | Merge branch 'patch-16' into 'dev' | Mario | 2018-10-15 | 1 | -1/+1 |
| * | Merge branch 'patch-14' into 'dev' | Mario | 2018-10-13 | 2 | -5/+40 |
| * | Merge branch 'dev' into 3.8RC | Mario Vavti | 2018-10-13 | 2 | -42/+5 |
| |\ |
|
| | * | Revert "Merge branch 'patch-11' into 'dev'" | Mario Vavti | 2018-10-13 | 2 | -42/+5 |
| * | | Merge branch 'dev' into 3.8RC | Mario Vavti | 2018-10-13 | 3 | -8/+42 |
| |\| |
|
| | * | Merge branch 'dev' into 'dev' | Mario | 2018-10-13 | 1 | -2/+3 |
| | |\ |
|
| | | * | Fix order of assignment and get template file before return | ZotSocial Admin | 2018-10-12 | 1 | -2/+3 |
| | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -2/+1 |
| | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -3/+4 |
| | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -2/+2 |
| | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -1/+1 |
| | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -2/+1 |
| | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -4/+2 |
| | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -1/+1 |
| | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -1/+1 |
| | * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -5/+5 |
| | * | | Update language.php | Max Kostikov | 2018-10-12 | 1 | -0/+31 |
| | * | | Add plurals translation at browser side (JS) | Max Kostikov | 2018-10-12 | 1 | -5/+14 |
| | |/ |
|
| | * | verify some edge case http signatures | zotlabs | 2018-10-11 | 1 | -0/+24 |
| | * | Merge branch 'dev' | zotlabs | 2018-10-08 | 4 | -11/+30 |
| | |\ |
|
| | | * | Merge branch 'patch-2' into 'dev' | Mario | 2018-10-08 | 1 | -1/+3 |
| | | |\ |
|
| | | | * | Prevent links damage on foreign channel repost for cloned | Max Kostikov | 2018-10-05 | 1 | -1/+3 |
| | | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-10-07 | 1 | -1/+1 |
| | | |\ \ |
|
| | | * \ \ | Merge branch 'dev' into 'dev' | M. Dent | 2018-10-07 | 1 | -2/+3 |
| | | |\ \ \ |
|
| | | | * | | | Add missing else clause | M.Dent | 2018-10-06 | 1 | -2/+3 |
| | | * | | | | move profile assign selector to profile settings and personal menu selector t... | Mario Vavti | 2018-10-06 | 1 | -8/+19 |
| | | |/ / / |
|
| | | * | / | strings and force import_system_apps() on std_version change | Mario Vavti | 2018-10-06 | 1 | -0/+5 |
| | | | |/
| | | |/| |
|
| | | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-10-05 | 1 | -0/+6 |
| | | |\ \ |
|
| | * | | | | whitespace | zotlabs | 2018-10-08 | 1 | -3/+0 |
| | | |_|/
| | |/| | |
|
| | * | | | use hubloc_store_lowlevel to ensure all hubloc columns are initialised | zotlabs | 2018-10-06 | 1 | -1/+1 |
| | * | | | Merge branch 'dev' | zotlabs | 2018-10-04 | 15 | -231/+149 |
| | |\| |
| | | |/
| | |/| |
|
| | * | | do not propagate channel deletion for an already deleted channel. | zotlabs | 2018-10-02 | 1 | -0/+6 |
| * | | | Fix order of assignment and get template file before return | ZotSocial Admin | 2018-10-13 | 1 | -2/+3 |
| * | | | verify some edge case http signatures | zotlabs | 2018-10-12 | 1 | -0/+24 |
| * | | | Prevent links damage on foreign channel repost for cloned | Max Kostikov | 2018-10-08 | 1 | -1/+3 |
| * | | | Add missing else clause | M.Dent | 2018-10-07 | 1 | -2/+3 |
| * | | | use hubloc_store_lowlevel to ensure all hubloc columns are initialised | zotlabs | 2018-10-07 | 1 | -1/+1 |
| * | | | move profile assign selector to profile settings and personal menu selector t... | Mario Vavti | 2018-10-06 | 1 | -8/+19 |
| * | | | strings and force import_system_apps() on std_version change | Mario Vavti | 2018-10-06 | 1 | -0/+5 |
| * | | | version RC1 | Mario Vavti | 2018-10-06 | 1 | -6/+0 |
| * | | | Merge branch '3.8RC' of https://framagit.org/hubzilla/core into 3.8RC | Mario Vavti | 2018-10-05 | 1 | -0/+6 |
| |\ \ \ |
|
| | * | | | do not propagate channel deletion for an already deleted channel. | zotlabs | 2018-10-05 | 1 | -0/+6 |
| | | |/
| | |/| |
|
| * / | | force major version system apps import for 3.8RC - remove this at a later point | Mario Vavti | 2018-10-05 | 1 | -0/+7 |
| |/ / |
|
| * | | move *_divmore_height setting to the module extra_settings, and fix issue whe... | Mario Vavti | 2018-10-04 | 1 | -3/+9 |
| * | | move *_list_mode to features | Mario Vavti | 2018-10-04 | 1 | -0/+16 |
| * | | jot: show settings icon only to local profile owner | Mario | 2018-10-03 | 1 | -1/+2 |
| * | | move archives from network to channel_home | Mario | 2018-10-03 | 1 | -8/+8 |