aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into devzottel2016-08-058-18/+158
|\
| * issue #474redmatrix2016-08-031-11/+13
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-034-4/+142
| |\
| | * belongs to previous commitjeroenpraat2016-08-031-0/+1
| | * Improved a few schemas - context help fix - dark schemas now have dark text a...jeroenpraat2016-08-034-4/+141
| * | issue #473 - unable to delete privacy groupsredmatrix2016-08-031-1/+1
| |/
| * missing comma in atoken update sqlredmatrix2016-08-021-1/+1
| * comment policy permissions typoredmatrix2016-08-021-1/+1
* | Merge remote-tracking branch 'upstream/dev' into devzottel2016-08-0210-27/+142
|\|
| * this should sort out likes showing up as wall-to-wall posts on diasporaredmatrix2016-08-011-0/+2
| * This checkin should make all permission modes work correctly with atokens (th...redmatrix2016-08-016-23/+136
| * /storeurl/cloudurl/redmatrix2016-08-013-4/+4
* | Merge remote-tracking branch 'upstream/dev' into devzottel2016-08-0125-3212/+4151
|\|
| * allow individual permissions on atokensredmatrix2016-07-313-12/+98
| * add a few more path macros to portable menu elements (channelurl, pageurl, st...redmatrix2016-07-315-15/+25
| * make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, ...redmatrix2016-07-313-3184/+3151
| * Merge pull request #469 from anaqreon/website-importhubzilla2016-08-0115-1/+877
| |\
| | * Added help content for webpages app. Corrected apparent bug with capitalized ...Andrew Manning2016-07-314-0/+106
| | * Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-313-3/+3
| | |\ | | |/ | |/|
| | * Remove scanned element column for existing element information which we are n...Andrew Manning2016-07-311-3/+9
| | * Improved UI. Removed logger statements.Andrew Manning2016-07-315-45/+58
| | * Import element selection page added to allow selective importing.Andrew Manning2016-07-304-94/+307
| | * Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-3038-12337/+12863
| | |\
| | * \ Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-2152-796/+1516
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-202-3/+3
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-209-15/+52
| | |\ \ \ \
| | * | | | | Starting to make the import selection page after element scan.Andrew Manning2016-07-203-80/+176
| | * | | | | Importing webpage elements from manually entered cloud file path work. All de...Andrew Manning2016-07-173-7/+26
| | * | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-175-21/+48
| | |\ \ \ \ \
| | * | | | | | Added functions to check cloud files path and return path with hashed namesAndrew Manning2016-07-174-56/+91
| | * | | | | | Merge remote-tracking branch 'upstream/dev' into website-import-remoteAndrew Manning2016-07-1634-2397/+2326
| | |\ \ \ \ \ \
| | * | | | | | | Stash changes to merge from devAndrew Manning2016-07-163-30/+52
| | * | | | | | | Postpone remote folder import until filesystem mirroring matures.Andrew Manning2016-07-163-6/+55
| | * | | | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-147-32/+80
| | |\ \ \ \ \ \ \
| | * | | | | | | | Refactored the scan and import functions to reduce redundant code and simplif...Andrew Manning2016-07-142-373/+223
| | * | | | | | | | Blocks, pages, and layouts import from zip file. Layouts are not applied to p...Andrew Manning2016-07-131-9/+190
| | * | | | | | | | Updated import_blocks for database callsAndrew Manning2016-07-131-5/+3
| | * | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-133-20/+12
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-1227-56/+54
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Import blocks from zip file, but needs updates as detailed in https://gitlab....Andrew Manning2016-07-122-2/+224
| | * | | | | | | | | | Clearer import control interfaceAndrew Manning2016-07-102-8/+28
| | * | | | | | | | | | First draft of website import toolsAndrew Manning2016-07-104-0/+46
* | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into devzottel2016-07-3119-7589/+7848
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-3010-5092/+5417
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | Updating es-es stringsjeroenpraat2016-07-292-5059/+5299
| | * | | | | | | | | | catch all input fields (in preparation for acl in this place) and display the...Mario Vavti2016-07-292-4/+9
| | * | | | | | | | | | Merge pull request #467 from anaqreon/multiple-attachhubzilla2016-07-291-3/+3
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fixed bug where multiple post attachements by drag-and-drop were not being ad...Andrew Manning2016-07-281-3/+3
| | |/ / / / / / / / / /
| | * | | | | | | | | | missing spaceMario Vavti2016-07-281-1/+1
| | * | | | | | | | | | missing semicolonMario Vavti2016-07-281-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 01:12:37 +0000