Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Add wiki download button to export the selected wiki repo to a zip file | Andrew Manning | 2016-10-22 | 1 | -0/+30 | |
| | | | ||||||
| * | | Merge pull request #562 from fsteinel/issue-561 | zotlabs | 2016-10-23 | 1 | -2/+4 | |
| |\ \ | | | | | | | | | add column display_path to inserts into attachment, as this column is… | |||||
| | * | | until we've settled on what they should be, set os_path and display_path to ↵ | Florian Steinel | 2016-10-22 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | an emtpy string | |||||
| | * | | add column display_path to inserts into attachment, as this column is a not ↵ | Florian Steinel | 2016-10-22 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null column Conflicts: Zotlabs/Storage/Directory.php include/attach.php amend 54def92bcf75c08cd8dec3921e5ef26f23d85ffc display_path | |||||
* | | | | need to perform dbunescbin on stored filenames as well as binary data - this ↵ | zotlabs | 2016-10-23 | 3 | -5/+5 | |
|/ / / | | | | | | | | | | is a no-op under mysql but could provide unpredictable data under postgres | |||||
* | / | provide lockstate for events and remove obsolete code | Mario Vavti | 2016-10-22 | 1 | -5/+2 | |
| |/ |/| | ||||||
* | | Merge pull request #563 from ilu33/dev | zotlabs | 2016-10-22 | 1 | -1/+1 | |
|\ \ | | | | | | | Postgres complaining again ... | |||||
| * | | Postgres complaining again ... | ilu33 | 2016-10-22 | 1 | -1/+1 | |
| |/ | | | | | | | | | | | | | | | ```sql UPDATE abook SET abook_profile = (SELECT profile_guid AS FROM profile WHERE is_default = 1 AND uid = 13 LIMIT 1) WHERE abook_profile = '' AND abook_channel = 13 ; returned false ERROR: syntax error at or near "profile" LINE 1: ... SET abook_profile = (SELECT profile_guid AS FROM profile WH... ^ ``` | |||||
* / | squash timezone adjusted birthdays into a single day in the calendar, by ↵ | zotlabs | 2016-10-21 | 1 | -0/+6 | |
|/ | | | | lying and telling the js calendar that the end date/time is unknown | |||||
* | full revert, that wasn't working at all. Not sure why. | zotlabs | 2016-10-21 | 1 | -3/+1 | |
| | ||||||
* | partial revert | zotlabs | 2016-10-21 | 1 | -3/+2 | |
| | ||||||
* | fine tune the navbar people autocomplete, as the check for minimum length ↵ | zotlabs | 2016-10-21 | 1 | -1/+4 | |
| | | | | wasn't taking into consideration the initial tag character, and one char search provides way too many results. The autocomplete cache doesn't search again but just searches through its cache. This means as you type more chars, if the answer wasn't included in the very first search (one char), it won't be returned. This may need further tweaking as the network grows. | |||||
* | [BUGFIX] for fromStandalonePermission(). | Klaus Weidenbach | 2016-10-20 | 1 | -28/+26 | |
| | | | | | | Not sure if this method is used anywhere, but it should not have worked correctly. This should correct it. Add a unit test for this class. | |||||
* | remove requirement that imported profile photos be in the profile photos album | zotlabs | 2016-10-18 | 1 | -1/+1 | |
| | ||||||
* | Change the behaviour of 'use existing photo for profile'. For a channel with ↵ | zotlabs | 2016-10-18 | 1 | -11/+31 | |
| | | | | one profile, works just as it did previously. For multiple profiles, go back to the "upload form" but with a pre-existing file selected so that the correct profile can be selected. The text on this page and the resulting form are changed to remove the 'upload' text and file selection; but falls through to cropping in either case. | |||||
* | change event behaviour - share by default. | zotlabs | 2016-10-18 | 1 | -2/+4 | |
| | ||||||
* | [FEATURE] Add config and use composer autoloader. | Klaus Weidenbach | 2016-10-18 | 2 | -6/+1 | |
| | | | | | | | | | | | | | We use composer already to install SabreDAV. Include config composer.(json|lock) to install and manage more dependencies in future. Also provide PSR-4 autoloading for our namespaced classes, e.g. "Zotlabs\". To regenerate autoloader maps use: $ composer install --optimize-autoloader --no-dev We could also remove the whole vendor/ folder from our repository, but that would need changes in deployment and how to install hubs and needs more discussion first. | |||||
* | add get_photo hook to go along with get_profile_photo hook. This allows a ↵ | zotlabs | 2016-10-17 | 2 | -14/+12 | |
| | | | | plugin to over-ride the permissions for cover photos or insert a different photo in place of that requested | |||||
* | array_key_exists warning on PConfig::Delete() | zotlabs | 2016-10-17 | 1 | -6/+9 | |
| | ||||||
* | rename diaspora2bb() to markdown_to_bb() to reflect that is has a more ↵ | zotlabs | 2016-10-16 | 1 | -1/+1 | |
| | | | | generic use | |||||
* | remove logging | zotlabs | 2016-10-14 | 1 | -1/+1 | |
| | ||||||
* | permissions issue | zotlabs | 2016-10-14 | 1 | -2/+2 | |
| | ||||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-10-13 | 20 | -853/+822 | |
|\ | ||||||
| * | Merge pull request #547 from dawnbreak/docu | zotlabs | 2016-10-14 | 20 | -856/+826 | |
| |\ | | | | | | | [TASK] Update Doxyfile and fix Doxygen errors. | |||||
| | * | [TASK] Update Doxyfile and fix Doxygen errors. | Klaus Weidenbach | 2016-10-13 | 20 | -856/+826 | |
| | | | | | | | | | | | | | | | | | | Updated Doxyfile to include new folders. Add a list for @hooks tags. Fixed some parsing problems for Doxygen. | |||||
* | | | try to filter any path information from leaking through to zot_finger; and ↵ | zotlabs | 2016-10-13 | 1 | -1/+3 | |
|/ / | | | | | | | log the url wherever called to track down where it might be called with a malformed webbie or complete path instead of hostname. | |||||
* / | provide text log results of email success/failure rather than 1 and 0. | zotlabs | 2016-10-13 | 2 | -5/+5 | |
|/ | ||||||
* | additional array checking | zotlabs | 2016-10-13 | 1 | -7/+1 | |
| | ||||||
* | consolidate duplicated code for creating table entries from an array | zotlabs | 2016-10-12 | 1 | -29/+8 | |
| | ||||||
* | minor | zotlabs | 2016-10-12 | 1 | -0/+1 | |
| | ||||||
* | remove the rest of the backticks from sql queries; replace with TQUOT const ↵ | zotlabs | 2016-10-12 | 2 | -16/+16 | |
| | | | | which is driver dependent | |||||
* | some more api work | zotlabs | 2016-10-12 | 1 | -8/+8 | |
| | ||||||
* | When importing a channel from another server, try to auto-discover the best ↵ | zotlabs | 2016-10-11 | 1 | -10/+14 | |
| | | | | available api path. | |||||
* | don't expire posts before 2001 | zotlabs | 2016-10-10 | 1 | -2/+1 | |
| | ||||||
* | since the snap module runs without permissions controls, verify the logged ↵ | zotlabs | 2016-10-09 | 1 | -0/+9 | |
| | | | | in channel matches the requested cloud path | |||||
* | snap dav module is currently read-only. error out on any request methods ↵ | zotlabs | 2016-10-09 | 1 | -0/+3 | |
| | | | | which can alter data. | |||||
* | provide a DAV module which accesses the raw data storage for a channel. ↵ | zotlabs | 2016-10-09 | 1 | -0/+93 | |
| | | | | Together with an export data function in the API this allows a client process to create true backups of the cloud storage and importable cloud mirrors with all the metadata intact. The import function will need to be modified slightly to obtain the file contents from a plugin or API call; since it currently tries to fetch it from the source hub. | |||||
* | more backquotes - this should take care of most except for the array import ↵ | zotlabs | 2016-10-09 | 20 | -28/+27 | |
| | | | | queries | |||||
* | try naked embed before submission instead of at render time | redmatrix | 2016-10-06 | 1 | -0/+4 | |
| | ||||||
* | remove obscured @ hack | redmatrix | 2016-10-04 | 1 | -3/+0 | |
| | ||||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-10-04 | 2 | -3/+2 | |
|\ | ||||||
| * | feature_enabled() only takes two arguments | Mario Vavti | 2016-10-04 | 2 | -3/+2 | |
| | | ||||||
* | | remove leftover rating fragment | redmatrix | 2016-10-04 | 1 | -2/+5 | |
|/ | ||||||
* | even more backslashes | redmatrix | 2016-10-03 | 5 | -15/+15 | |
| | ||||||
* | more backticks | redmatrix | 2016-10-03 | 11 | -238/+128 | |
| | ||||||
* | allow delivery report for not just the author, but also if you're the owner ↵ | redmatrix | 2016-10-03 | 1 | -3/+5 | |
| | | | | and it's on your wall. | |||||
* | start removing db backticks | redmatrix | 2016-10-03 | 6 | -13/+13 | |
| | ||||||
* | add some more stuff to admin/account_edit (service class, language, and ↵ | redmatrix | 2016-10-03 | 3 | -9/+42 | |
| | | | | techlevel if appropriate). Fix en-au and en-gb so they are listed as languages, and move language selector stuff to include/language.php instead of include/text.php; new file Zotlabs/Lib/Techlevels.php so we only need to write the selection array once. | |||||
* | return the email_sent status | redmatrix | 2016-10-03 | 1 | -2/+2 | |
| | ||||||
* | another missing backslash | Mario Vavti | 2016-10-02 | 1 | -1/+1 | |
| |