| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-02 | 27 | -659/+420 |
|\| |
|
| * | some initial emoji reaction work | redmatrix | 2016-06-02 | 1 | -1/+5 |
| * | the rest of the schema updates - WARNING: some third party plugins may fail; ... | redmatrix | 2016-06-01 | 13 | -372/+236 |
| * | more db column renames | redmatrix | 2016-05-31 | 12 | -79/+96 |
| * | more removal of reserved words from DB schemas | redmatrix | 2016-05-31 | 3 | -10/+10 |
| * | provide a sort of mutex lock around db logging so it can't possibly recurse. ... | redmatrix | 2016-05-31 | 2 | -10/+18 |
| * | don't remove missing hooks while update_r1169 is happpening - temp fix | redmatrix | 2016-05-31 | 1 | -5/+8 |
| * | don't update hubloc_connected any more often than 15 minutes. We don't requir... | redmatrix | 2016-05-30 | 1 | -5/+11 |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-30 | 1 | -7/+7 |
| |\ |
|
| | * | Merge pull request #405 from git-marijus/dev | hubzilla | 2016-05-31 | 1 | -7/+7 |
| | |\ |
|
| | | * | render code bbcode inline if there are no linebreaks in the text. | Mario Vavti | 2016-05-30 | 1 | -7/+7 |
| * | | | start removing reserved words from database column names (this run: addon and... | redmatrix | 2016-05-30 | 4 | -15/+15 |
| * | | | begin moving config to zotlabs. Leave procedural stubs for backward comaptibi... | redmatrix | 2016-05-30 | 1 | -144/+17 |
| |/ / |
|
| * / | redundant dev line from an earlier modification causes issue #404 | redmatrix | 2016-05-30 | 2 | -20/+6 |
| |/ |
|
* | | Major corrections to access control and page construction. | Andrew Manning | 2016-06-02 | 2 | -18/+19 |
* | | Created page history widget to dynamically fetch and display the git commit h... | Andrew Manning | 2016-05-30 | 2 | -6/+35 |