aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
* resolve merge conflictMario Vavti2016-08-315-17/+279
|\
| * Imported webpage elements update existing elements properly. AllowCode permis...Andrew Manning2016-08-301-12/+11
| * increase timeout on oembed remote fetches. This is a balancing act. Too short...redmatrix2016-08-301-3/+12
| * Merge remote-tracking branch 'upstream/dev' into website-exportAndrew Manning2016-08-302-2/+27
| |\
| * \ Merge remote-tracking branch 'upstream/dev' into website-exportAndrew Manning2016-08-271-0/+1
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/dev' into website-export. Added attach...Andrew Manning2016-08-278-26/+154
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/dev' into website-exportAndrew Manning2016-08-236-18/+65
| |\ \ \ \
| * | | | | Website export to cloud files works. Created new recursive copy function in a...Andrew Manning2016-08-232-0/+51
| * | | | | Block export and re-import works. Fixed bug where layout content was not bein...Andrew Manning2016-08-201-2/+53
| * | | | | Layouts list and are selectable for export to the zip fileAndrew Manning2016-08-201-2/+46
| * | | | | Export of pages and their layouts to a zip file works. Bug on importing the e...Andrew Manning2016-08-201-1/+44
| * | | | | Merge remote-tracking branch 'upstream/dev' into website-exportAndrew Manning2016-08-193-13/+8
| |\ \ \ \ \
| * | | | | | Pages populate the available-to-export list. New checkbox class for smaller b...Andrew Manning2016-08-191-0/+62
| * | | | | | Progress implementing zip file exportAndrew Manning2016-08-172-42/+9
| * | | | | | Stash changes for merge with devAndrew Manning2016-08-172-0/+37
* | | | | | | provide a possibility to create checklists in bbcode [x] creates a checked ch...Mario Vavti2016-08-311-0/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | add authors to post distribution; case insensitive sort appsredmatrix2016-08-291-0/+20
* | | | | | Display text around the searched query in documentation searchAndrew Manning2016-08-271-2/+7
| |_|_|_|/ |/| | | |
* | | | | vsprintf error on sql queryredmatrix2016-08-271-0/+1
| |_|_|/ |/| | |
* | | | issue #186 ...different check for pubforum with expert permissionsredmatrix2016-08-261-12/+6
* | | | - implemented but untested: duplicate detection for photo 'move to another fo...redmatrix2016-08-261-2/+57
* | | | ratings are gone. They can be enabled, but there is no UI for doing so at thi...redmatrix2016-08-254-10/+7
* | | | move premium channel to 'pro' since that's the only configuration where it wo...redmatrix2016-08-251-3/+12
* | | | attach_move() function created to relocate files or photos to different direc...redmatrix2016-08-242-0/+72
* | | | include port in pdo url when host is 'localhost'redmatrix2016-08-231-0/+2
| |_|/ |/| |
* | | optional server role compatibility checks for pluginsredmatrix2016-08-221-0/+12
* | | public forum fallback checking (when custom/expert permissions are applied) w...redmatrix2016-08-221-5/+4
* | | make zid() do the right things when confronted with url fragmentsredmatrix2016-08-211-0/+10
* | | Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-mariju...redmatrix2016-08-212-9/+8
|\ \ \
| * | | move jotnets to jot and some cleanup (mostly whitespace)Mario Vavti2016-08-212-9/+8
| | |/ | |/|
* / | block backdoor delivery of bulk imported itemsredmatrix2016-08-191-4/+31
|/ /
* | import anomalyredmatrix2016-08-171-4/+6
* | don't set session theme unless logged in.redmatrix2016-08-161-1/+1
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-161-1/+1
|\|
| * rename limited -> customMario Vavti2016-08-161-1/+1
* | get rid of ugly code constructredmatrix2016-08-161-8/+1
|/
* Merge pull request #487 from git-marijus/devhubzilla2016-08-161-107/+12
|\
| * provide group options serverside and minor cleanupMario Vavti2016-08-151-107/+12
* | fix attached photo/file permissions on clonesredmatrix2016-08-152-0/+138
* | event_store_event hookredmatrix2016-08-141-0/+7
|/
* Context help for settings/features pageAndrew Manning2016-08-141-1/+1
* Change text for submenu on small screens to be static toggle statementAndrew Manning2016-08-141-0/+1
* Replace hardcoded button title in javascript to translatable textAndrew Manning2016-08-141-0/+2
* Added a disable comments setting to the "Additional features" settings with a...Andrew Manning2016-08-142-0/+8
* pending flag not being reset when using autoperms from custom roleredmatrix2016-08-121-1/+4
* better method of dealing with api versionsredmatrix2016-08-111-23/+29
* more cleanup of apiredmatrix2016-08-111-109/+109
* move error processing back inside the functionredmatrix2016-08-111-22/+22
* embed filter adjustmentsredmatrix2016-08-111-13/+17
* A bit of api cleanup. Don't get excited. This is like a 0.005% cleanup but yo...redmatrix2016-08-112-85/+126