aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* enable bbcode autocomplete for other placesMario Vavti2016-04-095-2/+8
* objectify all the session management stuffredmatrix2016-04-087-12/+181
* Merge branch 'master' into devredmatrix2016-04-082-1281/+1303
|\
| * revupredmatrix2016-04-082-1281/+1303
* | send file sync packets for all known file operationsredmatrix2016-04-077-47/+112
* | implement updates of attach data to sync'd clones.redmatrix2016-04-071-18/+38
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-072-1/+22
|\ \
| * | translate the most common bbcodes to their *real name*. finally we should pro...Mario Vavti2016-04-072-1/+19
| * | some more autocompletion for bbcode tables - leave it open if we wanna use th...Mario Vavti2016-04-071-0/+3
| * | move li back in the list since it will be used far less than listMario Vavti2016-04-071-1/+1
* | | Merge branch 'master' into devredmatrix2016-04-071-1/+1
|\ \ \ | |/ / |/| / | |/
| * revup issue #337redmatrix2016-04-071-1/+1
* | Merge branch 'master' into devredmatrix2016-04-061-1/+1
|\|
| * revup issue #337redmatrix2016-04-061-1/+1
* | reset profile photo and cover photo bits for existing photos if a new one arr...redmatrix2016-04-061-6/+50
* | missing profile photo in export dataredmatrix2016-04-061-1/+2
* | use the explicit form of build_sync_packet so that file/photo sync will work ...redmatrix2016-04-063-1/+13
* | more work on file sync to clones, 60-70% test coverage, mostly working but ma...redmatrix2016-04-064-13/+63
* | file sync testing continuedredmatrix2016-04-061-0/+4
* | file sync testingredmatrix2016-04-062-2/+5
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-061-6/+64
|\ \
| * | automate bbcode list creation even furtherMario Vavti2016-04-071-0/+57
| * | adjust the regex to also work with asteriks and use the simpler syntax for listsMario Vavti2016-04-061-6/+7
* | | file sync workredmatrix2016-04-064-7/+173
|/ /
* | issue #340redmatrix2016-04-062-9/+15
* | getting file sync data - missed parent folderredmatrix2016-04-061-1/+7
* | rework the "remember me" fix to be a bit less hackishredmatrix2016-04-062-5/+1
* | provide function to collect file/photo sync data per help/filesyncredmatrix2016-04-052-0/+56
* | Merge branch 'master' into devredmatrix2016-04-052-1/+2
|\|
| * undeclared static property App::$stringsave (push_lang() and pop_lang())redmatrix2016-04-052-1/+2
* | add some doco to getfile moduleredmatrix2016-04-051-0/+20
* | server side of file/photo sync to deliver the file data. We'll sign it using ...redmatrix2016-04-051-0/+76
* | provide stream resource pointer option to z_fetch_url() and z_post_url() per ...redmatrix2016-04-051-1/+13
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-051-1/+5
|\ \
| * \ Merge pull request #339 from anaqreon/autocompleteredmatrix2016-04-061-1/+5
| |\ \
| | * | Improve (un)ordered list autocompletion for list constructionAndrew Manning2016-04-051-1/+5
* | | | add some doco on some of the issues and approaches to file/photo syncing and ...redmatrix2016-04-051-0/+61
|/ / /
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-0514-78/+297
|\| |
| * | fix contextual helpMario Vavti2016-04-052-4/+3
| * | use min version of justifiedGalleryMario Vavti2016-04-051-1/+1
| * | expand list of bbcode in autocompleteMario Vavti2016-04-051-3/+6
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-04-059-5/+190
| |\ \
| | * \ Merge pull request #338 from anaqreon/contextual-helpredmatrix2016-04-059-5/+190
| | |\ \
| | | * \ Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextua...Andrew Manning2016-04-03292-61382/+62954
| | | |\ \
| | | * | | More help content for channel pages. Channel, photos, files, about.Andrew Manning2016-03-264-1/+71
| | | * | | Search docs/context/ hierarchically for help.html files to reduce redundancyAndrew Manning2016-03-266-42/+27
| | | * | | Added help for post permissionsAndrew Manning2016-03-262-3/+4
| | | * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextua...Andrew Manning2016-03-2331-3052/+2924
| | | |\ \ \
| | | * | | | Network page help with auto-scroll and element highlightingAndrew Manning2016-03-231-0/+26
| | | * | | | Override navbar help button to open contextual help panel. Contextual help fo...Andrew Manning2016-03-218-5/+108