]>
git.mxchange.org Git - friendica.git/log
Tobias Diekershoff [Tue, 10 Nov 2015 19:12:16 +0000 (20:12 +0100)]
new version of the ShaShape iconset
Tobias Diekershoff [Tue, 10 Nov 2015 19:10:20 +0000 (20:10 +0100)]
Merge branch 'develop' of https://github.com/friendica/friendica into develop
fabrixxm [Tue, 10 Nov 2015 15:31:41 +0000 (16:31 +0100)]
Merge pull request #2062 from annando/1511-vier-fonts
Vier: Make it look more beautiful under Linux
Michael Vogel [Tue, 10 Nov 2015 15:25:36 +0000 (16:25 +0100)]
Vier: Make it look more beautiful under Linux
Michael Vogel [Mon, 9 Nov 2015 15:05:23 +0000 (16:05 +0100)]
Merge pull request #2055 from tobiasd/
20151108-messagespo
regenerated master messages.po file
Tobias Diekershoff [Sun, 8 Nov 2015 21:26:22 +0000 (22:26 +0100)]
regenerated master messages.po file
Tobias Diekershoff [Sun, 8 Nov 2015 18:17:32 +0000 (19:17 +0100)]
Merge pull request #2054 from fabrixxm/vier_aside_mobile
aside bar as menu in mobile
fabrixxm [Sun, 8 Nov 2015 18:08:00 +0000 (19:08 +0100)]
aside bar as menu in mobile
Tobias Diekershoff [Sun, 8 Nov 2015 17:39:07 +0000 (18:39 +0100)]
Merge pull request #2053 from annando/1511-only-supported-themes
Only show supported themes on the admin site.
Michael Vogel [Sun, 8 Nov 2015 17:35:39 +0000 (18:35 +0100)]
Only show supported themes on the admin site.
Tobias Diekershoff [Sun, 8 Nov 2015 17:29:15 +0000 (18:29 +0100)]
Merge pull request #2052 from fabrixxm/issue_1718
duepuntozero, vier: add unread messages per group
fabrixxm [Sun, 8 Nov 2015 17:02:04 +0000 (18:02 +0100)]
duepuntozero, vier: add unread messages per group
Tobias Diekershoff [Sun, 8 Nov 2015 16:06:05 +0000 (17:06 +0100)]
Merge pull request #2050 from fabrixxm/issue_1718
quattro: add unread message count per groups
fabrixxm [Sun, 8 Nov 2015 16:04:39 +0000 (17:04 +0100)]
remove debug code
fabrixxm [Sun, 8 Nov 2015 15:55:44 +0000 (16:55 +0100)]
quattro: add unread message count per groups
Tobias Diekershoff [Sun, 8 Nov 2015 15:46:45 +0000 (16:46 +0100)]
Merge pull request #2049 from annando/1511-only-valid-contacts
Only show valid contacts on the group page
Michael Vogel [Sun, 8 Nov 2015 15:41:00 +0000 (16:41 +0100)]
Only show valid contacts on the group side
Tobias Diekershoff [Sun, 8 Nov 2015 15:04:50 +0000 (16:04 +0100)]
Merge branch 'develop' of https://github.com/friendica/friendica into develop
Tobias Diekershoff [Sun, 8 Nov 2015 15:03:04 +0000 (16:03 +0100)]
Merge pull request #2035 from FlxAlbroscheit/develop
Preview the last 5 conversations in message-sidebar
fabrixxm [Sun, 8 Nov 2015 15:01:19 +0000 (16:01 +0100)]
Merge pull request #2048 from strk/group_post
Include per-group count of unseen items in /ping output
Sandro Santilli [Sun, 8 Nov 2015 14:56:43 +0000 (15:56 +0100)]
Revert the rename of <groups>
Sandro Santilli [Sun, 8 Nov 2015 14:56:08 +0000 (15:56 +0100)]
Fix bugs and rename <groups> to <group_posts>
FlxAlbroscheit [Sun, 8 Nov 2015 14:45:42 +0000 (15:45 +0100)]
Preview last five conversations in message-sidebar
Tobias Diekershoff [Sun, 8 Nov 2015 14:43:53 +0000 (15:43 +0100)]
Merge pull request #2047 from annando/1511-ostatus-warning
This is a bugfix for pull request 2040
Sandro Santilli [Sun, 8 Nov 2015 14:33:12 +0000 (15:33 +0100)]
Include per-group count of unseen items in /ping output
See #1718
Unfinished work
Michael Vogel [Sun, 8 Nov 2015 14:32:16 +0000 (15:32 +0100)]
This is a bugfix for pull request 2040
Tobias Diekershoff [Sun, 8 Nov 2015 14:19:11 +0000 (15:19 +0100)]
Merge pull request #2045 from annando/1511-dirfind-addr
You can now discover previously unknown users via the dirsearch
Michael Vogel [Sun, 8 Nov 2015 14:17:08 +0000 (15:17 +0100)]
Fixed an undefined variable
Tobias Diekershoff [Sun, 8 Nov 2015 14:04:01 +0000 (15:04 +0100)]
Merge pull request #2044 from fabrixxm/issue_1249
User language setting is a setting and now is between settings in settings page
Michael Vogel [Sun, 8 Nov 2015 14:00:52 +0000 (15:00 +0100)]
Now it is possible to search for @http://profile...
Michael Vogel [Sun, 8 Nov 2015 13:48:47 +0000 (14:48 +0100)]
You can now search for @username@domain.tld in dirfind and the search will resolve that.
fabrixxm [Sun, 8 Nov 2015 13:42:54 +0000 (14:42 +0100)]
Remove language selectors from themes
This is now a user setting
fabrixxm [Sun, 8 Nov 2015 13:23:49 +0000 (14:23 +0100)]
Add user language in settings, use that field as language for UI
fabrixxm [Sun, 8 Nov 2015 11:44:44 +0000 (12:44 +0100)]
Merge pull request #2042 from tobiasd/develop
some icons were added to the ShaShape iconset
Tobias Diekershoff [Sun, 8 Nov 2015 11:37:17 +0000 (12:37 +0100)]
Merge branch 'develop' of https://github.com/friendica/friendica into develop
Tobias Diekershoff [Sun, 8 Nov 2015 11:33:48 +0000 (12:33 +0100)]
some icons were added to the ShaShape iconset
Tobias Diekershoff [Sun, 8 Nov 2015 11:18:16 +0000 (12:18 +0100)]
Merge pull request #2041 from fabrixxm/issue_1991
File and Image dialog fixes
Tobias Diekershoff [Sun, 8 Nov 2015 11:13:07 +0000 (12:13 +0100)]
Merge pull request #2040 from annando/issue-2038
Bugfix for non working pagination in GNU Social
fabrixxm [Sun, 8 Nov 2015 11:05:23 +0000 (12:05 +0100)]
Image filebrowser dialog links images to image page
fix #1991
fabrixxm [Sun, 8 Nov 2015 11:01:19 +0000 (12:01 +0100)]
js: add new Dialog object
The Dialog is used by code to show urls in colorbox.
Templates can overwrite `show()` function to change its behaviour
Michael Vogel [Sun, 8 Nov 2015 10:10:20 +0000 (11:10 +0100)]
Bugfix for not working pagination in GNU Social
Tobias Diekershoff [Sun, 8 Nov 2015 09:30:09 +0000 (10:30 +0100)]
Merge pull request #2039 from silke/docs-de
Neue Version der SSL-Hilfe auf deutsch
Silke Meyer [Sun, 8 Nov 2015 09:21:13 +0000 (10:21 +0100)]
Updated German translation
Silke Meyer [Sun, 8 Nov 2015 09:13:38 +0000 (10:13 +0100)]
fixed typo
Tobias Diekershoff [Sat, 7 Nov 2015 20:25:52 +0000 (21:25 +0100)]
Merge pull request #2037 from fabrixxm/issue_2022
Not current theme settings in admin page
fabrixxm [Sat, 7 Nov 2015 20:22:55 +0000 (21:22 +0100)]
Not current theme settings in admin page
fix #2022
Tobias Diekershoff [Sat, 7 Nov 2015 19:59:01 +0000 (20:59 +0100)]
Merge pull request #2036 from silke/docs
Docs
Silke Meyer [Sat, 7 Nov 2015 19:43:04 +0000 (20:43 +0100)]
Updated content.
Tobias Diekershoff [Sat, 7 Nov 2015 19:29:20 +0000 (20:29 +0100)]
Merge pull request #2034 from fabrixxm/issue_1986
fix the contact photo menu
Tobias Diekershoff [Sat, 7 Nov 2015 19:27:53 +0000 (20:27 +0100)]
Merge pull request #2032 from fabrixxm/cron_update_suggestions
cron: move update_suggestions in separated thread
FlxAlbroscheit [Sat, 7 Nov 2015 17:57:40 +0000 (18:57 +0100)]
Preview last five conversations in message-sidebar
FlxAlbroscheit [Sat, 7 Nov 2015 17:56:05 +0000 (18:56 +0100)]
Preview last five conversations in message-sidebar
FlxAlbroscheit [Sat, 7 Nov 2015 17:55:13 +0000 (18:55 +0100)]
Preview last five conversations in message-sidebar
FlxAlbroscheit [Sat, 7 Nov 2015 17:54:20 +0000 (18:54 +0100)]
Preview last five conversations in message-sidebar
FlxAlbroscheit [Sat, 7 Nov 2015 17:53:32 +0000 (18:53 +0100)]
Preview last five conversations in message-sidebar
Silke Meyer [Sat, 7 Nov 2015 17:26:48 +0000 (18:26 +0100)]
Markdown headings
fabrixxm [Sat, 7 Nov 2015 17:25:35 +0000 (18:25 +0100)]
fix the contact photo menu
fix "should open a new tab" attribute
fix javascript deletion dialog (fix #1986)
fabrixxm [Sat, 7 Nov 2015 17:07:17 +0000 (18:07 +0100)]
Merge pull request #2030 from tobiasd/
20151107-shashape
initial commit of the ShaShape iconset by Andi Stadler
Silke Meyer [Sat, 7 Nov 2015 16:56:47 +0000 (17:56 +0100)]
Threw out information about typos. They can always occur.
Silke Meyer [Sat, 7 Nov 2015 16:54:59 +0000 (17:54 +0100)]
Reformatted SSL documentation to one sentence per line before working on the content.
fabrixxm [Sat, 7 Nov 2015 16:52:52 +0000 (17:52 +0100)]
cron: move update_suggestions in separated thread
Move the call in discover_poco.php.
This should fix expiration and other cron related issues
Tobias Diekershoff [Sat, 7 Nov 2015 16:17:43 +0000 (17:17 +0100)]
Merge pull request #2031 from tugelbend/develop
adding Imagick to vagrant installation
hauke [Sat, 7 Nov 2015 16:14:00 +0000 (17:14 +0100)]
... and force the install
hauke [Sat, 7 Nov 2015 16:13:31 +0000 (17:13 +0100)]
fix: wrong package name
hauke [Sat, 7 Nov 2015 16:06:36 +0000 (17:06 +0100)]
adding Imagick to vagrant installation as it is needed for none-jpg-image-processing
Tobias Diekershoff [Sat, 7 Nov 2015 15:34:13 +0000 (16:34 +0100)]
Merge pull request #2029 from tugelbend/develop
changed syntax to work with PHP 5.3 #2027
Tobias Diekershoff [Sat, 7 Nov 2015 15:30:31 +0000 (16:30 +0100)]
wrong filename
Tobias Diekershoff [Sat, 7 Nov 2015 15:28:31 +0000 (16:28 +0100)]
wrong filename
hauke [Sat, 7 Nov 2015 15:24:59 +0000 (16:24 +0100)]
changed syntax to work with PHP 5.3 #2027
Tobias Diekershoff [Sat, 7 Nov 2015 15:24:22 +0000 (16:24 +0100)]
initial commit of the ShaShape iconset by Andi Stadler
Michael Vogel [Sat, 7 Nov 2015 15:02:26 +0000 (16:02 +0100)]
Merge pull request #2023 from tobiasd/
20151107-registertext
Following n4rky to resolve #1898
Michael Vogel [Sat, 7 Nov 2015 15:01:46 +0000 (16:01 +0100)]
Merge pull request #2005 from tobiasd/
20151101-dev
mark the development version
Tobias Diekershoff [Sat, 7 Nov 2015 14:39:55 +0000 (15:39 +0100)]
we found a dev format
Tobias Diekershoff [Sat, 7 Nov 2015 14:12:09 +0000 (15:12 +0100)]
Merge pull request #2026 from silke/vagrant-update
Vagrant update
Silke Meyer [Sat, 7 Nov 2015 13:55:58 +0000 (14:55 +0100)]
Configuration for Vagrant running Ubuntu 14.04
Tobias Diekershoff [Sat, 7 Nov 2015 13:51:11 +0000 (14:51 +0100)]
Merge pull request #2024 from annando/1511-api-bugfix
API Bugfix: Posts to AndStatus appeared as empty posts
Michael Vogel [Sat, 7 Nov 2015 13:36:00 +0000 (14:36 +0100)]
API Bugfix: This fixes the problem that posts to AndStatus appeared as empty posts
Tobias Diekershoff [Sat, 7 Nov 2015 12:19:55 +0000 (13:19 +0100)]
Following n4rky to resolve #1898
Silke Meyer [Sat, 7 Nov 2015 11:21:00 +0000 (12:21 +0100)]
Activate logging in vagrant VM
Silke Meyer [Sat, 7 Nov 2015 11:25:51 +0000 (12:25 +0100)]
Merge pull request #2021 from fabrixxm/php_arrays
Use old style array declaration
fabrixxm [Sat, 7 Nov 2015 11:21:54 +0000 (12:21 +0100)]
Use old style array declaration
Tobias Diekershoff [Sat, 7 Nov 2015 10:12:37 +0000 (11:12 +0100)]
Merge pull request #2020 from fabrixxm/install_checks
Install checks
fabrixxm [Sat, 7 Nov 2015 10:03:08 +0000 (11:03 +0100)]
Check for mcrypt_create_iv() for RINO2, update link to cron documentation
Tobias Diekershoff [Sat, 7 Nov 2015 05:54:16 +0000 (06:54 +0100)]
Merge pull request #2019 from rabuzarus/0611_directory
simple photo_menu for directory
fabrixxm [Fri, 6 Nov 2015 23:22:26 +0000 (00:22 +0100)]
Check for ImageMagick and for GIF support
Tobias Diekershoff [Fri, 6 Nov 2015 23:09:58 +0000 (00:09 +0100)]
Merge pull request #2018 from fabrixxm/admin_theme_reload
Add 'Reload active themes' to admin
rabuzarus [Fri, 6 Nov 2015 23:08:35 +0000 (00:08 +0100)]
simple photo_menu for directory
fabrixxm [Fri, 6 Nov 2015 22:53:10 +0000 (23:53 +0100)]
Add 'Reload active themes' to admin
It will call 'uninstall()' and 'install()' on every active themes
Tobias Diekershoff [Fri, 6 Nov 2015 19:03:38 +0000 (20:03 +0100)]
Merge pull request #2016 from fabrixxm/template_vars_hook
Fix template_var hook
fabrixxm [Fri, 6 Nov 2015 18:52:00 +0000 (19:52 +0100)]
Fix template_var hook
move it to smarty3 replate_macro, pass the theme name in $b
Tobias Diekershoff [Fri, 6 Nov 2015 18:39:42 +0000 (19:39 +0100)]
Merge pull request #2015 from fabrixxm/template_vars_hook
Add 'template_vars' hook
fabrixxm [Fri, 6 Nov 2015 18:33:14 +0000 (19:33 +0100)]
Add 'template_vars' hook
Tobias Diekershoff [Fri, 6 Nov 2015 10:01:28 +0000 (11:01 +0100)]
Merge pull request #2014 from annando/1511-gcontaxt-update
Only show accessible contacts (allfriends/common_contacts)
Michael Vogel [Fri, 6 Nov 2015 08:15:20 +0000 (09:15 +0100)]
Optical adjustments for contacts/set "last_failure" when inaccessible
Tobias Diekershoff [Fri, 6 Nov 2015 05:57:06 +0000 (06:57 +0100)]
Merge pull request #2013 from annando/1511-addr2
The address field is now displayed instead of the url - if available
Michael Vogel [Fri, 6 Nov 2015 00:19:37 +0000 (01:19 +0100)]
Update the contact table as well.
Michael Vogel [Thu, 5 Nov 2015 23:47:54 +0000 (00:47 +0100)]
The contact template now displays the address if available
Michael Vogel [Thu, 5 Nov 2015 09:55:00 +0000 (10:55 +0100)]
Fetch the "addr" value whenever it is empty
Tobias Diekershoff [Thu, 5 Nov 2015 08:10:25 +0000 (09:10 +0100)]
Merge pull request #2011 from annando/1511-gcontact-addr
The "addr" field is now in the global contacts as well.
Michael Vogel [Thu, 5 Nov 2015 07:37:00 +0000 (08:37 +0100)]
The "addr" field is now in the global contacts as well.
projects / friendica.git / log