Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-16 11:33:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
9196 commits 3 branches 64 tags 247 MiB
Commit graph

9196 commits

This branch
This branch
All branches
Author SHA1 Message Date
tobiasd
b178317cbb Merge pull request #774 from silke/frost-mobile-share-link 
Transferred link link from Neptune theme (by 23n) to frost-mobile
 2013-09-23 21:36:47 -07:00
Silke Meyer
5075770654 Transferred link link from Neptune theme (by 23n) to frost-mobile 2013-09-24 00:28:35 +02:00
Tobias Diekershoff
a4d51c9195 FR: update to the strings 2013-09-20 14:48:38 +02:00
Michael Vogel
34d0eb709b Merge remote-tracking branch 'upstream/master' 2013-09-15 19:39:22 +02:00
Michael Vogel
d5ae5ecedd - Improved speed due to forced indexes when showing items. 
- Possibility to setup a hostname
 2013-09-15 10:40:58 +02:00
tomtom84
26ee28d255 Merge pull request #769 from tomtom84/master 
- diabook update
 2013-09-11 10:16:36 -07:00
tomtom84
ca39c2acb4 - diabook update 
-- adjust nav-bar, depending to userstatus
 2013-09-11 19:14:41 +02:00
fabrixxm
4487515d0c Merge pull request #764 from fabrixxm/bug729 
Fix bug #729
 2013-09-08 23:39:36 -07:00
Tobias Diekershoff
7ab366b9c3 Check for user name in deleted user list and unset account expiration before importing the account (Bug #760) 2013-09-09 08:33:47 +02:00
tomtom84
a8345a555a Merge pull request #767 from tomtom84/master 
update diabook-theme
 2013-09-07 19:35:13 -07:00
tomtom84
9ddca9425d update diabook-theme 
-- fixed contact-edit-page
-- some css-fixes
 2013-09-08 04:30:55 +02:00
tomtom84
0cdc23d9fb Merge pull request #766 from tomtom84/master 
- update diabook-theme
 2013-09-06 19:06:26 -07:00
tomtom84
06994b94b2 - update diabook-theme: 
-- removed twitter-box from right col, because api is outdated
-- some css-fixes
 2013-09-07 03:28:52 +02:00
tomtom84
4747145ca9 add a readme to diabook-folder and update my fork 2013-09-06 20:51:33 +02:00
tomtom84
8c0c807a59 add a readme to diabook-folder 2013-09-06 20:51:33 +02:00
Fabrixxm
3ebc5d1c80 update error message to login one 2013-09-06 12:30:10 -04:00
Fabrixxm
be3111dc6f add error control for openid on registration. fix #729 2013-09-06 12:22:53 -04:00
fabrixxm
51d934ee70 Merge pull request #758 from annando/master 
Better use of APC,  	Preparations for the pumpio synchronisation, fix youtube for firefox
 2013-09-06 07:55:03 -07:00
tobiasd
5a3c27fb87 Merge pull request #763 from silke/master 
Added link to import a profile im register tpl
 2013-09-05 06:12:05 -07:00
Michael Vogel
159a7bda85 Prepearations for queueing of twitter messages 2013-09-05 08:34:54 +02:00
Silke Meyer
9152198927 Added link to import a profile im register tpl 2013-09-04 20:51:04 +02:00
Michael Vogel
55b79e0891 Always embed the SSL version of youtube to avoid problems with Firefox. 2013-09-04 07:39:03 +02:00
Michael Vogel
9a1a666f24 Some changes to let pumpio react similar to facebook. 2013-09-04 00:01:00 +02:00
Tobias Diekershoff
d21496454b NL: update to the strings 2013-08-30 14:42:40 +02:00
Michael Vogel
34e7206ba4 Preparations for the pumpio synchronisation. 2013-08-28 08:56:48 +02:00
Michael Vogel
209343d883 If "remove_multiplicated_lines" is set then some more linefeeds in lists are removed. 2013-08-24 14:54:07 +02:00
fabrixxm
da9f20f389 Merge pull request #749 from mexon/fetch_url_cookies 
Allow calls to fetch_url to specify a cookiejar file
 2013-08-23 10:01:43 -07:00
Tobias Diekershoff
20d35439a4 passing more then one argument to the crypt tag is parsed now as well 2013-08-20 11:47:11 +02:00
Tobias Diekershoff
3ff982be99 we use the bugtracker on github now 2013-08-20 11:35:26 +02:00
Tobias Diekershoff
b0886d2d85 NL: update to the strings 2013-08-20 09:56:47 +02:00
Michael Vogel
694ca8fc57 Code cleanup 2013-08-12 11:14:02 +02:00
Michael Vogel
e75f88d7fe Further redoings 2013-08-12 11:12:00 +02:00
Michael Vogel
ed33d28e61 redoing the change concerning the hostname. 2013-08-12 11:09:11 +02:00
Michael Vogel
61020cf174 Merge remote-tracking branch 'upstream/master' 2013-08-11 21:20:36 +02:00
Michael Vogel
e746c4955b Added an option to configure the hostname manually. And there was a problem when APC wasn't present. 2013-08-11 21:19:26 +02:00
Michael Vogel
d92a348cf0 - Using APC to store config values (when present) 
- Enabling interlacing for pictures
 2013-08-09 18:28:50 +02:00
fabrixxm
1df7211dfd Merge pull request #751 from fabrixxm/master 
move register_adminadd_eml.tpl to view/en/
 2013-08-08 08:36:22 -07:00
Fabrixxm
e8171a03d1 move register_adminadd_eml.tpl to view/en/ 2013-08-08 11:35:12 -04:00
Tobias Diekershoff
1b3961286d PT BR: update to the strings 2013-08-06 20:12:37 +02:00
fabrixxm
7e61c23994 Merge pull request #744 from annando/master 
- More visible reshares
- lockfile for onepoll.php
- clear old smarty3 cache files
- rework tag serarch
- add more logs for diaspora messages
 2013-08-06 09:50:51 -07:00
Michael Vogel
6576aae938 If APC is enabled then store config data there 2013-08-06 00:20:16 +02:00
Michael Vogel
e40bcbb4bc Some debugging information added 2013-08-05 23:06:40 +02:00
Michael Vogel
741b932cc9 Merge remote-tracking branch 'upstream/master' 2013-08-05 20:32:02 +02:00
Michael Vogel
f70a80bbe5 Changed the tag search. This hopefully speeds it up on larger systems. 2013-08-05 20:31:08 +02:00
fabrixxm
3e4c4f53f7 Merge pull request #750 from zered/deleted_user_disp 
Deleted user display in admin page
 2013-08-05 04:24:54 -07:00
Zered
82972be85e Adding a "User waiting for permanent deletion" table in admin page 2013-08-05 06:08:33 +02:00
Matthew Exon
11163c6fb3 Allow calls to fetch_url to specify a cookiejar file, for sites that refuse to deliver content without setting a cookie 2013-08-05 10:59:22 +08:00
fabrixxm
9b79c6607c Merge pull request #748 from fabrixxm/bug739 
add tag to term table. fix hex tag filter. close #739
 2013-08-04 00:17:07 -07:00
Fabrixxm
3f36d375e2 hex tag filter: look at entire string 2013-08-04 03:12:17 -04:00
Fabrixxm
2f6333c751 remove debug code. again. 2013-08-04 03:11:01 -04:00