Michael Vogel
|
1a1984c78d
|
Updated from master
|
2013-02-17 12:36:54 +01:00 |
|
Michael Vogel
|
93143702ed
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
boot.php
database.sql
library/fancybox/jquery.fancybox-1.3.4.css
mod/search.php
update.php
|
2013-02-17 12:35:40 +01:00 |
|
Tobias Diekershoff
|
2f22081a64
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2013-02-17 11:20:11 +01:00 |
|
Tobias Diekershoff
|
2e6577fb32
|
DE; update to the strings, fixing #476
|
2013-02-17 11:19:12 +01:00 |
|
Tobias Diekershoff
|
fca8a23265
|
use enotify to send CC mails
|
2013-02-17 08:20:29 +01:00 |
|
friendica
|
3d86f47bbd
|
Merge pull request #618 from tobiasd/master
use item title (if set) as mail subject
|
2013-02-16 15:56:31 -08:00 |
|
friendica
|
00cd04f193
|
Merge pull request #619 from fermionic/20130216-redir-with-contact-url
add support for doing a redir/ based on contact url
|
2013-02-16 15:56:18 -08:00 |
|
Zach Prezkuta
|
8a8e02cb84
|
add support for doing a redir/ based on contact url
|
2013-02-16 11:38:41 -07:00 |
|
Tobias Diekershoff
|
dfce513c4b
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2013-02-16 11:03:56 +01:00 |
|
Tobias Diekershoff
|
77bc4cd0dc
|
use entry title (if set) as subject when send by email
|
2013-02-16 11:03:46 +01:00 |
|
fabrixxm
|
3d1dd3aac4
|
Merge pull request #617 from fabrixxm/master
Update IT strings
|
2013-02-16 01:03:46 -08:00 |
|
friendica
|
bc03bb5a4a
|
Merge https://github.com/friendica/friendica into pull
|
2013-02-15 17:41:42 -08:00 |
|
friendica
|
bd8350562e
|
2012 is long gone
|
2013-02-15 17:40:58 -08:00 |
|
Michael Vogel
|
3e58060b30
|
API: beautify the output of repeated items
Vier: Birthday reminder looks better
|
2013-02-15 20:14:45 +01:00 |
|
Fabrixxm
|
64ca15f7f9
|
update it strings
|
2013-02-15 11:23:49 -05:00 |
|
fabrixxm
|
9bf0f60290
|
Merge pull request #616 from fabrixxm/master
small fix and feature
|
2013-02-15 03:39:00 -08:00 |
|
Fabrixxm
|
0a79b2300c
|
delete item page respond with json if called via ajax.
|
2013-02-15 06:34:32 -05:00 |
|
Fabrixxm
|
f1a0aeb480
|
Merge remote branch 'friendica/master'
|
2013-02-15 03:17:59 -05:00 |
|
Tobias Diekershoff
|
c5b8082c31
|
ZH-CN: update to the strings to 100% thx Matthew
|
2013-02-11 06:23:55 +01:00 |
|
Tobias Diekershoff
|
3eeee2525c
|
CA: update to the strings
|
2013-02-11 06:21:10 +01:00 |
|
fermionic
|
8f2087a198
|
Merge pull request #611 from fermionic/20130209-cant-select-individual-contacts
don't change to string in prune_deadguys()
|
2013-02-10 19:29:39 -08:00 |
|
fermionic
|
8e80755a47
|
Merge pull request #615 from fermionic/20130210-update-frost-mobile
add new Smarty3 templates
|
2013-02-10 16:12:50 -08:00 |
|
Zach Prezkuta
|
e377fd9d22
|
add new Smarty3 templates
|
2013-02-10 17:11:55 -07:00 |
|
fermionic
|
6b6f00c702
|
Merge pull request #613 from fermionic/20130210-update-frost
update to Frost v0.4
|
2013-02-10 14:02:53 -08:00 |
|
fermionic
|
1a91e6c196
|
Merge pull request #614 from fermionic/20130210-update-frost-mobile
added files for Frost Mobile v0.3
|
2013-02-10 14:02:40 -08:00 |
|
Zach Prezkuta
|
646c161506
|
added files for Frost Mobile v0.3
|
2013-02-10 15:00:20 -07:00 |
|
Zach Prezkuta
|
4d8678e523
|
update to Frost v0.4
|
2013-02-10 14:57:44 -07:00 |
|
tobiasd
|
1bc48d43af
|
Merge pull request #612 from fermionic/20130210-update-frost-mobile
Update Frost-mobile to v0.3
|
2013-02-10 11:04:03 -08:00 |
|
Zach Prezkuta
|
c1c83115ad
|
Update Frost-mobile to v0.3
|
2013-02-10 10:21:52 -07:00 |
|
Zach Prezkuta
|
399e8cd8e4
|
don't change to string in prune_deadguys()
|
2013-02-09 17:52:29 -07:00 |
|
Tobias Diekershoff
|
5195d99216
|
ZH-CN: update to the strings
|
2013-02-08 17:26:08 +01:00 |
|
fermionic
|
7c1c2d8869
|
Merge pull request #610 from fermionic/20130208-duepuntozero-install-crash
move all commands inside the duepuntozero_init() function
|
2013-02-08 08:09:30 -08:00 |
|
Zach Prezkuta
|
c4e6cb916d
|
move all commands inside the duepuntozero_init() function
|
2013-02-08 09:03:50 -07:00 |
|
friendica
|
6242f9a147
|
add .gif to fix_private_photos checking, try another tactic to reduce notification duplication - check for duplicates after storage rather than before. This tactic worked out well to reduce item duplication.
|
2013-02-07 23:43:55 -08:00 |
|
fermionic
|
a0e18a0ff8
|
Merge pull request #601 from fermionic/20130204-100-percent-CPU-usage-on-xmlify
move mb_strlen call out of for loop definition
|
2013-02-06 21:38:15 -08:00 |
|
Zach Prezkuta
|
c886927a52
|
use mb_ereg_replace for xmlify and unxmlify
|
2013-02-06 22:30:27 -07:00 |
|
Zach Prezkuta
|
18f71c1050
|
parsing multi-byte strings with xmlify
|
2013-02-06 00:37:15 -07:00 |
|
Michael Vogel
|
5e077e541a
|
The community page is speeded up.
Photos will be compressed before the output.
|
2013-02-06 08:01:46 +01:00 |
|
Zach Prezkuta
|
774a78dbde
|
better unicode support in xmlify
|
2013-02-05 23:02:13 -07:00 |
|
friendica
|
b00426c9fb
|
Merge pull request #605 from fermionic/20130204-events-request-too-many-dates
limit event queries to one month even if no finish date is specified
|
2013-02-05 17:36:58 -08:00 |
|
friendica
|
c273adf0fe
|
Merge pull request #608 from fermionic/20130204-diabook-reduce-css
Try to start reducing Diabook CSS
|
2013-02-05 17:36:33 -08:00 |
|
friendica
|
2e6446371a
|
Merge pull request #602 from fermionic/20130204-permissions-bug-on-profile-page
fix bug that wouldn't show posts to a user who was in an allowed group
|
2013-02-05 17:36:06 -08:00 |
|
friendica
|
132600eee2
|
Merge pull request #603 from fermionic/20130204-info-message-shown-on-redir
add 'quiet' paramter to redir and dfrn_poll to allow calls
|
2013-02-05 17:35:39 -08:00 |
|
friendica
|
b6008130c4
|
Merge pull request #600 from fermionic/20130204-message-button-on-own-profile
don't show Message button to user on own profile page
|
2013-02-05 17:22:25 -08:00 |
|
friendica
|
34c9156fa1
|
Merge pull request #604 from fermionic/20130204-db-debugging-in-mod-display
take debugging commands out of mod/display
|
2013-02-05 17:22:05 -08:00 |
|
friendica
|
70f02053e1
|
Merge pull request #606 from fermionic/20130204-themes-cant-use-plugin-hooks
allow themes to use plugin hooks
|
2013-02-05 17:21:42 -08:00 |
|
friendica
|
2044862eb9
|
Merge pull request #607 from fermionic/20130204-attach-types-are-too-coarse
add support for more file attachment types
|
2013-02-05 17:19:53 -08:00 |
|
friendica
|
ff8c1be987
|
Merge pull request #609 from fermionic/20130204-move-tpl-scripts-to-util
move tpl scripts to util
|
2013-02-05 17:19:23 -08:00 |
|
friendica
|
79e9214a75
|
Merge https://github.com/friendica/friendica into pull
|
2013-02-05 15:10:23 -08:00 |
|
friendica
|
9bf8364506
|
rev update
|
2013-02-05 15:09:28 -08:00 |
|