aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | | | | | | | | | | | | | | * | | fix pdledit list moderedmatrix2016-06-241-5/+5
| | | | | | | | | | | | | | | | | | | |/ /
| | | | | | | | | | | | | | | | | | | * | move revision upredmatrix2016-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | * | missing class selector when "use photo as profile photo"redmatrix2016-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | * | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-06-201-2/+2
| | | | | | | | | | | | | | | | | | | |\ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | missing backslash leading to wsod on xconfig changesMario Vavti2016-06-201-2/+2
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | * | fix siteinfo plugin listredmatrix2016-06-201-2/+1
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | merge conflictredmatrix2016-06-191-6/+0
| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | zot_revision should be string, not float1.8redmatrix2016-06-191-1/+1
| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | recreate link from the merge kerfuffleredmatrix2016-06-191-0/+1
| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge branch '1.8RC'redmatrix2016-06-192861-171567/+92849
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | hebrew hstrings.php was emptyredmatrix2016-06-181-0/+2317
| | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | hebrew updateredmatrix2016-06-183-3548/+1311
| | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | changelog update for 1.8redmatrix2016-06-171-0/+4
| | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | "thing" always showing default url, not that supplied by the thing.redmatrix2016-06-171-2/+2
| | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC_mergeredmatrix2016-06-1544-81254/+77509
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | All languages up to date as far as they are updated. Added Hebrew (I saw no ↵jeroenpraat2016-06-1544-81254/+77509
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RTL on my browser, but maybe that's a locale setting or else it's not yet implemented in HZ). Removed Esperanto and Czech (they where old ones from Friendica and are not on Transifex (yet)).
| | | | | * | | | | | | | | | | | | | | | | translate already imported system appsredmatrix2016-06-151-0/+2
| | | | | |/ / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | | Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC_mergeredmatrix2016-06-152-5529/+5467
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #420 from phellmes/de20160615Jeroen van Riet Paap2016-06-152-5529/+5467
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update DE translation strings
| | | | | | | * | | | | | | | | | | | | | | | Update DE translation stringsphellmes2016-06-152-5529/+5467
| | | | | | |/ / / / / / / / / / / / / / / /
| | | | | * / / / / / / / / / / / / / / / / add new connection to default group when auto-acceptedredmatrix2016-06-152-1/+11
| | | | | |/ / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | | DB schema issue with importredmatrix2016-06-121-12/+26
| | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | Merge pull request #414 from anaqreon/1.8RChubzilla2016-06-132-16/+4
| | | |_|/| | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add filter to wiki content to prevent JavaScript code injection
| | | | | * | | | | | | | | | | | | | | | Apply purify_html to page content before preview and save to prevent ↵Andrew Manning2016-06-122-16/+4
| | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JavaScript code injection.
| | * | | | | | | | | | | | | | | | | | css fixesMario Vavti2016-06-112-10/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | es_ES and NL string for 1.8RC. Hopefully I'm doing it right.jeroenpraat2016-06-114-9041/+9047
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RCjeroenpraat2016-06-110-0/+0
| |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | iconfig sharing not set correctlyredmatrix2016-06-101-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | iconfig sharing not set correctlyredmatrix2016-06-101-1/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | move dev forwardredmatrix2016-06-101-1/+1
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | changelog updateredmatrix2016-06-101-0/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge pull request #410 from anaqreon/wikihubzilla2016-06-10353-18/+1685
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | Wiki module: first iteration
| | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-095-21/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-02428-56247/+1158
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | Major corrections to access control and page construction.Andrew Manning2016-06-027-120/+135
| | | | | | | | | | | | | | | | | | | | | | | |