Commit graph

7761 commits

Author SHA1 Message Date
fermionic 04a255e393 Merge pull request #652 from mexon/edited_timestamp
items.php edited timestamp logic
2013-03-24 07:30:07 -07:00
fermionic 316b93f9e3 Merge pull request #653 from tobiasd/typo_itemphp
typo found in the php logs
2013-03-24 07:29:44 -07:00
Tobias Diekershoff 4ee23069ad typo found in the php.logs 2013-03-24 09:37:11 +01:00
Tobias Diekershoff 4986e0b3cd PL: update to the strings 2013-03-24 07:26:28 +01:00
Tobias Diekershoff d921ca26d0 RU: update to the strings 2013-03-23 08:49:40 +01:00
Tobias Diekershoff 6f382f016d RU: update to the strings 2013-03-22 07:25:08 +01:00
Tobias Diekershoff 869baa763f PL: update to the strings 2013-03-21 16:01:02 +01:00
Tobias Diekershoff 7d4f312345 DE: update to the strings 2013-03-21 15:57:52 +01:00
fermionic 5a9f1652c7 Merge pull request #651 from tobiasd/admin_logs_wording
Admin logging UI string clarification
2013-03-20 19:08:56 -07:00
Matthew Exon 6edc52f78f Convert received "edited" timestamp to UTC before comparing to what's in the database, and don't overwrite with older items. 2013-03-20 09:00:12 +08:00
friendica 00aab4039d Merge https://github.com/friendica/friendica into pull 2013-03-19 03:31:37 -07:00
friendica 17cb682ed0 rm addon.old 2013-03-19 03:30:50 -07:00
Tobias Diekershoff 39cc7f4565 use _Enable Debugging_ instead of only _Debugging_ in the interface 2013-03-19 07:01:34 +01:00
fermionic 1a49c841d8 Merge pull request #649 from mexon/redirect_fix
Restore redirect functionality removed by change 452ff19d
2013-03-18 18:06:41 -07:00
friendica 133ef9155d don't allow deleted accounts to appear on "manage" page 2013-03-18 17:31:21 -07:00
friendica 108f2e1b81 Merge https://github.com/friendica/friendica into pull 2013-03-18 16:41:56 -07:00
friendica 1ff37ca4c1 double encode any text that is destined for meta fields. 2013-03-18 16:40:33 -07:00
fermionic 887a5e5987 Merge pull request #650 from fermionic/20130316-network-infinite-redirect
prevent infinite redirect on network page for non-existant group
2013-03-16 09:12:35 -07:00
Zach Prezkuta 03f2fa5119 prevent infinite redirect on network page for non-existant group 2013-03-16 10:11:32 -06:00
Matthew Exon c53bdfb163 Restore redirect functionality removed by change 452ff19d 2013-03-14 14:09:42 +08:00
pixelroot bb3e8ad785 modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2013-03-12 10:06:19 +01:00
pixelroot a65ae04bcc modified: view/theme/smoothly/style.css 2013-03-11 19:59:49 +01:00
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