mexon/friendica
1
0
Fork 0
Code Pull requests Activity
7739 commits 5 branches 60 tags 188 MiB
Commit graph

7739 commits

This branch
This branch
All branches
Author SHA1 Message Date
pixelroot a2adc03636 deleted: view/theme/smoothly/login.tpl 
deleted:    view/theme/smoothly/smarty3/login.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2013-03-11 19:19:33 +01:00
fermionic 3399b1ccf6 Merge pull request #648 from mexon/mailstream-prerequisites 
Mailstream prerequisites
 2013-03-10 15:34:54 -07:00
fermionic 91a6a1cb25 Merge pull request #646 from annando/master 
OStatus conversations, "vier" and diaspora android client
 2013-03-10 15:24:27 -07:00
Matthew Exon 720a44bb0b The post_remote_end hook was being called with an escaped version of the item, not very useful. This change moves the hook to the end of item_store and gets all data fresh from the database. 2013-03-09 15:57:50 +08:00
Matthew Exon 4df162d929 Explicitly list protocols that are allowed, rather than using their initials. Also, add cid, which I need for my mailstream plugin to work. 2013-03-09 15:57:40 +08:00
Michael Vogel 5d3613c8bc Vier: The change from blue to black in links is now faded as well. 2013-03-07 19:34:54 +01:00
fabrixxm ce7217c8f6 Merge pull request #647 from fabrixxm/issue-552 
remove authentication from api help/test. fix issue 552.
 2013-03-07 05:21:36 -08:00
Fabrixxm a92ef6f0fe remove authentication from api help/test. fix issue 552. 
identi.ca don't ask for auth on help/test.
 2013-03-07 08:16:53 -05:00
Michael Vogel c40c61c106 OStatus conversations: Fixed a bug when a message hadn't got an id. 
vier: Some more changes to make the side menu static.
In the index.php I did a small change to make friendica compatible with the android client for diaspora.
 2013-03-06 23:23:04 +01:00
Tobias Diekershoff 3bf560f22f Merge pull request #643 from annando/master 
Vier - many changes
 2013-03-05 22:06:39 -08:00
Tobias Diekershoff b94bd93b0b Merge pull request #645 from tobiasd/master 
change twitter API path
 2013-03-04 19:17:10 -08:00
Tobias Diekershoff 86eec2e0fa Twitter API 1.1 2013-03-05 03:48:29 +01:00
fermionic 1b74e3ff10 Merge pull request #644 from fermionic/20130303-no-embedding-private-images-option 
fix disable embedding option description
 2013-03-04 15:57:57 -08:00
Zach Prezkuta 277c47732b fix disable embedding option description 2013-03-04 16:55:07 -07:00
Michael Vogel 86e19dda22 Vier: Some more changes to the theme. 
Added a switch to suppress displaying of the tags.
 2013-03-05 00:46:11 +01:00
Michael Vogel 8bb6b51967 Vier: Some more transition effects 2013-03-04 21:11:31 +01:00
Michael Vogel 421d484839 Merge remote-tracking branch 'upstream/master' 2013-03-04 00:05:17 +01:00
Michael Vogel 478a079665 Vier: Further changes: profile border is rounded. 2013-03-04 00:04:06 +01:00
Michael Vogel 8e1d253568 OStatus conversation: now the creation date of the item is store with the conversation 
vier: The link color and the color of the top bar is changed.
 2013-03-03 23:44:50 +01:00
friendica 631085462e Merge pull request #642 from oohlaf/master 
Ignore invalid tokens when scraping an URL
 2013-03-03 14:38:17 -08:00
Olaf Conradi 77f4a36d90 Ignore invalid tokens when scraping an URL 2013-03-03 21:41:27 +01:00
friendica 1c55b0b359 Merge pull request #639 from annando/master 
Community/Open Graph
 2013-03-03 12:07:52 -08:00
friendica ee70e02d0d Merge pull request #640 from fermionic/20130303-no-embedding-private-images-option 
allow admin to prevent private image embedding on hub
 2013-03-03 12:07:35 -08:00
friendica 2c1729e7a8 Merge pull request #641 from oohlaf/master 
Fix SQL error
 2013-03-03 12:06:10 -08:00
Olaf Conradi aa7aa59def Fix SQL error for missing AND operator 
AND operator was missing from WHERE clause
 2013-03-03 20:44:52 +01:00
Michael Vogel 00888a73bb OStatus conversation: Prevent posting loops 2013-03-03 17:58:35 +01:00
Zach Prezkuta 0187283709 allow admin to prevent private image embedding on hub 2013-03-03 09:44:41 -07:00
fermionic ee263aec55 Merge pull request #636 from fabrixxm/installer/checkphpcli 
install: add check for php-cli
 2013-03-03 07:51:51 -08:00
fermionic ef39edd845 Merge pull request #638 from tobiasd/issue_197 
put edited meta info in item object to give theme developers the chance ...
 2013-03-03 07:48:51 -08:00
Michael Vogel 05597b564d Merge remote-tracking branch 'upstream/master' 2013-03-03 16:30:18 +01:00
Tobias Diekershoff 4e68a6b3e0 typo 2013-03-03 12:02:45 +01:00
Tobias Diekershoff 0b925899d4 put edited meta info in item object to give theme developers the chance to display this in a fancy way 2013-03-03 11:47:01 +01:00
friendica 583e82aeb5 Merge https://github.com/friendica/friendica into pull 2013-03-02 15:47:23 -08:00
friendica f07df4f667 merge 2013-03-02 15:46:54 -08:00
friendica 59c03edbc9 fix util/config 2013-03-02 15:44:00 -08:00
Michael Vogel 2866f62c88 Suppoorting Open Graph and Dublin Core when displaying single item 
Following link shorteners in parse_url
 2013-03-02 14:46:06 +01:00
Thomas Willingham 7e7e88d4ad Add sample lighttpd config, from the mailing list. 2013-03-01 19:55:33 +00:00
fabrixxm 40f61f7841 Merge pull request #637 from fabrixxm/lang/it 
update IT strings
 2013-03-01 08:29:02 -08:00
Fabrixxm 1524c15ba5 update IT strings 2013-03-01 11:27:43 -05:00
Tobias Diekershoff c54b61cf81 DE: update to the strings 2013-03-01 16:24:58 +01:00
Fabrixxm 4791e5b245 install: add check for php-cli 
Check won't pass if $php -v won't return "(cli)"
 2013-03-01 04:43:04 -05:00
fermionic 78cc56309b Merge pull request #633 from tobiasd/admin-info-themes 
Admin info themes
 2013-02-28 17:00:56 -08:00
fabrixxm 570f67187d Merge pull request #635 from fabrixxm/addonlangs 
fix bug in run_xgettext, update messages.po
 2013-02-28 07:16:18 -08:00
Fabrixxm 3d3aebeda1 fix bug in run_xgettext, update messages.po 2013-02-28 10:14:40 -05:00
Tobias Diekershoff a84e9196fb ZH-CN: update to the strings 2013-02-28 08:59:06 +01:00
Tobias Diekershoff 56b8118485 PL: update to the strings 2013-02-28 08:55:38 +01:00
Tobias Diekershoff cd478ecdca exp account info in decaf-mobile 2013-02-28 08:10:05 +01:00
Tobias Diekershoff 42a054c667 exp account info in frost-mobile 2013-02-28 08:07:41 +01:00
Tobias Diekershoff 209ebd4e74 exp account info in frost 2013-02-28 08:03:34 +01:00
Tobias Diekershoff 36959cfc4b exp accounts info in diabook 2013-02-28 08:01:37 +01:00