Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-18 | 1 | -1/+1 | |
| |\| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | include site identitfier on redmatrix delivery reports also | redmatrix | 2015-09-18 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | DB table for delivery reports | redmatrix | 2015-09-18 | 3 | -1/+86 | |
| * | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-18 | 8 | -14/+21 | |
| |\| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-18 | 5 | -11/+14 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | Another (hopefully final) Spanish update | jeroenpraat | 2015-09-17 | 2 | -5/+5 | |
| | | * | | | | | | | | | | | | | | fix calculation of content height with margins | Mario Vavti | 2015-09-17 | 3 | -6/+9 | |
| | * | | | | | | | | | | | | | | | dummy update | redmatrix | 2015-09-18 | 4 | -8/+12 | |
| | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | add reporting site to delivery report | redmatrix | 2015-09-18 | 3 | -1/+7 | |
| * | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-18 | 8 | -1/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | more work on surviving hub re-installs | redmatrix | 2015-09-18 | 2 | -4/+8 | |
* | | | | | | | | | | | | | | | | | Added hot_deploy directly to .openshift/makers/hot_deploy | Haakon Meland Eriksen | 2015-09-18 | 1 | -0/+0 | |
* | | | | | | | | | | | | | | | | | Added hot_deploy to deploy script - fixed echo | Haakon Meland Eriksen | 2015-09-18 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-18 | 75 | -761/+964 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | css fixes | Mario Vavti | 2015-09-18 | 8 | -1/+8 | |
| |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | / | change photo permissions when attach permissions are changed through mod/file... | redmatrix | 2015-09-18 | 3 | -4/+14 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | start hooking in the new webfinger/zot merged discovery | redmatrix | 2015-09-17 | 1 | -6/+10 | |
| * | | | | | | | | | | | | | | consolidate zotfinger and webfinger | redmatrix | 2015-09-17 | 5 | -291/+299 | |
| * | | | | | | | | | | | | | | Converse width for a few related (old) schemas back to 1024px / Name default ... | jeroenpraat | 2015-09-17 | 6 | -6/+15 | |
| * | | | | | | | | | | | | | | missing refernce to array | Mario Vavti | 2015-09-17 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-09-17 | 3 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #46 from anaqreon/master | git-marijus | 2015-09-17 | 3 | -5/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | Corrected some missing space typos in docs | Andrew Manning | 2015-09-17 | 3 | -5/+5 | |
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | ||||||
| * | / | | | | | | | | | | | | | quickfix for private messages - needs a lot more work | Mario Vavti | 2015-09-17 | 5 | -48/+56 | |
| |/ / / / / / / / / / / / / / | ||||||
| * / / / / / / / / / / / / / | Revert "moved submit button to the bottom in settings.tpl" | Mario Vavti | 2015-09-17 | 1 | -5/+7 | |
| |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-16 | 1 | -1/+1 | |
| |\| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-16 | 12 | -197/+199 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | push revision | redmatrix | 2015-09-16 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-16 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Cleaned some wrong metadata from PNG files. | jeroenpraat | 2015-09-15 | 9 | -0/+0 | |
| * | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-16 | 6 | -47/+45 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #45 from anaqreon/master | redmatrix | 2015-09-17 | 4 | -35/+35 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | Started correcting vestiges of the RedMatrix and matrix, replacing with Hubzi... | Andrew Manning | 2015-09-16 | 4 | -35/+35 | |
| | |/ / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | Merge pull request #44 from mrjive/move_submit_button | redmatrix | 2015-09-17 | 1 | -7/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | moved submit button to the bottom in settings.tpl | mrjive | 2015-09-16 | 1 | -7/+5 | |
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Merge pull request #43 from mrjive/toggleselect | redmatrix | 2015-09-17 | 1 | -5/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | added toggle_select | mrjive | 2015-09-16 | 1 | -5/+5 | |
| | |/ / / / / / / / / / / / / | ||||||
| * / / / / / / / / / / / / / | change matrix to grid, begin webfinger optimisation | redmatrix | 2015-09-16 | 4 | -18/+15 | |
| |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | serve as application/xrd+xml | redmatrix | 2015-09-15 | 2 | -2/+2 | |
| * | | | | | | | | | | | | | italian string correction | redmatrix | 2015-09-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Less margin | jeroenpraat | 2015-09-15 | 3 | -0/+0 | |
| * | | | | | | | | | | | | | Made the favicons a bit sharper (direct from SVG) and cleaned some wrong meta... | jeroenpraat | 2015-09-15 | 15 | -0/+0 | |
| * | | | | | | | | | | | | | make sure we've got a doc type | redmatrix | 2015-09-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | I'm not going to tell you what's wrong because I'll be accused of bashing ano... | redmatrix | 2015-09-15 | 3 | -1/+3 | |
| * | | | | | | | | | | | | | persona | redmatrix | 2015-09-14 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | nit | redmatrix | 2015-09-14 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-14 | 2 | -194/+194 | |
| |\| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Small update Spanish strings | jeroenpraat | 2015-09-14 | 2 | -194/+194 | |
| | * | | | | | | | | | | | | quick fix for choklet bannertwo | Mario Vavti | 2015-09-14 | 1 | -3/+5 | |
| | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | we need an owner for permissions_sql | redmatrix | 2015-09-14 | 1 | -1/+9 |