fabrixxm
|
52614bd72b
|
Merge pull request #629 from tobiasd/admin-info
Admin info
|
2013-02-25 05:04:58 -08:00 |
|
|
|
f97c81c178
|
kill some newlines
|
2013-02-25 13:05:30 +01:00 |
|
|
|
7186331a89
|
Admin panel: show if an account has expired
|
2013-02-25 13:02:17 +01:00 |
|
|
|
6100ae98a2
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2013-02-24 18:19:55 +01:00 |
|
fermionic
|
cf677a3003
|
Merge pull request #628 from fermionic/20130223-limit-body-size-on-email-imports
run limit_body_size on imported emails, which don't go through consume_feed
|
2013-02-24 07:13:21 -08:00 |
|
|
|
ab81be3bb1
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2013-02-24 12:31:25 +01:00 |
|
|
|
521ccc38c6
|
Merge pull request #625 from tobiasd/master
make sure conv_as->items is an array or don't proceed
|
2013-02-23 23:27:21 -08:00 |
|
|
|
69776fc54e
|
Merge pull request #627 from fermionic/20130223-quattro-vier-smarty-updates
some smarty templates needed updating
|
2013-02-23 23:26:48 -08:00 |
|
|
|
c83b82ee2b
|
Merge pull request #626 from fermionic/20130223-disable-content-in-notifications
admin option to disable content in email notifications
|
2013-02-23 23:25:49 -08:00 |
|
|
|
c0d1caa47d
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2013-02-23 19:57:31 +01:00 |
|
|
|
023752ae46
|
DE: update to the strings
|
2013-02-23 19:56:21 +01:00 |
|
Zach Prezkuta
|
fcab22b80f
|
run limit_body_size on imported emails, which don't go through consume_feed
|
2013-02-23 10:06:59 -07:00 |
|
Zach Prezkuta
|
047cf0d342
|
some smarty templates needed updating
|
2013-02-23 09:36:00 -07:00 |
|
Zach Prezkuta
|
3843f821b2
|
better description
|
2013-02-23 09:33:29 -07:00 |
|
Zach Prezkuta
|
4db50a3ecb
|
admin option to disable post content in email notifications for the site
|
2013-02-23 09:31:34 -07:00 |
|
|
|
c2b49f2588
|
make sure conv_as->items is an array or don't proceed
|
2013-02-23 12:42:55 +01:00 |
|
|
|
c35b21eb18
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2013-02-23 08:25:12 +01:00 |
|
friendica
|
6e21534f23
|
Merge https://github.com/friendica/friendica into pull
|
2013-02-22 17:12:14 -08:00 |
|
friendica
|
c8717ede42
|
rev update
|
2013-02-22 17:12:03 -08:00 |
|
fabrixxm
|
45de0fa21b
|
Merge pull request #624 from fabrixxm/quattrofixs
Some fixs to Quattro theme
|
2013-02-22 08:29:29 -08:00 |
|
fabrixxm
|
331fcdb94b
|
Merge pull request #623 from fabrixxm/master
IT strings update
|
2013-02-22 08:26:52 -08:00 |
|
Fabrixxm
|
7ac30330c6
|
update IT strings.php
|
2013-02-22 11:21:34 -05:00 |
|
Fabrixxm
|
7a6d63a1b3
|
quattro: autocomplete private message To field
|
2013-02-22 11:02:01 -05:00 |
|
Fabrixxm
|
cc210bae3d
|
quattro: fix item max-width, fix contact serarch autocomplete popup style
|
2013-02-22 10:45:40 -05:00 |
|
|
|
6db780dd33
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2013-02-22 16:05:11 +01: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 |
|
|
|
41f31f3282
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2013-02-21 22:47:06 +01: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 |
|
|
|
17ab34c7e7
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2013-02-19 07:27:17 +01:00 |
|
|
|
e0e82afe18
|
Merge pull request #620 from tobiasd/master
CC mails
|
2013-02-18 22:26:09 -08:00 |
|
|
|
4681d79491
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2013-02-18 09:51:39 +01:00 |
|
|
|
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 |
|
|
|
8e65e95d17
|
add multi vs. single user config to the admin panel
|
2013-02-17 17:42:32 +01:00 |
|
|
|
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 |
|
|
|
2f22081a64
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2013-02-17 11:20:11 +01:00 |
|
