Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | possible fix for #385 | Mario Vavti | 2016-05-21 | 2 | -1/+5 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-19 | 1 | -17/+32 |
|\ | |||||
| * | Replace text strings for translation support | Andrew Manning | 2016-05-19 | 1 | -9/+3 |
| | | |||||
| * | Improved plugin repo management UI in admin/plugins | Andrew Manning | 2016-05-19 | 1 | -17/+38 |
| | | |||||
* | | provide an acl select option for only me | Mario Vavti | 2016-05-19 | 2 | -15/+58 |
|/ | |||||
* | Merge pull request #388 from phellmes/de20160516 | hubzilla | 2016-05-17 | 2 | -3045/+3082 |
|\ | | | | | Update DE translation strings | ||||
| * | Update DE translations strings | phellmes | 2016-05-16 | 2 | -3045/+3082 |
| | | |||||
* | | Dutch and Spanish Spanish strings, and some schema-bits | jeroenpraat | 2016-05-16 | 9 | -5809/+5990 |
|/ | |||||
* | Enable options for chat notifications, with optional audio. Notify for ↵ | Andrew Manning | 2016-05-13 | 1 | -3/+45 |
| | | | | member entering room and incoming messages. | ||||
* | change wording restricted -> custom selection and add a label to the select | Mario Vavti | 2016-05-13 | 1 | -1/+1 |
| | |||||
* | instead of radio buttons use select to choose between public and restricted ↵ | Mario Vavti | 2016-05-13 | 2 | -60/+70 |
| | | | | acl. if restricted is selected acl is set to default. if there is no default acl will be set to self. if public is selected acl-list will be hidden and acl-info is visible. | ||||
* | Merge remote-tracking branch 'upstream/dev' into chat-notify | Andrew Manning | 2016-05-11 | 2 | -23/+23 |
|\ | |||||
| * | Merge pull request #376 from anaqreon/plugin-repo | redmatrix | 2016-05-12 | 1 | -3/+3 |
| |\ | | | | | | | Check if target directories are writable when adding, updating, or removing plugin repos | ||||
| | * | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-11 | 1 | -0/+11 |
| | |\ | |||||
| | * | | Check if target directories are writable when adding, updating, or removing ↵ | Andrew Manning | 2016-05-11 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | plugin repos | ||||
| * | | | more whitespace | Mario Vavti | 2016-05-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | whitespace | Mario Vavti | 2016-05-11 | 1 | -19/+19 |
| | |/ | |/| | |||||
* / | | Browser notification issued when member enters chat room | Andrew Manning | 2016-05-11 | 1 | -0/+76 |
|/ / | |||||
* / | provide repository versions on admin summary page and an upgrade message if ↵ | redmatrix | 2016-05-10 | 1 | -0/+11 |
|/ | | | | you're behind master | ||||
* | Delete existing repo if the new one has a different URL. Fixed bug that ↵ | Andrew Manning | 2016-05-10 | 1 | -4/+8 |
| | | | | could cause repeated installation. | ||||
* | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-09 | 4 | -6/+15 |
|\ | |||||
| * | remove unused code and whitespace | Mario Vavti | 2016-05-09 | 1 | -1/+1 |
| | | |||||
| * | remove the old IE html5 hack. | redmatrix | 2016-05-08 | 1 | -4/+0 |
| | | |||||
| * | improve non-ACL option description in ACL dialog | Treer | 2016-05-08 | 2 | -1/+14 |
| | | |||||
* | | Fixed some bugs with empty repo name and improved the interface a bit. | Andrew Manning | 2016-05-09 | 1 | -12/+19 |
| | | |||||
* | | copy-paste error | Andrew Manning | 2016-05-09 | 1 | -9/+24 |
| | | |||||
* | | Addon repo is copied to /extend/addon/ when admin presses install. Addon ↵ | Andrew Manning | 2016-05-08 | 1 | -6/+49 |
| | | | | | | | | repos can be removed via GUI. | ||||
* | | Custom addon repo name option added. | Andrew Manning | 2016-05-08 | 2 | -1/+3 |
| | | |||||
* | | Existing addon repos are listed on plugin page with controls for updating, ↵ | Andrew Manning | 2016-05-07 | 1 | -1/+33 |
| | | | | | | | | removing, and switching branches. | ||||
* | | New plugin repo cloned using new GitRepo class. Readme and info displayed in ↵ | Andrew Manning | 2016-05-07 | 2 | -11/+23 |
| | | | | | | | | wide modal dialog. | ||||
* | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-07 | 2 | -2/+2 |
|\| | |||||
| * | update 2 fontawesome icons | Treer | 2016-05-06 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into plugin-repo | Andrew Manning | 2016-05-06 | 2 | -22/+26 |
|\| | |||||
| * | use section-content-info-wrapper class for info text | Mario Vavti | 2016-05-06 | 2 | -11/+2 |
| | | |||||
| * | use darker background colour only for searchbar | Mario Vavti | 2016-05-06 | 2 | -11/+24 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-05 | 3 | -1/+3 |
|\| | |||||
| * | replace app tagcloud with more traditional categories widget. One can always ↵ | redmatrix | 2016-05-05 | 1 | -1/+1 |
| | | | | | | | | change this in the PDL | ||||
| * | provide a tag cloud for app categories and allow filtering apps from this | redmatrix | 2016-05-04 | 2 | -1/+2 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-04 | 3 | -17/+116 |
| |\ | |||||
| * | | add categories to apps (wip) | redmatrix | 2016-05-04 | 1 | -0/+1 |
| | | | |||||
* | | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-04 | 5 | -19/+122 |
|\ \ \ | | |/ | |/| | |||||
| * | | add help to some permissions dialogs | Treer | 2016-05-05 | 2 | -2/+14 |
| | | | |||||
| * | | Refine permissions dialog UI | Treer | 2016-05-04 | 3 | -17/+104 |
| |/ | |||||
| * | ensure that important system fields are passed through the appman editor | redmatrix | 2016-05-03 | 1 | -0/+4 |
| | | |||||
| * | more background work for app management - give every member a copy of all ↵ | redmatrix | 2016-05-03 | 1 | -2/+2 |
| | | | | | | | | the system apps so that they can edit and delete them to taste/preference. This needs further work to pick up changes in system apps (additions, edits, deletions, etc.). Currently this is done once and never attempted again. | ||||
* | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-03 | 1 | -1/+1 |
|\| | |||||
| * | Merge pull request #365 from Treer/fontawesome | git-marijus | 2016-05-03 | 1 | -1/+1 |
| |\ | | | | | | | another font-awesome icon | ||||
| | * | another font-awesome icon | Treer | 2016-05-04 | 1 | -1/+1 |
| | | | |||||
* | | | Increased PHPGit timeout to 120 seconds for large repos. Retrieve Readme.md ↵ | Andrew Manning | 2016-05-03 | 1 | -1/+10 |
| | | | | | | | | | | | | and render on plugins page. | ||||
* | | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-03 | 4 | -1/+13 |
|\| | |