Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge branch 'patch-11' into 'dev'" | Mario Vavti | 2018-10-13 | 2 | -42/+5 |
* | 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 |
|\| | | |/ |/| | |||||
| * | 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 |
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-10-03 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'dev' into 'dev' | M. Dent | 2018-10-03 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Fix misplaced comma with period. | M.Dent | 2018-10-02 | 1 | -1/+1 |
| * | | | move filing from conversation to network - it is only functional there. | Mario Vavti | 2018-10-03 | 1 | -8/+8 |
| |/ / | |||||
| * / | indicate locked features | Mario Vavti | 2018-10-01 | 1 | -1/+1 |
| |/ | |||||
| * | Status editor hook | M. Dent | 2018-09-29 | 1 | -1/+15 |
| * | Remove servicelevel logic | M. Dent | 2018-09-29 | 4 | -20/+3 |
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2018-09-28 | 1 | -8/+13 |
| |\ | |||||
| | * | settings for channel home | Mario Vavti | 2018-09-28 | 1 | -8/+13 |
| * | | nav_channel_select should be off by default | Mario | 2018-09-28 | 1 | -1/+1 |
| |/ | |||||
| * | Update zot.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| * | Update security.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| * | Update zot.php | Max Kostikov | 2018-09-28 | 1 | -14/+14 |
| * | Update group.php | Max Kostikov | 2018-09-28 | 1 | -21/+21 |
| * | Update acl_selectors.php | Max Kostikov | 2018-09-27 | 1 | -1/+1 |
| * | Update api_zot.php | Max Kostikov | 2018-09-27 | 1 | -4/+4 |
| * | Update channel.php | Max Kostikov | 2018-09-27 | 1 | -5/+5 |
| * | Update connections.php | Max Kostikov | 2018-09-27 | 1 | -2/+2 |
| * | Update items.php | Max Kostikov | 2018-09-27 | 1 | -1/+1 |