clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,731 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

13731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Diekershoff 39e2be54c4 regenerated messages.po 2016-09-27 21:36:27 +02:00
Tobias Diekershoff 4aa834564a Merge pull request #2802 from annando/xmpp-profile 
New fields for the DFRN protocol (XMPP and Account Type)
 2016-09-27 20:57:56 +02:00
Michael Vogel 629dce0268 Documentation added 2016-09-27 18:29:50 +00:00
Michael Vogel 2f06e9360f "Company" is now "Organisation" and there is an auto update 2016-09-26 19:35:01 +00:00
Michael Vogel d632d282cd We are now having an account type and are publishing it 2016-09-25 20:37:27 +00:00
gerhard6380 6c3c3a64ae remove parameter from doxygen description 2016-09-25 22:25:59 +02:00
Michael Vogel 29a8d2f957 Merge pull request #2798 from Hypolite/issue-2792 
Issue #2792
 2016-09-25 20:19:32 +02:00
Michael Vogel fa8be545b2 Merge pull request #2799 from Hypolite/Issue-#2791 
Issue #2791
 2016-09-25 20:14:06 +02:00
gerhard6380 0e8a9f93d7 another correction of spaces 2016-09-25 18:52:59 +02:00
gerhard6380 0581cbcfc8 change spaces/tabstopps 2016-09-25 18:50:08 +02:00
gerhard6380 5e1726184a correct some spaces/tabs 2016-09-25 18:45:00 +02:00
gerhard6380 01ff105a43 correct tab indents and CRLF 2016-09-25 18:22:42 +02:00
Michael Vogel 196eb6009f The XMPP address is now in the profile and will be transmitted 2016-09-25 15:28:00 +00:00
Hypolite Petovan c5260c0f2f Add active response support to frio theme (continued) 
- Added active class to search_item.tpl
 2016-09-25 11:09:54 -04:00
Hypolite Petovan 4264d43f8c 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-09-25 11:08:12 -04:00
Hypolite Petovan 0c9cc29a51 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-09-25 10:56:37 -04:00
Hypolite Petovan b105e134d3 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-09-25 10:49:12 -04:00
Hypolite Petovan 86fb9f0db0 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-09-25 10:29:59 -04:00
Hypolite Petovan 3321e36dd5 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-09-25 10:07:32 -04:00
Hypolite Petovan ff9c0ebad2 Add active like style to duepuntozero 
- Update general wall_thread.tpl
- Add specific styles for duepuntozero
 2016-09-25 09:49:54 -04:00
Hypolite Petovan fdacc40b5f Fix wrong data type 2016-09-24 13:51:53 -04:00
Hypolite Petovan fac2d9a880 Fix registration request notification query 
- Removed wrong usage of COUNT in registration request query
- Added simple count() of results
 2016-09-24 13:49:55 -04:00
Hypolite Petovan 6e1d715725 [frio] Enable Like Rotator on posts 
- Move rotator from hidden block to post header
 2016-09-24 13:04:35 -04:00
Hypolite Petovan 67dc6b0aac [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-09-24 12:05:14 -04:00
Hypolite Petovan f0e386bffb Remove extra whitespaces 2016-09-24 12:02:37 -04:00
Hypolite Petovan b9468df1e6 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-09-24 11:50:23 -04:00
rabuzarus 2d983ea634 Merge pull request #2797 from tobiasd/20160924-de 
DE update to the translation
 2016-09-24 14:51:16 +02:00
Tobias Diekershoff 89b5c9276b DE update to the translation 2016-09-24 14:16:58 +02:00
rabuzarus 7b357843be Merge pull request #2795 from tobiasd/20160924-fr 
FR update to the strings, THX Hypolite Petovan
 2016-09-24 09:52:33 +02:00
rabuzarus f094864d70 Merge pull request #2796 from tobiasd/20160924-msg 
regenerated messages.po to fix typos
 2016-09-24 09:52:15 +02:00
Tobias Diekershoff 58fb593e72 regenerated messages.po to fix typos 2016-09-24 09:45:44 +02:00
Tobias Diekershoff 076475383b FR update to the strings, THX Hypolite Petovan 2016-09-24 09:35:23 +02:00
rabuzarus 049254774c Merge pull request #2794 from tobiasd/20160924-typos 
correction of typos
 2016-09-24 08:50:12 +02:00
Tobias Diekershoff 252f1827c1 correction of typos 2016-09-24 08:08:04 +02:00
Tobias Diekershoff 1ea9df5974 correction of typos 2016-09-24 08:07:48 +02:00
Tobias Diekershoff de326c6d11 Merge pull request #2793 from Hypolite/fr-translation-fix 
Fr translation fix
 2016-09-23 23:40:42 +02:00
Hypolite Petovan 07ce216064 Fix wrong french translation string.php 2016-09-23 16:51:43 -04:00
Hypolite Petovan b5b0b0b163 Fix wrong french translation 2016-09-23 16:51:04 -04:00
gerhard6380 528a492282 Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop 2016-09-23 19:38:57 +02:00
gerhard6380 c0aac54827 Merge remote-tracking branch 'upstream/develop' into develop 2016-09-23 19:34:57 +02:00
gerhard6380 afc7d316a7 Change API documentation to contain new API call /api/friendica/profile/show 2016-09-23 19:26:44 +02:00
gerhard6380 4de12dacc7 New API /api/friendica/profile/show to return data of all profiles a user has to a client 2016-09-23 19:06:41 +02:00
Tobias Diekershoff 4caaeb9978 Merge pull request #2789 from annando/1609-escaping 
Special characters should be escaped
 2016-09-23 08:46:02 +02:00
Michael Vogel 5f9a392fc4 At the search we should do it as well. 2016-09-23 06:36:48 +00:00
Michael Vogel 3f35fed35a Special characters should be escaped 2016-09-23 06:29:02 +00:00
Tobias Diekershoff 4948460232 Merge pull request #2787 from annando/1609-xmpp-auth 
Reworked ejabberd authentification
 2016-09-22 23:28:46 +02:00
gerhard6380 a04100cef7 changing gitignore 2016-09-22 22:08:24 +02:00
gerhard6380 7c9a0ec459 Merge branch 'master' 2016-09-22 21:59:51 +02:00
gerhard6380 8f4d4962ce add Visual Studio special files to gitignore 2016-09-22 21:55:16 +02:00
Michael Vogel 5a3b3cddda Merge pull request #2788 from tobiasd/20160922-de 
DE update to the translation
 2016-09-22 20:23:15 +02:00