Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-04-03 | 9 | -62/+101 |
|\ | |||||
| * | sql error photos_albums_list with non-logged-in viewer | zotlabs | 2017-04-03 | 2 | -3/+6 |
| | | |||||
| * | fix connectDefaultShare generated js function, though it isn't obvious if we ↵ | zotlabs | 2017-04-03 | 1 | -19/+11 |
| | | | | | | | | still use it. | ||||
| * | change hook for perm_is_allowed while retaining backwards compatibility | zotlabs | 2017-04-03 | 1 | -3/+4 |
| | | |||||
| * | import_author_zot() - check for both hubloc and xchan entries. This should ↵ | zotlabs | 2017-04-03 | 1 | -5/+14 |
| | | | | | | | | catch and repair entries which were subject to transient storage failures. | ||||
| * | app sorting issue | zotlabs | 2017-04-03 | 1 | -3/+13 |
| | | |||||
| * | logic error | zotlabs | 2017-04-03 | 1 | -2/+4 |
| | | |||||
| * | import authors from any unrecognised network as network 'unknown'. | zotlabs | 2017-04-03 | 1 | -3/+3 |
| | | |||||
| * | whitespace | zotlabs | 2017-04-03 | 1 | -12/+14 |
| | | |||||
| * | Merge pull request #711 from zotlabs/crypto-upgrade | git-marijus | 2017-04-03 | 3 | -15/+35 |
| |\ | | | | | | | crypto updates | ||||
| | * | crypto updates | zotlabs | 2017-04-02 | 3 | -15/+35 |
| |/ | |||||
* | | Revert "fr strings update (Monret)" | zotlabs | 2017-04-03 | 2 | -10559/+11080 |
| | | | | | | | | This reverts commit 4e4d406d23e01a6aa0992c94baea0fd676f04d1e. | ||||
* | | fr strings update (Monret) | zotlabs | 2017-04-03 | 2 | -11080/+10559 |
|/ | |||||
* | triple a is more sane | Mario Vavti | 2017-03-31 | 1 | -1/+1 |
| | |||||
* | minor css adjustments | Mario Vavti | 2017-03-31 | 1 | -1/+5 |
| | |||||
* | various form css fixes | Mario Vavti | 2017-03-31 | 10 | -42/+38 |
| | |||||
* | make btn-outline-secondary color slightly darker | Mario Vavti | 2017-03-31 | 1 | -0/+4 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-03-31 | 4 | -7/+8 |
|\ | |||||
| * | Merge pull request #710 from dawnbreak/importcsrf | git-marijus | 2017-03-31 | 4 | -7/+8 |
| |\ | | | | | | | :lock: Add CSRF protection for import and import_items. | ||||
| | * | :lock: Add CSRF protection for import and import_items. | Klaus Weidenbach | 2017-03-30 | 4 | -7/+8 |
| | | | |||||
* | | | css fixes | Mario Vavti | 2017-03-31 | 3 | -17/+9 |
|/ / | |||||
* | | add max height to #navbar-collapse-2 | Mario Vavti | 2017-03-31 | 2 | -0/+2 |
| | | |||||
* | | version bump | Mario Vavti | 2017-03-31 | 1 | -1/+1 |
| | | |||||
* | | regenerate hmessages.po | Mario Vavti | 2017-03-31 | 1 | -6525/+6399 |
| | | |||||
* | | fix a couple more instances where we were still calling mail() directly for ↵ | zotlabs | 2017-03-31 | 1 | -27/+27 |
| | | | | | | | | site critical messages | ||||
* | | get rid of some more deprecated uses of $a | zotlabs | 2017-03-31 | 3 | -9/+7 |
| | | |||||
* | | remove obsolete app argument from load_pdl | zotlabs | 2017-03-31 | 3 | -3/+3 |
| | | |||||
* | | get rid of get_app() | zotlabs | 2017-03-31 | 7 | -30/+3 |
| | | |||||
* | | add 'author_is_pmable()' function with plugin hooks to control whether or ↵ | zotlabs | 2017-03-31 | 3 | -3/+42 |
| | | | | | | | | not to display a 'send mail' link in the thread author menu. | ||||
* | | provide platform specific install script | zotlabs | 2017-03-31 | 1 | -3/+5 |
| | | |||||
* | | provide compatibility with old-style update system | zotlabs | 2017-03-31 | 1 | -6/+16 |
| | | |||||
* | | get rid of 'davguest' and allow for project specific DB updates (currently ↵ | zotlabs | 2017-03-31 | 4 | -2138/+2128 |
| | | | | | | | | db updates are common between all possible projects/subprojects/forks). | ||||
* | | move db_upgrade to zlib | zotlabs | 2017-03-31 | 6 | -199/+129 |
|/ | |||||
* | Merge pull request #709 from dawnbreak/docu | Klaus | 2017-03-30 | 5 | -323/+465 |
|\ | | | | | Add some documentation for import functions. | ||||
| * | Add some documentation for import functions. | Klaus Weidenbach | 2017-03-30 | 5 | -323/+465 |
| | | |||||
* | | do not allow creating two wikis with the same name | Mario Vavti | 2017-03-30 | 1 | -3/+10 |
| | | |||||
* | | add some missing files | Mario Vavti | 2017-03-30 | 8 | -0/+2661 |
| | | |||||
* | | update to textcomplete v 1.8.0 | Mario Vavti | 2017-03-30 | 4 | -58/+125 |
| | | |||||
* | | more css fixes | Mario Vavti | 2017-03-30 | 2 | -1/+5 |
| | | |||||
* | | circular logic - we need the mailbox to find the last message so move the ↵ | zotlabs | 2017-03-30 | 1 | -4/+9 |
| | | | | | | | | code block back where it was, and only set a direct mid if one was specified. | ||||
* | | when clicking a notification to view a private mail message, actually view ↵ | zotlabs | 2017-03-30 | 1 | -2/+9 |
| | | | | | | | | that message instead of the most recent. | ||||
* | | css fixes | Mario Vavti | 2017-03-30 | 2 | -47/+17 |
|/ | |||||
* | remove hubzilla.site from directory fallback servers until further notice | Mario Vavti | 2017-03-29 | 1 | -1/+1 |
| | |||||
* | missing closing bracket and semicolon | Mario Vavti | 2017-03-29 | 1 | -0/+1 |
| | |||||
* | create channel_store_lowlevel() | Mario Vavti | 2017-03-29 | 1 | -20/+56 |
| | |||||
* | css fixes | Mario Vavti | 2017-03-29 | 1 | -2/+11 |
| | |||||
* | bump version | Mario Vavti | 2017-03-29 | 1 | -1/+1 |
| | |||||
* | allow setting the system email name/address/reply | zotlabs | 2017-03-29 | 2 | -0/+20 |
| | |||||
* | more cloud updates - upgrade the DAV structures as well. | zotlabs | 2017-03-29 | 3 | -41/+79 |
| | |||||
* | some more photo issues | zotlabs | 2017-03-29 | 3 | -32/+33 |
| |