Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | | | | | | | | | | | | | | | | * | | | fix pdledit list mode | redmatrix | 2016-06-24 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | |/ / | ||||||
| | | | | | | | | | | | | | | | | | | * | | move revision up | redmatrix | 2016-06-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | | | | | | * | | missing class selector when "use photo as profile photo" | redmatrix | 2016-06-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | | | | | | * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-06-20 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | |\ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | missing backslash leading to wsod on xconfig changes | Mario Vavti | 2016-06-20 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | | | | | | * | | fix siteinfo plugin list | redmatrix | 2016-06-20 | 1 | -2/+1 | |
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | merge conflict | redmatrix | 2016-06-19 | 1 | -6/+0 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | zot_revision should be string, not float1.8 | redmatrix | 2016-06-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | recreate link from the merge kerfuffle | redmatrix | 2016-06-19 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | Merge branch '1.8RC' | redmatrix | 2016-06-19 | 2861 | -171567/+92849 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | | | | hebrew hstrings.php was empty | redmatrix | 2016-06-18 | 1 | -0/+2317 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | | hebrew update | redmatrix | 2016-06-18 | 3 | -3548/+1311 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | | changelog update for 1.8 | redmatrix | 2016-06-17 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | | "thing" always showing default url, not that supplied by the thing. | redmatrix | 2016-06-17 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | | Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC_merge | redmatrix | 2016-06-15 | 44 | -81254/+77509 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | * | | | | | | | | | | | | | | | | All languages up to date as far as they are updated. Added Hebrew (I saw no ↵ | jeroenpraat | 2016-06-15 | 44 | -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 apps | redmatrix | 2016-06-15 | 1 | -0/+2 | |
| | | | | |/ / / / / / / / / / / / / / / / | ||||||
| | | | | * | | | | | | | | | | | | | | | | Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC_merge | redmatrix | 2016-06-15 | 2 | -5529/+5467 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #420 from phellmes/de20160615 | Jeroen van Riet Paap | 2016-06-15 | 2 | -5529/+5467 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update DE translation strings | |||||
| | | | | | | * | | | | | | | | | | | | | | | | Update DE translation strings | phellmes | 2016-06-15 | 2 | -5529/+5467 | |
| | | | | | |/ / / / / / / / / / / / / / / / | ||||||
| | | | | * / / / / / / / / / / / / / / / / | add new connection to default group when auto-accepted | redmatrix | 2016-06-15 | 2 | -1/+11 | |
| | | | | |/ / / / / / / / / / / / / / / / | ||||||
| | | | | * | | | | | | | | | | | | | | | | DB schema issue with import | redmatrix | 2016-06-12 | 1 | -12/+26 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | | Merge pull request #414 from anaqreon/1.8RC | hubzilla | 2016-06-13 | 2 | -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 Manning | 2016-06-12 | 2 | -16/+4 | |
| | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JavaScript code injection. | |||||
| | * | | | | | | | | | | | | | | | | | | css fixes | Mario Vavti | 2016-06-11 | 2 | -10/+1 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | es_ES and NL string for 1.8RC. Hopefully I'm doing it right. | jeroenpraat | 2016-06-11 | 4 | -9041/+9047 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC | jeroenpraat | 2016-06-11 | 0 | -0/+0 | |
| |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | iconfig sharing not set correctly | redmatrix | 2016-06-10 | 1 | -1/+1 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | iconfig sharing not set correctly | redmatrix | 2016-06-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | move dev forward | redmatrix | 2016-06-10 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | changelog update | redmatrix | 2016-06-10 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge pull request #410 from anaqreon/wiki | hubzilla | 2016-06-10 | 353 | -18/+1685 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | Wiki module: first iteration | |||||
| | * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-09 | 5 | -21/+21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | Revised permissions checks across API and enabled collaborative editing ↵ | Andrew Manning | 2016-06-08 | 2 | -81/+71 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using the write_pages per-channel permission. | |||||
| | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-08 | 8 | -372/+449 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | Javascript only allows saving a page if the content has changed. | Andrew Manning | 2016-06-07 | 1 | -2/+11 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-07 | 13 | -252/+315 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | Hide page history viewer when viewing sandbox | Andrew Manning | 2016-06-05 | 2 | -3/+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 | 5 | -5772/+5649 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | Custom commit message available. Improved history viewer and feedback from ↵ | Andrew Manning | 2016-06-05 | 3 | -7/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revert buttons. | |||||
| | * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-05 | 7 | -21/+27 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Basic page reversion implemented. The revert button on the history view ↵ | Andrew Manning | 2016-06-05 | 4 | -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 Manning | 2016-06-04 | 3 | -8/+99 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-04 | 1 | -3/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Wiki and page filenames are abstracted from their displayed names. Special ↵ | Andrew Manning | 2016-06-04 | 6 | -48/+62 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | characters do not seem to break things. | |||||
| | * | | | | | | | | | | | | | | | | | | | | Created three distinct names for wiki and page that are suitable for URL, ↵ | Andrew Manning | 2016-06-04 | 2 | -20/+52 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTML, and raw display. Implemented in new wiki POST activity only so far. | |||||
| | * | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-04 | 1844 | -458/+517 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-02 | 428 | -56247/+1158 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Major corrections to access control and page construction. | Andrew Manning | 2016-06-02 | 7 | -120/+135 | |
| | | | | | | | | | | | | | | | | | | | | | | | |