Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-01 07:25:35 +00:00
Code Issues Projects Releases Packages Wiki Activity
24191 commits 3 branches 64 tags 241 MiB
Commit graph

24191 commits

This branch
This branch
All branches
Author SHA1 Message Date
fabrixxm
f3901b99a2 Fix contact popup with tinyMCE 
Fix #1920
 2015-12-04 18:59:50 +01:00
Fabrixxm
4f06107579 Fix generated po headers 2015-12-04 15:47:41 +01:00
Tobias Diekershoff
4e53df7c71 Merge pull request #2141 from fabrixxm/issue_1953 
Add support for attending an event to frost themes
 2015-12-04 15:39:53 +01:00
Fabrixxm
ddbba521c5 Add support for attending an event to frost themes 
fix #1953
 2015-12-04 15:01:46 +01:00
Fabrixxm
d53b23858a Rewrite util/php2po.php 
Fix #2046
 2015-12-04 14:09:17 +01:00
Michael Vogel
25c2e219ee Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts 2015-12-04 07:07:34 +01:00
Tobias Diekershoff
7ac7caef08 Merge pull request #2136 from annando/1512-diaspora-retractions 
Support for a new Diaspora command for post retraction
 2015-12-04 06:54:55 +01:00
Tobias Diekershoff
eaf975faae Merge pull request #2130 from annando/1512-contact-rework 
Some more contact rework
 2015-12-04 06:53:29 +01:00
Michael Vogel
37bd03422b The preview picture can now be remote or local 2015-12-04 06:50:23 +01:00
Michael Vogel
540d217134 Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts 2015-12-04 06:05:12 +01:00
Michael Vogel
f82ce0de66 Merge branch '1512-ostatus-picture-posts' of github.com:annando/friendica into 1512-ostatus-picture-posts 2015-12-04 06:00:56 +01:00
Michael Vogel
bb45112544 OStatus: Picture posts are reformatted 2015-12-04 05:57:33 +01:00
Michael Vogel
dfbc5c39f5 Merge pull request #2139 from rabuzarus/0312_ping_cleanup 
moving group_count_unseen to include/group.php
 2015-12-04 05:50:49 +01:00
Michael Vogel
25e2a849c4 Merge pull request #2135 from rabuzarus/doxygen 
Code reference in help
 2015-12-04 05:47:59 +01:00
rabuzarus
d94b96e546 ping: docu fix 2015-12-03 22:51:00 +01:00
rabuzarus
4b7f080c46 ping: further work 2015-12-03 22:42:53 +01:00
rabuzarus
5ff9fbb013 doxygen: correct mistake - .gitignore shouldn't be submitted 2015-12-03 21:22:13 +01:00
rabuzarus
b4213d0e9e doxygen: delete wrong commited file 2015-12-03 17:30:34 +01:00
rabuzarus
c0406918ec ping: cleanup 2015-12-03 17:15:49 +01:00
Fabrixxm
95508bf4bb Allow multicolunn primary keys in dbstructure 2015-12-03 16:39:20 +01:00
rabuzarus
76bb3f6673 doxygen: exclude some more folders 2015-12-03 16:17:25 +01:00
Michael Vogel
1a170c8743 Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework 
Conflicts:
	mod/contacts.php
	mod/crepair.php
 2015-12-03 14:38:04 +01:00
Michael Vogel
1f9644bded Merge pull request #2131 from rabuzarus/3011_hcard_vcard 
unify hcard and vcard
 2015-12-03 14:16:52 +01:00
Michael Vogel
24f1a24208 Support for a new Diaspora command for post retraction 2015-12-03 08:35:47 +01:00
rabuzarus
8522446891 little cleanup: insert new line at the end 2015-12-03 00:11:18 +01:00
rabuzarus
3af7cff281 remove unneeded function page_type_translate() 2015-12-03 00:08:43 +01:00
rabuzarus
b31c602e9b added code reference to docs 2015-12-03 00:06:11 +01:00
rabuzarus
d963cdfe48 photos-albms widget: add some classes 2015-12-02 20:01:22 +01:00
Michael Vogel
4286225f37 Added/Changed accesskeys for the new tab actions 2015-12-02 07:56:10 +01:00
Michael Vogel
7ed73a06ab Solved a problem with author links that are different from what is provided in the contact 2015-12-01 23:51:34 +01:00
Michael Vogel
4798675e6e Merge pull request #2132 from rabuzarus/0112_vier_css 
photos-albms widget: add some classes
 2015-12-01 22:40:56 +01:00
rabuzarus
1d6d9d3d24 photos-albms widget: add some classes 2015-12-01 21:07:05 +01:00
rabuzarus
cd7ec72b20 unify hcard and vcard: make $pdesc available in hcard&vcard 2015-12-01 19:47:23 +01:00
Michael Vogel
c45b16d2a1 Unifying the texts. 2015-12-01 19:02:03 +01:00
rabuzarus
39b37281a7 Merge develop into 3011_hcard_vcard 2015-12-01 18:34:13 +01:00
rabuzarus
89c5989cfb unify hcard and vcard 2015-12-01 18:31:08 +01:00
Michael Vogel
06a4b0dc5e Header removed in the contact area 2015-12-01 18:21:05 +01:00
Michael Vogel
fe900ac576 Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework 2015-12-01 17:16:31 +01:00
Michael Vogel
6910604ffb Merge pull request #2125 from rabuzarus/2911_event_template 
vier event_form: include bb-tags for editing
 2015-12-01 17:13:46 +01:00
fabrixxm
0dee14d91d Merge pull request #2129 from annando/1512-diaspora-cid 
Diaspora comments/likes: The contact id and the network is now taken …
 2015-12-01 17:11:35 +01:00
Michael Vogel
50a46c2c6e Merge pull request #2127 from tobiasd/20151201-de 
DE translations THX Abrax
 2015-12-01 17:01:47 +01:00
Michael Vogel
107204f405 Diaspora comments/likes: The contact id and the network is now taken from the contact 2015-12-01 15:36:32 +01:00
fabrixxm
9e0a15c972 Merge pull request #2128 from tobiasd/20151201-issue2079 
add the module to the page title
 2015-12-01 14:33:25 +01:00
Tobias Diekershoff
51d392b97f add the module to the page title 2015-12-01 14:19:06 +01:00
Tobias Diekershoff
91bac8a6e0 DE translations THX Abrax 2015-12-01 13:56:23 +01:00
Michael Vogel
1c93729c46 Tab is added to "all friends" and "common friends" 2015-12-01 08:12:05 +01:00
Tobias Diekershoff
146f386e37 Merge pull request #2126 from annando/1511-duplicates 
Bugfix: The duplicate check sometimes seemed to have scrambled the posts
 2015-12-01 06:07:18 +01:00
Michael Vogel
712b3c7593 Merge pull request #2121 from rabuzarus/3011_viewcontactstitle 
make viewcontacts part of the profile tab
 2015-11-30 23:29:35 +01:00
Michael Vogel
b0898cc461 Bugfix: The duplicate check sometimes seemed to have scrambled the posts 2015-11-30 23:13:56 +01:00
Michael Vogel
0278e60664 Merge pull request #2104 from rabuzarus/2611_contacts_directory 
display contact information in contact and directory according to the…
 2015-11-30 18:07:35 +01:00