aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #351 from anaqreon/toggle-context-helpgit-marijus2016-04-216-51/+65
|\
| * Added admin/site setting that toggles context help panel. If disabled, origin...Andrew Manning2016-04-214-48/+57
| * Merge branch 'dev' into toggle-context-helpAndrew Manning2016-04-20326-26364/+27310
| |\
| * | Try toggling context help using onclick attributeAndrew Manning2016-04-194-4/+9
* | | Merge pull request #348 from git-marijus/devgit-marijus2016-04-211-5/+11
|\ \ \
| * | | add querystring to css and js which is added via head_add_{css, js}Mario Vavti2016-04-191-5/+11
* | | | make the cookie check agnostic to cookie stateredmatrix2016-04-201-5/+3
* | | | revert the reversal of checkjs logic, but still restrict the behaviour scope ...redmatrix2016-04-204-7/+20
* | | | send the correct number of argsredmatrix2016-04-201-1/+1
* | | | We no longer require the diaspora_meta service locally.redmatrix2016-04-201-3/+3
* | | | Merge branch 'dmeta' into devredmatrix2016-04-202-8/+28
|\ \ \ \
| * | | | There is no longer a followup flag in the notifier. Remove all traces of it.redmatrix2016-04-201-2/+0
| * | | | Merge branch 'dev' into dmetaredmatrix2016-04-207-169/+11
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | bb2d updates from testing signature changesredmatrix2016-04-201-5/+5
| * | | | testing dmetaredmatrix2016-04-191-6/+5
| * | | | rework bb2diaspora for eradicating the diaspora comment virusredmatrix2016-04-191-3/+26
| * | | | Revert the last edit on this file. Need to work this through a bit more befor...redmatrix2016-04-191-15/+17
| * | | | second phase of diaspora comment virus eradication beginsredmatrix2016-04-191-17/+15
* | | | | upgrade std revredmatrix2016-04-201-1/+1
| |/ / / |/| | |
* | | | Merge branch 'master' into devredmatrix2016-04-202-3/+9
|\ \ \ \
| * | | | some crossbrowser rendering work on the comment boxMario Vavti2016-04-201-1/+3
| * | | | Use stopImmidiatePropagation() only if we are in a list to not interfere with...Mario Vavti2016-04-201-2/+6
* | | | | Merge branch 'master' into devredmatrix2016-04-201-1/+1
|\| | | |
| * | | | revup #337redmatrix2016-04-201-1/+1
* | | | | missing class instance pointer in Pconfig module upgraderedmatrix2016-04-191-1/+1
* | | | | remove test files which were committed by accidentredmatrix2016-04-193-164/+0
| |/ / / |/| | |
* | | | Merge branch 'master' into devredmatrix2016-04-191-1/+1
|\| | | | |/ / |/| |
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-04-192-1/+4
| |\ \
| * | | revup #337redmatrix2016-04-191-1/+1
* | | | a bit more namespace wranglingredmatrix2016-04-185-9/+9
* | | | module updatesredmatrix2016-04-18317-26132/+27211
* | | | 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 i...redmatrix2016-04-189-228/+253
|/ /
* | 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
* | 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 (3rd...jeroenpraat2016-04-186-6/+62
| * | Merge pull request #345 from anaqreon/context-helpredmatrix2016-04-1815-315/+292
| |\ \
| | * | 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
| |/ /
* | | pull in the new object router and a few selected samples for the new controll...redmatrix2016-04-175-1896/+1917
* | | Merge commit '521d404' into devredmatrix2016-04-175-66/+115
|\ \ \
| * | | remove the date hack on public feeds which was a temporary fix for an issue l...redmatrix2016-04-171-2/+2
| * | | Convert Channel to new moduleredmatrix2016-04-152-45/+56
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-17 16:48:16 +0000