Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix sql error | Mario Vavti | 2018-07-26 | 1 | -1/+1 |
| | | | (cherry picked from commit ec3a066e4e94ad7c72d1d07371081318a4d5e9ab) | ||||
* | Merge branch '3.6RC' | Mario Vavti | 2018-07-25 | 25 | -481/+639 |
|\ | |||||
| * | query filter was a bit greedy | zotlabs | 2018-07-19 | 1 | -1/+1 |
| | | | | | | (cherry picked from commit a05c8ff66bd8d09f69f6c59bc49b7627792f4109) | ||||
| * | mangled urls on redirects | zotlabs | 2018-07-19 | 3 | -4/+4 |
| | | | | | | (cherry picked from commit 5ce50d0a2e15ae66765a68ba2785a87ecda57f6a) | ||||
| * | set the correct album name when moving photos | Mario Vavti | 2018-07-18 | 1 | -1/+3 |
| | | | | | | (cherry picked from commit eb322e831297ee8fd773049c1a00c915c49dc93e) | ||||
| * | fix to cart behaviour | zotlabs | 2018-07-11 | 1 | -1/+1 |
| | | |||||
| * | change to import system apps at most once a day per person | zotlabs | 2018-07-05 | 1 | -2/+2 |
| | | |||||
| * | issue syncing pageflags | zotlabs | 2018-07-04 | 1 | -8/+5 |
| | | |||||
| * | bad merge | zotlabs | 2018-07-01 | 1 | -0/+4 |
| | | |||||
| * | imagick converter: -thumbnail doesn't preserve exif, -resize does | zotlabs | 2018-06-26 | 1 | -3/+3 |
| | | |||||
| * | crc32 is potentially reversible | zotlabs | 2018-06-25 | 1 | -1/+1 |
| | | |||||
| * | SECURITY: logging: hash the session_id in case somebody posts log snippets ↵ | zotlabs | 2018-06-25 | 1 | -3/+10 |
| | | | | | | | | from active sessions; also provide a hashed process_id if using a daemon process (with no session) for easier tracking of related log events | ||||
| * | remove the white-space pre-wrap property on code blocks. This should ↵ | zotlabs | 2018-06-24 | 1 | -8/+2 |
| | | | | | | | | probably be done with the word-break property instead | ||||
| * | remote_self wasn't working correctly | zotlabs | 2018-06-24 | 1 | -5/+6 |
| | | |||||
| * | whitespace | zotlabs | 2018-06-18 | 1 | -2/+0 |
| | | |||||
| * | provide flag to collect_recipients to exclude privacy groups (for federation ↵ | zotlabs | 2018-06-18 | 1 | -2/+8 |
| | | | | | | | | plugin use) | ||||
| * | remove several unused/unreferenced templates | zotlabs | 2018-06-17 | 1 | -0/+12 |
| | | |||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-06-17 | 2 | -10/+11 |
| |\ | |||||
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2018-06-17 | 4 | -5/+8 |
| | |\ | |||||
| | * | | some work on mod group | Mario | 2018-06-17 | 2 | -10/+11 |
| | | | | |||||
| * | | | slightly more memory efficient way to drop posts of removed connections | zotlabs | 2018-06-15 | 1 | -7/+8 |
| | |/ | |/| | |||||
| * | | re-implement/refactor getQuotaInfo() on DAV storage | zotlabs | 2018-06-14 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of ../hz into dev | zotlabs | 2018-06-10 | 3 | -4/+7 |
| |\ \ | | |/ | |/| | |||||
| | * | hubzilla core issue #1218 | zotlabs | 2018-06-10 | 1 | -0/+5 |
| | | | |||||
| | * | fixes for immediate expire, channel_active not initialised in DB | zotlabs | 2018-06-10 | 2 | -4/+2 |
| | | | |||||
| * | | new feature filter network by name | Mario Vavti | 2018-06-08 | 1 | -1/+10 |
| |/ | |||||
| * | fixes for search_item.tpl | Mario Vavti | 2018-06-07 | 1 | -4/+6 |
| | | |||||
| * | update a number of links in the code | zotlabs | 2018-06-06 | 1 | -1/+1 |
| | | |||||
| * | photos not syncing properly if destination is a postgres site | zotlabs | 2018-06-04 | 2 | -13/+28 |
| | | |||||
| * | missing $perm_sql | Mario Vavti | 2018-06-03 | 1 | -2/+0 |
| | | |||||
| * | add the archived flag | Mario Vavti | 2018-06-02 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-06-02 | 1 | -2/+7 |
| |\ | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-06-02 | 2 | -16/+4 |
| | |\ | |||||
| | * | | when removing a connection, use the same rules as expire: don't remove items ↵ | zotlabs | 2018-05-31 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | that are starred, filed, or that you replied to. | ||||
| * | | | respect the privacy group feature setting in nav | Mario Vavti | 2018-06-02 | 1 | -2/+2 |
| | | | | |||||
| * | | | finalize filters and forum notifications | Mario Vavti | 2018-06-02 | 3 | -15/+56 |
| | |/ | |/| | |||||
| * | | add manage privacy groups entry to the panel channel menu dropdown for now | Mario Vavti | 2018-06-01 | 1 | -15/+3 |
| | | | |||||
| * | | fixes for css fix | Mario Vavti | 2018-06-01 | 1 | -1/+1 |
| |/ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-31 | 1 | -1/+1 |
| |\ | |||||
| | * | typo in unused function | zotlabs | 2018-05-30 | 1 | -1/+1 |
| | | | |||||
| * | | make navbar search use the module search function in /network and /channel | Mario Vavti | 2018-05-30 | 1 | -1/+13 |
| | | | |||||
| * | | first cut on restructuring the previously called network tabs | Mario Vavti | 2018-05-30 | 3 | -12/+32 |
| |/ | |||||
| * | alternate fix for z_check_dns | zotlabs | 2018-05-24 | 1 | -6/+14 |
| | | |||||
| * | deal with db failure gracefully | zotlabs | 2018-05-23 | 1 | -2/+2 |
| | | |||||
| * | new_channel - make text strings translatable and use the name as a base for ↵ | zotlabs | 2018-05-21 | 1 | -0/+10 |
| | | | | | | | | the nick if you try to create without entering a nick | ||||
| * | not null violation oauth1 | zotlabs | 2018-05-21 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-20 | 3 | -5/+15 |
| |\ | |||||
| | * | Merge pull request #1174 from anaqreon/dev | git-marijus | 2018-05-20 | 1 | -2/+2 |
| | |\ | | | | | | | | | Rename Permission Groups to Permission Categories and clarify feature… | ||||
| | | * | Rename Permission Groups to Permission Categories and clarify feature ↵ | Andrew Manning | 2018-05-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | settings text. | ||||
| | * | | implement jot reset button | Mario Vavti | 2018-05-20 | 1 | -1/+5 |
| | | | |