| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-17 | 3 | -8/+33 |
|\ |
|
| * | core changes to better support media migrations | redmatrix | 2016-06-16 | 3 | -8/+33 |
* | | Wiki page revision comparison tool with diff displayed in modal dialog. Lever... | Andrew Manning | 2016-06-17 | 1 | -1/+43 |
|/ |
|
* | code comments | redmatrix | 2016-06-15 | 1 | -0/+5 |
* | custom request methods for curl | redmatrix | 2016-06-15 | 1 | -3/+13 |
* | provide a default for undefined languages | redmatrix | 2016-06-15 | 1 | -0/+1 |
* | ignore case in language names and add 'js' as an alias for 'javascript' | redmatrix | 2016-06-15 | 2 | -4/+6 |
* | Merge pull request #422 from anaqreon/wiki | hubzilla | 2016-06-16 | 1 | -9/+46 |
|\ |
|
| * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-15 | 2 | -1/+11 |
| |\ |
|
| * | | Rename page feature added. Fixed bug in git commit function and other minor f... | Andrew Manning | 2016-06-15 | 1 | -9/+46 |
* | | | This was the reason for the large line widths - an extra linefeed after each ... | redmatrix | 2016-06-15 | 1 | -1/+1 |
* | | | provide syntax based [colour] highlighting on code blocks for popular languag... | redmatrix | 2016-06-15 | 2 | -0/+52 |
| |/
|/| |
|
* | | add new connection to default group when auto-accepted | redmatrix | 2016-06-15 | 2 | -1/+11 |
|/ |
|
* | some work to provide propagation and honouring of the item_notshown flag. | redmatrix | 2016-06-13 | 2 | -8/+23 |
* | missing iconfig conversion | redmatrix | 2016-06-13 | 1 | -3/+6 |
* | deprecate the item_id table - replace with iconfig. A possibly useful functio... | redmatrix | 2016-06-13 | 10 | -65/+73 |
* | Merge pull request #416 from anaqreon/embedphotos | hubzilla | 2016-06-13 | 1 | -0/+12 |
|\ |
|
| * | Merge remote-tracking branch 'upstream/dev' into embedphotos | Andrew Manning | 2016-06-12 | 5 | -12/+499 |
| |\ |
|
| * | | Stashing changes. Not a functional state. | Andrew Manning | 2016-06-09 | 1 | -0/+12 |
* | | | DB schema issue with import | redmatrix | 2016-06-12 | 1 | -12/+26 |
* | | | Apply purify_html to page content before preview and save to prevent JavaScri... | Andrew Manning | 2016-06-12 | 1 | -1/+1 |
| |/
|/| |
|
* | | remove debugging | redmatrix | 2016-06-11 | 1 | -1/+0 |
* | | Work supporting issue #411, add an optional priority (int) as a second arg to... | redmatrix | 2016-06-11 | 1 | -11/+23 |
* | | iconfig sharing not set correctly | redmatrix | 2016-06-10 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-09 | 1 | -0/+5 |
|\ \ |
|
| * | | potential fix to hubzilla-addons issue 16 | redmatrix | 2016-06-08 | 1 | -0/+5 |
| |/ |
|
* | | Revised permissions checks across API and enabled collaborative editing using... | Andrew Manning | 2016-06-08 | 1 | -2/+11 |
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-08 | 2 | -369/+20 |
|\| |
|
| * | block random_profile from accessing sys channels | redmatrix | 2016-06-07 | 1 | -1/+2 |
| * | Finish the config family | redmatrix | 2016-06-07 | 1 | -368/+18 |
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-07 | 3 | -191/+23 |
|\| |
|
| * | 'recent photos' query was buggered, also fix issue #163 by adding configurabl... | redmatrix | 2016-06-07 | 2 | -16/+16 |
| * | rename admin/users to admin/accounts, provide sortable columns in account and... | redmatrix | 2016-06-06 | 1 | -1/+1 |
| * | move pconfig to static class | redmatrix | 2016-06-05 | 1 | -174/+6 |
* | | Remove debugging logger statements | Andrew Manning | 2016-06-05 | 2 | -4/+0 |
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-05 | 3 | -20/+19 |
|\| |
|
| * | provide a hover class for smiley emojis which renders them slightly larger on... | redmatrix | 2016-06-04 | 1 | -1/+1 |
| * | another switch of type and ttype | redmatrix | 2016-06-04 | 1 | -1/+1 |
| * | the :tone variants are messed up, remove them | redmatrix | 2016-06-04 | 1 | -0/+2 |
| * | return of the project smilie | redmatrix | 2016-06-04 | 1 | -2/+3 |
| * | For emojis in posts, extend smilies and save a lot of duplication of effort | redmatrix | 2016-06-04 | 2 | -14/+12 |
| * | cross-site encoding issue with tags | redmatrix | 2016-06-04 | 1 | -4/+2 |
* | | Basic page reversion implemented. The revert button on the history view repla... | Andrew Manning | 2016-06-05 | 1 | -1/+38 |
* | | Page deletion implemented. Hide the delete button and disallow for Home page. | Andrew Manning | 2016-06-04 | 1 | -0/+18 |
* | | Wiki and page filenames are abstracted from their displayed names. Special ch... | Andrew Manning | 2016-06-04 | 2 | -24/+36 |
* | | Created three distinct names for wiki and page that are suitable for URL, HTM... | Andrew Manning | 2016-06-04 | 1 | -14/+42 |
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-04 | 3 | -1/+16 |
|\| |
|
| * | allow bbcode emojis (at least the single unicode character forms) | redmatrix | 2016-06-03 | 1 | -0/+14 |
| * | turn emoji ability into a feature so that either a member or the site admin c... | redmatrix | 2016-06-03 | 1 | -0/+1 |
| * | missed an object -> obj conversion in prepare_body | redmatrix | 2016-06-03 | 1 | -1/+1 |