aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-095-21/+21
|\
| * remove the automatic ajax page load on pgdn key; it can load content much ↵redmatrix2016-06-091-16/+0
| | | | | | | | faster than you can page and potentially lead to memory exhaustion.
| * namespace issue with openid reverse authredmatrix2016-06-091-4/+4
| |
| * allow an exclusion for transmitting hidden file activities. There may be a ↵redmatrix2016-06-091-1/+5
| | | | | | | | better way to do this, but it was pointed out recently that transmitting some hidden activities might cause a problem. I cannot locate the conversation at the moment to summarise the exact issue.
| * issue #59redmatrix2016-06-081-0/+7
| |
| * potential fix to hubzilla-addons issue 16redmatrix2016-06-081-0/+5
| |
* | Revised permissions checks across API and enabled collaborative editing ↵Andrew Manning2016-06-082-81/+71
| | | | | | | | using the write_pages per-channel permission.
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-088-372/+449
|\|
| * block random_profile from accessing sys channelsredmatrix2016-06-071-1/+2
| |
| * whitespaceredmatrix2016-06-071-2/+5
| |
| * Finish the config familyredmatrix2016-06-076-369/+442
| |
* | Javascript only allows saving a page if the content has changed.Andrew Manning2016-06-071-2/+11
| |
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-0713-252/+315
|\|
| * slight alteration to the base descriptionredmatrix2016-06-071-2/+2
| |
| * 'recent photos' query was buggered, also fix issue #163 by adding ↵redmatrix2016-06-073-25/+21
| | | | | | | | configurable sort order to the album widget - default is album name ascending
| * rename admin/users to admin/accounts, provide sortable columns in account ↵redmatrix2016-06-064-48/+68
| | | | | | | | and channel summaries - issue #255
| * new utility: util/safemode (on or off); requires util/addonsredmatrix2016-06-062-1/+27
| |
| * adjust the autocomplete regex slightly to account for emoji namesredmatrix2016-06-051-1/+1
| |
| * move pconfig to static classredmatrix2016-06-052-174/+195
| |
| * We need a laugh icon more than we need a cry icon.redmatrix2016-06-051-1/+1
| |
* | Hide page history viewer when viewing sandboxAndrew Manning2016-06-052-3/+6
| |
* | Remove debugging logger statementsAndrew Manning2016-06-052-4/+0
| |
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-055-5772/+5649
|\|
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-054-5772/+5642
| |\
| | * Updating NL + es_ES stringsjeroenpraat2016-06-064-5772/+5642
| | |
| * | I don't know how to make this any clearer: "For these reasons we strongly ↵redmatrix2016-06-051-0/+7
| |/ | | | | | | recommend that you do NOT install addons from third-party repositories."
* | Custom commit message available. Improved history viewer and feedback from ↵Andrew Manning2016-06-053-7/+32
| | | | | | | | revert buttons.
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-057-21/+27
|\|
| * provide a hover class for smiley emojis which renders them slightly larger ↵redmatrix2016-06-042-1/+6
| | | | | | | | on compatible devices when you single them out for inspection
| * another switch of type and ttyperedmatrix2016-06-041-1/+1
| |
| * the :tone variants are messed up, remove themredmatrix2016-06-041-0/+2
| |
| * return of the project smilieredmatrix2016-06-041-2/+3
| |
| * For emojis in posts, extend smilies and save a lot of duplication of effortredmatrix2016-06-044-14/+14
| |
| * short-term solution to emoji size issue - make them 32px from the senderredmatrix2016-06-041-1/+1
| |
| * cross-site encoding issue with tagsredmatrix2016-06-041-4/+2
| |
* | Basic page reversion implemented. The revert button on the history view ↵Andrew Manning2016-06-054-3/+93
| | | | | | | | replaces the editor text but does not save the page.
* | Page deletion implemented. Hide the delete button and disallow for Home page.Andrew Manning2016-06-043-8/+99
| |
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-041-3/+3
|\|
| * class functions called incorrectlyredmatrix2016-06-041-3/+3
| |
* | Wiki and page filenames are abstracted from their displayed names. Special ↵Andrew Manning2016-06-046-48/+62
| | | | | | | | characters do not seem to break things.
* | Created three distinct names for wiki and page that are suitable for URL, ↵Andrew Manning2016-06-042-20/+52
| | | | | | | | HTML, and raw display. Implemented in new wiki POST activity only so far.
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-041844-458/+517
|\|
| * allow bbcode emojis (at least the single unicode character forms)redmatrix2016-06-031-0/+14
| |
| * App::init() should be staticredmatrix2016-06-031-1/+1
| |
| * need to set item_origin on locally created reactions so they propagate properlyredmatrix2016-06-031-0/+1
| |
| * missed table rename in event query in mod_manageredmatrix2016-06-031-5/+5
| |
| * allow any (current) emoji to be displayed on any site, and provide a default ↵redmatrix2016-06-031775-15/+15
| | | | | | | | list of reactions that can be over-ridden via configuration if a site doesn't like our choices or perhaps the ordering of our choices.
| * turn emoji ability into a feature so that either a member or the site admin ↵redmatrix2016-06-033-1/+3
| | | | | | | | can disable it. Default is enabled.
| * missed an object -> obj conversion in prepare_bodyredmatrix2016-06-031-1/+1
| |
| * stringsredmatrix2016-06-031-381/+336
| |