aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ /
| * | whitespaceMario Vavti2016-05-041-3/+3
| * | whitespaceMario Vavti2016-05-041-40/+34
| |/
| * Sync the current list of system apps with the built-in name translation table...redmatrix2016-05-036-8/+13
| * ensure that important system fields are passed through the appman editorredmatrix2016-05-032-1/+9
| * more background work for app management - give every member a copy of all the...redmatrix2016-05-034-18/+70
* | Merge remote-tracking branch 'upstream/dev' into plugin-repoAndrew Manning2016-05-037-8/+38
|\|
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-031-1/+1
| |\
| | * Merge pull request #365 from Treer/fontawesomegit-marijus2016-05-031-1/+1
| | |\
| | | * another font-awesome iconTreer2016-05-041-1/+1
| * | | some preliminary structural work for app organisationredmatrix2016-05-036-7/+37
| |/ /
* | | Increased PHPGit timeout to 120 seconds for large repos. Retrieve Readme.md a...Andrew Manning2016-05-034-12/+33
* | | Merge remote-tracking branch 'upstream/dev' into plugin-repoAndrew Manning2016-05-0334-101/+726
|\| |
| * | add the new hookredmatrix2016-05-021-0/+3
| * | more security stuffredmatrix2016-05-024-71/+52
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-0213-0/+395
| |\ \
| | * \ Merge pull request #364 from mjfriaza/devredmatrix2016-05-0313-0/+395
| | |\ \
| | | * | Contextual help in SpanishManuel Jiménez Friaza2016-05-0213-0/+395
| * | | | a bit more oembed security - and document the shortcomings of this approachredmatrix2016-05-021-16/+20
| |/ / /
| * | | sort out the rest of the source categoriesredmatrix2016-05-022-4/+4
| * | | a couple of bugfixes from earlier checkins and implementation of source tagsredmatrix2016-05-015-7/+50
| * | | db schema change to add tags to content sourcesredmatrix2016-05-014-3/+14