friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
7645 commits 1 branch 22 tags 59 MiB
Commit graph

7645 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabrixxm 7ac30330c6 update IT strings.php 2013-02-22 11:21:34 -05:00
zzottel ad16311be6 Merge pull request #622 from zzottel/master 
reorder iteam table update
 2013-02-22 04:27:49 -08:00
zottel a17dd541ee reorder the update of the item table as instructed by Michael Vogel 2013-02-22 13:26:11 +01:00
friendica 280b72b9e6 Merge https://github.com/friendica/friendica into pull 2013-02-21 16:43:01 -08:00
friendica 615b060352 rev update 2013-02-21 16:42:34 -08:00
fermionic dbf51229d9 Merge pull request #621 from annando/master 
Using "term" table to improve performance, OStatus autocomplete, some more performance stuff
 2013-02-21 10:16:50 -08:00
pixelroot 5c6562a996 modified: view/theme/smoothly/style.css 2013-02-21 08:46:30 +01:00
Michael Vogel 0d4d15c73d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/admin.php
 2013-02-20 21:57:26 +01:00
Michael Vogel c90272e2ae supressing warning when importing items. Speeding up community. Changed query for the search. 2013-02-20 21:47:36 +01:00
pixelroot c2add79ac0 Merge remote branch 'upstream/master' 2013-02-20 21:03:36 +01:00
pixelroot 7a1947b88a modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2013-02-20 21:03:02 +01:00
23n 39d8fec290 no more googlegroups 
googlegroup links deleted, librelist mail list archive added
 2013-02-20 21:01:19 +01:00
Tobias Diekershoff e0e82afe18 Merge pull request #620 from tobiasd/master 
CC mails
 2013-02-18 22:26:09 -08:00
Tobias Diekershoff bd1c86ed49 PL: update to the strings 2013-02-18 09:18:45 +01:00
friendica c3c2f0a6bd Merge https://github.com/friendica/friendica into pull 2013-02-17 17:23:35 -08:00
friendica d653bc4dbd rev update 2013-02-17 17:23:19 -08:00
Michael Vogel 37389795b0 added robots.txt to the igmnored files 2013-02-17 18:46:39 +01:00
Michael Vogel 7e154d5e4c plugin: orphaned hooks weren't deleted. 
update: fixing update job for tags.
 2013-02-17 18:05:30 +01:00
Tobias Diekershoff 8e65e95d17 add multi vs. single user config to the admin panel 2013-02-17 17:42:32 +01:00
Tobias Diekershoff aa2f1c38e9 add 'hide_help' to admin panel 2013-02-17 12:37:45 +01:00
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
Tobias Diekershoff 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