Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-17 | 2 | -4/+35 |
|\ | |||||
| * | improve the icon mappings for cloud tile view | zotlabs | 2017-11-16 | 2 | -4/+35 |
| | | |||||
* | | compare strpos result against false | Mario Vavti | 2017-11-16 | 1 | -2/+2 |
| | | |||||
* | | provide ability to pin apps to navbar from /apps. this removes the ability ↵ | Mario Vavti | 2017-11-16 | 1 | -5/+9 |
|/ | | | | to have per custom navbar pinned apps - this can be added later if desired | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-15 | 1 | -1/+1 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-15 | 3 | -14/+58 |
| |\ | |||||
| * | | typo - fixes issue #910 | Mario Vavti | 2017-11-15 | 1 | -1/+1 |
| | | | |||||
* | | | This should sort out hubzilla issue #826 but requires a bit more testing. It ↵ | zotlabs | 2017-11-15 | 1 | -8/+8 |
| |/ |/| | | | | | may also sort out some reported issues with commenting and liking items in the public stream. | ||||
* | | sort out a few more large image upload issues | zotlabs | 2017-11-14 | 3 | -14/+58 |
|/ | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-14 | 1 | -6/+2 |
|\ | |||||
| * | issue with group_rmv | zotlabs | 2017-11-13 | 1 | -6/+2 |
| | | |||||
* | | sort combined private mail conversations by latest updated conversation ↵ | Mario Vavti | 2017-11-13 | 1 | -4/+1 |
| | | | | | | | | instead of created parent | ||||
* | | fix php warnings on photo delete | Mario Vavti | 2017-11-13 | 1 | -1/+1 |
|/ | |||||
* | improve removed_channel final cleanup. Hubzilla issue #386 | zotlabs | 2017-11-12 | 1 | -15/+45 |
| | |||||
* | fix some conflicts between private tags and forum tags | zotlabs | 2017-11-12 | 1 | -154/+150 |
| | |||||
* | cleanup of upload_to_comments test; we actually don't care about the profile ↵ | zotlabs | 2017-11-12 | 1 | -14/+8 |
| | | | | owner. We only care that we're logged in locally and our storage is public by default. | ||||
* | also disable uploading in comments if the channel permissionlimits for ↵ | zotlabs | 2017-11-11 | 1 | -0/+3 |
| | | | | view_storage aren't PERMS_PUBLIC. | ||||
* | hubzilla issue #901 - unicode characters in urls tripping up url regexes - ↵ | zotlabs | 2017-11-09 | 4 | -13/+13 |
| | | | | these regexes have been modified to accept unicode "letters" which may preclude emojis and control sequences and symbols in url links; but should suffice for most legal URLs containing language context "text" glyphs. | ||||
* | use logger | zotlabs | 2017-11-08 | 1 | -2/+1 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-08 | 1 | -8/+10 |
|\ | |||||
| * | rename channel app events to calendar and add nav_set_selected() to /cal | Mario Vavti | 2017-11-07 | 1 | -3/+3 |
| | | |||||
| * | add location info to the navbar | Mario Vavti | 2017-11-07 | 1 | -5/+7 |
| | | |||||
* | | make most recent cloud_tiles setting for local channels persistent across logins | zotlabs | 2017-11-07 | 1 | -0/+1 |
|/ | |||||
* | lets try this in the wild for a while | Mario Vavti | 2017-11-06 | 1 | -4/+4 |
| | |||||
* | attach.php minor cleanup and doc | zotlabs | 2017-11-06 | 1 | -61/+26 |
| | |||||
* | allow cloud filenames to include ampersands without messing up auth tokens ↵ | zotlabs | 2017-11-05 | 1 | -16/+5 |
| | | | | (zid, owt, and zat, and the constant placeholder 'f=') | ||||
* | fix can_comment_on_post() after recent code cleanup (a required array ↵ | zotlabs | 2017-11-04 | 1 | -0/+1 |
| | | | | parameter was missing) | ||||
* | fix wrong variable in sprintf resulting in php warning | Mario Vavti | 2017-11-04 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' into docu | git-marijus | 2017-11-04 | 6 | -30/+74 |
|\ | |||||
| * | Merge pull request #891 from dawnbreak/langlibs | git-marijus | 2017-11-04 | 3 | -33/+48 |
| |\ | | | | | | | Langlibs updates | ||||
| | * | :white_check_mark: Some more work on unit tests. | Klaus Weidenbach | 2017-10-29 | 1 | -9/+21 |
| | | | | | | | | | | | | | | | | | | Some small improvements for coverage report. Add more functions from include/text.php Update composer dev libraries for phpunit. | ||||
| | * | :arrow_up: Update intl library. | Klaus Weidenbach | 2017-10-29 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | Update intl library from v0.4? (2014) to v0.7.4 (2016). Use global composer autoloader now. | ||||
| | * | :arrow_up: Update Text_LanguageDetect. | Klaus Weidenbach | 2017-10-29 | 2 | -20/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | Update from v0.3.0 (2012) to v1.0.0 (2017) which should remove some warnings and improve PHP7 support. Using composer to handle this PEAR library now. Fix a problem in FeedutilsTest. | ||||
| | * | :white_check_mark: Some unit test for include/language.php | Klaus Weidenbach | 2017-10-26 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | Unfortunately not so much unit testable, but added in preparation to update LanguageDetect and Intl library. | ||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-04 | 1 | -0/+12 |
| |\ \ | |||||
| | * | | provide short localised summary for likes that will end up in displayed ↵ | zotlabs | 2017-11-03 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | notifications | ||||
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-03 | 2 | -0/+28 |
| |\| | | |||||
| | * | | imagedata not set correctly if large photo AND imagick is not installed | zotlabs | 2017-11-03 | 1 | -0/+3 |
| | | | | |||||
| | * | | fix cloud redirects with owt tokens | zotlabs | 2017-11-03 | 1 | -0/+25 |
| | | | | |||||
* | | | | :bulb: Improving Doxygen documentation. | Klaus Weidenbach | 2017-11-03 | 13 | -948/+1573 |
|/ / / | | | | | | | | | | | | | Fix some Doxygen parsing errors. Improve hooks documentation. | ||||
* / / | update item_normal() to not include ACTIVITY_OBJ_FILE obj_type | Mario Vavti | 2017-11-03 | 1 | -4/+4 |
|/ / | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-02 | 2 | -4/+4 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-02 | 3 | -8/+28 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-02 | 1 | -1/+11 |
| |\ \ \ | |||||
| * | | | | fix issues with diaspora xchans | Mario Vavti | 2017-11-02 | 2 | -4/+4 |
| | | | | | |||||
* | | | | | more queue work | zotlabs | 2017-11-02 | 2 | -5/+11 |
| |_|/ / |/| | | | |||||
* | | | | put deferred queue logic every place we create a delivery process (except ↵ | zotlabs | 2017-11-02 | 3 | -8/+28 |
| |/ / |/| | | | | | | | | for protocol 'friend requests' which aren't likely to swamp the delivery system). Remove it from the queue_delivery function which was too late to do anything. | ||||
* | | | don't perform zot_refresh on dead sites unless $force is set | zotlabs | 2017-11-01 | 1 | -0/+10 |
| | | | |||||
* | | | do not send message_list responses to dead sites (this delivery method ↵ | zotlabs | 2017-11-01 | 1 | -1/+1 |
|/ / | | | | | | | bypassed the notifier) | ||||
* | | Maria's profile photo issue, please push to master. | zotlabs | 2017-11-01 | 1 | -0/+4 |
| | |