aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-182-1/+4
|\
| * Merge branch 'master' into devMario Vavti2016-04-181-0/+1
| |\
| | * bring back bbcode buttons for mod/editpostMario Vavti2016-04-181-0/+1
| | |
| * | Merge branch 'master' into devMario Vavti2016-04-181-1/+3
| |\|
| | * fix rpost bbcode buttons and autocompleteMario Vavti2016-04-181-1/+3
| | |
* | | convert all the _well_known service controllers which are a bit touchy when ↵redmatrix2016-04-189-228/+253
|/ / | | | | | | it comes to the router
* | Merge branch 'master' into devredmatrix2016-04-185-11601/+11629
|\|
| * revup #337redmatrix2016-04-181-1/+1
| |
| * Spanish and Dutch strings updatejeroenpraat2016-04-174-11600/+11628
| |
* | some issues with GNU-Social's implementation of events in feeds. The summary ↵redmatrix2016-04-181-2/+2
| | | | | | | | element is over-riding content, so put summary into the xcal namespace. Some investigation reveals that both projects are non-compliant in the xcal space. Will deal with this later.
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-1720-315/+348
|\ \
| * | Making sure the great new context help works with all thmes and schema's ↵jeroenpraat2016-04-186-6/+62
| | | | | | | | | | | | (3rd party themes: maybe abit of tweaking is still needed). Also fixing some minor cosmetic things.
| * | Merge pull request #345 from anaqreon/context-helpredmatrix2016-04-1815-315/+292
| |\ \ | | | | | | | | New help panel that slides in from the top and pushes the content ...
| | * | Recover lost language translation accommodation and doc/context restructuringAndrew Manning2016-04-1712-110/+38
| | | |
| | * | New help panel that slides in from the top and pushes the content down so it ↵Andrew Manning2016-04-173-205/+254
| |/ / | | | | | | | | | is not covered. Panel toggles with help button. Still some bugs with small screen viewing.
* | | pull in the new object router and a few selected samples for the new ↵redmatrix2016-04-175-1896/+1917
| | | | | | | | | | | | controller layout
* | | Merge commit '521d404' into devredmatrix2016-04-175-66/+115
|\ \ \
| * | | remove the date hack on public feeds which was a temporary fix for an issue ↵redmatrix2016-04-171-2/+2
| | | | | | | | | | | | | | | | limiting the number of posts returned and no longer needed.
| * | | Convert Channel to new moduleredmatrix2016-04-152-45/+56
| | | |
| * | | cleanup and test of new routerredmatrix2016-04-151-39/+39
| | | |
| * | | get init() working with class modulesredmatrix2016-04-152-9/+27
| | | |
| * | | testing the new router/module coderedmatrix2016-04-151-1/+21
| | | |
* | | | Merge branch 'master' into devredmatrix2016-04-171-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | revup #337redmatrix2016-04-171-1/+1
| | | |
* | | | Merge branch 'master' into devredmatrix2016-04-161-1/+1
|\| | | | |_|/ |/| |
| * | revup #337redmatrix2016-04-161-1/+1
| | |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-150-0/+0
|\ \ \
| * | | Merge branch 'master' into devMario Vavti2016-04-159-7360/+7416
| |\| |
* | | | Merge branch 'master' into devredmatrix2016-04-155-249/+238
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | nav: move js and css out of template, provide a help button in the panel on ↵Mario Vavti2016-04-153-233/+222
| | | | | | | | | | | | small screens and lots of whitespace cleanup
| * | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-04-154-7111/+7178
| |\ \
| * | | fix some slight crossbrowser rendering issues with jotMario Vavti2016-04-153-16/+16
| | | |
* | | | Merge branch 'master' into devredmatrix2016-04-154-7111/+7178
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-04-152-3091/+3147
| |\ \
| | * \ Merge pull request #343 from wave72/masterWave2016-04-152-3091/+3147
| | |\ \ | | | |/ | | |/| Updated Italian strings
| | | * Merge branch 'redmatrix-master'Paolo Tacconi2016-04-15532-91509/+104813
| | | |\
| | | | * Resolved conflict in view/it/hstrings.phpPaolo Tacconi2016-04-15532-91509/+104813
| | | |/| | | | |/ | | |/|
| | | * Updated Italian stringsPaolo Tacconi2016-04-152-3091/+3147
| | | |
| * | | revup + strings #337redmatrix2016-04-152-4020/+4031
| |/ /
* / / filter out a bit more dreport noise - especially for private posts to ↵redmatrix2016-04-141-0/+11
|/ / | | | | | | multiple recipients.
* | commit 1.41.4redmatrix2016-04-142-1/+34
| |
* | provide general purpose verification class, remove include/session.php (no ↵redmatrix2016-04-144-187/+48
| | | | | | | | longer used)
* | Merge branch 'master' into devredmatrix2016-04-141-2/+1
|\ \
| * | revup #337redmatrix2016-04-141-2/+1
| | |
* | | fix marked bug in coderedmatrix2016-04-131-2/+1
| | |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-131-2/+2
|\ \ \
| * | | some bbcode autocomplete refinement for edit webpageMario Vavti2016-04-131-2/+2
| | | |
* | | | refactor the js detection into a checkjs class which is only enabled on ↵redmatrix2016-04-135-19/+50
| | | | | | | | | | | | | | | | demand (currently only the channel and display pages). Will probably require a bit more work to hide/disable the cover photo when js is disabled. Have not actually tested without js to discover any other potential page issues. Have only confirmed that the detection class works and redirects to set a jsdisabled cookie and reload the page with that cookie+variable set if called from the channel page.
* | | | Merge branch 'master' into devredmatrix2016-04-131-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | issue #337redmatrix2016-04-131-1/+1
| | | |