| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-29 | 5 | -352/+382 | |
| | |\ | ||||||
| | | * | Update NL + 1 revert css, see comment here: ↵ | jeroenpraat | 2015-06-30 | 3 | -348/+374 | |
| | | | | | | | | | | | | | https://github.com/redmatrix/redmatrix/commit/22b9e97ae2e46513c7a43cb27e7230bc5c40b9d4 | |||||
| | | * | Probably a ugly hack, but it's the only way I could found that cuts off very ↵ | jeroenpraat | 2015-06-29 | 1 | -0/+5 | |
| | | | | | | | | | | | | | long channel names in the admin area. If there's a better alternative, be my guest. | |||||
| | | * | fix directory location | Mario Vavti | 2015-06-29 | 2 | -4/+3 | |
| | | | | ||||||
| | * | | some prep work | redmatrix | 2015-06-29 | 3 | -2/+101 | |
| | |/ | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 15 | -28/+144 | |
| |\| | | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-28 | 3 | -3/+9 | |
| | |\ | ||||||
| | | * | Merge pull request #363 from solstag/postnotstatus | redmatrix | 2015-06-28 | 1 | -2/+2 | |
| | | |\ | | | | | | | | | simply 'post' is a better default term than 'status' | |||||
| | | | * | simply 'post' is a better default term than 'status' | Alexandre Hannud Abdo | 2015-06-27 | 1 | -2/+2 | |
| | | | | | ||||||
| | | * | | css fixes | Mario Vavti | 2015-06-27 | 2 | -1/+7 | |
| | | |/ | ||||||
| | * / | no this isn't it. well ok, it's part of it, but not the important part. it's ↵ | redmatrix | 2015-06-28 | 11 | -25/+128 | |
| | |/ | | | | | | | still pretty cool. | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-26 | 1 | -0/+2 | |
| | |\ | ||||||
| | | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-25 | 4 | -2697/+2871 | |
| | | |\ | ||||||
| | | * | | directory: only provide connect button if we are not already connected | Mario Vavti | 2015-06-24 | 1 | -0/+2 | |
| | | | | | ||||||
| | * | | | project updates | redmatrix | 2015-06-26 | 4 | -196/+216 | |
| | | |/ | |/| | ||||||
| * | | | bring single instance file storage to dav and cloud uploaded photos | redmatrix | 2015-06-27 | 2 | -8/+28 | |
| | | | | ||||||
| * | | | we aren't using the module_aside functions or hooks any more | redmatrix | 2015-06-25 | 1 | -32/+0 | |
| | | | | ||||||
| * | | | undo the disabling of browser_prefetch and for the time being revert the ↵ | redmatrix | 2015-06-25 | 9 | -60/+46 | |
| | | | | | | | | | | | | | HTML cache until we can isolate all the zid and observer calls. Also get rid of youtube and vimeo bbcode tags which we should not be using any more. | |||||
| * | | | remove all QR-code stuff from core - now in qrator addon | redmatrix | 2015-06-25 | 427 | -10438/+0 | |
| | | | | ||||||
| * | | | localise event calendar | redmatrix | 2015-06-25 | 4 | -55/+139 | |
| | | | | ||||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-24 | 5 | -15/+109 | |
| |\| | | | | | | | | | | | | | | | | | | | | Conflicts: doc/de/features.bb view/de/messages.po view/de/strings.php | |||||
| | * | | Merge pull request #360 from zzottel/master | zzottel | 2015-06-24 | 4 | -2697/+2871 | |
| | |\ \ | | |/ | |/| | update German strings and help files | |||||
| | | * | update German help files | zottel | 2015-06-24 | 2 | -41/+56 | |
| | | | | ||||||
| | | * | update to German strings | zottel | 2015-06-24 | 2 | -2656/+2815 | |
| | |/ | ||||||
| | * | Add a new redbasic scheme called focus - It is supposed to focus on the main ↵ | Mario Vavti | 2015-06-24 | 2 | -0/+92 | |
| | | | | | | | | | content by adding a slight shadow and centering the main content on the screen. Also the default width of the content is set to 640px. | |||||
| | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-24 | 2 | -2/+2 | |
| | |\ | ||||||
| | * | | Reflect in directory title if we watch the local or the global directory | Mario Vavti | 2015-06-24 | 1 | -2/+3 | |
| | | | | ||||||
| * | | | more work on photos, including os_storage for the size '0' photo and ↵ | redmatrix | 2015-06-23 | 4 | -17/+69 | |
| | | | | | | | | | | | | | numbering duplicate filenames | |||||
| * | | | more work on mail flags | redmatrix | 2015-06-23 | 8 | -38/+26 | |
| | | | | ||||||
| * | | | item flag fixes discovered after a few merges | redmatrix | 2015-06-23 | 9 | -33/+12 | |
| | | | | ||||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-23 | 15 | -167/+180 | |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: include/items.php mod/item.php | |||||
| | * | | typo | redmatrix | 2015-06-23 | 2 | -2/+2 | |
| | |/ | ||||||
| | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-23 | 4 | -7/+33 | |
| | |\ | ||||||
| | | * | Merge pull request #356 from solstag/signature_edit_fix | redmatrix | 2015-06-23 | 1 | -2/+2 | |
| | | |\ | | | | | | | | | properly trims edited posts before signing so signature verification … | |||||
| | | | * | properly trims edited posts before signing so signature verification works | Alexandre Hannud Abdo | 2015-06-23 | 1 | -2/+2 | |
| | | | | | ||||||
| | | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-22 | 5 | -29/+29 | |
| | | |\| | ||||||
| | | * | | ensure we always sign a trimmed item body. | redmatrix | 2015-06-22 | 2 | -4/+4 | |
| | | | | | ||||||
| | | * | | discovered a couple of loose ends in the per-member enable diaspora setting | redmatrix | 2015-06-22 | 2 | -1/+27 | |
| | | | | | ||||||
| | * | | | some work on directory | Mario Vavti | 2015-06-23 | 6 | -130/+115 | |
| | | |/ | |/| | ||||||
| | * | | Bring /help in line with the rest of the app | Mario Vavti | 2015-06-22 | 5 | -29/+29 | |
| | |/ | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-21 | 29 | -331/+539 | |
| |\| | | | | | | | | | | | Conflicts: include/items.php util/messages.po | |||||
| | * | import: Improve the descriptive text for this feature | redmatrix | 2015-06-21 | 1 | -2/+2 | |
| | | | ||||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-21 | 3 | -7/+6 | |
| | |\ | ||||||
| | | * | Merge pull request #355 from dawnbreak/master | redmatrix | 2015-06-22 | 3 | -9/+23 | |
| | | |\ | | | | | | | | | Compatible update for .htaccess v2. | |||||
| | | | * | Compatible update for .htaccess. | Klaus Weidenbach | 2015-06-22 | 3 | -9/+23 | |
| | | | | | | | | | | | | | | | | | This should hopefully work in Apache 2.2 and 2.4. | |||||
| | | * | | Merge pull request #354 from redmatrix/revert-353-master | Klaus | 2015-06-22 | 3 | -23/+8 | |
| | | |\ \ | | | | | | | | | | | Revert "Compatible update for .htaccess." | |||||
| | | | * | | Revert "Compatible update for .htaccess." | Klaus | 2015-06-22 | 3 | -23/+8 | |
| | | |/ / | ||||||
| | * / / | some diaspora import issues uncovered during dry-run tests | redmatrix | 2015-06-21 | 4 | -13/+14 | |
| | |/ / | ||||||
| | * | | Merge pull request #353 from dawnbreak/master | redmatrix | 2015-06-22 | 3 | -8/+23 | |
| | |\ \ | | |/ | |/| | Compatible update for .htaccess. | |||||
| | | * | Compatible update for .htaccess. | Klaus Weidenbach | 2015-06-21 | 3 | -8/+23 | |
| | |/ | | | | | | | This should hopefully work in Apache 2.2 and 2.4. | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |