aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into plugin-repoAndrew Manning2016-05-0930-357/+425
|\
| * Merge pull request #371 from Treer/permissionsredmatrix2016-05-103-11/+20
| |\
| | * minor cleanup. No functional changesTreer2016-05-103-11/+20
| |/
| * if we do not have a layout $layout should be empty not defaultMario Vavti2016-05-091-1/+1
| * remove unused code and whitespaceMario Vavti2016-05-092-11/+1
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-05-094-13/+26
| |\
| | * prevent recursion in the database driver when debugging is enabled and the sy...redmatrix2016-05-094-13/+26
| * | make editwebpage use status_editor() and fix storing of layout on webpage cre...Mario Vavti2016-05-094-139/+91
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-05-0923-110/+260
| |\|
| | * remove the old IE html5 hack.redmatrix2016-05-081-4/+0
| | * clean up some cruftredmatrix2016-05-083-52/+6
| | * convert media embed functions that deal with rewriting specific corporate ser...redmatrix2016-05-082-24/+13
| | * Merge pull request #370 from Treer/permissionsredmatrix2016-05-0914-25/+236
| | |\
| | | * Update some modules to use new ACL dialog featureTreer2016-05-089-11/+24
| | | * improve non-ACL option description in ACL dialogTreer2016-05-085-14/+212
| | |/
| * | make editblock use status_editor()Mario Vavti2016-05-074-90/+44
* | | Fixed some bugs with empty repo name and improved the interface a bit.Andrew Manning2016-05-093-53/+52
* | | copy-paste errorAndrew Manning2016-05-093-10/+47
* | | Addon repo is copied to /extend/addon/ when admin presses install. Addon repo...Andrew Manning2016-05-082-7/+110
* | | Custom addon repo name option added.Andrew Manning2016-05-084-21/+72
* | | Existing addon repos are listed on plugin page with controls for updating, re...Andrew Manning2016-05-072-4/+61
* | | Merge remote-tracking branch 'upstream/dev' into plugin-repoAndrew Manning2016-05-071-3/+3
|\ \ \ | | |/ | |/|
| * | SDAV is already absoluteredmatrix2016-05-071-3/+3
* | | New plugin repo cloned using new GitRepo class. Readme and info displayed in ...Andrew Manning2016-05-075-160/+170
* | | Merge remote-tracking branch 'upstream/dev' into plugin-repoAndrew Manning2016-05-072-2/+2
|\| |
| * | Merge pull request #369 from Treer/fontawesomegit-marijus2016-05-062-2/+2
| |\ \ | | |/ | |/|
| | * update 2 fontawesome iconsTreer2016-05-062-2/+2
| |/
* | Progress implementing GitRepo class in Zotlabs/StorageAndrew Manning2016-05-071-9/+96
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into plugin-repoAndrew Manning2016-05-069-1994/+1999
|\|
| * use section-content-info-wrapper class for info textMario Vavti2016-05-062-11/+2
| * use darker background colour only for searchbarMario Vavti2016-05-062-11/+24
| * missed one other place where we called comanche outside the page buildredmatrix2016-05-062-1542/+1514
| * objectify comancheredmatrix2016-05-055-434/+459
| * commentsredmatrix2016-05-051-0/+4
* | Merge remote-tracking branch 'upstream/dev' into plugin-repoAndrew Manning2016-05-057-26/+82
|\|
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-055-25/+41
| |\
| | * Merge pull request #368 from Treer/permissionsredmatrix2016-05-065-25/+41
| | |\
| | | * Unify permissions dialog for network posts, channel posts, and remote postsTreer2016-05-065-25/+41
| | |/
| * / - Setup: check php version (5.4 required)redmatrix2016-05-052-1/+41
| |/
* | Merge remote-tracking branch 'upstream/dev' into plugin-repoAndrew Manning2016-05-0513-87/+346
|\|
| * replace app tagcloud with more traditional categories widget. One can always ...redmatrix2016-05-053-1/+45
| * Allow follow to work with a pasted webbie from the profile page (where we've ...redmatrix2016-05-041-1/+4
| * isolate all the tagadelic core code into a class and reuse itredmatrix2016-05-042-85/+48
| * provide a tag cloud for app categories and allow filtering apps from thisredmatrix2016-05-046-3/+98
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-048-65/+204
| |\
| * | add categories to apps (wip)redmatrix2016-05-045-33/+187
* | | Merge remote-tracking branch 'upstream/dev' into plugin-repoAndrew Manning2016-05-0419-92/+296
|\ \ \ | | |/ | |/|
| * | Merge pull request #366 from Treer/permissionsredmatrix2016-05-057-25/+170
| |\ \
| | * | add help to some permissions dialogsTreer2016-05-056-7/+32
| | * | Refine permissions dialog UITreer2016-05-046-25/+145
| |/ /