|
|
cda327a368
|
Merge pull request #658 from annando/master
Mail importing problems, a small "vier" change
|
2013-03-30 01:46:13 -07:00 |
|
Michael Vogel
|
eabefb2f04
|
vier: The background color of the right area is now white.
|
2013-03-29 11:18:20 +01:00 |
|
|
|
ad48ab2928
|
DE: update to the strings
|
2013-03-28 07:49:58 +01:00 |
|
friendica
|
74954e6c68
|
Merge pull request #656 from fabrixxm/master
phpdocs for include/text.php
|
2013-03-27 19:44:24 -07:00 |
|
friendica
|
1eb56116e8
|
Merge pull request #657 from mexon/cron_lock
Add separate lock file for cronhooks, which might also take a long time ...
|
2013-03-27 19:41:59 -07:00 |
|
Matthew Exon
|
c3621407d1
|
Remove debug line added by mistake
|
2013-03-28 10:29:27 +08:00 |
|
Matthew Exon
|
10b68ef837
|
Add separate lock file for cronhooks, which might also take a long time and shouldn't be allowed to interfere with itself
|
2013-03-28 09:49:10 +08:00 |
|
pixelroot
|
d685181101
|
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
|
2013-03-27 20:08:06 +01:00 |
|
Fabrixxm
|
1a8bdf8ae8
|
more phpdocs
|
2013-03-27 10:28:56 +01:00 |
|
Fabrixxm
|
a161b86d1f
|
add phpdoc
|
2013-03-27 05:11:40 -04:00 |
|
|
|
e7c705c9a1
|
Merge pull request #654 from mexon/filter_var
Use filter_var instead of parse_url to validate URLs, since the latter r...
|
2013-03-26 11:31:11 -07:00 |
|
pixelroot
|
2b7dd2f72b
|
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
|
2013-03-26 17:10:58 +01:00 |
|
pixelroot
|
296c49f4a1
|
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
|
2013-03-26 15:47:17 +01:00 |
|
pixelroot
|
0a446da659
|
modified: view/theme/smoothly/css/typography.css
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
|
2013-03-26 11:28:22 +01:00 |
|
|
|
48ba0619c5
|
PL: update to the strings
|
2013-03-26 07:27:09 +01:00 |
|
|
|
80b78705ef
|
Merge pull request #655 from tobiasd/admin_ostatus_poll
Admin ostatus poll
|
2013-03-25 23:16:49 -07:00 |
|
|
|
8666673175
|
template additions for the options
|
2013-03-25 11:01:54 +01:00 |
|
|
|
c43e65e26b
|
OStatus conversation poll option in the admin panel
|
2013-03-25 11:00:13 +01:00 |
|
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 |
|
|
|
4ee23069ad
|
typo found in the php.logs
|
2013-03-24 09:37:11 +01:00 |
|
|
|
4986e0b3cd
|
PL: update to the strings
|
2013-03-24 07:26:28 +01:00 |
|
|
|
d921ca26d0
|
RU: update to the strings
|
2013-03-23 08:49:40 +01:00 |
|
|
|
6f382f016d
|
RU: update to the strings
|
2013-03-22 07:25:08 +01:00 |
|
|
|
869baa763f
|
PL: update to the strings
|
2013-03-21 16:01:02 +01:00 |
|
|
|
7d4f312345
|
DE: update to the strings
|
2013-03-21 15:57:52 +01:00 |
|
Matthew Exon
|
c7cfc6b170
|
Use filter_var instead of parse_url to validate URLs, since the latter returns true even for invalid URLs, in particular the empty string
|
2013-03-21 16:27:12 +08: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 |
|
|
|
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 |
|
Michael Vogel
|
111495423c
|
Imported mails were deleted the second time the poller ran - when moving or deleting of mails was activated.
|
2013-03-14 23:15:15 +01: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
|
e200040c5b
|
Merge remote-tracking branch 'upstream/master'
|
2013-03-07 20:20:12 +01: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 |
|
