Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-12 | 1 | -1/+0 |
|\ | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-04-11 | 3 | -2/+4 |
| |\ | |||||
| * | | channel delegation: push current identity and pop it on logout from the ↵ | zotlabs | 2018-04-11 | 1 | -1/+0 |
| | | | | | | | | | | | | delegated channel. This fixes the known issue of being forced to log back in after leaving the delegated channel. | ||||
* | | | fix issue #1047 | Mario Vavti | 2018-04-12 | 1 | -1/+3 |
| |/ |/| | |||||
* | | also clean localStorage upon logout or channel switch | Mario Vavti | 2018-04-11 | 1 | -1/+2 |
| | | |||||
* | | allow to toggle visibility of likes/dislikes in notifications | Mario Vavti | 2018-04-11 | 1 | -0/+1 |
| | | |||||
* | | wrong function | Mario Vavti | 2018-04-11 | 1 | -1/+1 |
|/ | |||||
* | Update French hstrings.php | Galette Saucisse | 2018-04-10 | 1 | -0/+19 |
| | | | added some missing strings | ||||
* | do not get or set post category if the field is not available. remove logging. | Mario Vavti | 2018-04-10 | 1 | -3/+5 |
| | |||||
* | fix autosave content not cleaned after post submission | Mario Vavti | 2018-04-10 | 1 | -24/+47 |
| | |||||
* | last commented expiration setting in admin | zotlabs | 2018-04-10 | 1 | -0/+1 |
| | |||||
* | Replace pushState with replaceState to prevent browser history clutter in ↵ | Andrew Manning | 2018-04-09 | 1 | -2/+2 |
| | | | | Help pages. | ||||
* | Merge pull request #1051 from anaqreon/auto-save | git-marijus | 2018-04-09 | 3 | -0/+101 |
|\ | | | | | Auto-save comment and post text | ||||
| * | Added feature setting for auto-save, defaulting to enabled. | Andrew Manning | 2018-04-08 | 3 | -34/+51 |
| | | |||||
| * | Auto-save post and comment entry using localStorage in browser. | Andrew Manning | 2018-04-08 | 3 | -32/+84 |
| | | |||||
| * | Merge branch 'dev' into auto-save | Andrew Manning | 2018-04-07 | 7 | -5/+60 |
| |\ | |||||
| * | | Post body and title are auto-saved | Andrew Manning | 2018-04-04 | 1 | -0/+32 |
| | | | |||||
* | | | more work merging techlevels and features | zotlabs | 2018-04-08 | 1 | -0/+15 |
| | | | |||||
* | | | first cut of feature/techlevel merge | zotlabs | 2018-04-08 | 1 | -0/+7 |
| | | | |||||
* | | | extend AC | zotlabs | 2018-04-08 | 1 | -1/+12 |
| |/ |/| | |||||
* | | Use Add Files/Photos instead of Upload to open the upload dialog | Mario Vavti | 2018-04-07 | 3 | -3/+3 |
| | | |||||
* | | oauth2 client settings page | zotlabs | 2018-04-05 | 3 | -1/+56 |
| | | |||||
* | | private forum mentions | zotlabs | 2018-04-04 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' into oauth2 | zotlabs | 2018-04-03 | 3 | -7/+7 |
|\ | |||||
| * | some more work on hubzilla issue #1019 | zotlabs | 2018-04-02 | 1 | -1/+1 |
| | | |||||
| * | fix missing login/out buttons for medium screensize | Mario Vavti | 2018-04-01 | 2 | -6/+6 |
| | | |||||
* | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-31 | 3 | -1/+6 |
|\| | |||||
| * | Hubzilla issue #1022 - improve the usability | zotlabs | 2018-03-30 | 1 | -3/+1 |
| | | |||||
| * | Hubzilla issue #1022 - provide a way to share wiki pages. Currently this is ↵ | zotlabs | 2018-03-30 | 1 | -0/+3 |
| | | | | | | | | only implemented in the 'edit' pane and could use some improvement/enhancement | ||||
| * | allow case independence of replacements as well as patterns | zotlabs | 2018-03-30 | 1 | -1/+1 |
| | | |||||
| * | use context method | zotlabs | 2018-03-28 | 1 | -0/+1 |
| | | |||||
| * | put vcard widget with author of top-level post on display page | zotlabs | 2018-03-27 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-27 | 18 | -15476/+24437 |
|\| | |||||
| * | Update hmessages.po | goofy-bz | 2018-03-23 | 1 | -6/+6 |
| | | | | | | typofix | ||||
| * | Update translations for catalan (ca/ca_ES) from transifex | fadelkon | 2018-03-23 | 6 | -6966/+11194 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-17 | 1 | -3/+3 |
| |\ | |||||
| | * | slight re-org and update of documentation, moving the tutorial to the top. | zotlabs | 2018-03-16 | 1 | -3/+3 |
| | | | |||||
| * | | use transform to scale emojis. this prevents text jumping on hover | Mario Vavti | 2018-03-16 | 1 | -2/+3 |
| |/ | |||||
| * | indicate that there are events today in notifications by changing the badge ↵ | Mario Vavti | 2018-03-14 | 1 | -0/+8 |
| | | | | | | | | class from secondary to danger. issue #1001 | ||||
| * | make the oneway-overlay slightly opaque | Mario Vavti | 2018-03-14 | 1 | -0/+1 |
| | | |||||
| * | reveal the profile name field only if multi prifiles feature is enabled | Mario Vavti | 2018-03-14 | 1 | -2/+6 |
| | | |||||
| * | show site registration notifications setting only to site admin | Mario Vavti | 2018-03-14 | 1 | -1/+3 |
| | | |||||
| * | Merge pull request #1000 from mrjive/dev | git-marijus | 2018-03-13 | 3 | -8483/+13200 |
| |\ | | | | | | | Connections page filtering for active connections | ||||
| | * | Merge pull request #18 from redmatrix/dev | mrjive | 2018-03-13 | 100 | -3022/+4060 |
| | |\ | | | | | | | | | Dev | ||||
| | * | | small work on connections page | mrjive | 2018-03-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | Partial italina translationhmessages.po hstrings.php | mrjive | 2018-03-05 | 2 | -8482/+13199 |
| | | | | |||||
| * | | | Merge pull request #999 from mjfriaza/dev | git-marijus | 2018-03-13 | 2 | -9/+9 |
| |\ \ \ | | |_|/ | |/| | | Spanish translation: adapted the new timeago's stuff | ||||
| | * | | Spanish translation: adapted the new timeago's stuff | Manuel Jiménez Friaza | 2018-03-13 | 2 | -9/+9 |
| | | | | |||||
| * | | | Merge pull request #997 from mjfriaza/dev | git-marijus | 2018-03-13 | 2 | -5/+5 |
| |\| | | | | | | | | | | Spanish translation: added "el" before "artículo", which is the correct construction | ||||
| | * | | Spanish translation: added el before artículo, which is the correct ↵ | Manuel Jiménez Friaza | 2018-03-11 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | construction. |