aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 strings
| | * 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 page
| | * 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 ↵redmatrix2016-08-155-35/+83
|/ | | | theme:schema theme selectors in settings
* Use double quotes for strings passed via templates to javascript. Some ↵redmatrix2016-08-151-5/+5
| | | | translated strings have unescaped single quotes.
* Merge pull request #487 from git-marijus/devhubzilla2016-08-163-128/+79
|\ | | | | implement groups in the acl select.
| * provide group options serverside and minor cleanupMario Vavti2016-08-153-124/+30
| |
| * implement groups in the acl select. please notice that selecting *custom ↵Mario Vavti2016-08-151-17/+62
| | | | | | | | selection* now sets an empty (public) acl. it was set to self before...
* | 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 master
| | * 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 page
| * Context help for settings/features pageAndrew Manning2016-08-142-1/+13
|/
* Merge pull request #482 from anaqreon/nocommenthubzilla2016-08-145-0/+35
|\ | | | | Added an optional post editor button to toggle comments
| * 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 ↵Andrew Manning2016-08-145-0/+32
| | | | | | | | a corresponding post editor toggle button
* | 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 ↵Mario Vavti2016-08-134-16/+3
| | | | redundant javascript
* 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 jotnets
| * possible quickfix for multi-acl not honoring jotnetsMario Vavti2016-08-121-0/+6
| |
* | fix auto-connect settingzottel2016-08-121-3/+0
| |
* | Merge remote-tracking branch 'upstream/dev' into devzottel2016-08-1214-232/+375
|\|
| * better method of dealing with api versionsredmatrix2016-08-111-23/+29
| |
| * more cleanup of apiredmatrix2016-08-112-110/+110
| |
| * move error processing back inside the functionredmatrix2016-08-111-22/+22
| |