Zach Prezkuta
77529ccdf1
allow individual choice of mobile themes
2012-09-06 17:24:34 -06:00
friendica
f8b81b31f2
rev update
2012-09-05 15:43:19 -07:00
friendica
4cd8233f61
remote_user can now support multiple contacts being logged in at once
2012-09-04 22:50:28 -07:00
friendica
a9deda1e5e
rev update
2012-09-04 20:41:44 -07:00
friendica
ca371de509
rev update
2012-09-03 21:31:00 -07:00
friendica
39c7b34276
rev update
2012-09-02 01:47:04 -07:00
friendica
f88f0bf3f2
Merge https://github.com/friendica/friendica into pull
2012-08-31 01:29:55 -07:00
friendica
b1c8b22aa5
rev update
2012-08-31 01:29:37 -07:00
friendica
2ace7d6646
Merge pull request #451 from fabrixxm/master
...
fixes and tweaks
2012-08-31 01:26:03 -07:00
friendica
724583e386
rev update
2012-08-28 19:08:17 -07:00
Fabrixxm
9ecb984285
Merge remote branch 'friendica/master' into bid-prov
2012-08-28 10:38:40 -04:00
friendica
1b0dd6f2ec
handle Windows proc_run
2012-08-23 16:36:13 -07:00
friendica
9a50454290
rev update
2012-08-23 16:35:40 -07:00
friendica
386b6d081b
moods
2012-08-22 21:36:55 -07:00
friendica
175849494c
rev update
2012-08-22 20:39:36 -07:00
friendica
154be4bc5c
rev update
2012-08-21 19:40:28 -07:00
friendica
179292f758
rev update
2012-08-20 21:36:04 -07:00
friendica
bcec1bddc0
put the real post time into the post
2012-08-19 14:39:43 -07:00
friendica
a26b4e8af1
Merge https://github.com/friendica/friendica into pull
2012-08-18 15:18:02 -07:00
friendica
862a12f8f5
rev update
2012-08-18 15:17:07 -07:00
Zach Prezkuta
b4a4ccfb2b
include login style when necessary
2012-08-18 14:47:59 -06:00
friendica
d233beb4ce
rev update
2012-08-17 22:05:42 -07:00
friendica
f9d703b8fc
rev update
2012-08-16 15:24:02 -07:00
friendica
6184b5cf5a
rev update
2012-08-15 17:12:58 -07:00
friendica
7718b6abea
rev update
2012-08-14 15:21:54 -07:00
friendica
3a601ff66f
rev update
2012-08-13 16:46:24 -07:00
friendica
962c357ebd
common_friends_visitor_widget warning
2012-08-12 15:54:38 -07:00
friendica
6348634a1b
Merge https://github.com/friendica/friendica into pull
...
Conflicts:
view/wall_thread.tpl
2012-08-11 15:42:48 -07:00
friendica
1cd23860cb
rev update
2012-08-11 15:39:45 -07:00
Zach Prezkuta
5e09fc31f5
Threading updates
...
- Add rudimentary thread handling to Frost
- Fix possible CSS bug in several themes from threading update
- Add ability for themes to prevent threading
2012-08-11 14:36:58 -06:00
friendica
ed7e626ed2
Merge https://github.com/friendica/friendica into pull
2012-08-10 16:04:16 -07:00
friendica
b960352b54
rev update
2012-08-10 16:02:20 -07:00
Zach Prezkuta
d9279da369
- Frost Mobile: redo CSS to adjust automatically to the screen width
...
- Frost Mobile: various tweaks and fixes
- Allow themes to limit number of items on the Network page
2012-08-10 08:34:00 -06:00
friendica
ba9c50c0dd
rev update
2012-08-09 15:32:07 -07:00
friendica
101df5145e
rev update
2012-08-08 17:06:54 -07:00
friendica
10b0ce5861
Merge https://github.com/friendica/friendica into pull
2012-08-06 19:52:49 -07:00
friendica
558fbcc69e
rev update + don't tag anything in [] brackets
2012-08-06 19:50:57 -07:00
Zach Prezkuta
d8a13d6e8d
allow themes to change the size of embedded videos
2012-08-06 09:59:57 -06:00
friendica
5d7f9d3b4b
rev update
2012-08-05 21:43:20 -07:00
friendica
bc5b54d7b7
Merge https://github.com/friendica/friendica into pull
2012-08-04 17:03:32 -07:00
friendica
bf19e62ecd
rev update
2012-08-04 17:02:05 -07:00
Zach Prezkuta
63628910b2
-- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter)
...
-- More HTML cleanup in TPL files
-- Various Frost bug fixes and tweaks
2012-08-04 14:02:39 -06:00
friendica
621e737826
fix angle char storage and transmission, rev update
2012-08-03 18:33:11 -07:00
friendica
864b5fc256
rev update
2012-08-02 14:15:56 -07:00
friendica
4cbde6a75d
rev update
2012-08-02 01:23:16 -07:00
friendica
49ad9b355c
rev update
2012-07-31 18:01:55 -07:00
friendica
27ee8620f9
rev update
2012-07-30 14:14:20 -07:00
friendica
299f9e3d9e
rev update
2012-07-29 15:32:26 -07:00
friendica
5e64bccd5c
don't show birthday/event details on mobile devices
2012-07-28 17:48:33 -07:00
friendica
fe19890c3c
Merge https://github.com/friendica/friendica into pull
2012-07-28 16:13:25 -07:00
friendica
61115d7a07
rev update
2012-07-28 16:12:12 -07:00
Zach Prezkuta
1f09e7ad23
Modify Javascript to improve page loading times
...
1. Add template category 'end' that places content right before final </body> tag
2. Move most Javascript from tpl files into one cacheable file, theme.js
3. Load scripts at end of the HTML document instead of in the header
4. Minify several Javascript files
Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.
2012-07-28 09:57:16 -06:00
friendica
50e20a1494
rev update
2012-07-27 17:52:43 -07:00
Fabrixxm
a77fdfa6aa
remove special case for /.well-known/host-meta and add module for /.well-known
2012-07-27 08:58:27 -04:00
friendica
b9f13400d9
rev update
2012-07-25 15:52:26 -07:00
friendica
00043f3f1e
Merge https://github.com/friendica/friendica into pull
2012-07-24 17:25:36 -07:00
friendica
f48e491ba0
rev update
2012-07-24 17:24:53 -07:00
Zach Prezkuta
657347254f
use regular theme choosing logic if no mobile theme is specified
2012-07-24 18:13:19 -06:00
friendica
aa5e60248a
Merge pull request #405 from fermionic/support-for-mobile-themes
...
changes to support a mobile theme
2012-07-23 20:18:23 -07:00
Zach Prezkuta
5cb979f5e4
changes to support a mobile theme
2012-07-23 20:37:00 -06:00
friendica
dbdcbaa7ef
Merge https://github.com/friendica/friendica into pull
2012-07-23 16:51:02 -07:00
Domovoy
c052c6afca
Database can now be automatically updated
2012-07-24 01:21:02 +02:00
friendica
0d631cc08c
hopefully better update handling - never update the current DB version or continue with other updates if there was a failure of any individual update.
2012-07-23 15:57:40 -07:00
friendica
b20a80bf39
rev update
2012-07-23 15:27:25 -07:00
friendica
cdf67ce725
rev update
2012-07-22 15:39:25 -07:00
friendica
5255a5c9a9
rev update
2012-07-21 16:44:15 -07:00
friendica
8c83828f83
rev update
2012-07-20 15:12:21 -07:00
friendica
a54278649f
poke notifications
2012-07-19 20:13:40 -07:00
friendica
d442bbc482
have fun...
2012-07-19 18:17:16 -07:00
friendica
b6a3471608
rev update
2012-07-19 15:27:22 -07:00
friendica
ac47edb775
rev update
2012-07-18 16:28:19 -07:00
friendica
749ae9b297
filter the protocol specifier in bbcode links.
2012-07-17 18:33:04 -07:00
friendica
e477683987
rev update
2012-07-16 17:03:23 -07:00
friendica
3408a56dd3
rev update
2012-07-15 14:22:45 -07:00
friendica
c87d3cb86f
rev update
2012-07-14 14:16:24 -07:00
friendica
bbb022f564
rev update
2012-07-13 13:52:23 -07:00
friendica
ce5ca967c1
rev update
2012-07-12 16:11:43 -07:00
friendica
9a299920eb
language detection - result is stored in item['postopts']
2012-07-11 22:45:14 -07:00
friendica
24ea480276
rev update
2012-07-11 17:55:39 -07:00
friendica
12255dded5
rev update
2012-07-10 18:05:13 -07:00
friendica
1fda9e9365
rev update
2012-07-10 01:06:11 -07:00
friendica
caabb43326
diaspora message receive security issue - check message crypto signer against purported message author and bail if they don't match.
2012-07-08 22:32:04 -07:00
friendica
e94f7ed23d
rev update
2012-07-07 16:20:34 -07:00
friendica
d7920c4c25
term (tag, mention, category, file, etc.) table
2012-07-05 17:59:56 -07:00
friendica
8af78079cb
Merge https://github.com/friendica/friendica into pull
2012-07-05 16:06:43 -07:00
friendica
9951071b5b
rev update
2012-07-05 16:06:01 -07:00
Zach Prezkuta
2edfc3b539
final db updates after testing
2012-07-05 14:31:19 -06:00
friendica
5589bca1e0
fix !@#$ tinymce linebreaks for the thousandth time
2012-07-04 17:15:43 -07:00
friendica
c726a92a3f
punycode hostname
2012-07-03 21:40:13 -07:00
friendica
b550b1326b
Merge https://github.com/friendica/friendica into pull
2012-07-03 16:26:58 -07:00
friendica
7926a0d171
add link to shares
2012-07-03 16:26:14 -07:00
Zach Prezkuta
3fe5bdbd8d
add ability to set maximum pixel length of uploaded pictures
2012-07-02 20:01:23 -06:00
friendica
ced0a208d8
fix double lines
2012-07-02 16:34:01 -07:00
friendica
ab2b3304dc
...and the other bit
2012-07-01 19:40:03 -07:00
friendica
e2a725ff98
pagination start off by one
2012-07-01 19:17:21 -07:00
friendica
dd71f9446b
config to disable email validation
2012-07-01 18:56:00 -07:00
friendica
7747f6fc96
rev update
2012-06-30 17:38:02 -07:00
friendica
a3dfb55029
bug #437
2012-06-30 06:27:46 -07:00
friendica
78e03abed8
convert ent_quotes for jquery calendar title/summary
2012-06-29 20:11:36 -07:00
friendica
7b63e5792a
more pager limits
2012-06-28 21:39:02 -07:00
friendica
de93c61e0d
remove titles in ostatus even when edited date differs from created date
2012-06-28 16:04:00 -07:00
friendica
eb3bbd9081
insidious little parsing bug
2012-06-26 22:32:07 -07:00
friendica
b02c733967
service class restrict the email connector
2012-06-26 18:30:20 -07:00
friendica
fbaca4b742
event summary/title
2012-06-25 20:55:27 -07:00
friendica
eebb2d2120
rev update
2012-06-25 15:34:23 -07:00
friendica
c464bc494c
add like/dislike to profiles
2012-06-24 21:16:55 -07:00
friendica
9528beac34
sidebar photo album list not visible to anybody if user['hidewall'] set
2012-06-24 16:51:39 -07:00
friendica
7f3813e9b0
service class basics
2012-06-24 00:56:27 -07:00
friendica
1574396d04
sort out some "like" issues
2012-06-23 21:11:18 -07:00
friendica
181a17bd05
share RSS items
2012-06-22 15:27:06 -07:00
friendica
eeceecc9ba
unterminated sql string
2012-06-22 00:25:01 -07:00
friendica
0f0e5be549
contact search oddities
2012-06-20 16:05:46 -07:00
friendica
1dd33770ed
plugin optimisation - don't loop through every single plugin callback for every hook call, only those registered for that hook
2012-06-19 18:26:40 -07:00
friendica
01aa953951
rework fallback themes, glob pattern was wrong
2012-06-19 16:22:38 -07:00
Zvi ben Yaakov (a.k.a rdc)
4977ef4142
Added App::get_cached_avater_image usage in profile_sidebar function for creating the $diaspora array that is used to populate diaspora_vcard.tpl. This allows the correct profile image revision to be used when dfrn_request friend requests are made.
2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)
9058029eef
Added get_cached_avatar_image to App class for shared profile image access and reduced sql queries/load
2012-06-19 16:05:37 -07:00
friendica
9c844e3bbe
rev update
2012-06-19 16:04:20 -07:00
friendica
341a5a2672
public forum author using private posting, correct the comment permissions downstream.
2012-06-18 17:19:56 -07:00
friendica
b385729c17
rev update
2012-06-17 16:00:47 -07:00
friendica
7c2d27e275
rev update
2012-06-16 17:29:42 -07:00
friendica
4faf0e609f
rev update
2012-06-16 03:35:45 -07:00
friendica
8c94fa23bf
Merge https://github.com/friendica/friendica into pull
2012-06-14 17:39:17 -07:00
friendica
be090cc851
better handling of dead contacts
2012-06-14 16:56:46 -07:00
fabrixxm
f66ae301b8
network: fix bug #453
2012-06-14 10:04:13 -04:00
friendica
d908c9dd71
disable archive widget for PHP < 5.3
2012-06-13 16:17:45 -07:00
friendica
832d9eeaaf
more fixes
2012-06-12 16:17:34 -07:00
friendica
30295926b9
make sure default timezone is set in external processes
2012-06-11 19:52:46 -07:00
friendica
24e85c95b6
date based profile wall filter - backend
2012-06-11 19:36:04 -07:00
friendica
09f74be14c
variable confusion in poller, don't allow negative page offsets
2012-06-11 17:24:16 -07:00
friendica
3b9c3d886d
sheesh
2012-06-11 16:21:27 -07:00
friendica
4f9fb37925
rev update
2012-06-10 16:31:00 -07:00
friendica
ff8d159698
rev update
2012-06-10 00:59:36 -07:00
friendica
67d8afb9d1
Merge https://github.com/friendica/friendica into pull
2012-06-07 15:48:04 -07:00
friendica
c4aeb57fcd
rev update
2012-06-07 15:46:07 -07:00
Fabio Comuni
7cc8c369cb
Add support for PNG images with alpha
2012-06-07 17:42:13 +02:00
friendica
dd001e32f4
rev update
2012-06-06 16:02:10 -07:00
friendica
7cc7a14380
rev update
2012-06-05 17:59:12 -07:00
friendica
9f4b897261
Merge https://github.com/friendica/friendica into pull
2012-06-03 14:48:28 -07:00
friendica
0b657aa235
rev update
2012-06-03 14:47:53 -07:00
Zach Prezkuta
2a01ae8149
database updates
2012-06-03 14:53:30 -06:00
friendica
d27c6de84e
add hometown to profiles
2012-06-02 20:58:20 -07:00
friendica
4978ee12d1
webfinger profile linker
2012-06-02 18:05:23 -07:00
friendica
608d424b0b
"howlong" added to marital status.
2012-06-02 02:30:26 -07:00
friendica
0165d5dd2c
registration issue after re-factor
2012-06-01 15:42:13 -07:00
friendica
93bc29a711
turn registration code into a standalone function for re-use
2012-05-31 19:06:17 -07:00
friendica
069361f946
rev update
2012-05-30 15:50:30 -07:00
friendica
88a0d6a1d5
private group tests, cont.
2012-05-29 22:57:15 -07:00
friendica
419cf91aae
bugfixes: private photo embeds and search for strings with %
2012-05-29 16:44:02 -07:00
friendica
f033c9a4ae
rev update
2012-05-28 16:51:52 -07:00
friendica
2bd1004587
rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by.
2012-05-27 21:01:58 -07:00
friendica
5a7363b248
more ssl policy stuff
2012-05-26 16:21:48 -07:00
friendica
73c61b6f96
allow force ssl on notifications
2012-05-26 16:11:51 -07:00
friendica
fafd41f4bf
keep private FB stuff out of personal notes
2012-05-25 14:36:17 -07:00
friendica
abb9fecf09
rev update
2012-05-25 00:42:38 -07:00
friendica
6bcfda6d53
rev update
2012-05-23 15:46:04 -07:00
friendica
e70573f34c
if identity (uid) changes - reload any other open browser windows on next ping.
2012-05-22 16:01:07 -07:00
friendica
54e2c1ca81
rev update, bug 428, 429, and ability to block globaldir submissions from demo sites
2012-05-21 16:40:11 -07:00
friendica
afaf9ec74f
rev update
2012-05-20 18:30:02 -07:00
friendica
dd86f40f96
set comment permissions explicitly to parent permissions
2012-05-19 16:42:24 -07:00
friendica
4133df6223
profile change activity link bug
2012-05-18 17:55:11 -07:00
friendica
7b0ded3f14
more private forums, default privacy group for new contacts
2012-05-17 22:44:52 -07:00
friendica
d5d853f37f
setup delivery chain for private groups (work in progress)
2012-05-17 19:35:24 -07:00
friendica
6744b5975c
rev update
2012-05-16 13:52:11 -07:00
friendica
205c09e4f0
rev update
2012-05-15 17:05:28 -07:00
friendica
2b471d6df3
rev update
2012-05-14 16:32:21 -07:00
friendica
2bd4ff5705
rev update
2012-05-13 16:40:02 -07:00
friendica
e7813f22af
slackr drop shadows
2012-05-12 22:19:29 -07:00
friendica
aa83198611
rev update
2012-05-12 01:27:33 -07:00
friendica
496782e468
moderated comment templates
2012-05-11 03:41:29 -07:00
friendica
8600afafe2
rev update
2012-05-10 18:50:11 -07:00
friendica
4a42414135
rev update
2012-05-09 18:15:27 -07:00
friendica
8be8db39de
rev update
2012-05-09 17:56:05 -07:00
friendica
70a07086ad
slight improvement in a couple of queries
2012-05-08 22:46:40 -07:00
friendica
10812e0c19
make it optional to optimize the item table after expire
2012-05-08 15:33:01 -07:00
friendica
189a31e628
If a contact has had delivery issues in the last 15 minutes, send new posts straight to the queue
...
and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of
stuck processes trying to connect with dead or dying servers significantly.
2012-05-07 15:54:49 -07:00
friendica
8e46c43ee1
rev update
2012-05-06 19:52:22 -07:00
friendica
49ccefd6c7
bad sql left after the mailbox in/out merge
2012-05-05 17:53:23 -07:00
friendica
7c6e8b30b2
only show remove category to item owner
2012-05-04 16:45:10 -07:00
friendica
f3e18df55d
string update
2012-05-03 16:55:03 -07:00
friendica
3be9cddfd7
rev update
2012-05-02 15:26:57 -07:00
friendica
dc31b93941
provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc.
2012-05-02 01:45:57 -07:00
friendica
dd27328390
perform basic validation
2012-05-01 23:15:39 -07:00
friendica
38ccd2e655
convert html entities to utf-8 before email header encoding
2012-05-01 15:49:22 -07:00
friendica
584ac68ae4
adding zrl support to social graphs
2012-05-01 01:16:47 -07:00
friendica
d48cd0f9a3
hidden plugins (add .hidden file to dir)
2012-04-30 23:07:52 -07:00
friendica
88c77083e6
rev update
2012-04-30 17:17:19 -07:00
friendica
05df5337dd
start adding tooltips to tab menus
2012-04-30 05:15:29 -07:00
friendica
0639f645d2
activitystreams schema constants for "join group"
2012-04-29 23:15:12 -07:00
friendica
0153d86b7f
admin page to manage failed updates
2012-04-29 19:10:07 -07:00
friendica
e3fecb2557
improved db error logging
2012-04-29 17:34:54 -07:00
friendica
249a6814cd
add db field for removed account, which will also be the first test of update error checking
2012-04-29 01:08:28 -07:00
friendica
b3a71e4327
indicate successful updates
2012-04-28 21:35:14 -07:00
friendica
356bd9b04a
some constants for the db update failure possibilities
2012-04-28 17:53:19 -07:00
friendica
7919d00399
bring back the email and logging of update failures, but without the transactions
2012-04-28 17:50:28 -07:00
friendica
4ff2e9a103
a few more continues that should be returns
2012-04-28 16:54:33 -07:00
friendica
0ab6b60a52
archive contact flag
2012-04-27 16:46:28 -07:00
friendica
c7cbff6fbb
rev update
2012-04-27 15:55:56 -07:00
friendica
f8e7f28f40
rev update
2012-04-26 15:35:00 -07:00
friendica
78579627ce
rev update, fix autoname test "random" failure
2012-04-26 01:33:41 -07:00
friendica
139c2c1bbd
Merge https://github.com/friendica/friendica into pull
2012-04-24 17:55:56 -07:00
friendica
a5f9e67c9f
rev update
2012-04-24 17:55:35 -07:00
Fabio Comuni
62ad5043d6
remove html from get_birthdays() and get_events()
2012-04-24 09:50:10 +02:00
Fabio Comuni
fc61616c53
events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id])
2012-04-24 08:12:30 +02:00
friendica
f265863435
more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips
2012-04-23 18:28:33 -07:00
friendica
00cb7f9efb
don't allow non-existent themes as choices
2012-04-22 16:24:29 -07:00
friendica
371f3e450e
rev update
2012-04-21 19:28:45 -07:00
friendica
bdbe068b95
rev update
2012-04-21 01:18:46 -07:00
friendica
30bbbf32e5
rev update
2012-04-20 06:31:38 -07:00
friendica
7ebca2b37d
rev update
2012-04-16 22:58:52 -07:00
friendica
37bb3c330d
rev update
2012-04-15 16:21:20 -07:00
friendica
0939029b74
track requested profile error msg
2012-04-14 14:45:09 -07:00
friendica
0d869ceb65
pass zrl's to/through global directory
2012-04-14 03:51:41 -07:00
friendica
dfe774179a
rev update
2012-04-13 14:44:37 -07:00
friendica
972c01edb3
profile change activities
2012-04-12 21:10:32 -07:00
friendica
2b01d2b6e0
rev update
2012-04-12 16:12:51 -07:00
friendica
7eb1fbb41f
turn off update transactions until we figure out how to do them safely.
2012-04-12 05:45:28 -07:00
friendica
8a8702c9cd
extensible item_id table for managing all the different message-ids generated by multiple services
2012-04-11 16:13:57 -07:00
friendica
35b978bb1e
rev update
2012-04-10 15:25:15 -07:00
friendica
9a8c69b024
Merge branch 'pull'
2012-04-09 16:55:06 -07:00
friendica
2072fabc78
rev update
2012-04-09 16:54:39 -07:00
Alexander Kampmann
018727aa15
source beautifarming to make review easier
2012-04-09 16:56:01 +02:00
Alexander Kampmann
1370ba5d16
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-09 14:28:21 +02:00
Alexander Kampmann
7187516718
fixed some typos
2012-04-09 14:27:52 +02:00
Alexander Kampmann
7ac4b83c39
made exceptions from the db optional
...
set address for updae mails correctly
2012-04-09 14:04:49 +02:00
friendica
977625a53b
fix to wall_upload photos default permissions to use cid rather than uid.
2012-04-08 16:19:45 -07:00
Alexander Kampmann
0d60dbef31
added exceptions to dba class
...
added exception handling to index.php, please mind that there is no
recovery at the moment
added transactions to db update. Please mind that they might not be
supported by db table engines.
added admin email on failed updates
added german translation for admin email
2012-04-09 00:45:10 +02:00
friendica
741a5dba57
provide theme_init() functions
2012-04-08 05:52:00 -07:00
friendica
3afc9915e3
rev updates
2012-04-08 05:24:11 -07:00
friendica
3a1c78bd75
some work on tests
2012-04-07 01:04:45 -07:00
friendica
13dfb40128
fix messed up config tables w/ duplicate entries
2012-04-06 05:11:09 -07:00
friendica
0731c177eb
fix bad sql update
2012-04-06 03:25:01 -07:00
friendica
4bee1859be
Merge branch 'pull'
2012-04-05 21:43:38 -07:00
friendica
053048af10
rev update
2012-04-05 14:37:30 -07:00
Alexander Kampmann
355c42cb30
Merge branch 'master' of https://github.com/friendica/friendica
...
Conflicts:
include/config.php
update.php
2012-04-05 13:39:15 +02:00
Alexander Kampmann
cbf4544887
added index to config and pconfig table
...
changed config.php to use REPLACE instead of INSERT,
this removes one db hit.
2012-04-05 13:27:09 +02:00
friendica
62c60fd53d
bug: diaspora_enabled setting turns it on but doesn't fully turn it off.
2012-04-04 14:13:34 -07:00
friendica
3db2cf76b9
remove loozah themes which fell too far behind to recover
2012-04-03 16:40:25 -07:00
friendica
9391fc965d
bug #363 and a couple of other reported ssl link issues
2012-04-02 17:43:11 -07:00
Michael Johnston
581b54c974
allow users to set categories on their posts
2012-04-01 21:28:31 -04:00
friendica
00bbb9ad36
slight improvement in handling of plaintext feeds
2012-04-01 15:43:57 -07:00
friendica
5c2fdc795f
send unverified private mail using zrl
2012-04-01 00:59:35 -07:00
friendica
2147e0a71f
ensure all new users get a timezone. We'll use UTC until they choose otherwise.
2012-03-31 16:08:40 -07:00
friendica
0cf2e051bb
escape % in file_tag_query as it is ultimately embedded in a sprintf
2012-03-31 14:48:35 -07:00
friendica
b4b1055b50
settings for unknown private mail acceptance
2012-03-31 00:57:59 -07:00
friendica
aace55df0a
Merge branch 'pull'
2012-03-30 15:12:20 -07:00
friendica
cfdfcb37cb
don't delete contact from a friend request if friendship was already established
2012-03-30 15:10:50 -07:00
Fabio Comuni
01af7d355a
allow themes to use "style.php" instead of "style.css".
...
Load style.php trhu mod/view.php to pass it friendica framework.
2012-03-30 21:18:25 +02:00
friendica
bb8beb26b4
use zrl to get home again
2012-03-29 20:58:32 -07:00
friendica
5921dc6f16
typo in function name
2012-03-29 16:01:44 -07:00
friendica
60fe74ce97
network permission ids
2012-03-28 19:56:14 -07:00
