Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | rename some menus | Mario Vavti | 2015-11-19 | 1 | -3/+3 | |
| | | | ||||||
* | | | remove more unneeded files | Mario Vavti | 2015-11-18 | 7 | -157/+0 | |
| | | | ||||||
* | | | move moment.min.js and remove unneeded files | Mario Vavti | 2015-11-18 | 425 | -111600/+1 | |
| | | | ||||||
* | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-11-18 | 4 | -9/+10 | |
|\| | | ||||||
| * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-18 | 2 | -8/+8 | |
| |\ \ | ||||||
| | * | | Pass in account_id. Required for bulk identity importer. | ken restivo | 2015-11-18 | 2 | -5/+5 | |
| | | | | ||||||
| | * | | Use provided account_id instead of user's logged in account_id. Necessary ↵ | ken restivo | 2015-11-18 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | for bulk importer. | |||||
| * | | | wsod viewing photo widget | redmatrix | 2015-11-18 | 2 | -1/+2 | |
| |/ / | ||||||
* / / | some events refacturing | Mario Vavti | 2015-11-18 | 456 | -5770/+128487 | |
|/ / | ||||||
* | | fix admin plugin hooks | redmatrix | 2015-11-17 | 3 | -3/+25 | |
| | | ||||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-17 | 13 | -230/+599 | |
|\ \ | ||||||
| * | | whitespace | Mario Vavti | 2015-11-17 | 1 | -1/+1 | |
| | | | ||||||
| * | | more css fixes | Mario Vavti | 2015-11-17 | 6 | -16/+14 | |
| | | | ||||||
| * | | missing closing " for src attribute | Mario Vavti | 2015-11-17 | 1 | -1/+1 | |
| | | | ||||||
| * | | update bootstrap lib 3.3.4 -> 3.3.5 | Mario Vavti | 2015-11-17 | 6 | -195/+568 | |
| | | | ||||||
| * | | css fixes | Mario Vavti | 2015-11-17 | 2 | -7/+9 | |
| | | | ||||||
| * | | show jotnets toggle button only if there are jotnets and whitespace fixes | Mario Vavti | 2015-11-17 | 1 | -14/+10 | |
| | | | ||||||
* | | | photo album widget permissions issue | redmatrix | 2015-11-17 | 4 | -3/+9 | |
|/ / | ||||||
* | | fix api/direct_messages/new at least for the json case. We seem to have a ↵ | redmatrix | 2015-11-16 | 4 | -16/+34 | |
| | | | | | | | | missing template for XML | |||||
* | | tag_deliver of an edit to an already uplinked item wasn't resetting ↵ | redmatrix | 2015-11-15 | 1 | -1/+4 | |
| | | | | | | | | permissions and ownership bits before starting delivery chain on the edit. | |||||
* | | allow plugins to also log to a different named logfile and also alter the ↵ | redmatrix | 2015-11-15 | 1 | -1/+1 | |
| | | | | | | | | log message | |||||
* | | add logger plugin hook | redmatrix | 2015-11-15 | 1 | -0/+16 | |
| | | ||||||
* | | permission issues editing wall-to-wall posts | redmatrix | 2015-11-15 | 3 | -9/+19 | |
| | | ||||||
* | | issue with dead hub detection | redmatrix | 2015-11-15 | 1 | -1/+1 | |
| | | ||||||
* | | revert html in markdown for posts, but trim the input before processing the ↵ | redmatrix | 2015-11-15 | 2 | -2/+2 | |
| | | | | | | | | markdown | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-15 | 7 | -1138/+1160 | |
|\ \ | ||||||
| * | | nl+es and some other bits | jeroenpraat | 2015-11-14 | 7 | -1138/+1160 | |
| | | | ||||||
* | | | issues connecting to local forum | redmatrix | 2015-11-15 | 3 | -13/+9 | |
|/ / | ||||||
* | | superblock enhancements | redmatrix | 2015-11-13 | 4 | -533/+543 | |
| | | ||||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-12 | 3 | -4/+4 | |
|\ \ | ||||||
| * | | Add note about base64 and urlencode. | ken restivo | 2015-11-12 | 1 | -2/+2 | |
| | | | ||||||
| * | | Fix spelling of documentation. | ken restivo | 2015-11-12 | 2 | -2/+2 | |
| | | | ||||||
* | | | really basic photo album widget for content regions | redmatrix | 2015-11-12 | 3 | -0/+87 | |
|/ / | ||||||
* | | allow pdl content | redmatrix | 2015-11-12 | 4 | -1/+23 | |
| | | ||||||
* | | issue #154 | redmatrix | 2015-11-12 | 1 | -0/+11 | |
| | | ||||||
* | | small fixes, removed old unused database row, and log more prominently a ↵ | redmatrix | 2015-11-12 | 3 | -2/+3 | |
| | | | | | | | | missing directory server URL | |||||
* | | Small update to Bluegrid and generic-content-wrapper-styled to dreport | jeroenpraat | 2015-11-12 | 2 | -3/+4 | |
| | | ||||||
* | | will also need api doco | redmatrix | 2015-11-11 | 2 | -1/+24 | |
| | | ||||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-11 | 1 | -7/+7 | |
|\ \ | ||||||
| * \ | Merge pull request #149 from waitman/master | redmatrix | 2015-11-12 | 1 | -7/+7 | |
| |\ \ | | | | | | | | | updates to Postgres schema | |||||
| | * | | updates to Postgres schema | Waitman Gobble | 2015-11-11 | 1 | -7/+7 | |
| | | | | ||||||
* | | | | run markdown through html purifier for those who insist on mixing html with ↵ | redmatrix | 2015-11-11 | 2 | -2/+3 | |
|/ / / | | | | | | | | | | markdown. | |||||
* | | | Merge pull request #144 from kenrestivo/api-auth-fix | ken restivo | 2015-11-11 | 1 | -0/+1 | |
|\ \ \ | |/ / |/| | | api_auth.php must be included since the function moved. | |||||
| * | | api_auth.php must be included since the function moved. | ken restivo | 2015-11-11 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge pull request #143 from kenrestivo/allow-importing-by-proxy | redmatrix | 2015-11-11 | 1 | -3/+13 | |
|\ \ \ | | | | | | | | | Bust out import_account() into a separate function | |||||
| * | | | Bust out import_account() into a separate function to allow importing ↵ | ken restivo | 2015-11-10 | 1 | -3/+13 | |
| | | | | | | | | | | | | | | | | accounts by proxy, i.e. for admins to import a channel on behalf of a user. | |||||
* | | | | Merge pull request #141 from HaakonME/master | redmatrix | 2015-11-11 | 1 | -0/+5 | |
|\ \ \ \ | | | | | | | | | | | Added Hubzilla plugin repo for ownMapp - decentralized and private map sharing | |||||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-11 | 2 | -2/+2 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-10 | 2 | -2/+2 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Fixed ownMapp repo address | Haakon Meland Eriksen | 2015-11-10 | 1 | -1/+1 | |
| | | | | | | |