aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-201-1/+1
|\
| * jquery update issue prevents comments from reloading and resetting watch cursorredmatrix2016-07-171-1/+1
* | Starting to make the import selection page after element scan.Andrew Manning2016-07-202-0/+78
* | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-174-20/+47
|\|
| * hide fullscreen button in embedphotos modal album viewMario Vavti2016-07-171-0/+2
| * boobooredmatrix2016-07-171-2/+2
| * some work on guest access token uiMario Vavti2016-07-173-37/+45
* | Merge remote-tracking branch 'upstream/dev' into website-import-remoteAndrew Manning2016-07-1615-558/+102
|\|
| * check for variables after schema files have been addedMario Vavti2016-07-161-12/+12
| * check for variables in schemesMario Vavti2016-07-161-1/+1
| * hide/show mixupMario Vavti2016-07-161-3/+2
| * only use visibility for tabsMario Vavti2016-07-161-4/+4
| * provide examples for using access tokens in urlsredmatrix2016-07-153-0/+13
| * bump minor version because of jquery updateMario Vavti2016-07-151-9/+2
| * round up heightMario Vavti2016-07-151-1/+1
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-07-152-2/+14
| |\
| | * more cleanup of atoken UIredmatrix2016-07-152-1/+5
| | * cleanup and debug of atoken featureredmatrix2016-07-152-2/+10
| * | add jquery migrate for version 3Mario Vavti2016-07-151-0/+2
| * | upgrade to jquery-3.1 and minor fixesMario Vavti2016-07-1510-531/+30
| |/
| * Here's the basic UI for the Zot Access Tokens, requires some minor cleanupredmatrix2016-07-141-0/+28
* | Stash changes to merge from devAndrew Manning2016-07-161-13/+6
* | Postpone remote folder import until filesystem mirroring matures.Andrew Manning2016-07-161-3/+14
* | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-143-3/+3
|\|
| * document mod_acl a bit better and try to remove some redundancies and consoli...redmatrix2016-07-133-3/+3
* | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-127-13/+16
|\|
| * do not use visibility for fullscreen button and move fullscreen button to the...Mario Vavti2016-07-117-13/+16
* | Import blocks from zip file, but needs updates as detailed in https://gitlab....Andrew Manning2016-07-121-2/+2
* | Clearer import control interfaceAndrew Manning2016-07-101-6/+22
* | First draft of website import toolsAndrew Manning2016-07-102-0/+8
* | Set max-width for embedded imagesAndrew Manning2016-07-091-0/+4
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-07-093-3/+82
|\|
| * hide the redeliver option one level down since it should rarely be needed by ...redmatrix2016-07-071-1/+8
| * force immediate avatar updateTreer2016-07-031-0/+72
| * use visibility instead of display to hide elementsMario Vavti2016-07-011-2/+2
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-07-014-22/+24
|\|
| * ditch the change_view widget and make header fixed in fullscreen modeMario Vavti2016-07-014-22/+24
* | JavaScript popup for page delete confirmationAndrew Manning2016-07-011-0/+3
|/
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-309-12/+53
|\
| * templatise the Dreport page and add a redeliver option for when things stuff ...redmatrix2016-06-291-0/+21
| * only request geolocation permission if we're creating a post.redmatrix2016-06-291-1/+1
| * Merge branch 'dev' into sabre32Mario Vavti2016-06-281-1/+7
| |\
| | * fix month view in fullscreen modeMario Vavti2016-06-281-1/+7
| * | erge branch 'dev' into sabre32Mario Vavti2016-06-282-8/+0
| |\|
| | * update fullcalendar to version 2.8.0Mario Vavti2016-06-282-8/+0
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-281-0/+3
| |\|
| | * add letsencrypt x3 intermediate cert and new cert file, improve UX of new reg...redmatrix2016-06-271-0/+3
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-262-3/+132
| |\|
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-243-4/+4
| |\ \
| * \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-232-7/+7
| |\ \ \