Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-24 13:20:15 +00:00
Code Issues Projects Releases Packages Wiki Activity
13623 commits 3 branches 64 tags 237 MiB
Commit graph

13623 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan
50d3c49297 main.js: Remove debug 2016-11-23 10:06:42 -05:00
Michael Vogel
4eeb5a0a17 Merge pull request #2969 from gerhard6380/develop 
Develop
 2016-11-23 05:13:31 +01:00
Hypolite Petovan
0f33311f65 pig.php: remove debug 2016-11-22 23:04:00 -05:00
Hypolite Petovan
133120007c Merge remote-tracking branch 'friendica/develop' into improvement/ping-php-json 2016-11-22 21:14:25 -05:00
Hypolite Petovan
58e03c5155 ping.php: Ensure data structure consistency 
- Formatting
- Documentation
 2016-11-22 21:11:22 -05:00
gerhard6380
a0a26a830f reverse change in proxy.php (issue with proxied images is within c#/uwp of windows, not in Friendica server) 2016-11-23 00:14:45 +01:00
gerhard6380
41ab4479fa Corrections of duplicate entries in states (Albania, Bemruda, Laos, Hungary, Kiribati, Moldova, Taiwan) 2016-11-23 00:07:21 +01:00
Michael Vogel
61da46677d Merge pull request #2967 from Hypolite/issue/#2955 
ping.php: Prevent $register_count from being undefined
 2016-11-22 21:00:34 +01:00
Hypolite Petovan
e0322546d8 ping.php improvement: Prevent $register_count from being undefined 2016-11-22 14:17:05 -05:00
Hypolite Petovan
fac144e3d4 Add active response support to frost theme 
- Add active classes to wall_thread.tpl
- Add styles
- Fix event icon not appearing at full opacity on hover
 2016-11-22 18:42:37 +01:00
Hypolite Petovan
4937a3b7d8 Add the self property to conversation responses 
- Add a condition to check if the current user is amongst the responses
- Populate the responses array with the self attribute
 2016-11-22 18:35:19 +01:00
Tobias Diekershoff
22732fef12 Merge pull request #2966 from annando/1611-myisam 
Bugfix: We should only search in the current database for MyISAM tables
 2016-11-22 17:53:01 +01:00
Michael
edbdd0e34a Bugfix: We should only search in the current database for MyISAM tables 2016-11-22 16:47:08 +00:00
Hypolite Petovan
d406b17fe0 Remove extra whitespaces 2016-11-22 16:32:43 +01:00
Hypolite Petovan
9064277bd4 Add active response support to frio theme (continued) 
- Added active class to search_item.tpl
 2016-11-22 16:32:14 +01:00
Hypolite Petovan
3e4781172f Add response active support to vier theme 
- Add active class to wall_thread.tpl, search_item.tpl, photo_item.tpl
- Add style
Note: because of an !important in the Dark variant stylesheet, the
active links won't show up
 2016-11-22 16:32:04 +01:00
Hypolite Petovan
e361536cd8 Added response active support to smoothly 
- Added "self" class to wall_thread.tpl to avoid conflict with the
already existing "active" class
- Added style
 2016-11-22 16:31:52 +01:00
Hypolite Petovan
92da411465 Add active response support to quattro theme 
- Add active classes to wall_thread.tpl, search_item.tpl and
photo_item.tpl
- Add styles both in the master LESS file and the generated variant CSS
themes
 2016-11-22 16:31:37 +01:00
Hypolite Petovan
b98f23dcd4 Added active response support to frost-mobile 
- Added active class to wall_thread.tpl
- Added styles
- Fixed background-size declarations to be able to add padding to icons
 2016-11-22 16:31:25 +01:00
Hypolite Petovan
065c12e652 Add active like style to duepuntozero 
- Update general wall_thread.tpl
- Add specific styles for duepuntozero
 2016-11-22 16:31:14 +01:00
Hypolite Petovan
a55c03896c [frio] Enable Like Rotator on posts 
- Move rotator from hidden block to post header
 2016-11-22 16:31:01 +01:00
Hypolite Petovan
bdc7d1b87a [frio] Add active class to responses current user holds 
- Add active class when the self attribute is found
- Add CSS styling to active response links
 2016-11-22 16:30:48 +01:00
Tobias Diekershoff
754de768f2 Merge pull request #2960 from Hypolite/issue/#2955 
ping.php Fix confusion between count vars and array vars
 2016-11-22 08:13:36 +01:00
rabuzarus
67f966a0b1 Merge pull request #2954 from tobiasd/20161121-de 
DE, ES translation of the core THX Andreas and Albert
 2016-11-21 22:05:23 +01:00
Hypolite Petovan
cc242d52f8 ping.php Fix confusion between count vars and array vars 2016-11-21 16:02:36 -05:00
Tobias Diekershoff
01b46f5ec0 ES translation of the core THX Albert 2016-11-21 18:35:17 +01:00
Tobias Diekershoff
e375517a31 DE translation of the core THX Andreas 2016-11-21 11:45:19 +01:00
Michael Vogel
46ba1a46f5 Merge pull request #2896 from rabuzarus/0311_fix_photo_albums 
chache: check for valid serialized data + uncomment caching of contac…
 2016-11-21 04:04:36 +01:00
rabuzarus
282de40452 Merge pull request #2953 from tobiasd/20161120-regenmsgHackathon 
regenerated master messages.po files after Hackathon 2016
 2016-11-21 00:40:25 +01:00
Tobias Diekershoff
9f428bb264 regenerated master messages.po files after Hackathon 2016 2016-11-20 21:47:51 +01:00
Tobias Diekershoff
0628068977 Merge pull request #2952 from annando/issue-2772 
Issue 2772: Posts from pending contacts should be displayed as well.
 2016-11-20 17:56:05 +01:00
Michael
3de862712d Issue 2772: Posts from pending contacts should be displayed as well. 2016-11-20 16:52:57 +00:00
rabuzarus
721ac5fb9e cache: use unserialize(false) 2016-11-20 17:32:37 +01:00
Michael Vogel
b33e817586 Merge pull request #2951 from tobiasd/20161120-mysql 
add MySQL warning in admin panel
 2016-11-20 17:09:49 +01:00
Tobias Diekershoff
dd4a23070c Merge pull request #2950 from rabuzarus/berlin_fix_post_preview 
Bugfix: preview has sometimes phantom mentions and tags
 2016-11-20 16:46:31 +01:00
Tobias Diekershoff
c99c98ab8b script is moved 2016-11-20 16:33:56 +01:00
Tobias Diekershoff
97c6f668e6 add a warning to the admin panel when the MySQL version is problematic 2016-11-20 16:32:38 +01:00
rabuzarus
66341046d2 Bugfix: preview has sometimes phantom mentions and tags 2016-11-20 16:19:55 +01:00
Tobias Diekershoff
b03009d962 use an array for warnings in admin panel 2016-11-20 16:14:09 +01:00
Tobias Diekershoff
1e40cdd1d4 Merge pull request #2947 from annando/1611-nowarn-insecure 
The warning if a group contains members of several network types can …
 2016-11-20 16:00:29 +01:00
Tobias Diekershoff
59c12db020 Merge pull request #2949 from silke/vagrant-1604 
Added Vagrant for Ubuntu 16.04
 2016-11-20 15:39:31 +01:00
Silke Meyer
d0d746a3be Switched to a vagrant box that works for Ubuntu Xenial 2016-11-20 15:32:57 +01:00
Silke Meyer
2308a7d33e Vagrant does not download addons by default 2016-11-20 15:32:17 +01:00
Michael
7ad4a8ca93 The warning if a group contains members of several network types can now be supressed. 2016-11-20 12:09:18 +00:00
Michael Vogel
7ca4648ffd Merge pull request #2945 from tobiasd/20161119-admindbwarn 
Show a warning message in the admin panel when MyISAM is still in use
 2016-11-20 12:38:52 +01:00
Tobias Diekershoff
38f9fab6c4 mysql keywords 2016-11-20 10:44:54 +01:00
Tobias Diekershoff
20f987e814 Merge pull request #2946 from annando/1611-bugfix-groups 
Bugfix: Filtering by group has to be done with the contact id in the thread table
 2016-11-20 10:39:01 +01:00
Michael
68a31e084a Bugfix: Filtering by group has always to be done with the contact id in the thread table 2016-11-20 09:24:56 +00:00
Tobias Diekershoff
7aaaa0a3c7 Show a warning message in the admin panel when MyISAM is still in use 2016-11-20 09:50:14 +01:00
Tobias Diekershoff
24d31d3092 Merge pull request #2944 from annando/1611-bugfix-utf8 
Avoid UTF8 warning in mod/proxy.php
 2016-11-20 09:44:38 +01:00