aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* make zid() do the right things when confronted with url fragmentsredmatrix2016-08-211-0/+10
* Merge branch 'git-marijus-dev' into devredmatrix2016-08-2110-103/+125
|\
| * Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-mariju...redmatrix2016-08-2110-103/+125
|/|
| * move jotnets to jot and some cleanup (mostly whitespace)Mario Vavti2016-08-2110-103/+124
* | issue #496redmatrix2016-08-212-1/+3
* | Merge branch 'zp' into devredmatrix2016-08-191-4/+31
|\ \
| * | block backdoor delivery of bulk imported itemsredmatrix2016-08-191-4/+31
| |/
* / string updateredmatrix2016-08-191-3697/+3724
|/
* remove insecure repository warning.redmatrix2016-08-184-31/+31
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-172-6106/+6089
|\
| * Merge pull request #492 from wave72/devhubzilla2016-08-172-6106/+6089
| |\
| | * Updated Italian stringsWave722016-08-172-6106/+6089
| |/
* / import anomalyredmatrix2016-08-171-4/+6
|/
* don't set session theme unless logged in.redmatrix2016-08-163-1/+11
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-164-43/+30
|\
| * Merge pull request #491 from mjfriaza/devhubzilla2016-08-171-0/+12
| |\
| | * Add Spanish context help settings/features pageManuel Jiménez Friaza2016-08-161-0/+12
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-08-165-35/+83
| |\
| * | rename limited -> customMario Vavti2016-08-163-17/+17
| * | remove unneeded functionMario Vavti2016-08-161-26/+1
* | | get rid of ugly code constructredmatrix2016-08-161-8/+1
| |/ |/|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-151-14/+1
|\|
| * only check settings-form for dirty state and remove redundant javascriptMario Vavti2016-08-161-14/+1
* | move schema settings into the display settings main so we can set theme:schem...redmatrix2016-08-155-35/+83
|/
* Use double quotes for strings passed via templates to javascript. Some transl...redmatrix2016-08-151-5/+5
* Merge pull request #487 from git-marijus/devhubzilla2016-08-163-128/+79
|\
| * provide group options serverside and minor cleanupMario Vavti2016-08-153-124/+30
| * implement groups in the acl select. please notice that selecting *custom sele...Mario Vavti2016-08-151-17/+62
* | fix attached photo/file permissions on clonesredmatrix2016-08-153-134/+140
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-152-47/+7
|\ \
| * \ Merge pull request #488 from einervonvielen/dev_homeinstall_merge_master-devhubzilla2016-08-162-47/+7
| |\ \ | | |/ | |/|
| | * Merge dev with last changes of homeinstall script in masterEiner von Vielen2016-08-152-47/+7
| |/
* | s/$rr/$rv/redmatrix2016-08-141-22/+22
* | event_store_event hookredmatrix2016-08-143-0/+21
|/
* Merge pull request #484 from anaqreon/settings-contexthubzilla2016-08-152-1/+13
|\
| * Context help for settings/features pageAndrew Manning2016-08-142-1/+13
|/
* Merge pull request #482 from anaqreon/nocommenthubzilla2016-08-145-0/+35
|\
| * Change text for submenu on small screens to be static toggle statementAndrew Manning2016-08-142-1/+2
| * Replace hardcoded button title in javascript to translatable textAndrew Manning2016-08-142-2/+4
| * Added a disable comments setting to the "Additional features" settings with a...Andrew Manning2016-08-145-0/+32
* | fix javascript error if not logged inMario Vavti2016-08-141-2/+2
|/
* update bootstrap 3.3.5 > 3.3.7Mario Vavti2016-08-146-138/+111
* btn/dropdown rendering issueMario Vavti2016-08-141-24/+30
* remove js debuggingMario Vavti2016-08-131-1/+0
* fix #480, enable bbcode autocomplete for photo comments and remove some redun...Mario Vavti2016-08-134-16/+3
* pending flag not being reset when using autoperms from custom roleredmatrix2016-08-121-1/+4
* string updateredmatrix2016-08-122-3626/+3620
* Merge pull request #479 from git-marijus/devhubzilla2016-08-131-0/+6
|\
| * possible quickfix for multi-acl not honoring jotnetsMario Vavti2016-08-121-0/+6
* | fix auto-connect settingzottel2016-08-121-3/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 21:31:15 +0000