friendica
1fda9e9365
rev update
2012-07-10 01:06:11 -07:00
fermionic
2096a5782e
Merge pull request #387 from fermionic/diaspora-slight-signature-bug
...
missed a couple of variable names when I redid comment and like code
2012-07-09 19:38:16 -07:00
Zach Prezkuta
d89b4cea64
missed a couple of variable names when I redid comment and like code
2012-07-09 20:36:25 -06:00
friendica
61ff2ecab2
Merge pull request #385 from fermionic/peculiar-queue-hangup
...
Prevent long delays in Diaspora delivery
2012-07-09 15:47:55 -07:00
Zach Prezkuta
00eb000e36
don't check for was_recently_delayed in diaspora_transmit during a queue run
2012-07-09 09:39:09 -06:00
friendica
ab710bce3b
Merge https://github.com/friendica/friendica into pull
2012-07-08 22:34:21 -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
fcf971fea9
Merge pull request #383 from fermionic/auto-orient-all-uploaded-images
...
auto-orient uploaded wall photos and profile photos also
2012-07-08 15:32:20 -07:00
tomtom84
9ae7555143
Merge pull request #384 from tomtom84/master
...
diabook
2012-07-08 12:53:42 -07:00
tomtom84
f475850739
diabook: add notification in website-title, whenever new notifications arrive
2012-07-08 21:50:17 +02:00
Zach Prezkuta
fb4295f07f
better check for image EXIF support
2012-07-08 11:17:50 -06:00
Tobias Diekershoff
5fc47d03bc
Merge pull request #382 from fermionic/archive-widget-bug
...
check for posted dates based on month only
2012-07-08 08:39:01 -07:00
Zach Prezkuta
9fbe921051
auto-orient uploaded wall photos and profile photos also
2012-07-08 09:18:05 -06:00
Zach Prezkuta
c8378260bc
check for posted dates based on month only
2012-07-08 08:46:46 -06:00
friendica
63f10f6c6b
Merge https://github.com/friendica/friendica into pull
2012-07-07 21:55:15 -07:00
friendica
a3640b4e9f
Merge pull request #381 from fermionic/embed-multiple-private-photos
...
Embed multiple private photos
2012-07-07 21:15:52 -07:00
Zach Prezkuta
6d10374c17
cleanup
2012-07-07 18:50:46 -06:00
Zach Prezkuta
da2ccebed8
fix bugs
2012-07-07 18:50:33 -06:00
friendica
e94f7ed23d
rev update
2012-07-07 16:20:34 -07:00
Zach Prezkuta
173b3a1b9a
allow more than one embedded private photo
2012-07-07 16:24:20 -06:00
Zach Prezkuta
57635e7684
add function to exclude embedded images when checking message length
2012-07-07 16:24:20 -06:00
friendica
0c5af9f303
Merge pull request #379 from fermionic/events-display-wrong-in-diaspora
...
remove check for event description in bb2diaspora
2012-07-07 04:19:15 -07:00
friendica
7788a93258
Merge pull request #380 from copyninja/master
...
orient function should not be called on png image types
2012-07-07 04:18:13 -07:00
Vasudev Kamath
1b3d84422e
orient function uses exif_read_data for which valid image types are only JPEG and TIFF as per the document [1].
...
When trying to upload an screenshot with png type I was getting message as *failed* even though image was uploading. So added a fix to check image type before calling orient function. Not sure if this is a proper fix but after this i'm not getting any error during file upload
[1] http://au2.php.net/manual/en/function.exif-read-data.php
2012-07-07 16:17:26 +05:30
Zach Prezkuta
4fb996d9f7
remove check for event description, since it's not required to create an event
2012-07-06 17:11:25 -06:00
Vasudev Kamath
ba4db236ec
Merge branch 'master' of git://github.com/friendica/friendica
2012-07-06 22:47:27 +05:30
friendica
a122fecf50
add additional page types to admin user report
2012-07-05 22:30:13 -07:00
friendica
8b19168999
a bit more colour
2012-07-05 22:20:27 -07:00
friendica
a6514e81bb
remove obsolete zot encapsulation functions
2012-07-05 20:58:45 -07:00
friendica
868e04f5eb
Merge pull request #378 from fermionic/apparent-typo-in-function-name
...
my php thinks this is a typo
2012-07-05 19:56:38 -07:00
Zach Prezkuta
47c7fd89ba
my php thinks this is a typo
2012-07-05 20:39:22 -06:00
friendica
a71365d566
Merge pull request #377 from fermionic/local-delete-blank-out-title-and-body
...
clear title and body of items on local delete
2012-07-05 19:14:27 -07:00
Zach Prezkuta
5395cf5bd9
clear title and body of items on local delete
2012-07-05 20:07:01 -06:00
friendica
854abcf612
Merge pull request #376 from fermionic/diaspora-prevent-fcontact-race-conditions
...
slightly better way of handling last loop
2012-07-05 18:10:32 -07:00
Zach Prezkuta
528d250ded
slightly better way of handling last loop
2012-07-05 19:08:30 -06:00
friendica
09959b1b1c
Merge pull request #375 from fermionic/diaspora-prevent-fcontact-race-conditions
...
add some timeouts to prevent deadlock
2012-07-05 18:05:32 -07:00
Zach Prezkuta
5dcce1ed93
add some timeouts to prevent deadlock
2012-07-05 19:01:13 -06: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
friendica
fe984963ed
Merge pull request #373 from fermionic/more-list-fixes
...
fix small bug in lists and revert Diaspora list processing to non-Markdo...
2012-07-05 16:03:29 -07:00
friendica
10336651ba
Merge pull request #374 from fermionic/diaspora-prevent-fcontact-race-conditions
...
Prevent fcontact race conditions
2012-07-05 15:57:28 -07:00
Zach Prezkuta
2edfc3b539
final db updates after testing
2012-07-05 14:31:19 -06:00
Zach Prezkuta
e0607e0238
cleanup some syntax errors in lock.php
2012-07-05 14:27:29 -06:00
Zach Prezkuta
75ed37fb3d
"lock" is a reserved MySQL keyword
2012-07-05 14:27:29 -06:00
Zach Prezkuta
46068935d0
minor cleanup in lock.php
2012-07-05 14:26:42 -06:00
Zach Prezkuta
20c4ecbcd9
cleanup obsolete comments
2012-07-05 14:26:42 -06:00
Zach Prezkuta
168ae40dd2
add rudimentary locking capability to Friendica functions
2012-07-05 14:26:42 -06:00
Zach Prezkuta
041aeaf4a1
fix small bug in lists and revert Diaspora list processing to non-Markdownify version
2012-07-05 12:54:52 -06:00
friendica
360c35e438
recycle symbol woes with multiple html entity encode/decode cycles going on
2012-07-04 23:24:59 -07:00
friendica
e29dd081ca
render the recycle symbol correctly on Diaspora reshares
2012-07-04 22:44:04 -07:00
friendica
f40b056e3b
some initial code and benchmarking for "red" content rendering engine
2012-07-04 20:37:15 -07:00
friendica
0990269555
restore translation of bbcode videos, events, bookmarks, etc. to diaspora
2012-07-04 19:12:09 -07:00
friendica
5589bca1e0
fix !@#$ tinymce linebreaks for the thousandth time
2012-07-04 17:15:43 -07:00
friendica
fd626022ec
add smarty engine, remove some obsolete zot1 stuff
2012-07-03 22:23:08 -07:00
friendica
13b4962531
Merge https://github.com/friendica/friendica into pull
2012-07-03 21:41:05 -07:00
friendica
c726a92a3f
punycode hostname
2012-07-03 21:40:13 -07:00
Thomas Willingham
badaa68340
Diabook directory wide variants.
2012-07-04 01:08:50 +01: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
Thomas Willingham
e3828fe675
Merge pull request #372 from rdc/master
...
Resolved CSS error in sidebar profile thumbs
2012-07-03 12:58:57 -07:00
Zvi ben Yaakov (a.k.a rdc)
424797138f
Limiting .directory-photo-wrapper styles to <section> so as not to
...
interfere with .directory-photo-wrapper in <aside>
2012-07-03 21:49:02 +03:00
friendica
14d4635be6
Merge pull request #371 from fermionic/option-to-limit-max-image-pixel-length
...
add ability to set maximum pixel length of uploaded pictures
2012-07-02 19:12:58 -07:00
Zach Prezkuta
3fe5bdbd8d
add ability to set maximum pixel length of uploaded pictures
2012-07-02 20:01:23 -06:00
friendica
f7144e671c
fix diabook directory pages (only the normal style - any volunteers for the wide?)
2012-07-02 16:56:37 -07:00
friendica
ced0a208d8
fix double lines
2012-07-02 16:34:01 -07:00
friendica
64fc1318c6
Merge https://github.com/friendica/friendica into pull
2012-07-02 01:13:30 -07:00
friendica
315784444a
try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up to harder stuff
2012-07-02 01:11:19 -07:00
friendica
a9c65dfe27
"babel" diagnostic - convert bbcode to different formats and back again
2012-07-01 23:00:25 -07:00
Thomas Willingham
610c78f9e0
Merge branch 'master' of https://github.com/friendica/friendica
2012-07-02 03:41:27 +01:00
Thomas Willingham
74a819980f
Various theme stuff.
...
Profile group list for testbubble
Screenshot for facepark
Various niggles in darkzero/NS
2012-07-02 03:40:12 +01: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
696d78d658
Merge pull request #369 from rdc/master
...
Added more profile data and CSS styling to the /directory page
2012-07-01 16:44:21 -07:00
friendica
c102a5f7cd
Merge pull request #370 from mschmitt/master
...
Esperanto at 100% again
2012-07-01 15:37:19 -07:00
Martin Schmitt
85c078f862
Esperanto -> 100%
2012-07-01 19:13:24 +02:00
Zvi ben Yaakov (a.k.a rdc)
2214cd74e5
Added more profile data and CSS styling to the /directory page
2012-07-01 14:46:03 +03: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
6cc844b2f9
restore 'shareable' to feeds after recent feed privacy re-factoring
2012-06-30 05:16:30 -07:00
friendica
31718968c6
advanced profile theming
2012-06-30 01:29:29 -07:00
friendica
ffd5217ffa
Merge https://github.com/friendica/friendica into pull
2012-06-29 20:12:44 -07:00
friendica
78e03abed8
convert ent_quotes for jquery calendar title/summary
2012-06-29 20:11:36 -07:00
friendica
1b27e24bb7
Merge pull request #368 from fabrixxm/master
...
Some work on quattro
2012-06-29 16:34:23 -07:00
Fabrixxm
a03e6b96ea
quattro: fix Forum widget, hide edit profile link
2012-06-29 05:47:53 -04:00
Fabrixxm
8b18ee49ff
quattro: some updates
...
- add makefile to rebuild both css with single command
- fix icons in Forums widget
- style photos pages
2012-06-29 05:29:58 -04:00
Fabrixxm
0fb08e3642
nav: pass $baseurl to template
2012-06-29 05:29:29 -04:00
friendica
be658788de
maintain page position when hovering on pop-outs
2012-06-28 22:19:12 -07:00
friendica
7b63e5792a
more pager limits
2012-06-28 21:39:02 -07:00
friendica
43036bee98
wrong column name (- vs _)
2012-06-28 21:32:49 -07:00
friendica
0ecba60503
undefined fn
2012-06-28 21:15:43 -07:00
friendica
1830ecc9ba
remote_self feeds are not private
2012-06-28 18:52:49 -07:00
friendica
a3edbf7e5d
create third privacy state - public post but not searchable or publicly visible
2012-06-28 17:43:29 -07:00
friendica
43d3721fa9
css smiley class
2012-06-28 16:42:40 -07:00
friendica
d7f35c81db
Merge https://github.com/friendica/friendica into pull
2012-06-28 16:05:28 -07:00
friendica
de93c61e0d
remove titles in ostatus even when edited date differs from created date
2012-06-28 16:04:00 -07:00
Simon
3bd0975c07
Merge pull request #367 from simonlnu/master
...
fix item-delete-selected* css
2012-06-28 09:16:53 -07:00
Simon L'nu
ecf9ad9a08
fix item-delete-selected* css
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-28 12:15:32 -04:00
Simon L'nu
4ae5589df7
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix logic for nested lists--should be OR, not AND
2012-06-28 12:12:43 -04:00
fermionic
26156e1dc4
Merge pull request #366 from fermionic/fix-big-monster-list-logic
...
fix logic for nested lists--should be OR, not AND
2012-06-27 20:24:18 -07:00
Zach Prezkuta
cd9ce0ecb3
fix logic for nested lists--should be OR, not AND
2012-06-27 21:21:26 -06:00
Simon L'nu
4f488c7e3c
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Friendicaland - couple of new 'countries'
insidious little parsing bug
have no idea why the if/endif macro block was getting printed and not processed.
highlight js events-reminder on birthday events
moved api direct message formating to own function. added same formating to direct reply message, when posting a new message.
fixed direct message reply in api call.
modified api message reply to set title to conversion title, when replying.
add reliable way to get server version
make it selectable
I want HTML code!
new param getUserObjects to avoid retransmitting the whole user info objects
bugfix
changes on api_direct_messages_box to allow to retrieve conversations and all messages
modified direct_messages
added replyto and subject to direct messages.
modified conversion to use x function for parameter checking.
2012-06-27 13:11:22 -04:00
Thomas Willingham
3968e71d4c
Friendicaland - couple of new 'countries'
2012-06-27 16:06:02 +01:00
friendica
04397865f9
Merge pull request #365 from ridcully/master
...
Direct-Message Api-Modified
2012-06-27 01:36:03 -07:00
friendica
eb3bbd9081
insidious little parsing bug
2012-06-26 22:32:07 -07:00
friendica
f995a11641
have no idea why the if/endif macro block was getting printed and not processed.
2012-06-26 21:35:03 -07:00
friendica
fa2a8fa9bd
highlight js events-reminder on birthday events
2012-06-27 13:49:35 +10:00
Simon L'nu
5b35a02d26
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
service class restrict the email connector
stray s
typos
add event titles to discovered birthday events
change required doco
change event behaviour so that title is required but description is not
event summary/title
propagate remote deletes
remove possibly unnecessary checks for likes or comments created by Diaspora users
store signature info for remote users too
was passing the wrong arguments to the signature storage function
add some debug logging
revert extra Diaspora disabling changes to try to eliminate Mustard double-posting
Clean up the Diaspora connectivity:
improve remote delete forwarding
typos in bbcode, add service class restrictions to jot uploads
rev update
2012-06-26 22:31:15 -04:00
friendica
b02c733967
service class restrict the email connector
2012-06-26 18:30:20 -07:00
Sebastian Egbers
587b081a38
moved api direct message formating to own function.
...
added same formating to direct reply message, when posting a new message.
2012-06-26 08:54:01 +02:00
Sebastian Egbers
0f0fb2e2f3
Merge branch 'master' of https://github.com/friendica/friendica
2012-06-26 08:33:41 +02:00
friendica
a4b407eb54
stray s
2012-06-25 22:01:32 -07:00
friendica
d32d0e2154
typos
2012-06-25 21:39:07 -07:00
friendica
78ede4744f
add event titles to discovered birthday events
2012-06-25 21:37:38 -07:00
friendica
0f0ffce1b6
change required doco
2012-06-25 21:27:34 -07:00
friendica
359a98cd22
change event behaviour so that title is required but description is not
2012-06-25 21:20:08 -07:00
friendica
fbaca4b742
event summary/title
2012-06-25 20:55:27 -07:00
friendica
53f0aee82d
Merge https://github.com/friendica/friendica into pull
2012-06-25 18:16:55 -07:00
friendica
f1991a5952
propagate remote deletes
2012-06-25 18:15:56 -07:00
fermionic
32f5d4e04a
Merge pull request #364 from fermionic/diaspora-refactor-and-better-disabling
...
Diaspora refactor and better disabling
2012-06-25 18:09:39 -07:00
Zach Prezkuta
28526dbf21
remove possibly unnecessary checks for likes or comments created by Diaspora users
2012-06-25 19:03:03 -06:00
Zach Prezkuta
9e8573507e
store signature info for remote users too
2012-06-25 19:03:03 -06:00
Zach Prezkuta
f495ba2bcb
was passing the wrong arguments to the signature storage function
2012-06-25 19:03:03 -06:00
Zach Prezkuta
5773241537
add some debug logging
2012-06-25 19:03:03 -06:00
Zach Prezkuta
c0c50ece0f
revert extra Diaspora disabling changes to try to eliminate Mustard double-posting
2012-06-25 19:03:03 -06:00
Zach Prezkuta
8bb7ab88fb
Clean up the Diaspora connectivity:
...
- Move Diaspora code into separate functions to make it more modular
- Create more checks for whether Diaspora connectivity has been enabled
2012-06-25 19:03:03 -06:00
friendica
f0b41709eb
improve remote delete forwarding
2012-06-25 17:45:33 -07:00
friendica
fad2679c7e
Merge https://github.com/friendica/friendica into pull
...
Conflicts:
include/bbcode.php
2012-06-25 16:05:42 -07:00
friendica
b044cd922d
typos in bbcode, add service class restrictions to jot uploads
2012-06-25 16:03:46 -07:00
Simon
c291581e13
Merge pull request #363 from simonlnu/master
...
fix typo and syntax error in include/bbcode.php
2012-06-25 15:50:35 -07:00
Simon L'nu
f04647ca4b
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
2012-06-25 18:49:46 -04:00
Simon L'nu
939ebe16f8
fix typo and syntax error
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-25 18:49:36 -04:00
Simon
33b7cd32a6
Merge pull request #362 from simonlnu/master
...
fix margin of .wall-item-body
2012-06-25 15:43:02 -07:00
Simon L'nu
eb6bf7e7fa
fix margin of wall-item-body
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-25 18:42:18 -04:00
friendica
89ad19ce01
Merge https://github.com/friendica/friendica into pull
2012-06-25 15:34:57 -07:00
friendica
eebb2d2120
rev update
2012-06-25 15:34:23 -07:00
Simon
d944ff7833
Merge pull request #361 from simonlnu/master
...
cleaned up the css a bit
2012-06-25 14:25:33 -07:00
friendica
cb450d3365
Merge pull request #360 from fermionic/more-nested-lists
...
allow nested [ol] and [ul] lists too
2012-06-25 14:20:16 -07:00
friendica
cb1d35fb09
Merge pull request #359 from fermionic/mustard-prevent-comment-doubles
...
fix check for parent of StatusNet API post
2012-06-25 14:19:48 -07:00
friendica
d0e14809fd
Merge pull request #358 from rdc/master
...
Added App::get_cached_avatar_image usage for displaying "Last users" avatar thumbs in right sidebar
2012-06-25 14:17:23 -07:00
Simon L'nu
2ed3af55a8
fix delete thingy, and minor clean up
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-25 17:17:06 -04:00
Zach Prezkuta
fa7e803f73
fix check for parent of StatusNet API post
2012-06-25 08:26:12 -06:00
Zach Prezkuta
4293de7554
allow nested [ol] and [ul] lists too
2012-06-25 08:26:00 -06:00
Sebastian Egbers
8c251aebc7
fixed direct message reply in api call.
2012-06-25 16:25:34 +02:00
Sebastian Egbers
af1d4bb632
modified api message reply to set title to conversion title, when replying.
2012-06-25 15:53:56 +02:00
Sebastian Egbers
020deedd7c
Merge branch 'master' of https://github.com/friendica/friendica
2012-06-25 13:59:39 +02:00
Zvi ben Yaakov (a.k.a rdc)
51ef8fb7ff
Added App::get_cached_avatar_image usage for displaying "Last users"
...
avatar thumbs in right sidebar
2012-06-25 14:01:16 +03:00
Zvi ben Yaakov (a.k.a rdc)
94f895e98d
Merge git://github.com/friendica/friendica
2012-06-25 13:59:53 +03:00
friendica
7ea5917bf7
more service class functionality
2012-06-25 03:25:06 -07:00
friendica
35a098e0dc
service limits for photo uploads
2012-06-25 01:37:44 -07:00
friendica
ad6c82bdea
implement "follow" service limits
2012-06-24 22:23:17 -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
fermionic
49ecf58163
Merge pull request #357 from fermionic/fix-relayable-signature-handle
...
ok now I'm just making silly mistakes--take out premature function locki...
2012-06-23 21:29:52 -07:00
Zach Prezkuta
59ebe6f111
ok now I'm just making silly mistakes--take out premature function locking code
2012-06-23 22:28:28 -06:00
friendica
92a997365f
Merge https://github.com/friendica/friendica into pull
2012-06-23 21:11:41 -07:00
friendica
1574396d04
sort out some "like" issues
2012-06-23 21:11:18 -07:00
fermionic
642880f89a
Merge pull request #356 from fermionic/fix-relayable-signature-handle
...
use author handle instead of sender handle
2012-06-23 21:08:43 -07:00
fermionic
38b8317726
Merge pull request #355 from fermionic/missing-urls-after-strip_tags-in-bb2diaspora
...
allow bare URLS to make it through to Diaspora
2012-06-23 21:08:19 -07:00
Zach Prezkuta
0877c5b687
use author handle instead of sender handle
2012-06-23 22:04:20 -06:00
Zach Prezkuta
5d2eed3517
allow bare URLS to make it through to Diaspora
2012-06-23 22:02:08 -06:00
fermionic
098c74a12a
Merge pull request #354 from fermionic/always-terminate-bbcode-list-elements
...
Fix Diaspora list formatting
2012-06-23 19:08:32 -07:00
Zach Prezkuta
1f96839674
small optimization
2012-06-23 20:01:29 -06:00
Zach Prezkuta
4ef33ac6eb
fix BB-to-Diaspora list formatting
2012-06-23 19:57:59 -06:00
Max Weller
cbf1cab0da
Merge remote-tracking branch 'sebastian/master'
2012-06-23 22:59:03 +02:00
Max Weller
e3c36dfd1d
add reliable way to get server version
2012-06-23 22:52:50 +02:00
Zvi ben Yaakov (a.k.a rdc)
00668aaa71
Merge git://github.com/friendica/friendica
2012-06-23 23:51:08 +03:00
Max Weller
11b6beae06
make it selectable
2012-06-23 22:39:11 +02:00
Max Weller
111ace5abd
I want HTML code!
2012-06-23 22:35:43 +02:00
Max Weller
9d462c6b6a
new param getUserObjects to avoid retransmitting the whole user info objects
2012-06-23 19:38:15 +02:00
Simon
381d091267
Merge pull request #352 from fermionic/diaspora-display-scaled-down-image
...
allow linking to Diaspora's scaled-down images
2012-06-23 10:37:59 -07:00
Simon
f6b7b99d16
Merge pull request #353 from simonlnu/master
...
jquery update; templates
2012-06-23 10:36:52 -07:00
Max Weller
2c992c5969
bugfix
2012-06-23 19:35:01 +02:00
Simon L'nu
3b1d9d9695
update jquery to 1.7.2; fix some dispy templates to be more in sync with view/
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-23 13:33:58 -04:00
Max Weller
f45c881815
changes on api_direct_messages_box to allow to retrieve conversations and all messages
2012-06-23 19:29:58 +02:00
Max Weller
d8a376666c
modified direct_messages
2012-06-23 19:21:48 +02:00
Zach Prezkuta
90f8454190
allow linking to Diaspora's scaled-down images
2012-06-23 11:02:15 -06:00
friendica
7a346bc756
this is going to take some more debug before it can be roller out
2012-06-23 07:43:56 -07:00
friendica
63141c73d8
debugging
2012-06-23 07:26:45 -07:00
friendica
a132eda2cf
cokmment likes not propagating
2012-06-23 06:41:37 -07:00
friendica
1ba0d73a9a
make feeds work with comment likes/dislikes
2012-06-23 06:13:11 -07:00
friendica
f55e8e831c
typo
2012-06-23 06:04:56 -07:00
friendica
49360b0a64
Merge https://github.com/friendica/friendica into pull
2012-06-23 05:47:31 -07:00
friendica
22ca358a8c
like comments
2012-06-23 05:46:15 -07:00
friendica
b97c406c82
Merge pull request #351 from annando/master
...
Massive change in bbcode2markdown
2012-06-23 05:11:31 -07:00
friendica
7614d35cad
liking comments backend
2012-06-23 04:44:48 -07:00
Michael Vogel
a81af2e042
Merge remote branch 'upstream/master'
...
Conflicts:
include/bb2diaspora.php
2012-06-23 12:50:00 +02:00
Michael Vogel
7a4ad4564d
Diaspora: Messages are now looking better
2012-06-23 12:42:01 +02:00
friendica
bf47bf5ba0
cleanup mod/share
2012-06-23 03:25:11 -07:00
fermionic
9a43c3689f
Merge pull request #350 from fermionic/improve-bb2diaspora-conversions
...
Improve bb2diaspora conversions
2012-06-22 19:50:44 -07:00
Zach Prezkuta
9c9e727042
cleanup lists and more comment signature stuff
2012-06-22 20:45:37 -06:00
Zach Prezkuta
7b219649a4
expand support for BB code-to-Diaspora conversion
2012-06-22 20:45:37 -06:00
Vasudev Kamath
6e4760dd9c
Merge branch 'master' of git://github.com/friendica/friendica
2012-06-23 08:11:35 +05:30
friendica
4e7eb36dd1
Merge https://github.com/friendica/friendica into pull
2012-06-22 15:27:54 -07:00
friendica
181a17bd05
share RSS items
2012-06-22 15:27:06 -07:00
Simon
9953e6dea4
Merge pull request #349 from simonlnu/master
...
minor template tweaks
2012-06-22 10:08:25 -07:00
Simon L'nu
5cfa7dd041
minor tweaks to some tpl files
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-22 13:07:42 -04:00
Sebastian Egbers
cd25c3b5dd
added replyto and subject to direct messages.
2012-06-22 14:54:31 +02:00
Sebastian Egbers
c14270ac64
modified conversion to use x function for parameter checking.
2012-06-22 13:35:36 +02:00
friendica
99000382cd
Merge https://github.com/friendica/friendica into pull
2012-06-22 00:25:46 -07:00
friendica
eeceecc9ba
unterminated sql string
2012-06-22 00:25:01 -07:00
friendica
2961e6efaf
Merge pull request #348 from max-weller/master
...
List statuses by conversation_id
2012-06-21 05:36:55 -07:00
Max Weller
6fe8a13b64
Added ORDER BY clause for conversation view
2012-06-21 12:55:03 +02:00
Zvi ben Yaakov (a.k.a rdc)
5e3e3915e3
Merge git://github.com/friendica/friendica
2012-06-21 13:38:14 +03:00
Max Weller
0f5a6bfcdb
Added statuses/show parameter ?conversation=true
2012-06-21 10:53:48 +02:00
friendica
53c9ea7606
show last.fm source in username
2012-06-20 23:04:55 -07:00
friendica
91a3a2d551
follow last.fm scrobbles
2012-06-20 22:59:01 -07:00
friendica
788a6626ef
Merge https://github.com/friendica/friendica into pull
2012-06-20 21:11:00 -07:00
friendica
0a302e100d
try and eliminate the openssl warnings for forums trying to talk back to fans
2012-06-20 21:09:52 -07:00
friendica
a64d0ac905
Merge pull request #346 from fermionic/add-rotate-ccw-option
...
allow rotation to be either CW or CCW
2012-06-20 20:34:41 -07:00
fermionic
ec83a62f70
Merge pull request #347 from fermionic/diaspora-more-signature-refinements
...
create new signed text for relayables right when relaying them
2012-06-20 20:02:07 -07:00
Zach Prezkuta
73c6f40ebc
create new signed text for relayables right when relaying them
2012-06-20 20:52:09 -06:00
Zach Prezkuta
54c76ca822
allow rotation either CW or CCW
2012-06-20 20:51:03 -06:00
Thomas Willingham
75e82dc077
Darkzero-NS fix weeks old BBIcon error
2012-06-21 03:14:41 +01:00
Thomas Willingham
c4df339b92
Darkzero/NS - make the archives font the same colour as the other widgets.
2012-06-21 02:42:38 +01:00
friendica
bf0ab10caf
undefined unmark_for_death
2012-06-20 16:35:49 -07:00
friendica
f4e434cd46
sort out contact search oddities
2012-06-20 16:20:55 -07:00
friendica
03c05d8a28
missing paren
2012-06-20 16:07:41 -07:00
friendica
0f0e5be549
contact search oddities
2012-06-20 16:05:46 -07:00
friendica
0d0f129d04
Merge https://github.com/friendica/friendica into pull
2012-06-20 05:06:20 -07:00
friendica
f0db196288
iframes were getting stripped at the rss/atom parser level. We can preserve these because we will strip them in the purifier after checking for supported video sources
2012-06-20 05:04:51 -07:00
Simon
3a8c1a4371
Merge pull request #345 from simonlnu/master
...
theme tweaks
2012-06-20 02:07:16 -07:00
Simon L'nu
0be715d271
icon change; tweak button in toolbar; move site-location
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-20 05:04:04 -04:00
friendica
961c633773
Merge pull request #344 from ridcully/master
...
exclude_replies for twitter api
2012-06-20 01:01:55 -07:00
friendica
b3bf48782f
allow dfrn_deliver to undo a mark_for_death just in case the poller is consistently getting killed.
2012-06-19 20:59:22 -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
friendica
6e06d415bb
Merge https://github.com/friendica/friendica into pull
2012-06-19 16:08: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)
ff2f7dfeef
Added App::get_cached_avatar_image usage on conversation wall of Normal View
2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)
a801888b15
Now using App::get_cached_avatar_image for /photos page
2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)
d4f4ed730c
Now using App::get_cached_avatar_image for /profile/{nickname} page
2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)
6df74b8cd9
Now using App::get_cached_avatar_image for navigation bar
2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)
f8d9f15879
Now using App::get_cached_avatar_image for /directory page
2012-06-19 16:05:38 -07:00
Zvi ben Yaakov (a.k.a rdc)
ac50c9e84d
Beginning to use App::get_cached_avatar_image for loading profile images in conversations
2012-06-19 16:05:38 -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
Zvi ben Yaakov (a.k.a rdc)
d20cdf09ea
Merge git://github.com/friendica/friendica
2012-06-19 23:29:24 +03:00
Zvi ben Yaakov (a.k.a rdc)
5b057e5dee
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 22:24:31 +03:00
Zvi ben Yaakov (a.k.a rdc)
45b4867bd3
Added App::get_cached_avatar_image usage on conversation wall of Normal View
2012-06-19 21:40:14 +03:00
Tobias Diekershoff
79357ec60d
Merge pull request #342 from fabrixxm/master
...
quattro: auto scroll and flash comment in display page
2012-06-19 10:12:09 -07:00
Sebastian Egbers
eab3938471
added exclude_replies option to api call statuses/user_timeline.
2012-06-19 16:27:23 +02:00
Sebastian Egbers
43532b7414
added exclude_replies option to api call statuses/home_timeline.
2012-06-19 16:15:19 +02:00
friendica
8b502bb486
position tweak
2012-06-19 03:34:31 -07:00
friendica
6325df3047
Merge https://github.com/friendica/friendica into pull
2012-06-19 00:50:55 -07:00
friendica
777830745f
missing $submit
2012-06-19 00:50:24 -07:00
Tobias Diekershoff
c2842efd3f
[DE] strings
2012-06-19 08:44:11 +02:00
Fabio Comuni
4c6a432130
quattro: in post display page, scroll to and flash selected comment
2012-06-19 06:54:41 +02:00
friendica
00a01e4520
minor nits
2012-06-18 21:28:13 -07:00
friendica
9dc5111347
a bit more description of message passing
2012-06-18 21:13:36 -07:00
friendica
e9aba87d76
add plugin hooks to every module_function (allows plugins to be triggered off specific pages/urls)
2012-06-18 20:57:43 -07:00
friendica
dbceef04e8
exif_read_data may not be available and isn't a requirement - check and silently ignore exif orientation if it isn't there
2012-06-18 20:21:54 -07:00
friendica
633726e4a9
Merge pull request #341 from fermionic/auto-orient-uploaded-images
...
rotate uploaded images if an EXIF rotation is present
2012-06-18 20:10:11 -07:00
Zach Prezkuta
7cd516e34f
fix some whitespace issues
2012-06-18 21:06:54 -06:00
Zach Prezkuta
42fa47e8f7
rotate uploaded images if an EXIF rotation is present
2012-06-18 21:02:11 -06:00
friendica
9374e1966f
some doco to explain what's happening
2012-06-18 20:01:32 -07:00
friendica
3e461abe6e
some psuedo code for the basic building blocks of zot-2012 - these are just ideas without a lot of the details yet filled in and this should NOT be used as any kind of definitive reference.
2012-06-18 18:13:36 -07:00
friendica
341a5a2672
public forum author using private posting, correct the comment permissions downstream.
2012-06-18 17:19:56 -07:00
Thomas Willingham
371bdfb19d
Typo breaking tag notifications
2012-06-18 22:00:18 +01:00
Zvi ben Yaakov (a.k.a rdc)
d1f81fff6b
Now using App::get_cached_avatar_image for /photos page
2012-06-18 22:41:43 +03:00
Zvi ben Yaakov (a.k.a rdc)
0c5476c6f2
Now using App::get_cached_avatar_image for /profile/{nickname} page
2012-06-18 22:18:43 +03:00
Zvi ben Yaakov (a.k.a rdc)
428fce633f
Now using App::get_cached_avatar_image for navigation bar
2012-06-18 22:09:00 +03:00
Zvi ben Yaakov (a.k.a rdc)
47650a0ee2
Now using App::get_cached_avatar_image for /directory page
2012-06-18 21:59:58 +03:00
Zvi ben Yaakov (a.k.a rdc)
88e7fe67de
Beginning to use App::get_cached_avatar_image for loading profile images
...
in conversations
2012-06-18 21:17:02 +03:00
Zvi ben Yaakov (a.k.a rdc)
358ffaef24
Added get_cached_avatar_image to App class for shared profile image
...
access and reduced sql queries/load
2012-06-18 21:12:13 +03:00
Michael
6eaca19f41
Merge branch 'master' of github.com:annando/friendica
...
Conflicts:
include/oembed.php
2012-06-18 08:51:12 +02:00
Michael
d53414a333
OEmbed: Don't output the width of images
2012-06-18 08:49:35 +02:00
friendica
d614089582
make subdued elements jump out at you on hover
2012-06-17 22:50:02 -07:00
friendica
83b9a8eb44
too many profiles
2012-06-17 19:40:16 -07:00
Michael Vogel
cc56f33b80
New option in the bbcode parser to disable oembed.
2012-06-18 01:29:08 +02:00
friendica
b385729c17
rev update
2012-06-17 16:00:47 -07:00
Zvi ben Yaakov (a.k.a rdc)
edc68f4876
Enabled Profile photo revisions to be displayed on /photos page
2012-06-17 23:59:29 +03:00
Zvi ben Yaakov (a.k.a rdc)
8af9fe8df7
Added missing backticks to navigation bar query
2012-06-17 23:39:28 +03:00
Zvi ben Yaakov (a.k.a rdc)
1ee22a749e
Enabled Profile photo revisions to be displayed on /profiles page
2012-06-17 23:24:47 +03:00
Zvi ben Yaakov (a.k.a rdc)
b0021a4637
Enabled Profile photo revisions to be displayed in navigation bar
2012-06-17 23:22:37 +03:00
Zvi ben Yaakov (a.k.a rdc)
59e0b6a0e3
Enabled Profile photo revisions to be displayed on /directory page
2012-06-17 23:20:14 +03:00
Michael Vogel
3968e77f9e
New function to convert bbcode to markdown.
2012-06-17 19:49:05 +02:00
friendica
7c2d27e275
rev update
2012-06-16 17:29:42 -07:00
friendica
217bd2a704
Merge pull request #336 from hauke68/master
...
Pull request
2012-06-16 16:25:40 -07:00
Hauke Zuehl
cc7d849ce3
Merge remote branch 'upstream/master'
2012-06-16 19:49:04 +02:00
fermionic
950dacbbdd
Merge pull request #338 from fermionic/diaspora-dont-check-more-signatures-than-diaspora-does
...
Diaspora dont check more signatures than diaspora does
2012-06-16 09:49:19 -07:00
Zach Prezkuta
3132ed2979
more cleanup
2012-06-16 10:45:26 -06:00
Zach Prezkuta
577cfdd314
some cleanup of obsolete code
2012-06-16 10:41:25 -06:00
fermionic
bb6027b6b5
Merge pull request #337 from fermionic/fix-api_php-logging-typo
...
fix small typo for logging command in api.php
2012-06-16 09:33:15 -07:00
Zach Prezkuta
0ff86e28bb
fix small typo for logging command in api.php
2012-06-16 10:25:46 -06:00
Zach Prezkuta
0946c4a375
still need the original author information for comments and likes
2012-06-16 10:25:33 -06:00
Zach Prezkuta
09eb52810b
update signature checking for relayables
2012-06-16 10:25:32 -06:00
Hauke Zuehl
f9a40ccbde
Merge remote branch 'upstream/master'
2012-06-16 18:04:59 +02:00
Hauke Zuehl
1231dd72f0
Check if $rr exists
2012-06-16 15:07:23 +02:00
friendica
4faf0e609f
rev update
2012-06-16 03:35:45 -07:00
friendica
4c3598ce2f
Merge https://github.com/friendica/friendica into pull
2012-06-15 06:15:59 -07:00
fabrixxm
10e99e9463
Merge pull request #335 from fabrixxm/master
...
The missing mod/network.php
2012-06-15 01:21:57 -07:00
fabrixxm
6416d09c71
the missing mod/network.php
2012-06-15 03:18:42 -04:00
friendica
ff45e11284
redundant log entry
2012-06-14 17:55:30 -07:00
friendica
ba0ea1e651
mod/network.php was lost
2012-06-14 17:46:58 -07:00
friendica
40e6d87d08
highlight the lost contact message
2012-06-14 17:41:24 -07:00
friendica
8c94fa23bf
Merge https://github.com/friendica/friendica into pull
2012-06-14 17:39:17 -07:00
friendica
2efee75557
also mark for death if there isn't any xml to be found
2012-06-14 17:38:39 -07:00
friendica
267681844d
poll even if contact hasn't responded recently, so we can update the termination status
2012-06-14 17:27:07 -07:00
friendica
be090cc851
better handling of dead contacts
2012-06-14 16:56:46 -07:00
friendica
244d7f9a8f
Merge pull request #334 from fabrixxm/master
...
Fix bug 453 and small update to quattro theme
2012-06-14 16:00:50 -07:00
fabrixxm
f66ae301b8
network: fix bug #453
2012-06-14 10:04:13 -04:00
fabrixxm
2f5e891cd1
quattro theme: show uncollapsed comments on display page
2012-06-14 09:25:18 -04:00
friendica
e68e9ec5f4
Required for github/Windows
2012-06-14 18:39:48 +10:00
friendica
79e2ae3791
syntax on sql
2012-06-13 22:34:48 -07:00
friendica
4229debff8
ajax append placeholder, fix some html warnings
2012-06-13 21:40:02 -07:00
friendica
edeca6d815
remove php version restriction on archive widget
2012-06-13 20:59:19 -07:00
friendica
b0a0c1ef4d
couple of little fixes to enotify positional params
2012-06-13 20:03:18 -07:00
friendica
7d8b087f4a
fix to imported youtube videos, updating of contact profile photos, do not remove "dead" contacts but archive them.
2012-06-13 19:59:20 -07:00
friendica
24bf4632af
Merge https://github.com/friendica/friendica into pull
2012-06-13 16:25:57 -07:00
friendica
85876be48a
Merge https://github.com/fabrixxm/friendica into pull
...
Conflicts:
util/messages.po
2012-06-13 16:25:09 -07:00
friendica
36491462ba
Merge pull request #333 from Erkan-Yilmaz/master
...
missing bracket
2012-06-13 16:21:15 -07:00
friendica
d908c9dd71
disable archive widget for PHP < 5.3
2012-06-13 16:17:45 -07:00
Erkan Yilmaz
e8e1de3603
add missing bracket
2012-06-13 20:41:53 +02:00
fabrixxm
feab17bfea
enotify: fix stupid typo
2012-06-13 12:08:34 -04:00
fabrixxm
46cb8174fa
enotify: rework strings to more easy to translate
2012-06-13 11:55:21 -04:00
friendica
a424fecdae
this should catch any weirdness caused by being in different timezones and making your first post on the 31st of March
2012-06-12 22:52:34 -07:00
friendica
f8314d6bea
one-click change for manage module
2012-06-12 22:05:35 -07:00
friendica
bbdb8751e5
that was it
2012-06-12 21:39:39 -07:00
friendica
82ad881c85
think this will fix it
2012-06-12 21:38:10 -07:00
friendica
d955813f22
tracking another edge case
2012-06-12 21:34:28 -07:00
friendica
08af43f396
edge case
2012-06-12 21:30:17 -07:00
friendica
920ea2e1c7
archive widget
2012-06-12 20:46:30 -07:00
friendica
832d9eeaaf
more fixes
2012-06-12 16:17:34 -07:00
friendica
08b3126dae
Merge https://github.com/friendica/friendica into pull
2012-06-12 02:48:00 -07:00
friendica
1dd52c20cf
move parens to proper place
2012-06-12 02:47:05 -07:00
Michael Vogel
a1c407e017
Removed "oauth/authorize" from the list of not implemented functions since it is implemented in "mod/api.php"
2012-06-12 12:39:28 +03:00
friendica
b6ff71acaa
survive bad/un-parseable input to datetime_convert
2012-06-12 02:06:29 -07:00
friendica
8eb81a99c6
fix default group for local follows
2012-06-12 01:13:09 -07:00
friendica
c53e1112d5
Merge https://github.com/friendica/friendica into pull
2012-06-12 01:02:05 -07:00
friendica
6f1efccf1c
bug #448
2012-06-12 01:01:35 -07:00
friendica
645c2f9092
Merge pull request #331 from mexon/upstream
...
Add a hook for post-processing remote items
2012-06-12 00:52:36 -07:00
Matthew Exon
33a4e45f6b
Add a hook for post-processing remote items after they've been stored in the database and have an ID
2012-06-12 07:58:12 +02:00
friendica
b7e2f802d8
revert an optimisation that was wrong
2012-06-11 21:50:10 -07:00
friendica
6c1914e6bc
date search backend to mod/network
2012-06-11 21:07:53 -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
75104416e0
reduce reverted edits due to edit arriving before original
2012-06-11 18:14:49 -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
Vasudev Kamath
11974b4d94
Merge branch 'master' of git://github.com/friendica/friendica
2012-06-11 20:47:11 +05:30
friendica
afa8815411
bug #447 - make followed feeds private
2012-06-11 05:28:08 -07:00
friendica
0ac3f5fc1c
Merge pull request #330 from fabrixxm/savenetworktab
...
network view: rembember last tab selected by user
2012-06-11 03:44:47 -07:00
fabrixxm
a21db51a58
network view: rembember last tab selected by user
2012-06-11 05:38:30 -04:00
friendica
4f9fb37925
rev update
2012-06-10 16:31:00 -07:00
friendica
64b4bbd65d
Merge https://github.com/friendica/friendica into pull
2012-06-10 01:00:16 -07:00
friendica
ff8d159698
rev update
2012-06-10 00:59:36 -07:00
Simon
810b1a5d6e
Merge pull request #329 from simonlnu/master
...
minor template update
2012-06-09 15:08:13 -07:00
Simon L'nu
1605bcd901
minor template update
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-09 18:07:19 -04:00
Simon L'nu
62e9047b8d
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master: (21 commits)
more logging on pubsub callbacks
provide ability to autofriend ostatus accounts
ostatus hub subscription issues
better events-reminder theming
png support for embedded private photos
rev update
png support: update database.sql, fix some typos, fix tinymce image browser
Add support for PNG images with alpha
fix a random profile error message
events: fix select events query select events that starts before display start date and/or ends after display end date.
more logging on subscribe_to_hub
admin page untranslated strings, remove empty list element for update
A few corrections in German translations.
rev update
set minchars to 2 for PM lookups too
set minchars to 2 for contacts search
contacts search autocomplete
add email probe logging, limit typo check to main addon files and skip additional support files
rev update
named anchors on display page
...
2012-06-08 23:58:46 -04:00
friendica
ea4515aca9
more logging on pubsub callbacks
2012-06-08 01:15:53 -07:00
friendica
0820865265
provide ability to autofriend ostatus accounts
2012-06-07 20:20:13 -07:00
friendica
da7773a259
ostatus hub subscription issues
2012-06-07 19:53:39 -07:00
friendica
52d90674ea
better events-reminder theming
2012-06-07 18:08:15 -07:00
friendica
ba2452a076
png support for embedded private photos
2012-06-07 16:02:56 -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
friendica
f4a80fcf24
Merge pull request #328 from fabrixxm/master
...
PNG with alpha channel
2012-06-07 15:44:56 -07:00
Fabio Comuni
2438c6e45d
png support: update database.sql, fix some typos, fix tinymce image browser
2012-06-07 20:17:31 +02:00
fabrixxm
fcf8f301e5
Merge pull request #327 from fabrixxm/master
...
events: fix select events query
2012-06-07 08:43:55 -07:00
Fabio Comuni
7cc8c369cb
Add support for PNG images with alpha
2012-06-07 17:42:13 +02:00
fabrixxm
1d832618a4
fix a random profile error message
2012-06-07 08:49:33 -04:00
fabrixxm
757037c3bf
events: fix select events query
...
select events that starts before display start date and/or ends
after display end date.
2012-06-07 08:28:10 -04:00
friendica
6477c24919
more logging on subscribe_to_hub
2012-06-06 23:10:32 -07:00
friendica
d2e86bdabc
Merge https://github.com/friendica/friendica into pull
2012-06-06 22:29:35 -07:00
friendica
3b49035636
admin page untranslated strings, remove empty list element for update
2012-06-06 22:28:30 -07:00
zzottel
6158fcf7be
Merge pull request #326 from zzottel/master
...
German translations
2012-06-06 16:45:57 -07:00
zottel
6a95d483c7
A few corrections in German translations.
2012-06-07 01:43:32 +02:00
zottel
3b5b216cad
Merge remote branch 'upstream/master'
2012-06-07 01:07:33 +02:00
friendica
dd001e32f4
rev update
2012-06-06 16:02:10 -07:00
zottel
2a83ebf77f
Merge remote branch 'upstream/master'
2012-06-06 08:08:09 +02:00
friendica
6c3ab225f7
set minchars to 2 for PM lookups too
2012-06-05 20:49:56 -07:00
friendica
6f41594634
set minchars to 2 for contacts search
2012-06-05 20:47:26 -07:00
friendica
49732114d7
contacts search autocomplete
2012-06-05 20:33:11 -07:00
friendica
5389efffa9
add email probe logging, limit typo check to main addon files and skip additional support files
2012-06-05 19:28:04 -07:00
friendica
ae08d2c49b
Merge https://github.com/friendica/friendica into pull
2012-06-05 17:59:49 -07:00
friendica
7cc7a14380
rev update
2012-06-05 17:59:12 -07:00
friendica
d873ceb719
Merge pull request #325 from annando/master
...
API: Repeating items only when there is content
2012-06-05 17:58:56 -07:00
Simon L'nu
5bb4a5912b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
DE: update for the strings
quattro: added editor buttons to comments
quattro: cleanup the less file
* master:
2012-06-05 12:46:42 -04:00
Tobias Diekershoff
c7b1b4b752
DE: update for the strings
2012-06-05 11:42:57 +02:00
zottel
ef6446288b
Merge remote branch 'upstream/master'
2012-06-05 08:20:41 +02:00
Vasudev Kamath
079fdecff1
Merge branch 'master' of git://github.com/friendica/friendica
2012-06-04 19:59:23 +05:30
friendica
fe1dc1bf98
named anchors on display page
2012-06-04 04:28:20 -07:00
Tobias Diekershoff
b13c6ea9ad
quattro: added editor buttons to comments
2012-06-04 11:49:16 +02:00
Vasudev Kamath
12474e3c2e
Merge branch 'master' of git://github.com/friendica/friendica
2012-06-04 12:04:17 +05:30
Michael Vogel
0353410cd4
Merge remote branch 'upstream/master'
2012-06-04 08:09:15 +02:00
Michael Vogel
5de91c2a7c
API: Only repeat items if there is a content
2012-06-04 08:08:45 +02:00
Tobias Diekershoff
ca105f1c66
quattro: cleanup the less file
2012-06-04 07:17:23 +02:00
Simon
4d9ab1d775
Merge pull request #324 from simonlnu/master
...
really odd error fixed in the mini photo-menu
2012-06-03 15:11:13 -07:00
Simon L'nu
34f210bc2d
fix mini photo-menu bug
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-03 18:10:04 -04:00
Simon L'nu
8d4c77fc43
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update
database updates
Debugged implementation of Diaspora relayable_retractions
cleanup and logging
first shot at getting like/unlike functions to work consistently
Fix bugs in the retraction code
prepare to implement database update
Implement relaying of relayable_retractions
Support relayable_retractions that are relayed to us by the top-level post owner
quattro: admin panel styling and 1st buttons for addon/theme overview
privacy settings: make submit button translateable
DE: update to the strings
prv messages: make submit translateable
* master:
2012-06-03 18:03:20 -04: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
friendica
a66baf2918
Merge pull request #323 from fermionic/add-relayable-retraction-support-for-diaspora
...
Add relayable retraction support for diaspora
2012-06-03 14:47:04 -07:00
Zach Prezkuta
2a01ae8149
database updates
2012-06-03 14:53:30 -06:00
Zach Prezkuta
9920fb39e5
Debugged implementation of Diaspora relayable_retractions
...
Diaspora "relayable_retraction" is now supported by Friendica.
The following should now work:
Friendica top-level post:
Diaspora comment deleted, disappears in Friendica
Friendica comment deleted, disappears in Diaspora
Diaspora like retracted, disappears in Friendica
Friendica like retracted, disappears in Diaspora
Diaspora top-level post:
Same
There are still exceptions, however. First, Friendica and Diaspora
seem to frequently reject comments with an "invalid signature" error.
This can probably be fixed.
Also, some comments/likes/retractions seem to just disappear on the
Diaspora side. In the Diaspora log these seem to be accompanied by a
"not a valid object" error, often preceeded by a "received a comment
but no corresponding post" error. These seem to be purely internal,
since sometimes it works for some Diaspora contacts but not others.
2012-06-03 14:53:30 -06:00
Zach Prezkuta
06263f72a8
cleanup and logging
2012-06-03 14:53:30 -06:00
Zach Prezkuta
cde0de965f
first shot at getting like/unlike functions to work consistently
2012-06-03 14:53:30 -06:00
Zach Prezkuta
77962aa79d
Fix bugs in the retraction code
...
Currently, the following seems to be the functional status:
For a Diaspora top-level post:
Friendica comments show up AND delete
Diaspora comments show up AND delete for top-level owner
Diaspora comments show up for non-owner
Diaspora comments sometimes don't delete for non-owner
-> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log
Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora)
Diaspora likes show up
Diaspora non-owner can't unlike
-> Same as comments, seems to be Diaspora's fault
For a Friendica top-level post:
Friendica comments show up AND delete
Diaspora comments show up AND delete
Friendica likes don't show up in Diaspora sometimes
Friendica doesn't even message Diaspora for unlikes (sometimes?)
Diaspora likes and unlikes work
2012-06-03 14:53:30 -06:00
Zach Prezkuta
b000088ded
prepare to implement database update
2012-06-03 14:53:30 -06:00
Zach Prezkuta
c0af6dbb1a
Implement relaying of relayable_retractions
...
Also: some whitespace cleanup, fix Diaspora parent DB query
2012-06-03 14:53:29 -06:00
Zach Prezkuta
1fe1ac022f
Support relayable_retractions that are relayed to us by the top-level post owner
2012-06-03 14:53:29 -06:00
Tobias Diekershoff
959b264c44
quattro: admin panel styling and 1st buttons for addon/theme overview
2012-06-03 22:32:42 +02:00
Tobias Diekershoff
2741ce67f8
privacy settings: make submit button translateable
2012-06-03 17:38:05 +02:00
Tobias Diekershoff
283524d990
DE: update to the strings
2012-06-03 17:33:28 +02:00
Tobias Diekershoff
6fbeafc843
prv messages: make submit translateable
2012-06-03 17:16:29 +02:00
zottel
70c4ab6875
Merge remote branch 'upstream/master'
2012-06-03 14:21:51 +02:00
Simon L'nu
598a2563e8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
zrl's when visiting public photos at the source site
doco
cleanup
turn "follow" into a function
add hometown to profiles
bug #439 - remove web port number from notification email "from" address
webfinger profile linker
"howlong" added to marital status.
fewer "bob smith to bob smith via wall-to-wall".
[quote=somebody] was appearing as an extended spoiler tag.
* master:
2012-06-03 04:59:07 -04:00
friendica
daa4f5213f
zrl's when visiting public photos at the source site
2012-06-03 01:53:11 -07:00
friendica
97576e3e33
doco
2012-06-02 23:22:02 -07:00
friendica
ee42c3be94
cleanup
2012-06-02 23:17:49 -07:00
friendica
82cf664920
turn "follow" into a function
2012-06-02 23:12:20 -07:00
friendica
d27c6de84e
add hometown to profiles
2012-06-02 20:58:20 -07:00
friendica
3d39e6e594
bug #439 - remove web port number from notification email "from" address
2012-06-02 18:23:54 -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
29bdf432f0
fewer "bob smith to bob smith via wall-to-wall".
2012-06-02 00:40:38 -07:00
friendica
c0b74b18fe
Merge pull request #321 from beardy-unixer/master
...
BB code [quote=somebody] fix.
2012-06-01 21:48:23 -07:00
Simon L'nu
8503a0e4cc
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
registration issue after re-factor
install: fix bug #436 and small typo Function check_htaccess() don't perform check if curl is not installed. This was leading to wsod beacuse check_htaccess() uses fetch_url().
admin: remove update link in admin menu
* master:
2012-06-01 23:13:24 -04:00
zottel
df2fdf08dd
Merge remote branch 'upstream/master'
2012-06-02 02:37:20 +02:00
friendica
0165d5dd2c
registration issue after re-factor
2012-06-01 15:42:13 -07:00
Thomas Willingham
7a5c85f628
[quote=somebody] was appearing as an extended spoiler tag.
2012-06-01 23:31:07 +01:00
friendica
974935e921
Merge pull request #320 from fabrixxm/master
...
Fix bug 436, fix small typo, and incomplete feature removal
2012-06-01 02:53:42 -07:00
root
1d1c50f6e3
install: fix bug #436 and small typo
...
Function check_htaccess() don't perform check if curl is not installed.
This was leading to wsod beacuse check_htaccess() uses fetch_url().
2012-06-01 03:31:24 -04:00
root
bad66a1154
Merge remote branch 'friendica/master'
2012-06-01 03:10:57 -04:00
zottel
08b335cac0
Merge remote branch 'upstream/master'
2012-06-01 08:31:38 +02:00
Simon L'nu
b1dacd6d83
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
turn registration code into a standalone function for re-use
query using both `id` and `parent`
prevent email from leaking in feeds
y didn't i think of this b4?
some zero theming on settings page
missing delimiter
transition to beta for private forums
rev update
Friendicaland - you can't 'live' on a demo server.
Create a "potential default group" called "Friends" on registration.
fix private photos that also have a size specification
private group tests, cont.
hide private group if desired
prvgroup should see intros
private group fix
possible sql injection in search
bugfixes: private photo embeds and search for strings with %
* master:
2012-05-31 23:22:19 -04:00
friendica
93bc29a711
turn registration code into a standalone function for re-use
2012-05-31 19:06:17 -07:00
friendica
598fc1ae21
Merge pull request #319 from fermionic/fix-diaspora-parent-query
...
query using both `id` and `parent`
2012-05-31 18:59:45 -07:00
Zach Prezkuta
d5116689af
query using both id
and parent
2012-05-31 19:45:58 -06:00
zottel
20fdbda25e
Merge remote branch 'upstream/master'
2012-05-31 08:43:14 +02:00
friendica
f0cf0ebb48
prevent email from leaking in feeds
2012-05-30 19:11:01 -07:00
friendica
15c023a218
y didn't i think of this b4?
2012-05-30 17:22:51 -07:00
friendica
1180919c89
some zero theming on settings page
2012-05-30 16:30:51 -07:00
friendica
ebc4a05164
missing delimiter
2012-05-30 15:56:11 -07:00
friendica
26db26d13a
Merge https://github.com/friendica/friendica into pull
2012-05-30 15:53:48 -07:00
friendica
bdcb8d27dd
transition to beta for private forums
2012-05-30 15:52:17 -07:00
friendica
069361f946
rev update
2012-05-30 15:50:30 -07:00
Thomas Willingham
3e226a665c
Friendicaland - you can't 'live' on a demo server.
2012-05-30 17:41:31 +01:00
friendica
7d77cfef56
Create a "potential default group" called "Friends" on registration.
2012-05-30 04:20:01 -07:00
zottel
24b58af689
Merge remote branch 'upstream/master'
2012-05-30 11:08:02 +02:00
friendica
e5a988f0b5
fix private photos that also have a size specification
2012-05-30 01:52:58 -07:00
friendica
88a0d6a1d5
private group tests, cont.
2012-05-29 22:57:15 -07:00
friendica
b6fe837a64
hide private group if desired
2012-05-29 18:43:56 -07:00
friendica
c58b0b9cbb
prvgroup should see intros
2012-05-29 18:24:44 -07:00
friendica
52995e0b1f
private group fix
2012-05-29 18:14:21 -07:00
friendica
514c994e6a
possible sql injection in search
2012-05-29 17:14:35 -07:00
friendica
21d79e787e
Merge https://github.com/friendica/friendica into pull
...
Conflicts:
mod/search.php
2012-05-29 16:50:42 -07:00
friendica
419cf91aae
bugfixes: private photo embeds and search for strings with %
2012-05-29 16:44:02 -07:00
Simon L'nu
04119d31e5
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Add two hooks, event_created and event_updated. One Bugfix for the <id>...</id> tag ($uri was never defined). Commented out the parse_event() function - its never called and would lead to a program abortion due to a broken require_once at the beginning
MySQL-Fulltext search option is disabled by default
Disabled logging of SQL statements
Doing negative caching for config values, special logfile for database optmisations
Saved searches now can search for tags as well
Deactivating the test output in db engine
Speed optimisation by enabling the posibility of the MySQL fulltext engine
Performance tests
API: RSS-Feeds are now shortened to 1000 characters. (With added link)
* master:
2012-05-29 16:13:27 -04:00
Simon
43c185ce04
Merge pull request #316 from annando/master
...
Speed improvements
2012-05-29 13:13:10 -07:00
Simon
39927e3dc5
Merge pull request #317 from CatoTH/master
...
Events: additional hooks, and a bugfix
2012-05-29 13:10:52 -07:00
Simon
d5cc81d217
Merge pull request #318 from simonlnu/master
...
fix toolbar; more size dynamicism
2012-05-29 13:09:55 -07:00
Simon L'nu
dd666e93d8
fix toolbar. more size dynamicism
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-29 16:09:02 -04:00
Simon L'nu
5edc6735b7
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
ability to only expire contacts, not self
Provide backend option to only expire other peoples' conversations.
more theme cleanup
rev update
* master:
2012-05-29 15:06:22 -04:00
Tobias Hößl
dfef0ec84d
Add two hooks, event_created and event_updated. One Bugfix for the <id>...</id> tag ($uri was never defined). Commented out the parse_event() function - its never called and would lead to a program abortion due to a broken require_once at the beginning
2012-05-29 19:03:30 +00:00
Michael Vogel
c707cba4c8
MySQL-Fulltext search option is disabled by default
2012-05-29 16:30:12 +02:00
Michael Vogel
8202355df9
Disabled logging of SQL statements
2012-05-29 16:16:37 +02:00
Michael Vogel
68757f2504
Merge remote branch 'upstream/master'
2012-05-29 16:09:26 +02:00
friendica
2eafa9a475
ability to only expire contacts, not self
2012-05-29 01:14:53 -07:00
friendica
0241bd1fbf
Provide backend option to only expire other peoples' conversations.
2012-05-28 23:24:10 -07:00
friendica
2dc7e53435
more theme cleanup
2012-05-28 19:17:06 -07:00
friendica
10a057b979
Merge https://github.com/friendica/friendica into pull
2012-05-28 16:52:19 -07:00
friendica
f033c9a4ae
rev update
2012-05-28 16:51:52 -07:00
Simon
51c2ef0efb
Merge pull request #315 from simonlnu/master
...
fixed font-size/line-height stuffs
2012-05-28 16:26:24 -07:00
Simon L'nu
cb259098dd
fixed font-size/line-height stuffs
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-28 19:25:10 -04:00
Simon L'nu
91c1a2943b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
slackr - tone down the shadows a smidgin
add plugin hooks to gender, sexpref, and marital selectors
birthday in november,december bug
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.
handle multiple underscores in D* links
* master:
2012-05-28 16:49:12 -04:00
friendica
6962989e52
slackr - tone down the shadows a smidgin
2012-05-27 23:02:25 -07:00
friendica
ff0291c876
add plugin hooks to gender, sexpref, and marital selectors
2012-05-27 22:35:01 -07:00
friendica
b752acd089
birthday in november,december bug
2012-05-27 21:36:20 -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
08941d4285
handle multiple underscores in D* links
2012-05-26 23:46:42 -07:00
Simon L'nu
24f5e6b3f3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
more ssl policy stuff
allow force ssl on notifications
* master:
2012-05-26 19:39:34 -04: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
Michael Vogel
a08232fa95
Merge branch 'master' of github.com:annando/friendica
2012-05-26 15:42:23 +02:00
Michael Vogel
7f19d39b14
Doing negative caching for config values, special logfile for database optmisations
2012-05-26 15:41:23 +02:00
Michael
817fc37f41
Merge branch 'master' of github.com:annando/friendica
...
Conflicts:
mod/network.php
2012-05-26 12:06:19 +02:00
Michael
7b3c02057d
Merge remote branch 'upstream/master'
2012-05-26 11:59:19 +02:00
Michael Vogel
a5dc41ab13
Saved searches now can search for tags as well
2012-05-26 11:51:48 +02:00
Simon L'nu
040d1467f3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
missing entries on personal tab after sql text search optimise
bug #434 - default group placement not working after accepting dfrn friend request
fix wall_uploaded photo permissions on group post by member
improve location change notifications
keep private FB stuff out of personal notes
rev update
DE update to strings and templates
* master:
2012-05-26 01:23:17 -04:00
friendica
f5290a5a10
missing entries on personal tab after sql text search optimise
2012-05-25 18:29:06 -07:00
Michael Vogel
a612b10b2a
Deactivating the test output in db engine
2012-05-26 03:23:18 +02:00
Michael Vogel
4951210508
Speed optimisation by enabling the posibility of the MySQL fulltext engine
2012-05-26 03:21:07 +02:00
friendica
bb4712b171
bug #434 - default group placement not working after accepting dfrn friend request
2012-05-25 18:06:51 -07:00
friendica
0ef8ccf11b
fix wall_uploaded photo permissions on group post by member
2012-05-25 17:42:35 -07:00
friendica
27c903a8d0
improve location change notifications
2012-05-25 15:56:18 -07:00
friendica
fafd41f4bf
keep private FB stuff out of personal notes
2012-05-25 14:36:17 -07:00
zottel
36d6018c11
Merge remote branch 'upstream/master'
2012-05-25 21:05:42 +02:00
Michael Vogel
a71e3134bf
Merge remote branch 'upstream/master'
2012-05-25 16:19:10 +02:00
friendica
d1345e5054
Merge https://github.com/friendica/friendica into pull
2012-05-25 00:43:09 -07:00
friendica
abb9fecf09
rev update
2012-05-25 00:42:38 -07:00
root
88d5d9684a
admin: remove update link in admin menu
2012-05-25 03:05:07 -04:00
Tobias Diekershoff
07535692dc
DE update to strings and templates
2012-05-25 06:04:33 +02:00
Simon L'nu
25547cb21f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix small js error when user not logged in
install wizard: fix php executable path - php executable not required - "check again" button submit form instead of reload page via js - checks form submit to install module without redirect
* master:
2012-05-24 19:30:41 -04:00
Simon
5bc0cfa067
Merge pull request #313 from fabrixxm/master
...
install wizard: fix php executable path
2012-05-24 16:30:22 -07:00
Simon
e54b649c98
Merge pull request #314 from simonlnu/master
...
update dark a bit. i messed up some buttons
2012-05-24 16:29:29 -07:00
Simon L'nu
2a32917e3a
update dark a bit. i messed up some buttons
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-24 19:28:12 -04:00
Simon L'nu
3c15336984
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
slackr: improve interactivity
slackr: hide calendar when posting
more theme stuff
* master:
2012-05-24 05:28:40 -04:00
root
60df67b9e3
fix small js error when user not logged in
2012-05-24 04:29:33 -04:00
root
a5b8339a75
install wizard: fix php executable path
...
- php executable not required
- "check again" button submit form instead of reload page via js
- checks form submit to install module without redirect
2012-05-24 04:21:33 -04:00
friendica
f0ddcb979b
slackr: improve interactivity
2012-05-23 23:29:45 -07:00
friendica
6c78d42050
slackr: hide calendar when posting
2012-05-23 18:20:24 -07:00
friendica
5d06e0060d
Merge https://github.com/friendica/friendica into pull
2012-05-23 16:58:58 -07:00
friendica
60723702f1
more theme stuff
2012-05-23 16:58:31 -07:00
Simon
fee3f7a872
Merge pull request #312 from simonlnu/master
...
a few more fixes
2012-05-23 16:27:34 -07:00
Simon L'nu
16f9d7fd35
clean up and more fixing
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-23 19:22:07 -04:00
Simon L'nu
30b658c429
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
slackr - better highlighting of current selections
slackr - knock the sharp edges off the events calendar
rev update
* master:
2012-05-23 19:20:24 -04:00
friendica
19bf0aa283
slackr - better highlighting of current selections
2012-05-23 16:16:59 -07:00
friendica
5b7865f8f9
slackr - knock the sharp edges off the events calendar
2012-05-23 15:55:09 -07:00
friendica
8bc8be1f87
Merge https://github.com/friendica/friendica into pull
2012-05-23 15:46:49 -07:00
friendica
6bcfda6d53
rev update
2012-05-23 15:46:04 -07:00
Simon L'nu
1d56ec3c7a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Update install wizard - writable .htconfig.php not required - add test for working .htaccess/mod_rewrite configuration - fix last pass: create tables, eventually show config text and print a "What next" section
* master:
2012-05-23 18:10:40 -04:00
Simon
5acd0a1c32
Merge pull request #309 from fabrixxm/master
...
Update install wizard
2012-05-23 15:10:24 -07:00
Simon
8cec510b73
Merge pull request #311 from simonlnu/master
...
clean up and fixing things
2012-05-23 15:08:43 -07:00
Simon L'nu
5198260e3a
clean up and make nice the dispy photo edit stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-23 18:06:49 -04:00
Simon L'nu
fb50727f8d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-05-23 18:04:23 -04:00
Simon
da67269468
Merge pull request #310 from simonlnu/master
...
add a placeholder attribute on #search-text; dispy fixes
2012-05-23 13:05:10 -07:00
Simon L'nu
789063da39
add a placeholder attribute on search-text; dispy fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-23 15:58:22 -04:00
zottel
3aa516ccab
Merge remote branch 'upstream/master'
2012-05-23 18:25:58 +02:00
root
325343a492
Update install wizard
...
- writable .htconfig.php not required
- add test for working .htaccess/mod_rewrite configuration
- fix last pass: create tables, eventually show config text and print a "What next" section
2012-05-23 07:38:31 -04:00
Simon L'nu
bd12902d7b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
photo rotation
event calendar theming
import quattro event reminder
mark bubbles unsupported
keep FB out of private notes
clear submanage, etc from session on logout
if identity (uid) changes - reload any other open browser windows on next ping.
* master:
2012-05-23 05:03:05 -04:00
friendica
61dba985c1
photo rotation
2012-05-23 01:01:04 -07:00
friendica
8ffb65ceef
event calendar theming
2012-05-22 22:34:35 -07:00
friendica
86a38cca24
import quattro event reminder
2012-05-22 22:06:52 -07:00
friendica
af495879af
mark bubbles unsupported
2012-05-22 21:54:19 -07:00
friendica
3ac7c4e859
keep FB out of private notes
2012-05-22 21:20:31 -07:00
friendica
0da20ec9ef
Merge https://github.com/friendica/friendica into pull
2012-05-22 18:06:34 -07:00
friendica
b43b680802
clear submanage, etc from session on logout
2012-05-22 18:05:58 -07:00
Simon L'nu
e56af0e09e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Oops - but lets commit the right revision, sorry. There's a spare line in the last one.
Fix darkzero/ns BB icon background colours.
cause of bogus wall-to-wall posts found
add queue totals to admin summary page
DE: update to the strings and some mail templates
fix setting array values to config items
redir links for permission controlled attachments
* master:
2012-05-22 19:49:03 -04:00
friendica
e70573f34c
if identity (uid) changes - reload any other open browser windows on next ping.
2012-05-22 16:01:07 -07:00
Thomas Willingham
b962559570
Oops - but lets commit the right revision, sorry. There's a spare line in the last one.
2012-05-22 19:19:36 +01:00
Thomas Willingham
18983bb932
Fix darkzero/ns BB icon background colours.
2012-05-22 19:14:58 +01:00
friendica
3ce06caeed
cause of bogus wall-to-wall posts found
2012-05-22 03:55:11 -07:00
friendica
f29f861d25
add queue totals to admin summary page
2012-05-22 03:44:03 -07:00
Tobias Diekershoff
be64437b14
DE: update to the strings and some mail templates
2012-05-22 12:17:01 +02:00
Tobias Diekershoff
30f3a16874
Merge branch 'master' of https://github.com/friendica/friendica
2012-05-22 11:57:19 +02:00
Tobias Diekershoff
5dad99888d
fix setting array values to config items
2012-05-22 11:56:49 +02:00
zottel
e9c86c0fd0
Merge remote branch 'upstream/master'
2012-05-22 08:46:02 +02:00
friendica
02502c3a74
Merge https://github.com/friendica/friendica into pull
2012-05-21 22:56:39 -07:00
friendica
a163825291
redir links for permission controlled attachments
2012-05-21 22:54:39 -07:00
Simon
2320a3e549
Merge pull request #308 from simonlnu/master
...
fix (mini-)search-text text
2012-05-21 18:39:50 -07:00
Simon L'nu
d466c9ab08
fix (min-)search-text text
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 21:38:53 -04:00
Simon
c95eb69997
Merge pull request #307 from simonlnu/master
...
updates to dispy family; fix typo in INSTALL.txt
2012-05-21 18:30:36 -07:00
Simon L'nu
bd3c0edf34
updates to dispy family; fix typo in INSTALL.txt
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 21:29:18 -04:00
Simon L'nu
867e3b33d1
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update, bug 428, 429, and ability to block globaldir submissions from demo sites
* master:
2012-05-21 21:23:40 -04:00
friendica
9ca3ac6e61
Merge https://github.com/friendica/friendica into pull
2012-05-21 16:43: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
Simon L'nu
f570965ebe
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-05-21 06:50:00 -04:00
Simon
997d88b449
Merge pull request #306 from simonlnu/master
...
more light fixes
2012-05-21 03:49:46 -07:00
Simon L'nu
627367e1ee
more light fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 06:48:08 -04:00
Simon
f982a8b3e5
Merge pull request #305 from simonlnu/master
...
fix dumb mistake in light
2012-05-20 23:49:59 -07:00
Simon L'nu
cb2702249f
fix dumb mistake in light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 02:47:43 -04:00
Simon L'nu
f65d8e50be
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update
* master:
2012-05-21 00:36:38 -04:00
friendica
71fe343324
Merge https://github.com/friendica/friendica into pull
2012-05-20 18:30:52 -07:00
friendica
afaf9ec74f
rev update
2012-05-20 18:30:02 -07:00
Simon
34423e4b32
Merge pull request #303 from simonlnu/master
...
fix brown paper bag with dispy light
2012-05-20 11:38:25 -07:00
Simon L'nu
2ac55c9f21
fix dispy light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-20 14:37:20 -04:00
Simon L'nu
18d4cf0583
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
search with leading @ performs directory search (# for tag search), nothing for text search
Darkzero-NS + 'Friendicaland' countries.
set comment permissions explicitly to parent permissions
* master:
2012-05-20 14:33:15 -04:00
zottel
2cd3ec7b98
Merge remote branch 'upstream/master'
2012-05-20 09:08:56 +02:00
friendica
f16a119940
search with leading @ performs directory search (# for tag search), nothing for text search
2012-05-19 21:53:27 -07:00
Thomas Willingham
c6104fb856
Darkzero-NS + 'Friendicaland' countries.
2012-05-20 01:44:07 +01:00
friendica
266512e801
Merge https://github.com/friendica/friendica into pull
2012-05-19 17:22:00 -07:00
friendica
dd86f40f96
set comment permissions explicitly to parent permissions
2012-05-19 16:42:24 -07:00
Simon L'nu
f48de79181
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Darkzero, another missing part of "everything"
Diabook-dark - some more cleaning up
Okay, so maybe not *everything*
Give Darkzero some loving.
backend support for 'x' deliveries per process - x is configurable, more importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @
sql script to ccnvert all tables to innodb
* master:
2012-05-19 18:53:57 -04:00
Michael Vogel
8c80fe0bf5
Performance tests
2012-05-20 00:11:32 +02:00
Thomas Willingham
4484bd0e97
Darkzero, another missing part of "everything"
2012-05-19 17:30:55 +01:00
Thomas Willingham
b1c58511ad
Diabook-dark - some more cleaning up
2012-05-19 17:20:27 +01:00
Michael
6342b3e0bd
Merge branch 'master' of github.com:annando/friendica
2012-05-19 16:55:33 +02:00
Thomas Willingham
a1b96d11a7
Okay, so maybe not *everything*
2012-05-19 15:17:35 +01:00
Thomas Willingham
d6ca4a1b42
Give Darkzero some loving.
...
Everything that used to be hidden with light text on light backgrounds is legible now.
2012-05-19 14:51:10 +01:00
Michael Vogel
9a940786c1
Merge remote branch 'upstream/master'
2012-05-19 14:04:24 +02:00
friendica
513ef2410d
backend support for 'x' deliveries per process - x is configurable, more importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @
2012-05-19 02:42:11 -07:00
friendica
a49bd0a686
Merge https://github.com/friendica/friendica into pull
2012-05-19 00:46:49 -07:00
friendica
668e03d4e5
sql script to ccnvert all tables to innodb
2012-05-19 00:45:45 -07:00
Simon
ec85825509
Merge pull request #302 from simonlnu/master
...
fix -desc again
2012-05-19 00:16:44 -07:00
Simon L'nu
4a35a51724
fix -desc again
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-19 03:15:35 -04:00
Simon L'nu
2cee9ec5c8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
profile change activity link bug
* master:
2012-05-19 02:59:40 -04:00
friendica
4133df6223
profile change activity link bug
2012-05-18 17:55:11 -07:00
Simon L'nu
83f0807e59
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
apply max-width to images in posts, duepuntozero
theming for default group selector
catch more places to apply default group
make it difficult to setup a private forum with no privacy
more private forums, default privacy group for new contacts
tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work
* master:
2012-05-18 12:12:40 -04:00
friendica
3821744450
apply max-width to images in posts, duepuntozero
2012-05-18 01:46:02 -07:00
friendica
34b79b4f2b
theming for default group selector
2012-05-18 01:38:11 -07:00
friendica
5ecaeb8e5c
catch more places to apply default group
2012-05-18 01:03:46 -07:00
friendica
1d157fc747
make it difficult to setup a private forum with no privacy
2012-05-17 23:05:41 -07:00
friendica
7b0ded3f14
more private forums, default privacy group for new contacts
2012-05-17 22:44:52 -07:00
Simon L'nu
c024c17b5f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
setup delivery chain for private groups (work in progress)
bring in the *much better* xml parser from the original zot branch
rev update
merged from wrong project
initial commit
* master:
2012-05-17 23:01:46 -04:00
friendica
7cfa7a7671
tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work
2012-05-17 19:59:46 -07:00
friendica
d5d853f37f
setup delivery chain for private groups (work in progress)
2012-05-17 19:35:24 -07:00
friendica
4f0e26759c
bring in the *much better* xml parser from the original zot branch
2012-05-16 21:29:57 -07:00
zottel
764ac240a9
Merge remote branch 'upstream/master'
2012-05-17 01:24:37 +02:00
friendica
f5f345d388
Merge https://github.com/friendica/friendica into pull
2012-05-16 13:55:00 -07:00
friendica
6744b5975c
rev update
2012-05-16 13:52:11 -07:00
Simon
296c84d822
Merge pull request #301 from simonlnu/master
...
fix admin links
2012-05-16 10:34:30 -07:00
Simon L'nu
331013f281
fix admin links...
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-16 13:33:20 -04:00
friendica
d6add82b32
merged from wrong project
2012-05-16 05:08:15 -07:00
friendica
18f638c93e
Merge https://github.com/friendica/friendica into pull
2012-05-16 04:59:15 -07:00
Simon
becfe1f6f7
Merge pull request #300 from simonlnu/master
...
*sigh*. fix dark *again*
2012-05-16 02:52:35 -07:00
Simon L'nu
a8a3732f05
*sigh*. fix dark *again*
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-16 05:51:29 -04:00
Simon
423864dc23
Merge pull request #299 from simonlnu/master
...
get rid of the monstrosity for .button. need to find alternate solution
2012-05-16 02:33:10 -07:00
Simon L'nu
7eb73bc600
get rid of the monstrosity for .button. need to find alternate solution
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-16 05:32:08 -04:00
Simon L'nu
2d6c6255f9
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-05-16 05:29:34 -04:00
Michael Vogel
f2c0c40f6e
Merge remote branch 'upstream/master'
2012-05-16 08:24:46 +02:00
friendica
1900f4dd5b
Merge https://github.com/friendica/friendica into pull
2012-05-15 23:15:29 -07:00
Michael
2b8c4df544
Merge branch 'master' of github.com:annando/friendica
2012-05-16 08:10:28 +02:00
Simon
a65bd73bf3
Merge pull request #298 from simonlnu/master
...
slight re-design of wall stuff and css/font cleaning
2012-05-15 23:01:20 -07:00
Simon L'nu
fca09c9d4c
slight re-design of wall stuff and css/font cleaning
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-16 01:58:55 -04:00
friendica
1872cf2b2d
Merge https://github.com/friendica/dir into dpull
2012-05-15 22:30:47 -07:00
Simon L'nu
a3137eec11
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
update tinymce to 3.5.0.1
rev update
DE strings
slackr drop shadows extended
Allow plugins to modify the contact photo menu
rev update
* master:
2012-05-15 23:40:35 -04:00
friendica
e39014a3a7
update tinymce to 3.5.0.1
2012-05-15 17:18:46 -07:00
friendica
205c09e4f0
rev update
2012-05-15 17:05:28 -07:00
Tobias Diekershoff
68dc7c3568
DE strings
2012-05-15 10:44:01 +02:00
zottel
e9aeafbe13
Merge remote branch 'upstream/master'
2012-05-15 08:45:19 +02:00
friendica
0faa0c2ab1
slackr drop shadows extended
2012-05-14 21:45:37 -07:00
friendica
c53674d367
Merge https://github.com/friendica/friendica into pull
2012-05-14 20:36:27 -07:00
friendica
bd32693a90
Merge pull request #297 from mexon/upstream
...
Allow plugins to modify the contact photo menu
2012-05-14 18:57:55 -07:00
Matthew Exon
e574514e21
Allow plugins to modify the contact photo menu
2012-05-15 08:59:45 +08:00
friendica
2b471d6df3
rev update
2012-05-14 16:32:21 -07:00
Simon L'nu
2687f4377c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-05-14 19:29:06 -04:00
zottel
584b15aaec
Merge remote branch 'upstream/master'
2012-05-14 13:59:37 +02:00
Simon
59aefd9346
Merge pull request #296 from simonlnu/master
...
finish dispy light colour fixes
2012-05-13 21:33:07 -07:00
Simon L'nu
db5fe14241
finish dipsy light colour fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-14 00:30:25 -04:00
Simon L'nu
fcf6d10efd
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update
* master:
2012-05-14 00:26:34 -04:00
friendica
c12ec1116b
Merge https://github.com/friendica/friendica into pull
2012-05-13 16:40:46 -07:00
friendica
2bd4ff5705
rev update
2012-05-13 16:40:02 -07:00
Simon L'nu
39c042f4ea
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-theme: small fixes
rename get_language() to get_browser_language()
slackr drop shadows
language detection library
rev update
* master:
2012-05-13 18:50:04 -04:00
tommy tomson
303856ce01
diabook-theme: small fixes
2012-05-13 20:51:39 +02:00
friendica
3811fe288f
rename get_language() to get_browser_language()
2012-05-13 04:52:29 -07:00
friendica
eaf028c9fb
Merge https://github.com/friendica/friendica into pull
2012-05-12 22:20:03 -07:00
friendica
e7813f22af
slackr drop shadows
2012-05-12 22:19:29 -07:00
Simon L'nu
f267a283b4
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-05-12 18:56:13 -04:00
Simon
b506c6f073
Merge pull request #295 from simonlnu/master
...
css fixes; new screenshots
2012-05-12 15:55:37 -07:00
Simon L'nu
93dc96e2cf
css fixes; new screenshots
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-12 18:53:01 -04:00
Simon L'nu
8853e53e29
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Ĝisdatigis la esperantlingvan tradukaĵon al 100%.
* master:
2012-05-12 18:50:53 -04:00
friendica
72d8e0459d
Merge pull request #294 from mschmitt/master
...
Esperanto at 100% again
2012-05-12 15:01:05 -07:00
Simon L'nu
89df33f0a8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-theme: fix in earthlayers
diabook-theme: some fixes
* master:
2012-05-12 15:55:03 -04:00
Martin Schmitt
ae300bceb9
Ĝisdatigis la esperantlingvan tradukaĵon al 100%.
2012-05-12 16:56:31 +02:00
Vasudev Kamath
3a45d4f9e0
Merge branch 'master' of git://github.com/friendica/friendica
2012-05-12 20:20:26 +05:30
tommy tomson
9699d9cd01
diabook-theme: fix in earthlayers
2012-05-12 16:11:46 +02:00
tommy tomson
2882012e1b
diabook-theme: some fixes
2012-05-12 13:50:22 +02:00
Simon
f434bd7f0a
Merge pull request #293 from simonlnu/master
...
finished migrating dispy light - maybe
2012-05-12 04:32:55 -07:00
Simon L'nu
c6897d0dc4
finished migrating dispy light - maybe
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-12 07:29:36 -04:00
friendica
62727012d3
language detection library
2012-05-12 01:55:18 -07:00
friendica
99e4ea19e7
Merge https://github.com/friendica/friendica into pull
2012-05-12 01:28:04 -07:00
friendica
aa83198611
rev update
2012-05-12 01:27:33 -07:00
Vasudev Kamath
10db2f00f9
Merge branch 'master' of git://github.com/friendica/friendica
2012-05-12 12:10:09 +05:30
Simon L'nu
534a93f81c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Darkzero - fixed notifications bar.
diabook-theme: update mapquery and small fix
diabook-theme: add "population density 2010"-layer to EarthLayers-box
fix search/new against possible email leakage
better test of email reply visibility
diabook-theme:small fix
moderated comment templates
diabook-theme: small fix
diabook-theme: include prv_message autocomplete
fix PM replies after autocomplete changes
add photos to PM autocomplete, improved appearance
rev update
diabook-theme: small fix
* master:
2012-05-11 20:39:06 -04:00
Thomas Willingham
2454028ef6
Darkzero - fixed notifications bar.
2012-05-12 00:32:47 +01:00
tommy tomson
48c48d644f
diabook-theme: update mapquery and small fix
2012-05-11 16:41:16 +02:00
tommy tomson
74e79a06a8
diabook-theme: add "population density 2010"-layer to EarthLayers-box
2012-05-11 14:56:59 +02:00
friendica
4e0b0d4e43
fix search/new against possible email leakage
2012-05-11 05:19:29 -07:00
friendica
20229ce187
better test of email reply visibility
2012-05-11 05:11:53 -07:00
friendica
49cd3f615d
Merge https://github.com/friendica/friendica into pull
2012-05-11 04:05:25 -07:00
tommy tomson
f9d5e602ac
diabook-theme:small fix
2012-05-11 13:04:25 +02:00
friendica
7600b9b1ee
Merge https://github.com/friendica/friendica into pull
2012-05-11 03:42:05 -07:00
friendica
496782e468
moderated comment templates
2012-05-11 03:41:29 -07:00
tommy tomson
e13e5070a7
diabook-theme: small fix
2012-05-11 09:01:58 +02:00
tommy tomson
a81faead6e
diabook-theme: include prv_message autocomplete
2012-05-11 08:39:39 +02:00
zottel
c43a03e21b
Merge remote branch 'upstream/master'
2012-05-11 08:36:24 +02:00
friendica
8a5dcf64d8
fix PM replies after autocomplete changes
2012-05-10 20:01:13 -07:00
friendica
547007e199
add photos to PM autocomplete, improved appearance
2012-05-10 19:29:01 -07:00
friendica
01b5136007
Merge https://github.com/friendica/friendica into pull
2012-05-10 18:50:37 -07:00
friendica
8600afafe2
rev update
2012-05-10 18:50:11 -07:00
tommy tomson
b2bd25a470
Merge remote-tracking branch 'origin/master'
2012-05-11 02:40:09 +02:00
tommy tomson
ccc825ccbc
diabook-theme: small fix
2012-05-11 02:39:54 +02:00
Simon L'nu
9c53a311de
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Diabook-dark. More touchups.
specified background image does not exist
diabook-theme: some fixes
priv mail autocomplete, improved contrast for darkzero, etc.
email autocomplete
diabook-theme: some css/bug-fixes
* master:
2012-05-10 19:53:11 -04:00
Thomas Willingham
e7b8e839ae
Diabook-dark. More touchups.
2012-05-10 17:14:27 +01:00
friendica
c5f6755bdd
specified background image does not exist
2012-05-10 05:49:48 -07:00
tommy tomson
3ac5d19b92
diabook-theme: some fixes
2012-05-10 12:19:51 +02:00
friendica
c9bb888611
priv mail autocomplete, improved contrast for darkzero, etc.
2012-05-10 02:01:08 -07:00
friendica
93ae6ee97b
Merge https://github.com/friendica/friendica into pull
2012-05-10 01:46:29 -07:00
friendica
774c51cc19
email autocomplete
2012-05-10 01:45:51 -07:00
zottel
4709960189
Merge remote branch 'upstream/master'
2012-05-10 09:58:52 +02:00
tommy tomson
7b41c0a555
Merge remote-tracking branch 'origin/master'
2012-05-10 09:54:47 +02:00
tommy tomson
69b43582d0
diabook-theme: some css/bug-fixes
2012-05-10 09:54:16 +02:00
Simon
da4c4c0c03
Merge pull request #292 from simonlnu/master
...
don't make -desc so obnoxious looking
2012-05-09 23:32:59 -07:00
Simon L'nu
a077e63fa5
don't make -desc so obnoxious looking
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-10 02:27:48 -04:00
Simon L'nu
25d5eae955
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update
rev update
* master:
2012-05-10 02:16:49 -04: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
Simon L'nu
39a7926015
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
send browser back to correct page (with query args) after posting
slight improvement in a couple of queries
Diabook-dark - do things the right way instead of the stupid way.
Fix TinyMCE, but needs adding to theme.php
Fix jquery.fancybox, but still needs adding to theme.php
Diabook-dark cleaned up a bit.
don't provide 'show more' on remote friends in common unless there are actually more
make it optional to optimize the item table after expire
wrap private message autocomplete in an ifdef to make it easier to test/develop
DE update for the strings
make mod-follow hookable (e.g. service class limits) and also begin to prepare it for functionalisation
* master:
2012-05-09 14:00:54 -04:00
Michael Vogel
f2e648d62f
Merge remote branch 'upstream/master'
2012-05-09 14:56:48 +02:00
friendica
53157bb954
send browser back to correct page (with query args) after posting
2012-05-09 04:18:01 -07:00
zottel
d92be9d93c
Merge remote branch 'upstream/master'
2012-05-09 09:27:23 +02:00
friendica
70a07086ad
slight improvement in a couple of queries
2012-05-08 22:46:40 -07:00
Thomas Willingham
89d3ce7b5d
Diabook-dark - do things the right way instead of the stupid way.
2012-05-09 04:54:17 +01:00
Thomas Willingham
d2bbd92889
Fix TinyMCE, but needs adding to theme.php
2012-05-09 03:42:09 +01:00
Thomas Willingham
8a1f8515ca
Fix jquery.fancybox, but still needs adding to theme.php
2012-05-09 03:31:56 +01:00
Thomas Willingham
a0293ae442
Diabook-dark cleaned up a bit.
2012-05-09 03:21:26 +01:00
friendica
a048fd806a
don't provide 'show more' on remote friends in common unless there are actually more
2012-05-08 17:40:56 -07:00
friendica
10812e0c19
make it optional to optimize the item table after expire
2012-05-08 15:33:01 -07:00
friendica
da4a360a6e
Merge https://github.com/friendica/friendica into pull
2012-05-08 01:15:19 -07:00
friendica
c141909f33
wrap private message autocomplete in an ifdef to make it easier to test/develop
2012-05-08 01:14:24 -07:00
Tobias Diekershoff
d2c2063084
DE update for the strings
2012-05-08 09:56:05 +02:00
zottel
78429926bc
Merge remote branch 'upstream/master'
2012-05-08 09:05:38 +02:00
friendica
df35746639
make mod-follow hookable (e.g. service class limits) and also begin to prepare it for functionalisation
2012-05-07 23:09:57 -07:00
Simon L'nu
34d3d45589
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
finished dry run - now for real test
diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie.
don't throw "did not contain xml" error if it's a valid rss that doesn't have the <?xml declaration
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.
separate poll_interval from delivery_interval - default is the same.
* master:
2012-05-07 21:53:57 -04:00
friendica
b128a37cee
Merge https://github.com/friendica/friendica into pull
2012-05-07 18:48:26 -07:00
friendica
f0b7a8ae35
finished dry run - now for real test
2012-05-07 18:36:28 -07:00
tommy tomson
88443ed3fb
diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie.
2012-05-08 03:29:25 +02:00
friendica
8a4e3cc370
don't throw "did not contain xml" error if it's a valid rss that doesn't have the <?xml declaration
2012-05-07 16:51:09 -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
e8b9b8a403
separate poll_interval from delivery_interval - default is the same.
2012-05-07 04:21:54 -07:00
Simon L'nu
dbbcddf845
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
reset permissions to forum default when adding forum delivery chain
* master:
2012-05-07 04:40:54 -04:00
zottel
a2ea560bf3
Merge remote branch 'upstream/master'
2012-05-07 09:11:45 +02:00
friendica
c7f3e626d0
Merge https://github.com/friendica/friendica into pull
2012-05-06 23:07:41 -07:00
friendica
8c26640835
reset permissions to forum default when adding forum delivery chain
2012-05-06 23:06:21 -07:00
Simon
fb05cd6f18
Merge pull request #291 from simonlnu/master
...
minor css tweaks
2012-05-06 22:22:29 -07:00
Simon L'nu
e554530430
more css tweaks. nothing major
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-07 01:20:32 -04:00
Simon L'nu
c36e39b18e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off.
mail autcomplete testing
email recip autocomplete
rev update
diabook-theme: small fix
diabook-theme: add "Earth Layers"-box at right_side
diabook-theme: twitterbox-bugfix
diabook: small fix
diabook-theme: bugfix
* master:
2012-05-07 00:55:53 -04:00
friendica
b3b303f037
Merge branch 'ac'
2012-05-06 20:08:20 -07:00
friendica
b74a776162
I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off.
2012-05-06 20:06:39 -07:00
friendica
8a10af3bce
Merge https://github.com/friendica/friendica into pull
2012-05-06 19:56:27 -07:00
friendica
851264161f
mail autcomplete testing
2012-05-06 19:55:39 -07:00
friendica
57920849c4
email recip autocomplete
2012-05-06 19:53:34 -07:00
friendica
8e46c43ee1
rev update
2012-05-06 19:52:22 -07:00
tommy tomson
e417f083b5
diabook-theme: small fix
2012-05-07 02:49:44 +02:00
tommy tomson
3d0a0b6abf
diabook-theme: add "Earth Layers"-box at right_side
2012-05-07 02:24:43 +02:00
tommy tomson
66b9b60792
diabook-theme: twitterbox-bugfix
2012-05-06 23:26:44 +02:00
tommy tomson
f09b3cfbf8
diabook: small fix
2012-05-06 12:25:09 +02:00
tommy tomson
8bdbfdc853
Merge remote-tracking branch 'origin/master'
2012-05-06 12:09:22 +02:00
tommy tomson
abbb4c2f36
diabook-theme: bugfix
2012-05-06 12:08:46 +02:00
Simon
b4bd8258e2
Merge pull request #290 from simonlnu/master
...
font and width tweaking
2012-05-06 03:08:08 -07:00
Simon L'nu
f32c3d74a4
fixing widths to be more dynamic where possible. font size fixes. add README.md
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-06 06:05:31 -04:00
Simon L'nu
7e7372fc5a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
bad sql left after the mailbox in/out merge
* master:
2012-05-06 04:51:15 -04:00
friendica
47c3b43afd
Merge https://github.com/friendica/friendica into pull
2012-05-05 17:54:19 -07:00
friendica
49ccefd6c7
bad sql left after the mailbox in/out merge
2012-05-05 17:53:23 -07:00
Simon L'nu
0c4099966a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-theme: small fix
diabook-theme: twitter-box-update at right_aside
diabook-theme: can now set the twitter search term in theme-settings & small fixes
consolidate item deletion so we can fix orphaned categories and file_as tags.
DE: new email templates translated
workaround to clean up orphaned filetags
only show remove category to item owner
Option to set theme width added. Minor layout changes
* master:
2012-05-05 20:08:19 -04:00
tommy tomson
e1ab3a93cc
diabook-theme: small fix
2012-05-06 00:36:46 +02:00
tommy tomson
c421f35da7
diabook-theme: twitter-box-update at right_aside
2012-05-06 00:10:35 +02:00
tommy tomson
f297751437
diabook-theme: can now set the twitter search term in theme-settings & small fixes
2012-05-05 20:01:38 +02:00
Vasudev Kamath
b5e857c0e7
Merge branch 'master' of git://github.com/friendica/friendica
2012-05-05 20:48:16 +05:30
friendica
8ae83201cf
consolidate item deletion so we can fix orphaned categories and file_as tags.
2012-05-05 07:05:32 -07:00
friendica
8f26e698e6
Merge pull request #289 from cvogeley/master
...
Option to set theme width added. Minor layout changes
2012-05-05 05:04:05 -07:00
Tobias Diekershoff
f9f62ee7ec
DE: new email templates translated
2012-05-05 09:11:25 +02:00
friendica
d0dd22af57
workaround to clean up orphaned filetags
2012-05-04 17:43:47 -07:00
friendica
7c6e8b30b2
only show remove category to item owner
2012-05-04 16:45:10 -07:00
zottel
3cd428152d
Merge remote branch 'upstream/master'
2012-05-05 00:54:00 +02:00
Christian Vogeley
7f061c255c
Option to set theme width added. Minor layout changes
2012-05-05 00:45:35 +02:00
Simon L'nu
250bf57e1e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-05-04 17:43:04 -04:00
Simon
62ea9130fe
Merge pull request #288 from simonlnu/master
...
multiple fixes
2012-05-04 14:13:03 -07:00
Simon L'nu
20ea1b7d4b
fix lightbox; finished dark, now on to light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-04 17:06:17 -04:00
Simon L'nu
5830c32dce
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
category removal
Esperanto 100%
"show more" friends in common
* master:
2012-05-04 17:03:23 -04:00
zottel
dedaa301cb
Merge remote branch 'upstream/master'
2012-05-04 20:42:14 +02:00
friendica
37d4181fde
Merge https://github.com/friendica/friendica into pull
2012-05-04 06:43:24 -07:00
friendica
10754ced3e
category removal
2012-05-04 06:42:56 -07:00
friendica
2a987356c6
Merge pull request #287 from mschmitt/master
...
Update Esperanto to 100%
2012-05-04 03:27:48 -07:00
Martin Schmitt
52f4563f30
Esperanto 100%
2012-05-04 12:02:05 +02:00
friendica
9ecd128e5e
"show more" friends in common
2012-05-04 01:46:36 -07:00
zottel
a9f825ec3f
Merge remote branch 'upstream/master'
2012-05-04 10:00:04 +02:00
Simon L'nu
00190b7faa
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
DE strings
implement max load average before queuing/deferring delivery and poller processes
yet another bug in remote_friends_in_common
string update
use html symbols for double quotes
string update
proofreading the mail templates in fr fixed typo, grammar, spelling…
validate_url() and validate_email() validate also IP address.
* master:
2012-05-04 02:31:21 -04:00
Tobias Diekershoff
22c8fe46a5
DE strings
2012-05-04 07:30:49 +02:00
friendica
421acee65b
implement max load average before queuing/deferring delivery and poller processes
2012-05-03 21:50:48 -07:00
friendica
15542a8690
yet another bug in remote_friends_in_common
2012-05-03 20:47:04 -07:00
friendica
f2d3039aed
string update
2012-05-03 17:20:24 -07:00
friendica
2818cb28e9
use html symbols for double quotes
2012-05-03 17:19:53 -07:00
friendica
f3e18df55d
string update
2012-05-03 16:55:03 -07:00
friendica
ff75dc4e40
Merge pull request #284 from fabrixxm/master
...
validate_url() and validate_email() validate also IP address.
2012-05-03 16:45:30 -07:00
friendica
6a5e5096db
Merge pull request #286 from grossard/french_proofreading
...
proofreading the mail templates in fr
2012-05-03 14:01:06 -07:00
Ludovic Grossard
1f86205ee8
proofreading the mail templates in fr
...
fixed typo, grammar, spelling…
2012-05-03 22:35:59 +02:00
Simon
cdb73f706f
Merge pull request #285 from simonlnu/master
...
dispy reworking, step 1
2012-05-03 11:39:34 -07:00
Simon L'nu
bb081e4bf5
forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv (which it includes)
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-03 14:35:21 -04:00
Simon L'nu
1a13c56fef
major reworking of dispy dark. light to follow
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-03 14:25:18 -04:00
Simon L'nu
4c8a82456e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-theme: small fix
Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely.
* master:
2012-05-03 14:18:40 -04:00
Fabio Comuni
52915c6e68
validate_url() and validate_email() validate also IP address.
2012-05-03 15:28:23 +02:00
zottel
35771a778d
Merge remote branch 'upstream/master'
2012-05-03 10:21:38 +02:00
tommy tomson
d72db2e1aa
diabook-theme: small fix
2012-05-03 07:57:40 +02:00
friendica
2bfba93940
Merge https://github.com/friendica/friendica into pull
2012-05-02 22:38:17 -07:00
friendica
e7ff35f27d
Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely.
2012-05-02 22:33:51 -07:00
Simon L'nu
0446766f04
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-theme: small fix
diabook-theme: made boxes at right_aside sortable
use cid rather than uid in perms
Modify events_post() in mod/events.php to set the `private` field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others.
use mysql replace on cache items
fixing common friends
rev update
Moved Meta Viewport from global head.tpl to diabook's header
* master:
2012-05-03 00:25:56 -04:00
tommy tomson
ff2ddc319d
diabook-theme: small fix
2012-05-03 06:25:23 +02:00
tommy tomson
3521e22333
diabook-theme: made boxes at right_aside sortable
2012-05-03 06:05:55 +02:00
friendica
e7580b71e1
use cid rather than uid in perms
2012-05-02 21:00:39 -07:00
friendica
079d954765
Merge pull request #283 from fermionic/private-events-post-correctly-in-diaspora
...
Fix private-events posts in Diaspora
2012-05-02 20:49:51 -07:00
Zach Prezkuta
5d957c3803
Modify events_post() in mod/events.php to set the private
field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others.
2012-05-02 21:12:57 -06:00
friendica
3ecde2d72f
use mysql replace on cache items
2012-05-02 16:27:19 -07:00
friendica
8e1437ca8b
fixing common friends
2012-05-02 16:15:59 -07:00
friendica
a292629215
Merge https://github.com/friendica/friendica into pull
2012-05-02 15:27:39 -07:00
friendica
3be9cddfd7
rev update
2012-05-02 15:26:57 -07:00
friendica
b9c91c3320
Merge pull request #282 from max-weller/master
...
Moved <meta viewport> to theme; Diabook style
2012-05-02 13:49:57 -07:00
Simon L'nu
02dc116a9c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box
diabook-theme: tryied to improve performance a bit
diabook-theme: fix footer/impressum
missing param
provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc.
delineate the new profile changes from the rest of the text
how did that happen?
shuffle results of remote_common_friends widget
only validate once
perform basic validation
* master:
2012-05-02 12:49:00 -04:00
Max Weller
f0c11cac4a
Moved Meta Viewport from global head.tpl to diabook's header
...
I mistakenly added this <meta> tag to the global header, but it
causes problems for other themes, as they have other optimal widths.
I also added a style to diabook which makes the jGrowl messages
appear below the header bar, so you can still click the menu items
without having to close messages first.
2012-05-02 16:59:58 +02:00
tommy tomson
6875f54647
diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box
2012-05-02 16:27:01 +02:00
tommy tomson
67471bb534
diabook-theme: tryied to improve performance a bit
2012-05-02 14:33:04 +02:00
tommy tomson
6a9cd8cd4b
diabook-theme: fix footer/impressum
2012-05-02 12:40:51 +02:00
friendica
21e18db757
missing param
2012-05-02 02:18:54 -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
06d6ab4812
delineate the new profile changes from the rest of the text
2012-05-02 01:07:23 -07:00
friendica
35dc4202a2
how did that happen?
2012-05-02 00:58:28 -07:00
friendica
a42a475e10
shuffle results of remote_common_friends widget
2012-05-02 00:44:37 -07:00
friendica
1b1f56f556
only validate once
2012-05-01 23:16:58 -07:00
friendica
dd27328390
perform basic validation
2012-05-01 23:15:39 -07:00
zottel
6000e7f30d
Merge remote branch 'upstream/master'
2012-05-02 08:11:52 +02:00
Simon L'nu
b3680c0d26
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
final touches - show friends in common with total strangers from different sites
fix size
cross fingers
reduce the scope a bit
add template
fn not found
really fat fingers today - though none of this has gone further than my own site
another one
typo
first try common friends for visitors
* master:
2012-05-02 01:54:59 -04:00
friendica
becdb1f508
final touches - show friends in common with total strangers from different sites
2012-05-01 21:22:27 -07:00
friendica
1fab28c413
fix size
2012-05-01 20:38:06 -07:00
friendica
e247ed3de2
cross fingers
2012-05-01 20:36:35 -07:00
friendica
594803afca
reduce the scope a bit
2012-05-01 20:33:19 -07:00
friendica
066d69b21c
add template
2012-05-01 20:22:59 -07:00
friendica
72dbc2faee
fn not found
2012-05-01 20:11:35 -07:00
friendica
91085f0969
really fat fingers today - though none of this has gone further than my own site
2012-05-01 19:24:22 -07:00
friendica
15c1850156
another one
2012-05-01 19:20:41 -07:00
friendica
1fc796b276
typo
2012-05-01 19:19:24 -07:00
friendica
8bd6e1aef9
first try common friends for visitors
2012-05-01 19:16:18 -07:00
Simon L'nu
c96b40ab5f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
improve handling of relative feed url's
convert html entities to utf-8 before email header encoding
More Diabook-dark touch-ups. Should *really* be useable this time...with editplain anyway.
modified: images/smiley-thumbsup.gif
diabook-themes: small fix at "community pages"-box
link socgraph to zrls
adding zrl support to social graphs
* master:
2012-05-01 21:38:33 -04:00
friendica
f24ffa8ef0
improve handling of relative feed url's
2012-05-01 17:10:26 -07:00
friendica
6914bdce17
Merge https://github.com/friendica/friendica into pull
2012-05-01 15:50:14 -07:00
friendica
38ccd2e655
convert html entities to utf-8 before email header encoding
2012-05-01 15:49:22 -07:00
Thomas Willingham
671a10f5d4
More Diabook-dark touch-ups. Should *really* be useable this time...with editplain anyway.
2012-05-01 21:37:49 +01:00
Thomas Willingham
a5f78cf655
modified: images/smiley-thumbsup.gif
...
Restored some yellow where there shouldn't have been transparency.
Probably introduced by me in the first place.
2012-05-01 21:05:55 +01:00
tommy tomson
ab556857f0
diabook-themes: small fix at "community pages"-box
2012-05-01 16:46:08 +02:00
friendica
0ca4fa78c8
link socgraph to zrls
2012-05-01 01:34:47 -07:00
friendica
f8acb32961
Merge https://github.com/friendica/friendica into pull
2012-05-01 01:19:02 -07:00
friendica
584ac68ae4
adding zrl support to social graphs
2012-05-01 01:16:47 -07:00
Simon
facffe1745
Merge pull request #281 from simonlnu/master
...
font and background adjustments
2012-05-01 01:03:52 -07:00
Simon L'nu
6d3ba2825b
lighten bg and darken font on dispy light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-01 04:02:56 -04:00
Simon L'nu
5d6296b81b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
hidden plugins (add .hidden file to dir)
* master:
2012-05-01 04:02:17 -04:00
zottel
2e2bb5e8b0
Merge remote branch 'upstream/master'
2012-05-01 08:21:12 +02:00
friendica
f175af05f9
Merge https://github.com/friendica/friendica into pull
2012-04-30 23:08:31 -07:00
friendica
d48cd0f9a3
hidden plugins (add .hidden file to dir)
2012-04-30 23:07:52 -07:00
Simon
b8b0b3a87d
Merge pull request #280 from simonlnu/master
...
added a / for consistency's sake ;p
2012-04-30 22:57:28 -07:00
Simon L'nu
e245ecddf2
sub-minor change to head.tpl
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-01 01:56:21 -04:00
Simon L'nu
46558e98a8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: add "community profiles"-box to right_column
change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it
make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter
rev update
start adding tooltips to tab menus
fix join group notifications
* master:
2012-05-01 00:49:42 -04:00
tommy tomson
2c577ed90f
diabook-themes: add "community profiles"-box to right_column
2012-05-01 06:21:40 +02:00
friendica
25afec0f81
Merge pull request #279 from fermionic/generate-random-id-bug-in-statusnet-api
...
Bug in StatusNet API
2012-04-30 20:45:10 -07:00
Zach Prezkuta
a844093365
change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it
2012-04-30 20:51:22 -06:00
friendica
a3a55897e5
Merge https://github.com/friendica/friendica into pull
2012-04-30 19:04:28 -07:00
friendica
3c0cf72716
make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it
...
also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
2012-04-30 19:01:41 -07:00
tommy tomson
f35ffa9b60
diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter
2012-05-01 02:33:55 +02: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
5d10672fb8
fix join group notifications
2012-04-30 04:11:42 -07:00
Simon L'nu
9b7dac6ce1
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
provide "xxx joined yyy" notifications
adding META viewport tag for better look on tablets
Update Esperanto to 100%
DE update to the strings
activitystreams schema constants for "join group"
missed a db field
typo in profile_selectors, fix remote tagging
not all profile selector choices have unique or direct translations
log db error strings in all cases
admin page to manage failed updates
improved db error logging
close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw)
* master:
2012-04-30 06:02:38 -04:00
friendica
9f18c9d664
Merge pull request #277 from mschmitt/master
...
Update Esperanto to 100%
2012-04-30 01:29:50 -07:00
friendica
6b9ac25398
Merge pull request #278 from max-weller/meta_viewport
...
adding META viewport tag for better look on tablets
2012-04-30 01:29:35 -07:00
friendica
52e4098a3d
Merge https://github.com/friendica/friendica into pull
2012-04-30 01:26:06 -07:00
friendica
3ff8fe53a2
provide "xxx joined yyy" notifications
2012-04-30 01:25:25 -07:00
Max Weller
9d8a0553ac
adding META viewport tag for better look on tablets
2012-04-30 09:48:21 +02:00
Martin Schmitt
5b9f01c3ab
Update Esperanto to 100%
2012-04-30 09:00:03 +02:00
Tobias Diekershoff
36522c4341
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-30 08:40:06 +02:00
Tobias Diekershoff
f08dc392df
DE update to the strings
2012-04-30 08:39:12 +02:00
friendica
0639f645d2
activitystreams schema constants for "join group"
2012-04-29 23:15:12 -07:00
friendica
384d28a6bd
Merge pull request #276 from tomtom84/master
...
close one menu (like notificationsmenu) when another one is opened (like when clicking somewhere else)
2012-04-29 22:39:29 -07:00
friendica
da555286d6
missed a db field
2012-04-29 22:36:26 -07:00
friendica
928faf3b97
typo in profile_selectors, fix remote tagging
2012-04-29 22:34:05 -07:00
friendica
ae2aa74444
not all profile selector choices have unique or direct translations
2012-04-29 20:05:29 -07:00
friendica
1ebde08415
log db error strings in all cases
2012-04-29 19:41:17 -07:00
friendica
0153d86b7f
admin page to manage failed updates
2012-04-29 19:10:07 -07:00
Simon L'nu
34eb843fb4
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
the heart should really be red.
fix location change notification
enhanced profile reporting for single values
add db field for removed account, which will also be the first test of update error checking
toggle to archive unfriends, though render them useless
indicate successful updates
diabook-themes: small fix
diabook-themes: bug/css-fixes
some constants for the db update failure possibilities
bring back the email and logging of update failures, but without the transactions
* master:
2012-04-29 22:06:16 -04:00
friendica
e3fecb2557
improved db error logging
2012-04-29 17:34:54 -07:00
tommy tomson
ab908469ae
close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw)
2012-04-30 02:00:41 +02:00
friendica
def6f0b408
the heart should really be red.
2012-04-29 02:11:33 -07:00
friendica
735f518fd8
fix location change notification
2012-04-29 01:49:54 -07:00
friendica
a9dba2720b
enhanced profile reporting for single values
2012-04-29 01:42:48 -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
64060f82dc
toggle to archive unfriends, though render them useless
2012-04-28 21:56:17 -07:00
friendica
b3a71e4327
indicate successful updates
2012-04-28 21:35:14 -07:00
tommy tomson
920d40acf4
diabook-themes: small fix
2012-04-29 05:58:23 +02:00
tommy tomson
3d054341ef
diabook-themes: bug/css-fixes
2012-04-29 04:12:04 +02: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
Simon L'nu
ecd1dab373
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
a few more continues that should be returns
small bugfix. sometimes also avatar pics were rescaled
* master:
2012-04-28 20:16:25 -04:00
friendica
8a112aee00
Merge https://github.com/friendica/friendica into pull
2012-04-28 16:55:07 -07:00
friendica
4ff2e9a103
a few more continues that should be returns
2012-04-28 16:54:33 -07:00
friendica
a757afc6bd
Merge pull request #275 from cvogeley/master
...
small bugfix. sometimes also avatar pics were rescaled
2012-04-28 16:46:12 -07:00
Simon L'nu
9413900a9f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
poller refactor: continue not valid in this context
* master:
2012-04-28 15:46:16 -04:00
Christian Vogeley
3f586bb962
small bugfix. sometimes also avatar pics were rescaled
2012-04-28 20:15:10 +02:00
friendica
44700b914d
poller refactor: continue not valid in this context
2012-04-28 04:20:38 -07:00
Simon L'nu
c661dc502f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
break up poller into separate processes
add tooltip title to common_tabs
PRIVACY: if wall is blocked, don't provide public keywords in HTML meta
Diabook-dark update, it's almost useable now (if you're lenient).
Added "important changes" to admin menu for admins who don't follow the github properly.
* master:
2012-04-28 05:29:03 -04:00
friendica
f163aed66d
break up poller into separate processes
2012-04-27 23:17:40 -07:00
friendica
3bb06cc3e4
add tooltip title to common_tabs
2012-04-27 19:47:52 -07:00
friendica
e356920e14
Merge https://github.com/friendica/friendica into pull
2012-04-27 19:40:24 -07:00
friendica
39d0926d09
PRIVACY: if wall is blocked, don't provide public keywords in HTML meta
2012-04-27 19:39:19 -07:00
Thomas Willingham
4b553de79f
Diabook-dark update, it's almost useable now (if you're lenient).
2012-04-28 03:01:27 +01:00
Simon L'nu
3bfa3f2a13
fix #search-text
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 21:02:57 -04:00
Simon L'nu
b618715fc6
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
string update
implement contact archival
archive contact flag
pass zrl to dfrn_request as fallback
rev update
another attempt to fix lower tab behaviour on small screens, community back in tab area
* master:
2012-04-27 21:00:56 -04:00
zottel
43f9ea7cfc
Merge remote branch 'upstream/master'
2012-04-28 02:30:20 +02:00
Thomas Willingham
adc2fc18a5
Added "important changes" to admin menu for admins who don't follow
...
the github properly.
2012-04-28 01:25:55 +01:00
friendica
c3f70a9e56
string update
2012-04-27 17:19:10 -07:00
friendica
26c53580d1
implement contact archival
2012-04-27 17:17:58 -07:00
friendica
0ab6b60a52
archive contact flag
2012-04-27 16:46:28 -07:00
friendica
ecc4962bd1
pass zrl to dfrn_request as fallback
2012-04-27 16:23:25 -07:00
friendica
b3750ab54e
Merge https://github.com/friendica/friendica into pull
2012-04-27 15:56:28 -07:00
friendica
c7cbff6fbb
rev update
2012-04-27 15:55:56 -07:00
friendica
455973180b
Merge pull request #274 from cvogeley/master
...
cleanzero: nav.tpl: Another attempt to improve lower tab behaviour
2012-04-27 15:55:38 -07:00
Christian Vogeley
731379fa25
another attempt to fix lower tab behaviour on small screens, community back in tab area
2012-04-27 23:48:44 +02:00
zottel
edc7e571b7
Merge remote branch 'upstream/master'
2012-04-27 23:05:38 +02:00
Simon
a632f03531
Merge pull request #273 from simonlnu/master
...
fix netsearch-box dupe and stuff
2012-04-27 11:38:19 -07:00
Simon L'nu
64f3af49fa
remove extra netsearch-box and fix
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 14:33:56 -04:00
Simon L'nu
fcbe78f9aa
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-04-27 14:33:11 -04:00
Simon
e315b01f86
Merge pull request #272 from simonlnu/master
...
fix contact-friend stuff on profile sidebar
2012-04-27 10:31:55 -07:00
Simon L'nu
d0d79196ba
fix contact-friend stuff on profile sidebar
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 13:31:06 -04:00
Simon L'nu
263836ad54
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
put community back on the lower tab. It belongs with message streams
* master:
2012-04-27 13:29:07 -04:00
Vasudev Kamath
214ec91a3f
Merge branch 'master' of git://github.com/friendica/friendica
2012-04-27 22:43:26 +05:30
friendica
4b92e3543c
Merge https://github.com/friendica/friendica into pull
2012-04-27 02:31:37 -07:00
friendica
266eaae439
put community back on the lower tab. It belongs with message streams
2012-04-27 02:30:49 -07:00
Simon
d16c93c7cd
Merge pull request #271 from simonlnu/master
...
fix some css errors
2012-04-27 01:43:32 -07:00
Simon L'nu
deae1df3be
fix some css errors
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 04:42:38 -04:00
Simon L'nu
014e832db0
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix view contacts
* master:
2012-04-27 04:15:27 -04:00
friendica
153534bc70
Merge https://github.com/friendica/friendica into pull
2012-04-27 01:10:33 -07:00
friendica
f06a554e05
fix view contacts
2012-04-27 01:10:09 -07:00
Simon
8aead9e517
Merge pull request #270 from simonlnu/master
...
fix 2 issues
2012-04-26 23:36:11 -07:00
Simon L'nu
b936e3a18a
fix 2 issues. contacts img in finder; wall filer title
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 02:33:58 -04:00
Simon L'nu
bd1b38381d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
reset qcomment selector after insert.
put fakelink back in birthday notice
birthday contact link goes to event page instead of remote profile
make comment edit icons look more like base theme
rev update
* master:
2012-04-27 02:28:44 -04:00
zottel
17aba3033f
Merge remote branch 'upstream/master'
2012-04-27 08:10:04 +02:00
friendica
a1f94ac59f
reset qcomment selector after insert.
2012-04-26 21:53:40 -07:00
friendica
d3992b78e6
put fakelink back in birthday notice
2012-04-26 20:08:57 -07:00
friendica
dee36c1b04
birthday contact link goes to event page instead of remote profile
2012-04-26 20:02:42 -07:00
friendica
dd33599a1d
Merge https://github.com/friendica/friendica into pull
2012-04-26 19:56:25 -07:00
friendica
3c6cf1f19c
make comment edit icons look more like base theme
2012-04-26 19:55:20 -07:00
Simon
6c1ab27626
Merge pull request #269 from simonlnu/master
...
fix s/color/colour/g issue
2012-04-26 17:15:14 -07:00
Simon L'nu
8834944952
fix s/color/colour/g issue
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-26 20:13:11 -04:00
Simon L'nu
7b5bab445d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: small-fix
add link "remove account" to /mod/settings.php
* master:
2012-04-26 20:07:54 -04:00
friendica
2d94d216a3
Merge https://github.com/friendica/friendica into pull
2012-04-26 15:35:25 -07:00
friendica
f8e7f28f40
rev update
2012-04-26 15:35:00 -07:00
friendica
3ee998dbaf
Merge pull request #267 from tomtom84/master
...
add link "remove account" to /mod/settings.php
2012-04-26 15:33:34 -07:00
Simon
552895001c
Merge pull request #268 from simonlnu/master
...
announced dipsy change. re-tie your boots, we're in for a wee ride ;)
2012-04-26 13:23:23 -07:00
Simon L'nu
d6116b6979
announced dipsy change. re-tie your boots, we're in for a wee ride ;)
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-26 16:14:42 -04:00
Simon L'nu
bd14fdec6e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update, fix autoname test "random" failure
duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
added BBCODE thing in comments
add cleanzero theme
* master:
2012-04-26 16:10:17 -04:00
tommy tomson
328568943e
diabook-themes: small-fix
2012-04-26 21:07:46 +02:00
tommy tomson
77a0570162
add link "remove account" to /mod/settings.php
2012-04-26 17:21:27 +02:00
friendica
82abb14bf9
Merge pull request #265 from cvogeley/master
...
cleanzero theme added
2012-04-26 01:35:50 -07:00
friendica
bf97ad2010
Merge https://github.com/friendica/friendica into pull
2012-04-26 01:34:21 -07:00
friendica
78579627ce
rev update, fix autoname test "random" failure
2012-04-26 01:33:41 -07:00
Simon
f6f666e38a
Merge pull request #266 from simonlnu/master
...
convert stylesheets to less, and compress output css
2012-04-25 23:45:32 -07:00
Simon L'nu
c1f1974e44
convert stylesheets to less, and compress output css
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-26 02:38:18 -04:00
Simon L'nu
6b830bfa97
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Diabook-dark more CSS fixes.
* master:
2012-04-26 00:20:00 -04:00
Thomas Willingham
20a9cdfc90
Diabook-dark more CSS fixes.
...
Slowly getting there.
2012-04-25 23:40:40 +01:00
Christian Vogeley
43a257f2f6
duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
2012-04-25 21:30:04 +02:00
Christian Vogeley
28370e320f
duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
2012-04-25 21:28:13 +02:00
Christian Vogeley
c0d4e39052
added BBCODE thing in comments
2012-04-25 21:08:31 +02:00
Simon L'nu
78280bdfed
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
bug #307 , explaining decentralised private photos is impossible.
this turns out to be harder than I thought
cleanup - make bb-buttons vanish when comment closed
Esperanto at 100% again
* master:
2012-04-25 13:47:20 -04:00
Christian Vogeley
4c1398c6b1
add cleanzero theme
2012-04-25 19:09:46 +02:00
friendica
c9e5609cbf
bug #307 , explaining decentralised private photos is impossible.
2012-04-25 05:41:32 -07:00
friendica
37bc00094e
this turns out to be harder than I thought
2012-04-25 01:36:22 -07:00
friendica
38e822320c
Merge pull request #264 from mschmitt/master
...
Esperanto at 100% again
2012-04-25 00:25:05 -07:00
friendica
50f10a4fd7
Merge https://github.com/friendica/friendica into pull
2012-04-25 00:14:20 -07:00
friendica
ba0ade3380
cleanup - make bb-buttons vanish when comment closed
2012-04-25 00:13:36 -07:00
zottel
0116426a0e
Merge remote branch 'upstream/master'
2012-04-25 09:07:36 +02:00
Simon L'nu
1a1efc7e46
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: fix css to login.tpl
restore qcomment selector
rev update
zero-themes: add bbcode-toolbar to commentbox
diabook-themes: small fix
Diabook-dark css fix
Diabook-dark, couple of new icons, and another css fix.
fix tags test with new url
quattro: small week calendar view for event/birthday reminders
remove html from get_birthdays() and get_events()
events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id])
* master:
2012-04-25 03:05:47 -04:00
Martin Schmitt
15f7125df2
Esperanto at 100% again
2012-04-25 08:50:02 +02:00
tomtom84
5187faa595
Merge pull request #263 from tomtom84/master
...
diabook-themes: fix css to login.tpl
2012-04-24 18:42:32 -07:00
tommy tomson
9fe6333fd4
diabook-themes: fix css to login.tpl
2012-04-25 03:38:21 +02:00
friendica
5af80dbb89
restore qcomment selector
2012-04-24 18:23:48 -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
friendica
75828b4750
Merge pull request #262 from tomtom84/master
...
zero-themes: add bbcode-toolbar to commentbox
2012-04-24 17:54:41 -07:00
tommy tomson
e72eaf2408
zero-themes: add bbcode-toolbar to commentbox
2012-04-25 02:43:50 +02:00
tommy tomson
08b990a314
diabook-themes: small fix
2012-04-25 00:19:57 +02:00
friendica
5ebc221c28
Merge pull request #261 from fabrixxm/eventspage
...
Some tweak on events page and events/bitrhdays reminder
2012-04-24 14:50:22 -07:00
Thomas Willingham
a28fea987e
Diabook-dark css fix
2012-04-24 20:07:08 +01:00
Thomas Willingham
fade45ca76
Diabook-dark, couple of new icons, and another css fix.
2012-04-24 20:00:49 +01:00
zottel
912e008ded
Merge remote branch 'upstream/master'
2012-04-24 10:38:23 +02:00
friendica
fbdb8fc43a
fix tags test with new url
2012-04-24 01:02:22 -07:00
Fabio Comuni
c9a8dbc322
quattro: small week calendar view for event/birthday reminders
2012-04-24 09:50:44 +02:00
Fabio Comuni
62ad5043d6
remove html from get_birthdays() and get_events()
2012-04-24 09:50:10 +02:00
Simon L'nu
0e2c6c2819
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
separate tag search from body search
Esperanto at 100% again
Improvements to diabook-dark
move unfriend to standalone function for use in account removal
more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips
* master:
2012-04-24 03:33:46 -04: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
7923404c83
Merge https://github.com/friendica/friendica into pull
2012-04-23 22:42:48 -07:00
friendica
2064d86cb3
separate tag search from body search
2012-04-23 22:41:32 -07:00
friendica
3299365c76
Merge pull request #260 from mschmitt/master
...
Esperanto at 100% again
2012-04-23 22:22:05 -07:00
Martin Schmitt
c85fd87df1
Esperanto at 100% again
2012-04-24 06:52:36 +02:00
friendica
822ecf41bd
Merge pull request #259 from beardy-unixer/master
...
Diabook-dark
2012-04-23 21:10:53 -07:00
Thomas Willingham
9443248fad
Improvements to diabook-dark
...
Still a long way to go, but some icons and a few CSS fixes
2012-04-24 04:55:39 +01:00
Thomas Willingham
92820c5181
Merge remote-tracking branch 'upstream/master'
...
Merge upstream
2012-04-24 04:54:14 +01:00
friendica
3637534119
move unfriend to standalone function for use in account removal
2012-04-23 19:42:57 -07: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
Thomas Willingham
8a80ea24d1
Merge remote-tracking branch 'upstream/master'
...
Merge upstream
2012-04-24 02:18:51 +01:00
Simon L'nu
6e9485605f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
DE strings, correction of a typo
diabok-themes: fixed bug in green-wide and dark-wide
diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders
diabook-themes: bugfix in admin-section
allow bbcode representation of html symbols such as © by wrapping in bb brackets
protect jappixmini/proxy from typo check, more work on email2 connector
* master:
2012-04-23 18:25:14 -04:00
Tobias Diekershoff
af7abcea27
DE strings, correction of a typo
2012-04-23 20:55:48 +02:00
tommy tomson
a305cf9f5c
diabok-themes: fixed bug in green-wide and dark-wide
2012-04-23 18:42:37 +02:00
tommy tomson
c5c419a785
diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders
2012-04-23 17:22:22 +02:00
tommy tomson
d072c12e7d
diabook-themes: bugfix in admin-section
2012-04-23 15:47:18 +02:00
friendica
e9e4fb664a
allow bbcode representation of html symbols such as © by wrapping in bb brackets
2012-04-23 05:42:46 -07:00
friendica
8f0f644295
protect jappixmini/proxy from typo check, more work on email2 connector
2012-04-23 05:16:57 -07:00
zottel
e6847cdd3f
Merge remote branch 'upstream/master'
2012-04-23 08:57:49 +02:00
Simon L'nu
29d7f260d7
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
bug #388 - notify_comment received after post deleted
don't allow non-existent themes as choices
diabook-themes: bugfix
diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer
api: add support for StatusNet-style media param to API
Add a hook
* master:
2012-04-22 22:22:52 -04:00
friendica
2170df897b
bug #388 - notify_comment received after post deleted
2012-04-22 19:19:02 -07:00
friendica
724e1d15d0
Merge https://github.com/friendica/friendica into pull
2012-04-22 16:25:02 -07:00
friendica
00cb7f9efb
don't allow non-existent themes as choices
2012-04-22 16:24:29 -07:00
friendica
c0dffa7442
Merge pull request #258 from unary/api
...
api: add support for StatusNet-style media param to API
2012-04-22 15:43:24 -07:00
friendica
3c6c5d4749
Merge pull request #257 from CatoTH/master
...
Add a hook in mod/ping.php
2012-04-22 15:41:47 -07:00
tommy tomson
e74ae8b031
diabook-themes: bugfix
2012-04-22 23:58:34 +02:00
tommy tomson
d6c8a14fb0
diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer
2012-04-22 22:31:44 +02:00
Michael Johnston
76aa9b3037
api: add support for StatusNet-style media param to API
2012-04-22 13:37:25 -04:00
Simon L'nu
75c228fa13
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
DE strings update
diabook-themes: comment-bbcode-bugfix
* master:
2012-04-22 12:27:59 -04:00
Michael Vogel
a3f08c44be
API: RSS-Feeds are now shortened to 1000 characters. (With added link)
2012-04-22 18:00:24 +02:00
Tobias Hößl
27c23229c4
Merge branch 'master' of git://github.com/friendica/friendica
2012-04-22 13:31:07 +00:00
Tobias Hößl
3116db1a74
Add a hook
2012-04-22 13:28:54 +00:00
Tobias Diekershoff
9434b447f3
DE strings update
2012-04-22 13:13:27 +02:00
tommy tomson
c0a377e0de
diabook-themes: comment-bbcode-bugfix
2012-04-22 12:59:00 +02:00
Vasudev Kamath
f1d84c1045
Merge branch 'master' of git://github.com/friendica/friendica
2012-04-22 12:08:05 +05:30
Simon
54817f058a
Merge pull request #256 from simonlnu/master
...
fix tinymce theming
2012-04-21 22:23:13 -07:00
Simon L'nu
203aa819e2
fix tinymce theming
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-22 01:22:29 -04:00
Simon L'nu
f99d9e4d7f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update
diabook-themes: deleted obsolete diabook-folder & minor bug-fixes
* master:
2012-04-22 01:17:13 -04:00
friendica
d340b80094
Merge https://github.com/friendica/friendica into pull
2012-04-21 19:29:08 -07:00
friendica
371f3e450e
rev update
2012-04-21 19:28:45 -07:00
tommy tomson
fe6567cb88
diabook-themes: deleted obsolete diabook-folder & minor bug-fixes
2012-04-22 03:15:06 +02:00
Michael Vogel
71e2dbf352
Merge commit 'upstream/master'
2012-04-21 19:26:24 +02:00
Simon L'nu
2d129e7455
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update
* master:
2012-04-21 04:34:56 -04:00
friendica
bdbe068b95
rev update
2012-04-21 01:18:46 -07:00
Vasudev Kamath
4499ce96a0
Executable permission missing on script
2012-04-21 12:00:19 +05:30
Simon
7bae290aeb
Merge pull request #255 from simonlnu/master
...
fix checkboxes and radio buttons for some browsers
2012-04-20 17:19:49 -07:00
Simon L'nu
7a14f45904
fix checkbox/radio buttons for some browsers
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-20 20:18:47 -04:00
Simon L'nu
172aff1c2b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: add diabook-dark
diabook-themes: add diabook-green and some minor css/bug-fixes
rev update
escape email template var names. fix bug n385.
* master:
2012-04-20 20:16:06 -04:00
tommy tomson
8809e96310
diabook-themes: add diabook-dark
2012-04-21 01:06:17 +02:00
Vasudev Kamath
8465ad6e1e
Few more files with unnecessary executable permissions
2012-04-21 00:22:48 +05:30
tommy tomson
e052be606c
diabook-themes: add diabook-green and some minor css/bug-fixes
2012-04-20 17:16:42 +02:00
friendica
30bbbf32e5
rev update
2012-04-20 06:31:38 -07:00
zottel
9663299da1
Merge remote branch 'upstream/master'
2012-04-20 13:42:33 +02:00
Simon
0e25376e4a
Merge pull request #254 from simonlnu/master
...
add some knobs to comment boxes
2012-04-20 03:43:55 -07:00
fabrixxm
16c308791f
Merge pull request #253 from fabrixxm/master
...
fix bug n385
2012-04-20 03:42:50 -07:00
Simon L'nu
5d2dd5798b
fix the buttons. don't hide the buttons once shown
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-20 06:42:08 -04:00
Simon L'nu
eb9ddb884a
optimise imgs; add some comment editing knobs
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-20 05:56:54 -04:00
Simon L'nu
1c88a7ef5d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
XSRF protection and PHPdoc for mod/admin.php
XSRF protection and PHPdoc for mod/admin.php
* master:
2012-04-20 05:52:08 -04:00
Fabio Comuni
6af5a3a485
escape email template var names. fix bug n385.
2012-04-20 11:39:36 +02:00
Fabio Comuni
3bb785fdad
Merge remote-tracking branch 'CatoTH/master' into req245
2012-04-20 09:25:51 +02:00
Simon L'nu
83683b516e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
* master:
2012-04-20 00:02:18 -04:00
tomtom84
c88dd1485f
Merge pull request #252 from tomtom84/master
...
diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
2012-04-19 16:55:24 -07:00
tommy tomson
f5f1956e8b
diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
2012-04-20 01:44:21 +02:00
Simon L'nu
ccdac0cd99
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-04-19 18:47:54 -04:00
Simon
4a292e4137
Merge pull request #251 from simonlnu/master
...
fix .item-select
2012-04-19 10:41:25 -07:00
Simon L'nu
6055d636ed
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-04-19 13:02:52 -04:00
Simon L'nu
05173d0a8a
fix .item-select
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-19 13:02:41 -04:00
Simon
51967edfe8
Merge pull request #250 from simonlnu/master
...
tweak drop-down and add in filebrowser
2012-04-19 09:55:36 -07:00
Simon L'nu
4fd1a17f06
tweak drop-down and add in filebrowser
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-19 12:54:53 -04:00
Simon L'nu
caa6bc96f3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Hadn't merged fixed typo from upstream.
EO translation fixes
filebrowser: fix style, show 10 recent photos if not in an album
filebrowser: more style, load min and max scale photos
tinymce: add inlinepopups plugin
tinymce: add filebrowser for photos and attached files
* master:
2012-04-19 12:32:09 -04:00
fabrixxm
44f4b4b9d1
Merge pull request #248 from fabrixxm/tmcefilebrowser
...
TinyMCE file browser
2012-04-19 00:30:45 -07:00
fabrixxm
42e120586c
Merge pull request #249 from mschmitt/master
...
EO translation fixes
2012-04-18 23:18:50 -07:00
Martin Schmitt
25f6753a1f
Hadn't merged fixed typo from upstream.
2012-04-19 06:51:52 +02:00
Martin Schmitt
7e3c183601
EO translation fixes
2012-04-19 06:45:54 +02:00
Simon L'nu
5916bc6539
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-04-18 23:48:41 -04:00
Fabio Comuni
fddf21d983
filebrowser: fix style, show 10 recent photos if not in an album
2012-04-18 15:15:52 +02:00
Fabio Comuni
0630120455
filebrowser: more style, load min and max scale photos
2012-04-18 14:56:03 +02:00
Fabio Comuni
56efb42223
tinymce: add inlinepopups plugin
2012-04-18 14:55:21 +02:00
Fabio Comuni
e2e6b56c44
tinymce: add filebrowser for photos and attached files
2012-04-18 13:23:42 +02:00
Simon
91d1ef36d8
Merge pull request #247 from simonlnu/master
...
fix silly abandonded typo. shouldn't affect translations
2012-04-18 03:20:10 -07:00
Simon L'nu
a30ea16218
only affect immediate li children
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-18 06:17:20 -04:00
Simon L'nu
4b9bcb39e0
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-04-18 06:11:54 -04:00
Simon L'nu
311f39f12f
fix silly abandonded typo. shouldn't affect translations
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-18 06:10:34 -04:00
Simon
b7bda7530f
Merge pull request #246 from simonlnu/master
...
fix alignment issues with toolbar
2012-04-18 03:01:02 -07:00
Simon L'nu
af3e37ce20
fix alignment issues with toolbar
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-18 05:59:50 -04:00
Tobias Hößl
b885fedee1
XSRF protection and PHPdoc for mod/admin.php
2012-04-18 07:36:48 +00:00
Tobias Hößl
d7e750ad74
XSRF protection and PHPdoc for mod/admin.php
2012-04-18 07:24:47 +00:00
Simon L'nu
f087fd5581
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: some css/bug-fixes
messages.po/strings.php at 100% Esperanto
Typo
* master:
2012-04-18 00:24:33 -04:00
tommy tomson
1b6c84d8f4
diabook-themes: some css/bug-fixes
2012-04-18 02:36:30 +02:00
friendica
c53d4498b8
Merge pull request #244 from mschmitt/master
...
Esperanto translation
2012-04-17 17:09:16 -07:00
friendica
34144a3b4a
Merge pull request #243 from CatoTH/master
...
Typo in Constant
2012-04-17 17:09:04 -07:00
Martin Schmitt
2fbd5127ba
messages.po/strings.php at 100% Esperanto
2012-04-17 22:50:44 +02:00
Simon L'nu
74b237d46d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: theme-settings: "wide"-option and new screenshots
* master:
2012-04-17 15:36:45 -04:00
Tobias Hößl
e3af818263
Typo
2012-04-17 19:31:06 +00:00
tommy tomson
5b407b5ee7
diabook-themes: theme-settings: "wide"-option and new screenshots
2012-04-17 19:45:53 +02:00
Simon
97c50a0924
Merge pull request #242 from simonlnu/master
...
[SECURITY] finish ripping out fpostit
2012-04-17 10:22:39 -07:00
Simon L'nu
f4ff75cace
[SECURITY] finish ripping out fpostit
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-17 13:21:30 -04:00
Simon L'nu
d92bab6693
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
update to the German string files
diabook-themes: removed fpostit due to security issues and small fix in german translation
naked br appearing when attaching and textplain
Some Bugfixes, and variable checks
rev update
* master:
2012-04-17 13:17:13 -04:00
Simon
04af5d9e2c
Merge pull request #241 from simonlnu/master
...
rip out fpostit
2012-04-17 10:16:56 -07:00
Simon L'nu
1b2209fb3c
rip out fpostit
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-17 13:15:11 -04:00
Tobias Diekershoff
dbff4252d4
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-17 18:07:20 +02:00
Tobias Diekershoff
757e3429ac
update to the German string files
2012-04-17 18:06:28 +02:00
tommy tomson
b30c761aae
diabook-themes: removed fpostit due to security issues and small fix in german translation
2012-04-17 16:15:49 +02:00
friendica
8269d6aa19
Merge pull request #240 from CatoTH/master
...
Some bugfixes / Notices
2012-04-17 06:50:09 -07:00
friendica
e6330e3b96
naked br appearing when attaching and textplain
2012-04-17 06:11:41 -07:00
Tobias Hößl
720c8324c7
Some Bugfixes, and variable checks
2012-04-17 11:33:50 +00:00
friendica
a742199035
Merge https://github.com/friendica/friendica into pull
2012-04-16 22:59:09 -07:00
friendica
7ebca2b37d
rev update
2012-04-16 22:58:52 -07:00
Simon
621bf6bab4
Merge pull request #239 from simonlnu/master
...
multiple ui and other fixes
2012-04-16 21:29:05 -07:00
Simon L'nu
68e1523496
finally fix the ui in the settings. it was fugly.... other bug fixes too
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-17 00:26:37 -04:00
Simon L'nu
4e967fc79f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master: (22 commits)
diabook-themes: bugfix (sry, necessary)
diabook-themes: small bug/css-fixes ---> ver. 1.019
diabook-themes: bug-fixes
diabook-themes: minor bugfixes
turn on comment edit
propagate edited comments
edited comments weren't being relayed
rev update
diabook-themes: css-fixes
open contact edit in same window
where did this "lang" string come from and why?
function name typo
track requested profile error msg
DBA: Reverting back to original source
DBA: Nothing really done ..
DBA: Deactivation of the mysqli-class for testing purposes.
API: Improved the timeline. Several (disabled) tests with caching of photos.
html2plain: changed behaviour for the "hr" element.
API: Tweetdeck is now working
API: Added Public Timeline
...
* master:
2012-04-16 22:58:28 -04:00
tommy tomson
f08844a8a5
diabook-themes: bugfix (sry, necessary)
2012-04-16 19:23:11 +02:00
tommy tomson
15dc8f4b21
diabook-themes: small bug/css-fixes ---> ver. 1.019
2012-04-16 18:51:08 +02:00
tommy tomson
b32a731517
diabook-themes: bug-fixes
2012-04-16 17:12:08 +02:00
tommy tomson
947b6073b1
diabook-themes: minor bugfixes
2012-04-16 16:05:29 +02:00
zottel
041f74dc77
Merge remote branch 'upstream/master'
2012-04-16 13:53:05 +02:00
friendica
fd2f7dd6ae
turn on comment edit
2012-04-16 03:51:48 -07:00
friendica
0b838e4cc7
propagate edited comments
2012-04-16 02:09:00 -07:00
friendica
c8598e7da6
edited comments weren't being relayed
2012-04-16 01:35:27 -07:00
friendica
37bb3c330d
rev update
2012-04-15 16:21:20 -07:00
friendica
93df525f5c
Merge pull request #238 from annando/master
...
API: Support of the statusnet application
2012-04-15 16:00:07 -07:00
tommy tomson
b5c164bf2f
diabook-themes: css-fixes
2012-04-15 19:58:26 +02:00
Michael Vogel
a147d6113c
Merge commit 'upstream/master'
2012-04-15 16:49:54 +02:00
friendica
f994f9abc6
open contact edit in same window
2012-04-15 06:34:01 -07:00
friendica
c4e8ef330e
where did this "lang" string come from and why?
2012-04-15 06:04:54 -07:00
friendica
97715c73fc
Merge https://github.com/friendica/friendica into pull
2012-04-15 05:12:14 -07:00
friendica
0a3454c841
function name typo
2012-04-15 05:11:52 -07:00
zottel
a2c4ce7487
Merge remote branch 'upstream/master'
2012-04-15 14:11:11 +02:00
Simon
f299749758
Merge pull request #237 from simonlnu/master
...
REALLY fix fpostit this time
2012-04-15 00:20:12 -07:00
Simon L'nu
6a2f0eb475
REALLY fix fpostit this time
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-15 03:18:55 -04:00
Simon L'nu
d90076b01a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-04-15 03:17:01 -04:00
Simon
4572179a24
Merge pull request #236 from simonlnu/master
...
fix fpostJS, add and fix some other stuff
2012-04-14 23:14:52 -07:00
Simon L'nu
d836be1dc3
fix fpostJS, add and fix some other stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-15 02:13:36 -04:00
Simon L'nu
adc932a5e2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: added js for auto-growing comment-textareas
diabook: theme-settings: add a wide-option
Another bunch of executable permission removal
Removed execution permission: lintian warning in Debian packaging
* master:
2012-04-15 00:40:21 -04:00
tommy tomson
dddf3307af
diabook-themes: added js for auto-growing comment-textareas
2012-04-15 04:39:33 +02:00
tommy tomson
170c15ceb9
diabook: theme-settings: add a wide-option
2012-04-15 02:50:16 +02:00
friendica
31b1d353b2
Merge pull request #234 from copyninja/master
...
Executable permisson removal on files which are not elf/script
2012-04-14 14:50:54 -07:00
friendica
0939029b74
track requested profile error msg
2012-04-14 14:45:09 -07:00
Simon
4ef5b9c4e3
Merge pull request #235 from simonlnu/master
...
string fix: typo. slow down scroll to top in dispys
2012-04-14 13:25:51 -07:00
Simon L'nu
6278b2a923
string fix: typo. slow down scroll to top in dispys
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-14 16:24:35 -04:00
Simon L'nu
1dd22be4d2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
bogus empty list element in dfrn_request page when emailnet not enabled
zrl on random profile
zrl hook
bug #372 - category feeds
pass zrl's to/through global directory
* master:
2012-04-14 15:12:39 -04:00
Vasudev Kamath
41d74c0868
Another bunch of executable permission removal
2012-04-14 20:16:06 +05:30
Vasudev Kamath
626bb57e1d
Removed execution permission: lintian warning in Debian packaging
2012-04-14 20:04:54 +05:30
friendica
6591b292a1
bogus empty list element in dfrn_request page when emailnet not enabled
2012-04-14 05:32:31 -07:00
friendica
6af4183302
zrl on random profile
2012-04-14 05:07:00 -07:00
friendica
f4ea764aaf
zrl hook
2012-04-14 04:54:26 -07:00
Michael Vogel
e825a73f1d
DBA: Reverting back to original source
2012-04-14 13:35:11 +02:00
friendica
9dd0ef2aeb
bug #372 - category feeds
2012-04-14 04:19:41 -07:00
Michael Vogel
eb27c32065
DBA: Nothing really done ..
2012-04-14 13:17:58 +02:00
Michael Vogel
4e220ec391
Merge commit 'upstream/master'
2012-04-14 13:15:25 +02:00
Michael
188829ed46
Merge remote branch 'upstream/master'
2012-04-14 13:03:40 +02:00
friendica
0d869ceb65
pass zrl's to/through global directory
2012-04-14 03:51:41 -07:00
Simon L'nu
16f729912a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
one more
additional marital status selectors
* master:
2012-04-14 01:34:25 -04:00
friendica
7c63ca8364
one more
2012-04-13 17:39:12 -07:00
friendica
0d0aa7495b
additional marital status selectors
2012-04-13 17:34:02 -07:00
Simon
1a0995f1bb
Merge pull request #233 from simonlnu/master
...
lighten wrapper shadow a bit on dispy
2012-04-13 17:14:46 -07:00
Simon L'nu
96cda3136b
lighten wrapper shadow a bit on dispy
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-13 20:14:09 -04:00
Simon L'nu
13930e9a80
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-04-13 20:13:30 -04:00
Simon
5877587e6e
Merge pull request #232 from simonlnu/master
...
neat little changes. hopefully the shadow will be well recieved
2012-04-13 16:31:25 -07:00
Simon L'nu
6b46fe3dfe
neat little changes. hopefully the shadow will be well recieved
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-13 19:30:07 -04:00
Simon L'nu
a3d95f79f2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
well that was a silly mistake...
setting wasn't being applied
rev update
diabook-themes: theme-settings: users can set font-size and line-height for posts and comments
diabook: theme-settings: users can set font-size and line-height for posts and comments
diabook-themes: small fixes
quattro: language icon in navbar
move html out of lang_selector() and new template lang_selector.tpl
display settings: show theme screenshot on page load
quattro: add admin theme settigs. darker items background with a bottom border.
admin: change global theme settings
quattro: work on "like" activitiy items less visible fixes to widths popup notification out of navbar category input in jot
validate_url allow naked subdomain if is "localhost"
* master:
2012-04-13 19:26:18 -04:00
friendica
bfb821e918
well that was a silly mistake...
2012-04-13 16:12:06 -07:00
friendica
d1b57d6e74
setting wasn't being applied
2012-04-13 15:37:25 -07:00
friendica
e71f01b549
Merge https://github.com/friendica/friendica into pull
2012-04-13 14:44:57 -07:00
friendica
dfe774179a
rev update
2012-04-13 14:44:37 -07:00
tommy tomson
a300616bcb
diabook-themes: theme-settings: users can set font-size and line-height for posts and comments
2012-04-13 22:08:13 +02:00
tomtom84
1ab69c2720
Merge pull request #231 from tomtom84/master
...
fixes in theme diabook
2012-04-13 12:36:07 -07:00
tommy tomson
2c843466a9
diabook: theme-settings: users can set font-size and line-height for posts and comments
2012-04-13 21:34:21 +02:00
tommy tomson
615cd53e51
diabook-themes: small fixes
2012-04-13 18:28:11 +02:00
friendica
11ba88b6d2
Merge pull request #230 from fabrixxm/master
...
some work, mainly on quattro
2012-04-13 06:02:18 -07:00
Fabio Comuni
f6e1ddf7fb
Merge remote-tracking branch 'friendica/master'
2012-04-13 11:59:25 +02:00
Fabio Comuni
469710893d
quattro: language icon in navbar
2012-04-13 11:56:56 +02:00
Fabio Comuni
4496d075e5
move html out of lang_selector() and new template lang_selector.tpl
2012-04-13 11:56:21 +02:00
Fabio Comuni
fdf50b8574
display settings: show theme screenshot on page load
2012-04-13 11:55:36 +02:00
Fabio Comuni
7aa3b92f4c
quattro: add admin theme settigs. darker items background with a bottom border.
2012-04-13 11:21:15 +02:00
Fabio Comuni
138a0e06b8
admin: change global theme settings
2012-04-13 11:20:05 +02:00
Simon L'nu
093c3a936f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master: (22 commits)
stray debug statements, forgot to filter pending contacts
bug #369 - show contacts who are not in any groups
extended the "interesting" profile attributes
send link directly to profile tab
stray log statements
profile change activities
allow setting default new friend notify
turn off new friend activity by default
rev update
diabook-themes: fixed css for settings aside-links
diabook-themes: css-fixes in aside
fix css in aside
query to find un-grouped contacts
reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem
turn off update transactions until we figure out how to do them safely.
table cleanup
quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons in a toolbar in notifications menu
main.js: set notifications icon "on" with new unread notifcations. Show "Nothing new here" with no notifications at all
settings: remove call to profile_load()
quattro: move center css to style.php. add tpl for generic_links_widget
...
* master:
2012-04-13 04:11:17 -04:00
Fabio Comuni
8be7b5c65b
quattro: work on
...
"like" activitiy items less visible
fixes to widths
popup notification out of navbar
category input in jot
2012-04-13 09:43:38 +02:00
Fabio Comuni
67a2d5be77
validate_url allow naked subdomain if is "localhost"
2012-04-13 09:42:53 +02:00
friendica
df1904b204
stray debug statements, forgot to filter pending contacts
2012-04-12 23:14:41 -07:00
friendica
3c4e6d3461
bug #369 - show contacts who are not in any groups
2012-04-12 23:06:41 -07:00
friendica
af68d033e3
extended the "interesting" profile attributes
2012-04-12 21:58:15 -07:00
friendica
446e962bb8
send link directly to profile tab
2012-04-12 21:38:40 -07:00
friendica
2b339d5a6b
stray log statements
2012-04-12 21:21:35 -07:00
friendica
972c01edb3
profile change activities
2012-04-12 21:10:32 -07:00
friendica
32cd62ff0a
allow setting default new friend notify
2012-04-12 18:15:46 -07:00
friendica
7e2d4d4026
turn off new friend activity by default
2012-04-12 16:51:57 -07:00
friendica
15e74402d4
Merge https://github.com/friendica/friendica into pull
2012-04-12 16:13:10 -07:00
friendica
2b01d2b6e0
rev update
2012-04-12 16:12:51 -07:00
Michael Vogel
572678fef9
Merge commit 'upstream/master'
...
Conflicts:
include/dba.php
2012-04-13 00:10:41 +02:00
Michael
7384786d44
Merge remote branch 'upstream/master'
2012-04-13 00:10:13 +02:00
Michael Vogel
138caa4380
DBA: Deactivation of the mysqli-class for testing purposes.
2012-04-13 00:05:52 +02:00
tommy tomson
e3af552bbf
diabook-themes: fixed css for settings aside-links
2012-04-12 22:00:18 +02:00
tommy tomson
39009b5ac9
diabook-themes: css-fixes in aside
2012-04-12 20:23:03 +02:00
tomtom84
2669a13378
Merge pull request #229 from tomtom84/master
...
fixes in theme diabook
2012-04-12 08:39:32 -07:00
tommy tomson
3a8e6cbacb
fix css in aside
2012-04-12 17:37:55 +02:00
friendica
73487989c0
query to find un-grouped contacts
2012-04-12 07:48:28 -07:00
friendica
60871555f5
reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem
2012-04-12 06:50:11 -07:00
friendica
03563ca35a
Merge https://github.com/friendica/friendica into pull
2012-04-12 05:48:41 -07:00
friendica
23b08e3ea7
Merge pull request #228 from fabrixxm/master
...
settings tabs, notifications js and quattro
2012-04-12 05:47:57 -07:00
friendica
6fa8b3067f
Merge https://github.com/friendica/friendica into pull
2012-04-12 05:46:24 -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
5a78400f37
table cleanup
2012-04-12 05:15:45 -07:00
Fabio Comuni
309f2bfa5f
quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons in a toolbar in notifications menu
2012-04-12 09:17:35 +02:00
Fabio Comuni
a23d46c49b
main.js: set notifications icon "on" with new unread notifcations. Show "Nothing new here" with no notifications at all
2012-04-12 09:15:08 +02:00
Fabio Comuni
18ecac4e93
settings: remove call to profile_load()
2012-04-12 08:42:00 +02:00
Fabio Comuni
6c50eba206
quattro: move center css to style.php. add tpl for generic_links_widget
2012-04-12 08:40:17 +02:00
Fabio Comuni
e992e29685
settings: move tabs to aside. add a new template "generic_links_widget.tpl"
2012-04-12 08:38:55 +02:00
Simon
815a727076
Merge pull request #227 from simonlnu/master
...
minor css fixes
2012-04-11 22:09:09 -07:00
Simon L'nu
c21244f679
fix the icons a bit
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-12 01:08:02 -04:00
Simon L'nu
a3b2f35c84
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: small fix
* master:
2012-04-12 01:03:54 -04:00
friendica
d52dad3826
Merge https://github.com/friendica/friendica into pull
2012-04-11 16:45:19 -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
Michael Vogel
ee714daf4d
Merge commit 'upstream/master'
2012-04-11 19:35:51 +02:00
Michael Vogel
c88c2515e4
API: Improved the timeline. Several (disabled) tests with caching of photos.
2012-04-11 19:31:01 +02:00
tommy tomson
a1d5026abf
diabook-themes: small fix
2012-04-11 18:49:07 +02:00
Michael
39405c8056
Merge remote branch 'upstream/master'
2012-04-11 18:48:58 +02:00
Michael
c3139fa0fd
Merge branch 'master' of github.com:annando/friendica
2012-04-11 18:47:21 +02:00
Simon
cdb6510b9f
Merge pull request #226 from simonlnu/master
...
re-factor default.php
2012-04-10 23:01:57 -07:00
Simon L'nu
c79d1deb92
major refactor. step 1
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-11 01:59:33 -04:00
Simon L'nu
8ec84c5bce
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
visit "random profile" feature
* master:
2012-04-11 01:57:52 -04:00
friendica
967ed8e23f
Merge https://github.com/friendica/friendica into pull
2012-04-10 20:51:04 -07:00
friendica
b02a671494
visit "random profile" feature
2012-04-10 20:50:31 -07:00
Simon
0c4e9912b0
Merge pull request #225 from simonlnu/master
...
[fixes] absolute links in docs and newmember.php; breaks sub-dir installs
2012-04-10 20:47:55 -07:00
Simon L'nu
6b414d3de4
more ' = ' spacing fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-10 23:45:47 -04:00
Simon L'nu
75c7877986
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
profile redir - goto correct profile page even if contact blocked, you just can't do anything.
* master:
2012-04-10 23:34:55 -04:00
Simon L'nu
2af41ee57b
[fix] absolute links in docs and newmember.php; breaks sub-dir installs
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-10 23:34:39 -04:00
friendica
0fa932853c
profile redir - goto correct profile page even if contact blocked, you just can't do anything.
2012-04-10 20:09:51 -07:00
Simon L'nu
ae9506f21e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
cleanup photo menus
more backend work on mail2 followers
make editplain work everywhere
move all fix_mce to one function so it can easily be undone
duplicate community posts
fix_mce_lf contact edit page
fix_mce_lf on profiles
set default on get_avatar
rev update
Incorrect tranlation (one negation too much)
fixed install bug
diabook-themes: smal fix in bbcode-js
diabook-themes: added url and quote to bbcode toolbar under comment box
Remove Gravatar from core and add new hook avatar_lookup.
Rename gravatar_img() more generic to avatar_img().
* master:
2012-04-10 22:51:29 -04:00
friendica
640f258f18
cleanup photo menus
2012-04-10 19:33:32 -07:00
friendica
19b636e7e8
more backend work on mail2 followers
2012-04-10 19:15:52 -07:00
friendica
ed608694ce
make editplain work everywhere
2012-04-10 18:08:06 -07:00
friendica
18e225b051
move all fix_mce to one function so it can easily be undone
2012-04-10 17:14:07 -07:00
friendica
ab46f95683
duplicate community posts
2012-04-10 16:59:30 -07:00
friendica
8f40e8546e
fix_mce_lf contact edit page
2012-04-10 16:32:38 -07:00
friendica
9b1bb53234
fix_mce_lf on profiles
2012-04-10 16:31:49 -07:00
friendica
703bfcb6d4
Merge https://github.com/friendica/friendica into pull
2012-04-10 16:07:05 -07:00
friendica
14d68a0dc0
set default on get_avatar
2012-04-10 15:33:43 -07:00
friendica
3c66816938
Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull
2012-04-10 15:28:48 -07:00
friendica
35b978bb1e
rev update
2012-04-10 15:25:15 -07:00
friendica
0e97e2338a
Merge pull request #222 from CatoTH/master
...
Translation bugfix
2012-04-10 15:23:04 -07:00
friendica
3380ff3240
Merge pull request #223 from campino/master
...
bug fix
2012-04-10 15:21:37 -07:00
Tobias Hößl
e1c43c1c1c
Incorrect tranlation (one negation too much)
2012-04-10 20:43:31 +00:00
Alexander Kampmann
64cf2d089a
fixed install bug
2012-04-10 17:10:24 +02:00
tommy tomson
6db33fc513
diabook-themes: smal fix in bbcode-js
2012-04-10 15:13:34 +02:00
tommy tomson
b3f18945ba
diabook-themes: added url and quote to bbcode toolbar under comment box
2012-04-10 14:38:59 +02:00
Simon
9fafe64f82
Merge pull request #221 from simonlnu/master
...
aaah, nice asides ;). we'll be updating these soon
2012-04-10 02:50:42 -07:00
Simon L'nu
707a5dbae7
aaah, nice asides ;). we'll be updating these soon
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-10 05:48:42 -04:00
Simon L'nu
514780745f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
path to default.php in theme dir was incorrect
* master:
2012-04-10 05:03:32 -04:00
friendica
4c3b835307
path to default.php in theme dir was incorrect
2012-04-10 01:51:53 -07:00
Simon L'nu
61c28e8c2e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update
source beautifarming to make review easier
fixed some typos
made exceptions from the db optional set address for updae mails correctly
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
* master:
2012-04-10 02:49:34 -04: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
friendica
2d23c8a246
Merge pull request #218 from campino/master
...
db errors and update error mail
2012-04-09 16:53:23 -07:00
Simon L'nu
16c48b2200
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
bbcode toolbar attached to the comment text field minor css-fixes
diabook-themes: small icon fix
diabook-nav-icons with gradient
use local_user for tag completion if available. See bug #368
more sane defaults datetime_convert
fix empty string timezone
Some new German translations
send zrl after dfrn_request homecoming for manual entries
fix to wall_upload photos default permissions to use cid rather than uid.
fixed z-index of youtube-vids fixed bug to hide right_side
* master:
2012-04-09 19:20:51 -04:00
tomtom84
0fd05171d0
Merge pull request #220 from tomtom84/master
...
fixes in diabook-themes
2012-04-09 15:56:52 -07:00
tommy tomson
0d4fab4ee3
bbcode toolbar attached to the comment text field
...
minor css-fixes
2012-04-10 00:55:39 +02:00
Klaus Weidenbach
1f9fe8b5ee
Remove Gravatar from core and add new hook avatar_lookup.
...
This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in.
I haven't touched the language files yet. Are they updated automatically somehow?
2012-04-09 21:22:09 +02:00
Klaus Weidenbach
93ffba58cc
Rename gravatar_img() more generic to avatar_img().
...
I would like to extend the Gravatar support to also use Libravatar, a decentralized avatar service.
First step to extract Gravatar from core and put it into its own plugin. Later the Libravatar plugin can be done, too as a plugin.
2012-04-09 21:22:09 +02:00
tommy tomson
d25a9df996
diabook-themes: small icon fix
2012-04-09 19:56:53 +02:00
Alexander Kampmann
2190b95d80
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-09 16:56:37 +02:00
Alexander Kampmann
018727aa15
source beautifarming to make review easier
2012-04-09 16:56:01 +02:00
tomtom84
71edd6843f
Merge pull request #217 from tomtom84/master
...
small fix in theme diabook
2012-04-09 07:42:57 -07:00
tommy tomson
c27c340de1
diabook-nav-icons with gradient
2012-04-09 16:41:23 +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
84142076a1
Merge branch 'pull'
2012-04-09 04:56:43 -07:00
friendica
92c20895e0
use local_user for tag completion if available. See bug #368
2012-04-09 04:55:52 -07:00
tomtom84
6267da0a29
Merge pull request #216 from zzottel/master
...
German translations
2012-04-09 04:02:29 -07:00
Michael Vogel
fe257a2032
html2plain: changed behaviour for the "hr" element.
2012-04-09 12:54:02 +02:00
Michael Vogel
894e126c55
API: Tweetdeck is now working
2012-04-09 11:49:33 +02:00
zottel
0bad8de056
Merge remote branch 'upstream/master'
2012-04-09 03:13:54 +02:00
friendica
c1e2596807
more sane defaults datetime_convert
2012-04-08 18:09:21 -07:00
friendica
129130b0f7
fix empty string timezone
2012-04-08 18:01:49 -07:00
zottel
5183d4f77d
Some new German translations
2012-04-09 02:30:18 +02:00
friendica
de3b9e9584
send zrl after dfrn_request homecoming for manual entries
2012-04-08 17:28:36 -07:00
zottel
7cf946e004
Merge remote branch 'upstream/master'
2012-04-09 02:20:34 +02:00
friendica
63c881b50d
Merge branch 'pull'
2012-04-08 16:29:54 -07: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
tomtom84
06c0447342
Merge pull request #215 from tomtom84/master
...
fixes in diabook-themes
2012-04-08 15:04:59 -07:00
tommy tomson
7d018f651d
fixed z-index of youtube-vids
...
fixed bug to hide right_side
2012-04-09 00:02:48 +02:00
zottel
315d496290
Merge remote branch 'upstream/master'
2012-04-08 21:50:41 +02:00
Michael Vogel
269f21ddc1
API: Added Public Timeline
2012-04-08 20:19:14 +02:00
Simon L'nu
f1db690786
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
prepare for using a master theme_init()
provide theme_init() functions
rev updates
API: API is now enhanced. mentions, repeat and destroy now works.
"vier": Some design stuff
"vier": Bookmarks now look better.
API: template for test function added
The "vier"-theme is now working again. But there is still work needed
New script that checks if a script is running
poller: An optional lockfile is used to check if the poller is already running
Several improvements
* master:
2012-04-08 13:49:52 -04:00
Michael Vogel
763729f11a
API: Now mentions could work as well - only my client doesn't really work
2012-04-08 17:51:05 +02:00
Michael Vogel
944f897d30
API: Basic support of the identica client added.
2012-04-08 17:23:38 +02:00
friendica
5c04469755
prepare for using a master theme_init()
2012-04-08 06:20:57 -07: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
c3867f4ce4
Merge pull request #214 from annando/master
...
API, Locking, some changes to "vier"
2012-04-08 05:19:54 -07:00
zottel
aaf5a81365
Merge remote branch 'upstream/master'
2012-04-08 10:33:32 +02:00
Michael Vogel
ce0eac44b5
Merge commit 'upstream/master'
2012-04-08 10:07:39 +02:00
Simon
e3b2ac0735
Merge pull request #213 from simonlnu/master
...
minor dispy* fixes
2012-04-07 20:47:37 -07:00
Simon L'nu
01961f7caa
minor dispy* fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-07 23:46:47 -04:00
Michael Vogel
cb4c7cdb3e
API: API is now enhanced. mentions, repeat and destroy now works.
2012-04-08 00:02:25 +02:00
Simon L'nu
cee3608747
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: small fix
changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section
ignore utf8 offset error for unit tests
had arg order backwards
try assertContains
tag tests cont.
fix autonamenegativelength test
some work on tests
* master:
2012-04-07 14:47:02 -04:00
tommy tomson
f931d5c918
diabook-themes: small fix
2012-04-07 19:56:00 +02:00
Michael Vogel
17d097124c
"vier": Some design stuff
2012-04-07 18:35:37 +02:00
Michael Vogel
cb05801a90
Merge commit 'upstream/master'
2012-04-07 18:35:29 +02:00
tomtom84
0fa3b7f348
Merge pull request #212 from tomtom84/master
...
fixes in diabook-themes
2012-04-07 07:41:23 -07:00
tommy tomson
1c0700f371
changelog 1.014 :
...
image-rezise via jquery-plugin in stream
comments under uploaded pictues
add Diabook's version-number in head-section
css-fixes:
tabs
youtube-iframe
title-bar in jot-wrapper
blockquote & .oembed
2012-04-07 16:39:43 +02:00
friendica
1440786c31
ignore utf8 offset error for unit tests
2012-04-07 02:31:41 -07:00
friendica
e575d67969
had arg order backwards
2012-04-07 02:23:11 -07:00
friendica
7a7102618b
try assertContains
2012-04-07 02:21:55 -07:00
friendica
cf2d8ef7a6
tag tests cont.
2012-04-07 02:11:56 -07:00
friendica
f30146b521
fix autonamenegativelength test
2012-04-07 01:20:38 -07:00
friendica
3a1c78bd75
some work on tests
2012-04-07 01:04:45 -07:00
Simon L'nu
bc69a957dc
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
ignore removed plugins
fix messed up config tables w/ duplicate entries
small fixes for the German strings
fix bad sql update
revert config changes, we're getting duplicate keys
new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox...
* master:
2012-04-07 03:10:09 -04:00
Michael Vogel
7308dbae28
"vier": Bookmarks now look better.
2012-04-07 01:19:07 +02:00
friendica
ecabe1d505
ignore removed plugins
2012-04-06 05:21:42 -07:00
friendica
533e215a96
Merge branch 'pull'
2012-04-06 05:12:18 -07:00
friendica
13dfb40128
fix messed up config tables w/ duplicate entries
2012-04-06 05:11:09 -07:00
tomtom84
9cff2e36cf
Merge pull request #211 from tomtom84/master
...
small fix
2012-04-06 04:33:26 -07:00
tommy tomson
75bcf42caa
Merge remote-tracking branch 'origin/master'
2012-04-06 13:29:20 +02:00
tomtom84
adf3ad5fd6
Merge pull request #210 from tomtom84/master
...
fixes in diabook-derivates
2012-04-06 04:29:01 -07:00
tommy tomson
0cb2407c94
Merge remote-tracking branch 'origin/master'
2012-04-06 12:58:41 +02:00
Tobias Diekershoff
4f9588d9ee
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-06 12:43:44 +02:00
Tobias Diekershoff
eb6370fa41
small fixes for the German strings
2012-04-06 12:43:20 +02:00
friendica
0731c177eb
fix bad sql update
2012-04-06 03:25:01 -07:00
tommy tomson
52d5ef905e
Merge remote-tracking branch 'origin/master'
2012-04-06 12:24:05 +02:00
friendica
91906b1b74
Merge branch 'pull'
2012-04-06 03:12:02 -07:00
friendica
665b2c8107
revert config changes, we're getting duplicate keys
2012-04-06 03:10:46 -07:00
tommy tomson
f980b79edc
new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator...
...
profile-picture is now scaled right in firefox...
fixed broken css on introductions-page in firefox...
2012-04-06 11:19:12 +02:00
Simon L'nu
43d5876e8b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
update to the German strings
add network_tabs hook
pass autoname(0) test
rev update
added index to config and pconfig table changed config.php to use REPLACE instead of INSERT, this removes one db hit.
* master:
2012-04-06 03:54:09 -04:00
Tobias Diekershoff
afd2bf031e
update to the German strings
2012-04-06 09:37:50 +02:00
Simon L'nu
b361bcea83
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php
* master:
2012-04-06 00:50:34 -04:00
friendica
4bee1859be
Merge branch 'pull'
2012-04-05 21:43:38 -07:00
friendica
6bc7e6e09f
add network_tabs hook
2012-04-05 21:42:47 -07:00
friendica
221726392e
pass autoname(0) test
2012-04-05 18:44:36 -07:00
Michael Vogel
34d268544e
Merge commit 'upstream/master'
2012-04-06 00:00:46 +02: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
9b6e91086b
make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php
2012-04-05 02:15:03 -07:00
Simon
b2290f4f12
Merge pull request #207 from simonlnu/master
...
styled cat tags and input
2012-04-04 21:05:13 -07:00
Simon L'nu
df82affe2f
finish styling category tags and category input
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-05 00:04:23 -04:00
Simon L'nu
9c4fca446b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
also block outbound
let's catch d* disabled at a higher level and not waste any resources on it.
* master:
2012-04-05 00:03:30 -04:00
friendica
37801dd6ed
also block outbound
2012-04-04 20:48:35 -07:00
Simon L'nu
9860d6b95c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-04-04 23:47:48 -04:00
Simon L'nu
9ee424c1e3
style categorytags
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-04 23:47:35 -04:00
friendica
b45327b856
let's catch d* disabled at a higher level and not waste any resources on it.
2012-04-04 20:45:48 -07:00
Simon
5377683c0f
Merge pull request #206 from simonlnu/master
...
update the template files
2012-04-04 20:35:59 -07:00
Simon L'nu
8e5489846d
update the dispy* templates
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-04 23:35:07 -04:00
Simon L'nu
afe7f09b27
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
correct some filer dialog weirdness caused by introduction of categories
move alert box away from nav links
log disabled requests
fix config storage of booleans
* master:
2012-04-04 23:32:16 -04:00
friendica
d509a46345
Merge pull request #205 from unary/filerfix
...
correct some filer dialog weirdness caused by introduction of categories
2012-04-04 20:23:20 -07:00
Michael Johnston
da0eb2d4c9
correct some filer dialog weirdness caused by introduction of categories
2012-04-04 23:08:16 -04:00
Simon L'nu
c0a18bc2fa
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
well that was a stupid mistake...
string update
bug: diaspora_enabled setting turns it on but doesn't fully turn it off.
better handling of reshares containing embeds
* master:
2012-04-04 22:58:32 -04:00
friendica
c4ca21a762
move alert box away from nav links
2012-04-04 19:13:41 -07:00
friendica
0c7710681c
log disabled requests
2012-04-04 18:49:39 -07:00
friendica
71671e5b9a
fix config storage of booleans
2012-04-04 17:51:59 -07:00
friendica
f63636ed14
well that was a stupid mistake...
2012-04-04 17:19:46 -07:00
friendica
145713c8e2
string update
2012-04-04 15:51:56 -07: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
51658826f9
Merge branch 'pull'
2012-04-04 02:02:50 -07:00
friendica
60c57704c6
better handling of reshares containing embeds
2012-04-04 02:02:23 -07:00
zottel
64a1367525
Merge remote branch 'upstream/master'
2012-04-04 08:56:35 +02:00
Simon
5c6c9d756f
Merge pull request #204 from simonlnu/master
...
many changes, all small
2012-04-03 23:21:39 -07:00
Simon L'nu
922d690d1e
latest changes are the popup menu for notifs, fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-04 02:19:39 -04:00
Simon L'nu
2871e28df7
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
display settings hooks
re-opened bug #363
this is better
include contact_widgets for categories_widget when doing updates
remove loozah themes which fell too far behind to recover
smal fix
german translation for right_aside
make right_aside translatable and provide german translation... and some css-fixes
suppress duplicates in search
make contact ssl_policy change a function since it is used in a few places
more ssl policy fixes and prevent delivery to soapbox when using local delivery
don't change ssl settings on local photos for remote contact
* master:
2012-04-04 02:14:26 -04:00
friendica
8e928d101b
display settings hooks
2012-04-03 22:01:52 -07:00
friendica
466188ebd7
re-opened bug #363
2012-04-03 20:14:37 -07:00
friendica
96abee53e4
this is better
2012-04-03 19:20:39 -07:00
friendica
1e02fd8a72
Merge branch 'pull'
2012-04-03 19:16:59 -07:00
friendica
dbe16afcd4
include contact_widgets for categories_widget when doing updates
2012-04-03 19:16:02 -07:00
friendica
3db2cf76b9
remove loozah themes which fell too far behind to recover
2012-04-03 16:40:25 -07:00
tommy tomson
f0a8ef64fe
smal fix
2012-04-03 21:45:58 +02:00
tomtom84
ca0795a096
Merge pull request #202 from tomtom84/master
...
german translation for right_aside
2012-04-03 12:08:40 -07:00
tommy tomson
cd309b69e6
german translation for right_aside
2012-04-03 21:06:57 +02:00
tomtom84
10c88f2a01
Merge pull request #201 from tomtom84/master
...
fixes in diabook-themes
2012-04-03 12:00:24 -07:00
tommy tomson
8a71191d6d
make right_aside translatable and provide german translation...
...
and some css-fixes
2012-04-03 20:59:00 +02:00
friendica
4b762ff923
suppress duplicates in search
2012-04-03 02:44:29 -07:00
zottel
e5cd5aab5c
Merge remote branch 'upstream/master'
2012-04-03 09:27:46 +02:00
friendica
5d0d9f8772
make contact ssl_policy change a function since it is used in a few places
2012-04-02 23:07:26 -07:00
friendica
f4721955db
more ssl policy fixes and prevent delivery to soapbox when using local delivery
2012-04-02 21:01:19 -07:00
friendica
e1de2e3de0
don't change ssl settings on local photos for remote contact
2012-04-02 19:38:13 -07:00
Simon L'nu
06942b3654
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
bug #363 and a couple of other reported ssl link issues
* master:
2012-04-02 21:55:10 -04:00
friendica
9391fc965d
bug #363 and a couple of other reported ssl link issues
2012-04-02 17:43:11 -07:00
Simon L'nu
9cb3fc226a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: css-fixes
diabook-themes: fixes in js
diabook-themes: fixed pageheader
diabook-themes: bugfixes / css-fixes
make the "new calendar" (javascript interactive) the default
remove zrl from query string
catch a couple more Oo smilies
add page_content_top hook
* master:
2012-04-02 16:53:47 -04:00
Michael Vogel
81dfb61f93
API: template for test function added
2012-04-02 22:36:05 +02:00
Michael Vogel
3dc317dcc6
Merge commit 'upstream/master'
2012-04-02 22:00:22 +02:00
tommy tomson
6dfd55668f
diabook-themes: css-fixes
2012-04-02 20:30:27 +02:00
tommy tomson
076b1b374b
diabook-themes: fixes in js
2012-04-02 18:16:58 +02:00
tommy tomson
b5d57d5313
diabook-themes: fixed pageheader
2012-04-02 17:17:14 +02:00
tommy tomson
9faa940f04
diabook-themes: bugfixes / css-fixes
2012-04-02 15:06:55 +02:00
friendica
2352e6c1cb
make the "new calendar" (javascript interactive) the default
2012-04-02 01:46:35 -07:00
friendica
62e528ba43
remove zrl from query string
2012-04-02 00:45:45 -07:00
zottel
7127626f55
Merge remote branch 'upstream/master'
2012-04-02 08:52:24 +02:00
friendica
1f74bd1b78
catch a couple more Oo smilies
2012-04-01 22:57:50 -07:00
friendica
7df6ab9a87
add page_content_top hook
2012-04-01 22:22:26 -07:00
Simon L'nu
5eca42975c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
add title to D* posts
allow users to set categories on their posts
Modified peopleyouknow to handle sites without Facebook better
diabook-themes: add link to global dir in "find friends" at right_aside
modified: mod/newmember.php
New user quick start.
check for style.php existence before inclusion
Moved Diaspora notes away from top, per user request
* master:
2012-04-01 23:56:13 -04:00
friendica
5d35f0d54a
add title to D* posts
2012-04-01 19:16:13 -07:00
friendica
07cfdba9c3
Merge pull request #200 from unary/categories
...
allow users to set categories on their posts
2012-04-01 19:03:20 -07:00
Michael Johnston
581b54c974
allow users to set categories on their posts
2012-04-01 21:28:31 -04:00
friendica
06e9a8b7a0
Merge pull request #199 from beardy-unixer/1457d6e90f36a6a7bb07df3579b6e5c0475b121d
...
Better peopleyouknow for sites without Facebook
2012-04-01 17:53:59 -07:00
Thomas Willingham
c4f4715a54
Merge remote-tracking branch 'upstream/master'
2012-04-02 01:27:23 +01:00
Thomas Willingham
1457d6e90f
Modified peopleyouknow to handle sites without Facebook better
2012-04-02 01:26:45 +01:00
friendica
845b123b47
Merge pull request #198 from beardy-unixer/master
...
New User Quick Start
2012-04-01 16:49:19 -07:00
Thomas Willingham
210586eaed
Merge remote-tracking branch 'upstream/master'
2012-04-02 00:29:27 +01:00
tommy tomson
23dc376364
diabook-themes: add link to global dir in "find friends" at right_aside
2012-04-02 01:29:20 +02:00
Thomas Willingham
8406803473
modified: mod/newmember.php
...
Add a link to the quick start
2012-04-02 00:27:47 +01:00
Thomas Willingham
8c9c561f6c
New user quick start.
2012-04-02 00:23:58 +01:00
friendica
f95db4382e
check for style.php existence before inclusion
2012-04-01 16:21:55 -07:00
Thomas Willingham
d0ddd380e7
Moved Diaspora notes away from top, per user request
2012-04-02 00:18:03 +01:00
Simon L'nu
9472ba8d20
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
slight improvement in handling of plaintext feeds
css-fixes
add new messages-layout in diabook
fix the display of community-plugin in diabook-themes
that didn't quite work out
document tinymce fixes/workarounds
various bugfixes and css-fixes
qcomment overflow
try slightly better detection of html in feeds
send unverified private mail using zrl
* master:
2012-04-01 18:59:53 -04:00
friendica
2589feef70
Merge branch 'pull'
2012-04-01 15:44:27 -07:00
friendica
00bbb9ad36
slight improvement in handling of plaintext feeds
2012-04-01 15:43:57 -07:00
Michael Vogel
a39d8d3f02
The "vier"-theme is now working again. But there is still work needed
2012-04-02 00:08:49 +02:00
tommy tomson
408de09f72
css-fixes
2012-04-02 00:05:49 +02:00
Michael Vogel
5409825fe7
New script that checks if a script is running
2012-04-01 20:56:27 +02:00
Michael Vogel
4cf1e5aa21
poller: An optional lockfile is used to check if the poller is already running
2012-04-01 20:52:33 +02:00
tomtom84
31d04d685e
Merge pull request #197 from tomtom84/master
...
fixes in diabook-derivates
2012-04-01 09:13:35 -07:00
tommy tomson
f075e977fe
add new messages-layout in diabook
2012-04-01 18:12:20 +02:00
tomtom84
6c302e78da
Merge pull request #196 from tomtom84/master
...
fixes in diabook-derivates
2012-04-01 07:35:47 -07:00
tommy tomson
ff12637ceb
fix the display of community-plugin in diabook-themes
2012-04-01 16:34:31 +02:00
friendica
9b4bef8ac4
that didn't quite work out
2012-04-01 06:46:12 -07:00
Michael Vogel
7d23149a61
Merge commit 'upstream/master'
2012-04-01 14:11:37 +02:00
friendica
bb67ca9f1c
Merge branch 'pull'
2012-04-01 04:13:58 -07:00
tomtom84
d1783bba17
Merge pull request #195 from tomtom84/master
...
fixes in diabook-derivates
2012-04-01 04:13:48 -07:00
friendica
63ea378d92
document tinymce fixes/workarounds
2012-04-01 04:13:27 -07:00
tommy tomson
15ba0ef5d0
various bugfixes and css-fixes
2012-04-01 13:12:15 +02:00
friendica
bc283f7c5d
qcomment overflow
2012-04-01 03:37:41 -07:00
friendica
f0b8d01615
try slightly better detection of html in feeds
2012-04-01 03:19:37 -07:00
friendica
ae5e5bf1e4
Merge branch 'pull'
2012-04-01 01:03:05 -07:00
friendica
5c2fdc795f
send unverified private mail using zrl
2012-04-01 00:59:35 -07:00
Simon
4bf2a7bf50
Merge pull request #194 from simonlnu/master
...
latest fixes for dispys. tweaking/repairing
2012-04-01 00:58:08 -07:00
Simon L'nu
db7f7e4237
latest fixes for dispys. tweaking/repairing
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-01 03:57:05 -04:00
Simon L'nu
bbd86382a6
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
line 86: s/Friendika/Friendica/
fix "between yourself and You" in mail list
* master:
2012-04-01 03:54:58 -04:00
Simon
e97d90820d
line 86: s/Friendika/Friendica/
2012-04-01 04:52:45 -03:00
friendica
ea10bba147
fix "between yourself and You" in mail list
2012-03-31 20:08:32 -07:00
Simon L'nu
ed8c5954a9
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
more error handling
ensure all new users get a timezone. We'll use UTC until they choose otherwise.
handle escaped file chars in display and search
escape % in file_tag_query as it is ultimately embedded in a sprintf
diabook-themes: move "common tabs" to left side on settings page
move the common tabs to right_aside in diabook-derivates
register hooks for a COPA plugin
some js fixes - ignore backspace as history selector and cleanup errors closing non-existent menus
bug fix in diabook-aerith and -red
bug-fixes in diabook-derivates
settings for unknown private mail acceptance
* master:
2012-03-31 22:46:13 -04:00
friendica
e6fd6bfd89
more error handling
2012-03-31 17:44:34 -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
53f799f2bc
handle escaped file chars in display and search
2012-03-31 15:25:17 -07:00
friendica
7581b32bb3
Merge branch 'pull'
2012-03-31 14:50:14 -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
tomtom84
05ad28fb9b
Merge pull request #193 from tomtom84/master
...
diabook-themes: move "common tabs" to left side on settings page
2012-03-31 09:44:12 -07:00
tommy tomson
36545e554b
diabook-themes: move "common tabs" to left side on settings page
2012-03-31 18:42:11 +02:00
tomtom84
19a7096be6
Merge pull request #192 from tomtom84/master
...
fixes in diabook-derivates
2012-03-31 08:00:45 -07:00
tommy tomson
13ded12ffb
move the common tabs to right_aside in diabook-derivates
2012-03-31 16:58:02 +02:00
Michael Vogel
59b45f7fc1
Several improvements
2012-03-31 16:28:39 +02:00
friendica
adebc2793e
register hooks for a COPA plugin
2012-03-31 06:15:33 -07:00
friendica
c34a71eba6
some js fixes - ignore backspace as history selector and cleanup errors closing non-existent menus
2012-03-31 05:51:56 -07:00
friendica
d5a31e5791
Merge branch 'pull'
2012-03-31 04:40:35 -07:00
tommy tomson
893ece9066
bug fix in diabook-aerith and -red
2012-03-31 11:50:33 +02:00
tomtom84
ee9a3eb163
Merge pull request #191 from tomtom84/master
...
bug-fixes in diabook-derivates
2012-03-31 02:11:30 -07:00
tommy tomson
0b41654935
bug-fixes in diabook-derivates
2012-03-31 11:09:57 +02:00
Simon L'nu
6b086cd266
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-31 04:05:19 -04:00
Simon
3d2bcaa5fc
Merge pull request #190 from simonlnu/master
...
forgot the css changes for last push
2012-03-31 01:03:39 -07:00
Simon L'nu
f5e3ec9a56
forgot the css changes for last push
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-31 04:02:51 -04:00
friendica
b4b1055b50
settings for unknown private mail acceptance
2012-03-31 00:57:59 -07:00
Simon
ee95c12a24
Merge pull request #189 from simonlnu/master
...
most notable one is fixing qcomment
2012-03-31 00:57:26 -07:00
Simon L'nu
b88a452c6b
theme fixes; fix qcomment (finally)
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-31 03:56:06 -04:00
Simon L'nu
e940acf8c6
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
warning cleanup
* master:
2012-03-31 03:42:19 -04:00
friendica
8c928e67ba
warning cleanup
2012-03-30 23:18:46 -07:00
Simon L'nu
301527e5a2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
don't delete contact from a friend request if friendship was already established
quattro: move quattro-green inside quattro folder. Add config option to select quattro color scheme.
allow themes to use "style.php" instead of "style.css". Load style.php trhu mod/view.php to pass it friendica framework.
css-fixes in diabook-derivates
css-fixes in diabook-derivates
quattro-green: remove settings code Use config.php from quattro
quattro: add config.php
settings: add "display settings" tab, with UI-related settings. Load optional "config.php" from theme folder and show in page. Loading of "config.php" follow theme_info['extends'] property.
catch OpenID login errors in cases when the OpenID server does not answers
css-fixes in diabook-derivates
quattro-green: added Description to the theme.php
* master:
2012-03-30 19:48:15 -04:00
zottel
f39e812677
Merge remote branch 'upstream/master'
2012-03-31 00:30:34 +02: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
friendica
007d67a998
Merge pull request #188 from fabrixxm/master
...
Display settings tab and theme settings code
2012-03-30 14:58:44 -07:00
Fabio Comuni
be2005f146
quattro: move quattro-green inside quattro folder.
...
Add config option to select quattro color scheme.
2012-03-30 21:21:14 +02: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
Fabio Comuni
77f57e1b13
Merge remote-tracking branch 'friendica/master'
2012-03-30 19:37:43 +02:00
tommy tomson
f50fb7d6ca
css-fixes in diabook-derivates
2012-03-30 17:52:29 +02:00
tommy tomson
6d3d882f9b
css-fixes in diabook-derivates
2012-03-30 16:33:34 +02:00
Fabio Comuni
24e7a3413c
quattro-green: remove settings code
...
Use config.php from quattro
2012-03-30 15:46:14 +02:00
Fabio Comuni
db59a45030
quattro: add config.php
2012-03-30 15:45:23 +02:00
Fabio Comuni
054d21a2e8
settings: add "display settings" tab, with UI-related settings.
...
Load optional "config.php" from theme folder and show in page.
Loading of "config.php" follow theme_info['extends'] property.
2012-03-30 15:45:02 +02:00
Tobias Diekershoff
17c908973f
catch OpenID login errors in cases when the OpenID server does not answers
2012-03-30 15:19:17 +02:00
tommy tomson
5b4bb347a6
css-fixes in diabook-derivates
2012-03-30 14:38:21 +02:00
Tobias Diekershoff
8685a91742
quattro-green: added Description to the theme.php
2012-03-30 14:24:45 +02:00
Simon L'nu
c5cb208cb8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
quattro-green: adopted quattro option for centered display
string update
add themes diabook-red & diabook-aerith
rename "file as" to "save to folder"
bug #352 - qcomment plugin disabled, qcomments still allowed
quattro-greey: apply theming to private mail
zrl into people searches
another silly mistake
silly mistake
zrl on mentions
use zrl to get home again
provide a way to specify an admin account for siteinfo if more than one have admin email address
* master:
2012-03-30 08:17:40 -04:00
Tobias Diekershoff
b5e292509e
quattro-green: adopted quattro option for centered display
2012-03-30 14:03:33 +02:00
friendica
e36b1ed3d7
Merge branch 'pull'
2012-03-30 04:53:49 -07:00
friendica
32b346f5f1
string update
2012-03-30 04:53:00 -07:00
tomtom84
0bee09350d
Merge pull request #187 from tomtom84/master
...
add themes diabook-red & diabook-aerith
2012-03-30 04:51:51 -07:00
tommy tomson
5ced7f2bc5
add themes diabook-red & diabook-aerith
2012-03-30 13:48:34 +02:00
friendica
bcc5801608
rename "file as" to "save to folder"
2012-03-30 02:42:36 -07:00
friendica
6f761e9d59
Merge branch 'pull'
2012-03-30 02:24:14 -07:00
friendica
87539dbec4
bug #352 - qcomment plugin disabled, qcomments still allowed
2012-03-30 02:22:57 -07:00
zottel
2212e69310
Merge remote branch 'upstream/master'
2012-03-30 09:03:43 +02:00
Tobias Diekershoff
d22b3a1d9c
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-30 08:12:28 +02:00
Tobias Diekershoff
e2370b56bf
quattro-greey: apply theming to private mail
2012-03-30 08:10:49 +02:00
friendica
d83bfd464b
zrl into people searches
2012-03-29 22:20:14 -07:00
friendica
e2c295c01f
another silly mistake
2012-03-29 21:44:30 -07:00
friendica
9332312ce9
silly mistake
2012-03-29 21:18:47 -07:00
friendica
168cf3b9d4
zrl on mentions
2012-03-29 21:08:10 -07:00
friendica
bb8beb26b4
use zrl to get home again
2012-03-29 20:58:32 -07:00
friendica
cd47ba6ed1
Merge branch 'pull'
2012-03-29 18:23:34 -07:00
friendica
75f778a504
provide a way to specify an admin account for siteinfo if more than one have admin email address
2012-03-29 18:22:20 -07:00
Simon
1326c1388e
Merge pull request #186 from simonlnu/master
...
tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now.
2012-03-29 17:21:06 -07:00
Simon L'nu
3b4016168d
tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now.
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-29 20:19:43 -04:00
Simon L'nu
fe1e384a51
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
typo in function name
* master:
2012-03-29 20:16:49 -04:00
friendica
5921dc6f16
typo in function name
2012-03-29 16:01:44 -07:00
Simon L'nu
e7b920c273
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
theme file_as combobox for 2.0
css fixes in diabook-derivates
quattro: style pm pages
message: remove tabs, move new message link to aside, all message with gmail-style
quattro: tpl for "file as"
* master:
2012-03-29 12:30:13 -04:00
friendica
e935b3a225
theme file_as combobox for 2.0
2012-03-29 04:07:16 -07:00
tommy tomson
339c8a4b56
css fixes in diabook-derivates
2012-03-29 11:02:59 +02:00
zottel
953840cf82
Merge remote branch 'upstream/master'
2012-03-29 10:23:45 +02:00
fabrixxm
3ee529d095
Merge pull request #185 from fabrixxm/master
...
Updated private message pages
2012-03-28 23:47:23 -07:00
Simon L'nu
f2e2632810
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
some reported warnings cleaned up
network permission ids
wrong var for notify total
fix notification total
improved rw notifications
bug #349 - email notls setting
add a searchbox to "find friends" for global search
bugfix in diabook
title not updated when editing post
New parameter in html2plain for plain text exports. More compatibility in API
API: added max_id
API: Now threading seems to work
API: Seesmic is now working. Optimizing text export.
Quotes with author are now having an "open/close" link
New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements
* master:
2012-03-29 00:04:00 -04:00
friendica
4e4f7ac79f
some reported warnings cleaned up
2012-03-28 20:50:09 -07:00
friendica
a946b7cea3
Merge branch 'pull'
2012-03-28 19:57:28 -07:00
friendica
60fe74ce97
network permission ids
2012-03-28 19:56:14 -07:00
friendica
3f89adfd62
wrong var for notify total
2012-03-28 17:51:43 -07:00
friendica
77715c0c65
fix notification total
2012-03-28 17:44:24 -07:00
friendica
7956c2d08e
improved rw notifications
2012-03-28 17:21:56 -07:00
friendica
75f3d41da2
Merge pull request #184 from annando/master
...
Enhancing the API - Preparations for a better facebook export
2012-03-28 15:08:15 -07:00
friendica
a2b1aca27c
Merge branch 'pull'
2012-03-28 14:55:06 -07:00
friendica
4fe0b56d76
bug #349 - email notls setting
2012-03-28 14:54:00 -07:00
tommy tomson
aa26517cdc
add a searchbox to "find friends" for global search
2012-03-28 23:07:34 +02:00
tommy tomson
1a9bbac0be
bugfix in diabook
2012-03-28 20:45:39 +02:00
Michael Vogel
bdd2754740
Merge commit 'upstream/master'
2012-03-28 19:52:30 +02:00
Fabio Comuni
011a96d960
quattro: style pm pages
2012-03-28 15:34:02 +02:00
Fabio Comuni
50711040cb
message: remove tabs, move new message link to aside, all message with gmail-style
2012-03-28 15:31:58 +02:00
Fabio Comuni
f86e909a82
Merge remote-tracking branch 'friendica/master'
2012-03-28 15:21:01 +02:00
friendica
e894775a39
Merge branch 'pull'
2012-03-28 05:16:25 -07:00
Fabio Comuni
0f2a34c23b
quattro: tpl for "file as"
2012-03-28 13:37:04 +02:00
Simon
3db94d5212
Merge pull request #183 from simonlnu/master
...
final pull req for now. really fixed.
2012-03-28 03:49:10 -07:00
Simon L'nu
57ef21295a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
viewsrc: return only body if page is requested via ajax
* master:
2012-03-28 06:48:05 -04:00
Simon L'nu
4a75ea2f42
really fix it this time...
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-28 06:47:38 -04:00
fabrixxm
77aeba0d12
Merge pull request #182 from fabrixxm/master
...
viewsrc returns only text if page is requested via ajax
2012-03-28 03:46:29 -07:00
Simon
8c95332753
Merge pull request #181 from simonlnu/master
...
how the default.php gets read just changed from under me. not pleasant.
2012-03-28 03:21:34 -07:00
Simon L'nu
3d5e711780
WITH is going on?
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-28 06:20:13 -04:00
friendica
b58dc43148
Merge branch 'pull'
2012-03-28 03:19:42 -07:00
friendica
b18086097e
title not updated when editing post
2012-03-28 03:18:26 -07:00
Simon L'nu
2a244be9ac
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
filer: replace "file as" prompt with combobox opened in fancybox
filer: info() on item filed
template: field_combobox
* master:
2012-03-28 06:05:54 -04:00
Simon
c32ee4d226
Merge pull request #180 from simonlnu/master
...
duh...
2012-03-28 03:03:47 -07:00
Simon L'nu
356e654521
doh fix
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-28 06:03:04 -04:00
fabrixxm
768326e484
Merge pull request #179 from fabrixxm/master
...
new field_combobox template and some eyecandy to "file as" function
2012-03-28 03:00:24 -07:00
Simon
40a65d38e0
Merge pull request #178 from simonlnu/master
...
i fixed the worst but ...
2012-03-28 02:55:15 -07:00
Simon L'nu
bcf8a571f9
add some icons for the newbie stuff (diabook but 24px not 32); fixes for dispy (broken last push)
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-28 05:52:28 -04:00
Simon L'nu
6bb8d42865
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
support autocomplete @-tags in plaintext mode
vier navbar messed up after default theme template move
profile_tabs hook
use theme directory for page templates, not language directory
turn on gecko spellcheck in tinymce
small fix in diabook
fixes in diabook
provide a close-option for boxes in right_aside and store info via js and cookies
provide a close-option for boxes in right_aside and store info via js and cookies
form security error when using existing photo
* master:
2012-03-28 05:42:47 -04:00
Fabio Comuni
767245e9ff
viewsrc: return only body if page is requested via ajax
2012-03-28 11:42:04 +02:00
Fabio Comuni
0a2675d8b6
filer: replace "file as" prompt with combobox opened in fancybox
2012-03-28 10:49:34 +02:00
Fabio Comuni
7aec2fd68d
filer: info() on item filed
2012-03-28 10:45:16 +02:00
Fabio Comuni
82106632f0
template: field_combobox
...
a text input plus a select wich updates text input value on change.
html5 version commented out for poor browsers support.
2012-03-28 10:43:52 +02:00
friendica
7fc57f486f
support autocomplete @-tags in plaintext mode
2012-03-28 00:44:45 -07:00
friendica
f95fb2667a
vier navbar messed up after default theme template move
2012-03-28 00:16:22 -07:00
friendica
0aa99acd35
profile_tabs hook
2012-03-27 20:15:15 -07:00
friendica
7ee07daf04
use theme directory for page templates, not language directory
2012-03-27 18:39:52 -07:00
friendica
47eaa97af6
Merge branch 'pull'
2012-03-27 15:21:30 -07:00
friendica
aba63f8b78
turn on gecko spellcheck in tinymce
2012-03-27 15:20:36 -07:00
tommy tomson
f30471df4f
small fix in diabook
2012-03-27 23:41:19 +02:00
tommy tomson
211d00a1f5
fixes in diabook
2012-03-27 23:27:43 +02:00
tomtom84
0bf22d64f6
Merge pull request #177 from tomtom84/master
...
fixes in theme diabook
2012-03-27 10:05:32 -07:00
tommy tomson
31fbc3fde3
provide a close-option for boxes in right_aside and store info via js and cookies
2012-03-27 19:02:07 +02:00
tomtom84
fef7790762
Merge pull request #176 from tomtom84/master
...
fixes in theme diabook-blue
2012-03-27 06:32:30 -07:00
tommy tomson
9fd54de691
provide a close-option for boxes in right_aside and store info via js and cookies
2012-03-27 15:29:46 +02:00
friendica
1982184ca0
Merge branch 'pull'
2012-03-27 04:52:39 -07:00
friendica
117d2165f5
form security error when using existing photo
2012-03-27 04:51:20 -07:00
zottel
fb817a29a9
Merge remote branch 'upstream/master'
2012-03-27 13:20:59 +02:00
Simon
928e6c7ef7
Merge pull request #175 from simonlnu/master
...
various fixes for dispys
2012-03-27 01:43:01 -07:00
Simon L'nu
cc33a564e1
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
profile wall privacy
don't expire filed items
* master:
2012-03-27 04:40:42 -04:00
Simon L'nu
c3388ad813
more fixes for dispys
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-27 04:40:31 -04:00
friendica
7c6c3d36f5
profile wall privacy
2012-03-27 01:31:47 -07:00
Simon L'nu
6cd56e0f33
add dispy-dark snapshot; fix toolbar
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-27 03:57:47 -04:00
friendica
ed30635bee
Merge branch 'pull'
2012-03-27 00:55:25 -07:00
friendica
20f9733250
don't expire filed items
2012-03-27 00:54:34 -07:00
Simon L'nu
a57e1e9cbc
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
add "find friends" to right_aside to diabook, fixes in css in diabook
fixed Umlaute in de strings.php
* master:
2012-03-27 03:23:50 -04:00
tommy tomson
e7bc3f2bd0
add "find friends" to right_aside to diabook, fixes in css in diabook
2012-03-27 08:28:47 +02:00
Tobias Diekershoff
b9d976e31b
fixed Umlaute in de strings.php
2012-03-27 07:18:20 +02:00
Simon L'nu
cfdb2979cb
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
@-completion bug
qcomment enhancements
theme description with preview (non-translatable unfortunately)
preparation for some possibly killer features
translate br with extra elements
revup
Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern Ireland, Spain, and the UK.
* master:
2012-03-27 00:54:47 -04:00
friendica
daa036e34c
@-completion bug
2012-03-26 21:48:04 -07:00
friendica
5275b5d049
qcomment enhancements
2012-03-26 20:13:03 -07:00
friendica
4c585f759f
theme description with preview (non-translatable unfortunately)
2012-03-26 18:15:10 -07:00
friendica
b5d0315d55
preparation for some possibly killer features
2012-03-26 17:57:27 -07:00
friendica
03b95c9a09
translate br with extra elements
2012-03-26 16:56:44 -07:00
friendica
70cc2fff6f
Merge branch 'pull'
2012-03-26 14:55:35 -07:00
friendica
7a1d044b21
revup
2012-03-26 14:54:30 -07:00
friendica
cc3617e286
Merge pull request #174 from beardy-unixer/master
...
Fixed regions
2012-03-26 14:40:47 -07:00
Thomas Willingham
ca8769e193
Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern Ireland, Spain, and the UK.
2012-03-26 22:03:54 +01:00
Thomas Willingham
286c230fa8
Merge remote-tracking branch 'main/master'
2012-03-26 20:17:01 +01:00
Simon
0a3f2bdd5b
Merge pull request #173 from simonlnu/master
...
fix dispy's nav element; fix colours in #search-text
2012-03-26 11:33:31 -07:00
Simon L'nu
3b9f0fd801
fix dispy's nav element; fix colours in #search-text
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-26 14:19:59 -04:00
Simon L'nu
a0ee51b3db
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css
marking quattro-green as extension of quattro and deleting the tpl files
minor css fixes in diabook
screenshot for darkzero-NS, same as darkzero
added quaddro templates to quaddro-green
language issues in enotify
small fix in diabook :: add local friendica to right_aside
comix screenshot
diabook: small fix in theme_info array
more theme screenshots
themes: use duepuntozero tpls as default
* master:
2012-03-26 14:18:39 -04:00
tommy tomson
2d834d0f45
add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css
2012-03-26 18:54:57 +02:00
Tobias Diekershoff
f1d15d8884
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-26 14:49:15 +02:00
Tobias Diekershoff
37f10a6d4f
marking quattro-green as extension of quattro and deleting the tpl files
2012-03-26 14:48:01 +02:00
tommy tomson
aaddee0d94
minor css fixes in diabook
2012-03-26 13:52:44 +02:00
friendica
0164da4fb9
screenshot for darkzero-NS, same as darkzero
2012-03-26 04:25:20 -07:00
Tobias Diekershoff
8ded404aaa
added quaddro templates to quaddro-green
2012-03-26 11:28:38 +02:00
friendica
63fa5f6c77
Merge pull request #172 from fabrixxm/master
...
Rearrange theme tpls
2012-03-26 02:00:14 -07:00
friendica
3431d0b427
Merge branch 'pull'
2012-03-26 01:43:48 -07:00
friendica
b240b8489a
language issues in enotify
2012-03-26 01:43:26 -07:00
tommy tomson
876aa0c752
small fix in diabook :: add local friendica to right_aside
2012-03-26 10:33:28 +02:00
friendica
ca31aed490
Merge branch 'pull'
2012-03-26 00:53:32 -07:00
friendica
2820dba1e7
comix screenshot
2012-03-26 00:52:54 -07:00
Fabio Comuni
579c4f3079
diabook: small fix in theme_info array
2012-03-26 09:48:38 +02:00
friendica
109e8d4f05
more theme screenshots
2012-03-26 00:47:52 -07:00
Simon
4b83b9bee6
Merge pull request #171 from simonlnu/master
...
changes in contact_edit.tpl
2012-03-26 00:41:22 -07:00
Simon L'nu
0c4aba4b57
[fix] contact_edit.tpl syntax; reduce cols to fit better
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-26 03:39:06 -04:00
Simon L'nu
7fad65d7af
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
add screenshots to diabook
* master:
2012-03-26 03:38:19 -04:00
tommy tomson
c4c69959e2
add screenshots to diabook
2012-03-26 09:37:14 +02:00
Fabio Comuni
51d419e159
themes: use duepuntozero tpls as default
2012-03-26 09:09:14 +02:00
Simon
5b3fe48ec6
Merge pull request #170 from simonlnu/master
...
fix search box in dispys
2012-03-26 00:02:51 -07:00
Simon L'nu
7de8e15ca4
fix the search box
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-26 03:01:13 -04:00
Simon L'nu
629a66793c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
small fix
don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin.
position the theme-preview on settings page
more wordsmithing of the Friendica invitation email
screenshot gallery
theme preview for end users
* master:
2012-03-26 02:51:40 -04:00
tommy tomson
37f02424f8
small fix
2012-03-26 07:02:27 +02:00
friendica
021c647673
don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin.
2012-03-25 21:43:17 -07:00
friendica
ba28362242
position the theme-preview on settings page
2012-03-25 21:12:10 -07:00
friendica
1e2e6f5ba9
more wordsmithing of the Friendica invitation email
2012-03-25 20:52:34 -07:00
friendica
a06185e87c
screenshot gallery
2012-03-25 20:08:28 -07:00
friendica
be52ec6f5a
Merge branch 'pull'
2012-03-25 19:48:17 -07:00
Simon L'nu
2147ffa487
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
typo datarry -> datarray
* master:
2012-03-25 22:47:56 -04:00
Simon
7873347c65
Merge pull request #167 from unary/typo
...
typo datarry -> datarray
2012-03-25 19:47:39 -07:00
Simon
8ac59d81f3
Merge pull request #169 from simonlnu/master
...
search box
2012-03-25 19:46:59 -07:00
Simon L'nu
3d11c22b01
add in the search box
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 22:45:44 -04:00
Simon L'nu
758e1b7424
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
theme screenshots
* master:
2012-03-25 22:40:24 -04:00
friendica
c88674aaf2
theme preview for end users
2012-03-25 19:05:14 -07:00
friendica
7ab117fd31
Merge branch 'pull'
2012-03-25 18:19:58 -07:00
friendica
7ef1ed2d70
theme screenshots
2012-03-25 17:55:43 -07:00
Simon L'nu
3d62cb9782
minor fix to dispy theme.php
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 17:13:24 -04:00
Simon L'nu
739d903870
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-25 17:07:43 -04:00
Simon
e6b07d61cf
Merge pull request #168 from simonlnu/master
...
fix dispy-dark
2012-03-25 14:07:33 -07:00
Simon L'nu
aa33815d3c
urgent fix to dispy-dark theme.php
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 17:06:38 -04:00
Simon L'nu
38b30c1d10
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
small fixes
enotify plugin hook
NOTIFY_SYSTEM
* master:
2012-03-25 17:06:17 -04:00
Michael Johnston
ca1e2254c9
typo datarry -> datarray
2012-03-25 16:00:11 -04:00
tommy tomson
baeb735315
small fixes
2012-03-25 19:43:42 +02:00
friendica
873a55e918
enotify plugin hook
2012-03-25 05:06:11 -07:00
friendica
5bb7303408
NOTIFY_SYSTEM
2012-03-25 04:37:09 -07:00
Simon
2e797a6243
Merge pull request #166 from simonlnu/master
...
fpostit; up versions to 1.0;
2012-03-25 00:32:55 -07:00
Simon L'nu
2c43120129
dispy-dark not experimental. start implementing fpostit
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 03:22:16 -04:00
Simon L'nu
84686a2698
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
move community_pages to right_aside, fixes in css
improved the inivitations and added a bit of sales pitch.
* master:
2012-03-25 03:18:21 -04:00
tomtom84
1b8ac30fae
Merge pull request #165 from tomtom84/master
...
fixes in diabook-derivates
2012-03-24 23:50:05 -07:00
tommy tomson
329a26d62e
move community_pages to right_aside, fixes in css
2012-03-25 08:47:17 +02:00
friendica
ea29a26059
Merge branch 'pull'
2012-03-24 23:05:33 -07:00
friendica
6780b76b0c
improved the inivitations and added a bit of sales pitch.
2012-03-24 23:04:18 -07:00
Simon L'nu
1d56224b08
increase version to 1.0 for dispys \o/
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 01:12:28 -04:00
Simon
f0b08290fc
Merge pull request #164 from simonlnu/master
...
implement filer/file-as
2012-03-24 22:04:23 -07:00
Simon L'nu
8fe77e5b86
implement filer/file-as
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 01:01:59 -04:00
Simon L'nu
5bd4f62210
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
bug #329 - compress the plugin list on the friendica info page
bug #346 - add oembed maxwidth to oembed request
* master:
2012-03-25 00:59:25 -04:00
friendica
f1cb287742
bug #329 - compress the plugin list on the friendica info page
2012-03-24 21:50:04 -07:00
friendica
d06ddeb1cc
bug #346 - add oembed maxwidth to oembed request
2012-03-24 21:26:50 -07:00
Simon L'nu
8a6c407282
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
prevent duplicate friend suggestions
block filed items from deletion
add the bang
network filter is now a permission group
small fix in css
add right_aside to diabook-blue
add connectable services to right_aside
add PostIt to right_aside, fixes in css
* master:
2012-03-24 19:38:54 -04:00
friendica
3ae43c2448
prevent duplicate friend suggestions
2012-03-24 15:53:53 -07:00
friendica
3aacc119a1
block filed items from deletion
2012-03-24 04:16:27 -07:00
friendica
8c4fbc3b4d
add the bang
2012-03-24 03:11:45 -07:00
friendica
72c2386edf
Merge branch 'pull'
2012-03-24 02:32:15 -07:00
friendica
db5ec58863
network filter is now a permission group
2012-03-24 01:33:50 -07:00
tommy tomson
8451b22d42
small fix in css
2012-03-24 08:56:26 +01:00
tomtom84
b23ad806ec
Merge pull request #163 from tomtom84/master
...
fixes in diabook-derivates
2012-03-24 00:15:31 -07:00
tommy tomson
ba027f174d
add right_aside to diabook-blue
2012-03-24 08:13:48 +01:00
tomtom84
64397ff09f
Merge pull request #162 from tomtom84/master
...
fixes in theme diabook
2012-03-23 22:20:25 -07:00
tommy tomson
378762fed2
add connectable services to right_aside
2012-03-24 06:17:14 +01:00
tomtom84
ef27af623e
Merge pull request #161 from tomtom84/master
...
fixes in theme diabook
2012-03-23 20:06:48 -07:00
tommy tomson
d76b052f90
add PostIt to right_aside, fixes in css
2012-03-24 04:05:21 +01:00
zottel
fabd4f4d2e
Merge remote branch 'upstream/master'
2012-03-24 01:31:05 +01:00
Simon L'nu
803f79e091
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master: (25 commits)
diabook: theme.php remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links)
user settings: don't show emoticons
fix in css right_aside
small fix
fix 1024resolution
add right_aside to theme diabook
ability to change tags in edited posts
normalise comparison link on delegation page
quattro(-green) styling the 'filed under: remove' text
it's only item.filer ;-)
non static filer text
new lines removed
removed some new lines to cut down number of changed files
removed unneccessary stuff
removed problem from previous commit
tests for the template engine
adding filer functionality to quattro(-green)
missing tooltip for "file as"
prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms
add file_as-option to diabook-derivates
...
* master:
2012-03-23 10:41:55 -04:00
tomtom84
ce8cfb7b05
Merge pull request #160 from fabrixxm/master
...
work on diabook theme and settings
2012-03-23 07:41:32 -07:00
Fabio Comuni
1780fff161
diabook: theme.php
...
remove code duplication
last photos check for user "hidewall"
remove unneeded regex
move js code to close popup in main.js (missing stop event propagation in popup links)
2012-03-23 14:09:06 +01:00
zottel
14f81eca00
Merge remote branch 'upstream/master'
2012-03-23 13:29:02 +01:00
Fabio Comuni
82cc86a41a
user settings: don't show emoticons
2012-03-23 12:07:22 +01:00
Fabio Comuni
6f79cde024
Merge remote-tracking branch 'friendica/master'
2012-03-23 10:45:10 +01:00
tommy tomson
c35b9ec24f
fix in css right_aside
2012-03-23 10:16:11 +01:00
zottel
5fadf68fb4
Merge remote branch 'upstream/master'
2012-03-23 08:39:00 +01:00
tommy tomson
7706a8f9d8
small fix
2012-03-23 07:28:48 +01:00
tomtom84
149b3f3018
Merge pull request #159 from tomtom84/master
...
fixes in theme diabook
2012-03-22 23:03:55 -07:00
tommy tomson
687fa80094
fix 1024resolution
2012-03-23 07:02:21 +01:00
friendica
42d231f8bf
Merge pull request #158 from tomtom84/master
...
add right_aside to theme diabook ... need author
2012-03-22 20:19:44 -07:00
tommy tomson
bf4dd8ad17
add right_aside to theme diabook
2012-03-23 02:36:34 +01:00
friendica
528d795fb6
ability to change tags in edited posts
2012-03-22 16:17:10 -07:00
zottel
e7d80a79ff
Merge remote branch 'upstream/master'
2012-03-22 16:03:14 +01:00
Fabio Comuni
d5a6e7b176
Merge remote-tracking branch 'friendica/master'
2012-03-22 14:56:23 +01:00
friendica
622b25df5f
Merge branch 'pull'
2012-03-22 06:20:32 -07:00
friendica
40d19d5b8c
normalise comparison link on delegation page
2012-03-22 06:19:27 -07:00
Tobias Diekershoff
586c07681b
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-22 14:10:53 +01:00
Tobias Diekershoff
07c5b0af5a
quattro(-green) styling the 'filed under: remove' text
2012-03-22 14:09:21 +01:00
friendica
c7dcc58673
Merge pull request #157 from campino/master
...
Tests for the template engine
2012-03-22 05:49:08 -07:00
Tobias Diekershoff
1e86e3fb26
it's only item.filer ;-)
2012-03-22 13:46:05 +01:00
Tobias Diekershoff
5babf5c8b4
Merge branch 'quattrofiler'
2012-03-22 13:42:10 +01:00
Tobias Diekershoff
6df7fae4b5
non static filer text
2012-03-22 13:41:41 +01:00
Tobias Diekershoff
19eaed60d5
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-22 13:38:59 +01:00
Alexander Kampmann
9ba5fff865
new lines removed
2012-03-22 13:05:34 +01:00
Alexander Kampmann
43f672877f
removed some new lines to cut down number of changed files
2012-03-22 13:03:28 +01:00
Alexander Kampmann
ad9d0dadb3
removed unneccessary stuff
2012-03-22 12:52:24 +01:00
Alexander Kampmann
cea7ca1df4
Merge branch 'master' of git://github.com/friendica/friendica
...
Conflicts:
boot.php
database.sql
include/template_processor.php
update.php
2012-03-22 12:50:02 +01:00
Alexander Kampmann
29900febb3
removed problem from previous commit
2012-03-22 12:45:11 +01:00
Alexander Kampmann
f208e7af36
tests for the template engine
2012-03-22 12:43:03 +01:00
Tobias Diekershoff
54c08b2b0f
adding filer functionality to quattro(-green)
2012-03-22 12:41:51 +01:00
friendica
808180ce5f
missing tooltip for "file as"
2012-03-22 04:07:37 -07:00
Tobias Diekershoff
5f7715529d
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-22 11:54:09 +01:00
friendica
ebdf0ee99e
prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms
2012-03-22 01:46:52 -07:00
zottel
3f3c4aec79
Merge remote branch 'upstream/master'
2012-03-22 09:16:10 +01:00
tomtom84
576eb6cc38
Merge pull request #156 from tomtom84/master
...
fixes in diabook-derivates
2012-03-21 22:57:29 -07:00
tommy tomson
e37c4f69b4
add file_as-option to diabook-derivates
2012-03-22 06:54:18 +01:00
Simon L'nu
8e29669b81
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
support lowercase :-p smilie
work around doubled linefeeds in tinymce3.5b2
add icons to aside diabook, fixes in css
revert permissions relaxation on community
add comix-plain
smooth the comix comment box
make autocomplete work with updated tinymce
ika to ica
private file in repository
facepark is unsupported ATM
remove stray template variable from old code
add comix theme
use password field for DB input
added Vijay's theme from facepark.in
added README to mcefixes to explain what is going on.
update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks
more friend suggestions
* master:
2012-03-22 01:29:55 -04:00
Tobias Diekershoff
5189a56ef8
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-22 06:27:13 +01:00
friendica
d81256d7b0
support lowercase :-p smilie
2012-03-21 21:45:45 -07:00
friendica
ec890f3ce2
Merge branch 'pull'
2012-03-21 21:43:10 -07:00
friendica
f1bbe03df1
work around doubled linefeeds in tinymce3.5b2
2012-03-21 21:42:27 -07:00
tomtom84
294d39f96f
Merge pull request #155 from tomtom84/master
...
fixes in diabook-derivates
2012-03-21 20:39:19 -07:00
tommy tomson
72d0756fa6
add icons to aside diabook, fixes in css
2012-03-22 04:33:21 +01:00
friendica
c1d6ece98e
revert permissions relaxation on community
2012-03-21 14:56:06 -07:00
friendica
89028f2e2f
add comix-plain
2012-03-21 13:55:37 -07:00
friendica
56495e04b2
smooth the comix comment box
2012-03-21 06:48:04 -07:00
friendica
3ad02a749b
make autocomplete work with updated tinymce
2012-03-21 05:27:08 -07:00
Michael Vogel
792edfe9c8
New parameter in html2plain for plain text exports. More compatibility in API
2012-03-21 10:08:40 +01:00
friendica
1a98f3c067
ika to ica
2012-03-21 00:35:33 -07:00
friendica
86d8d3f442
private file in repository
2012-03-21 00:34:12 -07:00
zottel
88bbc5e0bc
Merge remote branch 'upstream/master'
2012-03-21 08:08:23 +01:00
friendica
adcf52d02d
facepark is unsupported ATM
2012-03-21 00:08:06 -07:00
friendica
db02eebde1
Merge branch 'pull'
2012-03-20 23:59:02 -07:00
friendica
6c7b619b34
remove stray template variable from old code
2012-03-20 23:57:33 -07:00
friendica
efd7c14c24
Merge pull request #154 from tonybaldwin/master
...
added theme
2012-03-20 23:31:12 -07:00
friendica
0dc4c3f484
add comix theme
2012-03-20 22:54:20 -07:00
friendica
4d39b0658f
use password field for DB input
2012-03-20 22:53:19 -07:00
tony baldwin
e5c29fcc78
Merge remote branch 'upstream/master'
2012-03-21 01:36:23 -04:00
tony baldwin
cf17606d0f
added Vijay's theme from facepark.in
2012-03-21 01:33:48 -04:00
friendica
b4a2dae085
added README to mcefixes to explain what is going on.
2012-03-20 21:04:09 -07:00
friendica
f55779fd83
update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks
2012-03-20 20:47:31 -07:00
friendica
810e69ef0a
more friend suggestions
2012-03-20 19:06:26 -07:00
Simon L'nu
be50cc03b8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
move friend suggestions to top of contact page, add default contact profile photos if missing
missed a default profile photo replacement in notifications
change default profile photo to something more interesting than a reddish brown square
slightly relax overly strict permissions in community and search to match those in display - tl;dr public conversations are publicly visible
* master:
2012-03-20 21:41:34 -04:00
friendica
ef33cfcc9a
move friend suggestions to top of contact page, add default contact profile photos if missing
2012-03-20 16:05:32 -07:00
friendica
def0e35e21
Merge branch 'pull'
2012-03-20 15:45:32 -07:00
friendica
a72a23b6d6
missed a default profile photo replacement in notifications
2012-03-20 15:43:34 -07:00
friendica
894278dbcc
change default profile photo to something more interesting than a reddish brown square
2012-03-20 15:41:06 -07:00
friendica
92ef36ad61
slightly relax overly strict permissions in community and search to match those in display - tl;dr public conversations are publicly visible
2012-03-20 14:55:18 -07:00
Simon
d71cbb3034
Merge pull request #153 from simonlnu/master
...
intro boxen tweaks, dispy gets synced with -dark
2012-03-20 08:39:42 -07:00
Simon L'nu
de0298e67e
some tweakings for intro boxes (finally got an intro i could see :). dispy synced with dispy-dark
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-20 11:37:51 -04:00
Simon L'nu
f4ca441148
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
bug #339 - lostpass sending to username, not email
* master:
2012-03-20 11:33:52 -04:00
friendica
9df7972993
bug #339 - lostpass sending to username, not email
2012-03-20 01:50:20 -07:00
Simon L'nu
5642e9fa38
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
add IP address to failed login log message
modified: include/text.php Stupid bug fixed
cleanup after openid refactoring
refactor openid logins/registrations
modified: include/text.php deleted: images/diaspora.png deleted: images/smiley-bangheaddesk.gif deleted: images/smiley-beard.png deleted: images/smiley-shaka.gif deleted: images/smiley-whitebeard.png
some openid fixes, use identity url from openid server and normalise it.
support "no_smilies"
ctrl + left|right cursor keys to prev/next photos
add 'loggin_out' hook
* master:
2012-03-20 03:20:37 -04:00
zottel
cf34766416
Merge remote branch 'upstream/master'
2012-03-20 08:08:42 +01:00
friendica
5a5aadb743
add IP address to failed login log message
2012-03-19 21:58:21 -07:00
friendica
f7e380cdc6
Merge pull request #152 from beardy-unixer/84f8e2eaa87c90473ce79ebcd4f76f3657258f27
...
Smiley removal
2012-03-19 15:56:16 -07:00
Thomas
64a2b00cdc
Merge remote-tracking branch 'main/master'
2012-03-19 22:33:06 +00:00
Thomas
84f8e2eaa8
modified: include/text.php
...
Stupid bug fixed
2012-03-19 22:32:19 +00:00
friendica
a156ce196e
Merge pull request #150 from fabrixxm/master
...
Add "logging_out" hook
2012-03-19 15:29:32 -07:00
friendica
b8f6312408
cleanup after openid refactoring
2012-03-19 15:10:14 -07:00
friendica
9e133d6412
refactor openid logins/registrations
2012-03-19 15:03:09 -07:00
Thomas
e9b33a6f1f
modified: include/text.php
...
deleted: images/diaspora.png
deleted: images/smiley-bangheaddesk.gif
deleted: images/smiley-beard.png
deleted: images/smiley-shaka.gif
deleted: images/smiley-whitebeard.png
Removed selected smiley per Mike's request. Also removed deprecated smileys that were just commented out.
2012-03-19 21:59:06 +00:00
Thomas
4f927392f8
Merge remote-tracking branch 'main/master'
2012-03-19 21:53:13 +00:00
Fabio Comuni
e193091dfe
Merge remote-tracking branch 'friendica/master'
2012-03-19 16:41:32 +01:00
friendica
139a86dbd3
some openid fixes, use identity url from openid server and normalise it.
2012-03-19 06:48:11 -07:00
zottel
2b3b97df09
Merge remote branch 'upstream/master'
2012-03-19 12:32:07 +01:00
Fabio Comuni
ea4be0db89
Merge remote-tracking branch 'friendica/master'
2012-03-19 12:24:40 +01:00
friendica
2349852b4a
support "no_smilies"
2012-03-19 03:18:39 -07:00
zottel
6d31e3d6ef
Merge remote branch 'upstream/master'
2012-03-19 09:34:39 +01:00
friendica
cf2edb5b9a
ctrl + left|right cursor keys to prev/next photos
2012-03-19 01:20:53 -07:00
Simon L'nu
236eaf6ed0
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier
community discovery cont., cleanup of DB debugging
* master:
2012-03-19 03:41:26 -04:00
Simon
283bc51acf
Merge pull request #149 from CatoTH/master
...
Add a missing security token [Using photos as profile photos]
2012-03-19 00:40:51 -07:00
Tobias Hößl
0341078a73
Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier
2012-03-19 07:37:09 +00:00
friendica
cca524495c
community discovery cont., cleanup of DB debugging
2012-03-18 22:12:36 -07:00
Simon L'nu
5e2a9c99a6
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
revup
CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it)
* master:
2012-03-18 21:09:25 -04:00
friendica
02786d6ed0
Merge branch 'pull'
2012-03-18 17:57:54 -07:00
friendica
37f4cbd732
revup
2012-03-18 17:57:29 -07:00
friendica
c286681158
Merge pull request #147 from CatoTH/master
...
CSRF-Protection in the group-related form
2012-03-18 17:54:12 -07:00
Simon
6aab641bfd
Merge pull request #148 from simonlnu/master
...
fix the comment box being too wide and looking off-kilter
2012-03-18 15:47:25 -07:00
Simon L'nu
e84095182f
fix the comment box being too wide and looking off-kilter
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-18 18:33:38 -04:00
Michael Vogel
3393d80ac1
API: added max_id
2012-03-18 19:00:24 +01:00
Michael Vogel
77e77027b4
API: Now threading seems to work
2012-03-18 18:21:51 +01:00
Michael Vogel
6f10142b2e
API: Seesmic is now working. Optimizing text export.
2012-03-18 17:52:51 +01:00
Simon L'nu
8b13358ce3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
replace split() by explode(); split is deprecated
lost changes to tinymce/bbcode
remove admin view of local directory
bug #337 , call template_unescape() only at the end of template processing
queue optimisation - back off delivery attempts to once per hour after the first 12 hours.
* master:
2012-03-18 12:02:33 -04:00
Tobias Hößl
453b5b46a3
CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it)
2012-03-18 15:44:33 +00:00
friendica
09ed17df99
Merge pull request #146 from CatoTH/master
...
replace split() by explode(); split is deprecated
2012-03-18 03:59:49 -07:00
Tobias Hößl
72894b0e91
replace split() by explode(); split is deprecated
2012-03-18 10:36:49 +00:00
Tobias Diekershoff
751e4181e5
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-18 07:19:20 +01:00
friendica
4bb280bc2f
lost changes to tinymce/bbcode
2012-03-17 22:18:21 -07:00
friendica
9e731506c2
remove admin view of local directory
2012-03-17 22:14:17 -07:00
friendica
67fd539f53
bug #337 , call template_unescape() only at the end of template processing
2012-03-17 18:15:36 -07:00
Simon L'nu
939c8d3c8d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
compare ssl_policy precisely in case somebody was bitten by template processor bug
template processor broken with foreach k=>v and k is integer 0
* master:
2012-03-17 20:03:34 -04:00
zottel
df78c9be0b
Merge remote branch 'upstream/master'
2012-03-18 01:02:30 +01:00
Tobias Diekershoff
5fd03583a4
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-17 12:29:21 +01:00
Michael Vogel
f5db142d93
Quotes with author are now having an "open/close" link
2012-03-17 12:15:59 +01:00
friendica
94fac6d767
queue optimisation - back off delivery attempts to once per hour after the first 12 hours.
2012-03-17 03:43:02 -07:00
Michael Vogel
8a1f175df0
New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements
2012-03-17 11:07:49 +01:00
friendica
26258bca77
compare ssl_policy precisely in case somebody was bitten by template processor bug
2012-03-17 02:36:59 -07:00
friendica
e0e008fb8d
template processor broken with foreach k=>v and k is integer 0
2012-03-17 02:26:52 -07:00
Tobias Diekershoff
96da328acf
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-17 08:44:36 +01:00
Simon L'nu
c7759af8c5
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
cut/paste error
scheme checking for webservers without $_SERVER['HTTPS']
* master:
2012-03-17 03:23:46 -04:00
friendica
057a142b8c
cut/paste error
2012-03-17 00:08:52 -07:00
friendica
511d8a30a0
scheme checking for webservers without $_SERVER['HTTPS']
2012-03-16 23:51:49 -07:00
Simon
2785bb413e
Merge pull request #145 from simonlnu/master
...
[fix] whitespace in photo_view and like_noshare. dispy-dark clean up
2012-03-16 23:05:37 -07:00
Simon L'nu
87fdae2dd8
[fix] whitespace in photo_view and like_noshare. dispy-dark clean up
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-17 01:55:40 -04:00
Simon L'nu
2b06b081d3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-17 01:47:53 -04:00
zottel
3bbd82abb3
Merge remote branch 'upstream/master'
2012-03-17 02:25:22 +01:00
Simon
4a6f114ec0
Merge pull request #144 from simonlnu/master
...
remove auto-complete from some themes since the comment one is now global
2012-03-16 18:24:26 -07:00
Simon L'nu
75883b196e
remove auto-complete from darkzero-NS, dispys, since the comment one is now global
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 21:23:24 -04:00
Simon L'nu
49540fb958
make auto-complete work in more places
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 21:20:23 -04:00
Simon L'nu
030c8a089a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-16 21:19:17 -04:00
zottel
c56e3c5dd4
Merge remote branch 'upstream/master'
2012-03-17 01:49:17 +01:00
Simon
8af36b92bb
Merge pull request #143 from simonlnu/master
...
make auto-complete in darkzero-NS.
2012-03-16 17:31:24 -07:00
Simon L'nu
368d93625d
make auto-complete in darkzero-NS. other themes can use this easily. might need to edit the id it hooks into
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 20:29:02 -04:00
Simon L'nu
6bc2d58a98
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
convert boolean or int settings to strings to work around issues with template processing
add "send pm" link to photo dropdown for Diaspora contacts
* master:
2012-03-16 20:26:38 -04:00
friendica
82f2bfea5b
convert boolean or int settings to strings to work around issues with template processing
2012-03-16 16:05:16 -07:00
Simon L'nu
0e9d5e0ce8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
wrong link in d* comment notifications
* master:
2012-03-16 18:35:50 -04:00
friendica
949c6d47b5
add "send pm" link to photo dropdown for Diaspora contacts
2012-03-16 15:19:38 -07:00
friendica
141ae076ad
Merge branch 'pull'
2012-03-16 15:08:32 -07:00
friendica
58940175e1
wrong link in d* comment notifications
2012-03-16 15:07:45 -07:00
Simon
c7dd52be62
Merge pull request #142 from simonlnu/master
...
make profiles-menu disappear when clicked outside of it
2012-03-16 13:44:39 -07:00
Simon L'nu
91fee866b7
make profiles-menu disappear when clicked outside it
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 16:43:34 -04:00
Simon L'nu
01f8710832
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Bugfix of old IEs
Forgot to remove a debug line
Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button
* master:
2012-03-16 16:41:19 -04:00
Simon
1246a40ec2
Merge pull request #141 from CatoTH/master
...
Private messages - tabindex
2012-03-16 10:54:20 -07:00
Tobias Hößl
90bb32ab73
Bugfix of old IEs
2012-03-16 17:47:40 +00:00
Tobias Hößl
27054964fe
Forgot to remove a debug line
2012-03-16 17:46:26 +00:00
Tobias Hößl
75823c2353
Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button
2012-03-16 17:45:07 +00:00
Simon
925b9c5b9c
Merge pull request #140 from simonlnu/master
...
weee, dispys get another update
2012-03-16 10:35:19 -07:00
Simon L'nu
7b15f27ba4
weee, dispys get another update
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 13:31:59 -04:00
Simon L'nu
a8c1cbc655
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
syntax error from pasted text, remove ^M's
bug #335 network search broken after new ssl policy settings
whitespace
notification for disapora comments
* master:
2012-03-16 13:28:22 -04:00
friendica
28f941193d
syntax error from pasted text, remove ^M's
2012-03-16 06:02:26 -07:00
friendica
224dfa848b
bug #335 network search broken after new ssl policy settings
2012-03-16 05:51:04 -07:00
friendica
805087af67
whitespace
2012-03-16 05:41:29 -07:00
friendica
be1bd9ff4e
notification for disapora comments
2012-03-16 05:19:29 -07:00
zottel
ea4c806c5c
Merge remote branch 'upstream/master'
2012-03-16 08:33:01 +01:00
Tobias Diekershoff
74c64ef2d2
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-16 07:13:14 +01:00
Simon
47e1b8d0c0
Merge pull request #139 from simonlnu/master
...
missing close double quote in mail_list.tpl
2012-03-15 22:58:54 -07:00
Simon L'nu
e21bf3341b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-16 01:57:59 -04:00
Simon L'nu
d965f73ef1
missing close double quote in mail_list.tpl
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 01:57:27 -04:00
Simon
cecd62373b
Merge pull request #138 from simonlnu/master
...
more changes in dispy-dark
2012-03-15 22:56:46 -07:00
Simon L'nu
6bdb71f01c
more changes in dispy-dark
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 01:55:34 -04:00
Simon L'nu
f727b44c08
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master: (21 commits)
turn indexes back off (this is from an errant checkin a year or more ago)
undo git stuffup
added icons to profile_side, fixes in css
track whether contact is a community page or not
html2bbcode: Disabled size conversion
Mail: Subject are now with working "Re:"
Removing test exports
Missing field in database.sql
Removed changes
Added config options for the item cache and the ostatus priority
Item cache now is one day.
Corrected some git problems
Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works.
Pages: Show every community page - even from foreign servers (with caching)
New plugin that shows community pages in the sidebar
Caching improved.
Enabled Caching for items. Changed color of tags in diabook.
New config options if ostatus polling should use the priority in the contacts
Mail: Removing signatures, gpg, unnecessary line breaks
diabook: Moving the location between the icons
...
* master:
2012-03-16 01:51:25 -04:00
friendica
be4e4dfb0d
turn indexes back off (this is from an errant checkin a year or more ago)
2012-03-15 20:07:30 -07:00
friendica
33e03a8df0
Merge branch 'pull'
2012-03-15 19:56:32 -07:00
friendica
5a12383b78
undo git stuffup
2012-03-15 19:55:58 -07:00
tomtom84
0b509fd763
Merge pull request #137 from tomtom84/master
...
fixes in diabook-derivates
2012-03-15 19:55:10 -07:00
tommy tomson
02395c8af5
added icons to profile_side, fixes in css
2012-03-16 03:49:43 +01:00
friendica
41d595d5bc
Merge branch 'pull'
2012-03-15 16:39:21 -07:00
friendica
7684f63ecd
track whether contact is a community page or not
2012-03-15 16:38:26 -07:00
friendica
5d2c590fa9
Merge pull request #136 from annando/master
...
Mail improvements, item caching and so on
2012-03-15 15:30:52 -07:00
Simon L'nu
5c75d40c0b
fixed the sidebar edit thingy. haven't synced dispy yet.
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-15 17:27:06 -04:00
Simon L'nu
eee2eed588
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-15 17:25:22 -04:00
Michael Vogel
b5120888cf
html2bbcode: Disabled size conversion
2012-03-15 21:17:51 +01:00
Michael Vogel
9243c9fc14
Merge commit 'upstream/master'
2012-03-15 21:11:58 +01:00
Simon
ab89aa90ca
Merge pull request #135 from simonlnu/master
...
commit latest to dispy-dark. fixes in html css and js
2012-03-15 12:08:59 -07:00
Simon L'nu
5b757e4e0e
commit latest to dispy-dark. fixes in html css and js
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-15 15:07:17 -04:00
Simon L'nu
1d2049a6d6
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
more recycle fixes for plaintext
fix recycle symbol when using plaintext editor
add links to wall, photos, events, etc to aside on networkpage, fixes in css
* master:
2012-03-15 15:03:31 -04:00
Alexander Kampmann
899701c3d3
integrated profiler
2012-03-15 12:55:49 +01:00
friendica
f96aff5518
more recycle fixes for plaintext
2012-03-15 03:47:02 -07:00
Alexander Kampmann
9796e99fa8
added simple build-in profiling
2012-03-15 11:45:06 +01:00
friendica
9cd1c35c22
fix recycle symbol when using plaintext editor
2012-03-15 03:44:41 -07:00
Alexander Kampmann
29ade1d9b9
another test for xmlify
2012-03-15 10:51:22 +01:00
zottel
69f4448ada
Merge remote branch 'upstream/master'
2012-03-15 10:18:06 +01:00
friendica
a7fd3a8b24
Merge branch 'pull'
2012-03-15 01:48:10 -07:00
friendica
4cd3d5cd02
Merge https://github.com/friendica/friendica into pull
2012-03-15 01:48:07 -07:00
zottel
282465edab
Merge remote branch 'upstream/master'
2012-03-15 08:36:05 +01:00
tommy tomson
6dbee45d92
add links to wall, photos, events, etc to aside on networkpage, fixes in css
2012-03-15 08:29:39 +01:00
Tobias Diekershoff
80b57e664a
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-15 06:31:47 +01:00
Simon L'nu
6e133e75c3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts
roll protocol version due to ssl_policy settings
force login to ssl on SSL_POLICY_SELFSIGN
basic ssl_policy for important modules
ssl_policy stuff
revup
splitted tests into several files
removed done TODO
get_tags tests corrected. They test for the right things now.
addon settings form error
more work on filer, comment level and file tag removal
added slack-NS, non-scrolly, slackr-based theme.
get tags test improved
splitted test cases.
changed a test string
added some tests
added library and include to .htaccess
excludes reports from git
better tests
added test blueprints, fixed? encoding issues
* master:
2012-03-15 01:02:44 -04:00
friendica
b06c5983a4
don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts
2012-03-14 21:58:54 -07:00
friendica
b44533e9fb
roll protocol version due to ssl_policy settings
2012-03-14 21:40:36 -07:00
friendica
93a8907f43
force login to ssl on SSL_POLICY_SELFSIGN
2012-03-14 21:29:44 -07:00
friendica
110e8f2919
basic ssl_policy for important modules
2012-03-14 21:20:20 -07:00
friendica
f0a62d8908
ssl_policy stuff
2012-03-14 20:36:23 -07:00
friendica
64e3e3590b
revup
2012-03-14 16:09:13 -07:00
friendica
531201f2a1
Merge pull request #132 from campino/master
...
Test cases
2012-03-14 15:16:30 -07:00
friendica
959aa13de0
Merge pull request #133 from tonybaldwin/master
...
slack-NS
2012-03-14 15:15:34 -07:00
friendica
dcdfa96a1f
Merge branch 'pull'
2012-03-14 14:34:52 -07:00
friendica
2dc527609e
Merge https://github.com/friendica/friendica into pull
2012-03-14 14:34:48 -07:00
zottel
2481758886
Merge remote branch 'upstream/master'
2012-03-14 16:29:22 +01:00
Simon L'nu
ebccf13c4c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix in nav
add links to home, profile, photos, events, notes to aside in network-stream
* master:
2012-03-14 11:02:14 -04:00
Simon
c95deb4839
Merge pull request #134 from simonlnu/master
...
PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
2012-03-14 08:02:04 -07:00
Simon L'nu
0bf9595ab1
PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-14 11:00:20 -04:00
Alexander Kampmann
70709a8825
Merge branch 'master' of git://github.com/friendica/friendica
...
Conflicts:
view/de/strings.php
2012-03-14 12:57:35 +01:00
tommy tomson
f03c57007a
fix in nav
2012-03-14 12:56:59 +01:00
Alexander Kampmann
509ed2604f
splitted tests into several files
2012-03-14 12:54:49 +01:00
tommy tomson
42462cc1f0
add links to home, profile, photos, events, notes to aside in network-stream
2012-03-14 12:50:11 +01:00
Alexander Kampmann
c0c98206ef
removed done TODO
2012-03-14 12:31:25 +01:00
Alexander Kampmann
509532d168
get_tags tests corrected. They test for the right things now.
2012-03-14 12:30:52 +01:00
friendica
9df67e5cfe
Merge branch 'pull'
2012-03-13 23:53:33 -07:00
friendica
7e270b043c
addon settings form error
2012-03-13 23:52:13 -07:00
Tobias Diekershoff
4fcdada432
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-14 07:20:13 +01:00
Simon
fb77bfa648
Merge pull request #131 from simonlnu/master
...
massive work done to both dispys, mostly -dark
2012-03-13 22:10:02 -07:00
Simon L'nu
975781d3e2
massive work done to both dispys, mostly -dark
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-14 01:05:08 -04:00
friendica
4972d7ef6e
more work on filer, comment level and file tag removal
2012-03-13 20:46:37 -07:00
Tony Baldwin
1ae740535d
added slack-NS, non-scrolly, slackr-based theme.
2012-03-13 23:05:04 -04:00
Simon L'nu
a2073bcfc0
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
sort inbox by recently replied conversations first
file as widget and basic filing implementation for duepuntozero,slackr much more work needed - this is just for test/evaluation currently
don't count self in number of contatcs
invite potential connectees to the free social web
In HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ajax-call to a php-script. Once there actually is embedded Code in the HTML, this function is called after every single keypress. Not only is making an ajax-call every keypress bandith intensive - it also made typing hard / slow. Making a lot of JavaScript-RegExp-Computation every keypress isn't exactly great either, but still performs better.
Some security against XSRF-attacks
A 'PHP Fatal error: Call to a member function getElementsByTagName() on a non-object in mod/parse_url.php on line 191' occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't be link to in the editor therefore.
Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php
Avoid notices
contact.network is used later to check if a direct link or a redirect by /redir/contactid should be used
wasn't actually changed before
Avoid a notice
Avoid a Notice
Avoid a Notice
Avoid a Notice
* master:
2012-03-13 22:41:45 -04:00
friendica
de017d1ed7
sort inbox by recently replied conversations first
2012-03-13 19:27:52 -07:00
friendica
be48fff157
file as widget and basic filing implementation for duepuntozero,slackr
...
much more work needed - this is just for test/evaluation currently
2012-03-13 18:13:03 -07:00
friendica
8a789a33d1
Merge branch 'pull'
2012-03-13 16:02:52 -07:00
friendica
db80ffa0ff
don't count self in number of contatcs
2012-03-13 16:02:20 -07:00
friendica
2173f418dd
Merge pull request #130 from CatoTH/master
...
HTML2BBCode with [EMBED]: Compute in JS instead of PHP
2012-03-13 15:45:12 -07:00
friendica
427362c324
Merge branch 'pull'
2012-03-13 15:41:13 -07:00
friendica
dc84da520d
invite potential connectees to the free social web
2012-03-13 15:40:16 -07:00
Tobias Hößl
7868e3897b
In HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ajax-call to a php-script. Once there actually is embedded Code in the HTML, this function is called after every single keypress. Not only is making an ajax-call every keypress bandith intensive - it also made typing hard / slow. Making a lot of JavaScript-RegExp-Computation every keypress isn't exactly great either, but still performs better.
2012-03-13 21:46:57 +00:00
friendica
acc4bbeb6e
Merge pull request #129 from CatoTH/master
...
CSRF-Protection and minor changes
2012-03-13 14:36:52 -07:00
Simon L'nu
1763a6c9c2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming.
* master:
2012-03-13 14:41:46 -04:00
Tobias Hößl
43430ef561
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-13 18:34:15 +00:00
friendica
5a41676465
initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming.
2012-03-13 04:04:26 -07:00
Tobias Diekershoff
5bae7159cc
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-13 06:50:14 +01:00
Simon L'nu
203fa94e17
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
click anywhere to close notifications -> zeros and bubbles
revup
fix css
use fancybox instead of lightbox
fixes
* master:
2012-03-13 00:25:20 -04:00
friendica
bf7425c591
click anywhere to close notifications -> zeros and bubbles
2012-03-12 20:21:32 -07:00
friendica
e12706e825
Merge branch 'pull'
2012-03-12 19:12:39 -07:00
friendica
acf75e85c8
revup
2012-03-12 19:12:00 -07:00
tomtom84
691f5b11f7
Merge pull request #128 from tomtom84/master
...
fixes in diabook-derivates
2012-03-12 16:40:10 -07:00
tommy tomson
8358b9247f
fix css
2012-03-13 00:38:38 +01:00
tomtom84
ecc9f4ba70
Merge pull request #127 from tomtom84/master
...
fixes in diabook-derivates
2012-03-12 16:06:15 -07:00
tommy tomson
27bc8052d0
use fancybox instead of lightbox
2012-03-13 00:04:19 +01:00
tomtom84
8a85914e1d
Merge pull request #126 from tomtom84/master
...
fixes in diabook-derivates
2012-03-12 15:33:29 -07:00
tommy tomson
caffb217c1
fixes
2012-03-12 23:31:54 +01:00
Simon L'nu
5a1e2c32fe
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
add lightbox, fixex in css
more save to file backend
backend for "save to file" feature
* master:
2012-03-12 17:12:01 -04:00
Tobias Hößl
59766b944c
Some security against XSRF-attacks
2012-03-12 20:17:37 +00:00
tomtom84
a1305433b8
Merge pull request #125 from tomtom84/master
...
fixes in diabook-derivates
2012-03-12 13:11:19 -07:00
tommy tomson
9436175746
add lightbox, fixex in css
2012-03-12 21:09:16 +01:00
Tobias Hößl
9574f7df03
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-12 19:06:45 +00:00
Fabio Comuni
c30342e2f7
add 'loggin_out' hook
2012-03-12 15:58:59 +01:00
Alexander Kampmann
bce3bfff38
get tags test improved
2012-03-12 13:59:00 +01:00
friendica
38cb4a362f
Merge branch 'pull'
2012-03-12 00:57:06 -07:00
friendica
3bc990f718
more save to file backend
2012-03-11 21:32:11 -07:00
Tobias Diekershoff
30f5c3a9eb
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-12 05:02:45 +01:00
friendica
93058af4fc
backend for "save to file" feature
2012-03-11 20:19:56 -07:00
Simon L'nu
9f52e3df8d
fix dispy-dark photo album stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 21:34:51 -04:00
Simon L'nu
8629d90818
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-11 21:33:06 -04:00
Simon
18ef942f62
Merge pull request #124 from simonlnu/master
...
fix dispys' css and layout
2012-03-11 17:37:29 -07:00
Simon L'nu
e9b82bb5ee
fix dispys' css and layout
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 20:36:16 -04:00
Simon L'nu
de70b2f30f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
community meta tag renamed from "ika"
* master:
2012-03-11 20:33:10 -04:00
friendica
1401f763ec
Merge branch 'pull'
2012-03-11 17:09:07 -07:00
Michael Vogel
6e7a190e91
Mail: Subject are now with working "Re:"
2012-03-12 00:22:12 +01:00
friendica
d9bee73edf
community meta tag renamed from "ika"
2012-03-11 15:50:23 -07:00
Michael Vogel
2ed6b3531e
Removing test exports
2012-03-11 23:29:59 +01:00
Michael Vogel
905ba5ba1d
Missing field in database.sql
2012-03-11 22:39:40 +01:00
Simon L'nu
6e5f837609
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-11 17:05:08 -04:00
Michael Vogel
7235d5466a
Removed changes
2012-03-11 20:24:55 +01:00
Michael Vogel
d653e27e2d
Merge commit 'upstream/master'
...
Conflicts:
view/theme/diabook/wall_item.tpl
view/theme/diabook/wallwall_item.tpl
2012-03-11 20:22:28 +01:00
Michael Vogel
ebdf484218
Added config options for the item cache and the ostatus priority
2012-03-11 19:50:51 +01:00
Michael Vogel
9ca5de8c28
Item cache now is one day.
2012-03-11 19:45:28 +01:00
Michael Vogel
739309abd0
Corrected some git problems
2012-03-11 19:41:29 +01:00
Michael Vogel
9f76d96d46
Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works.
2012-03-11 19:11:25 +01:00
Michael Vogel
b879a1ddf1
Pages: Show every community page - even from foreign servers (with caching)
2012-03-11 17:45:12 +01:00
Tobias Hößl
d9cb46f0de
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-11 14:43:16 +00:00
Simon
1dad15a021
Merge pull request #123 from simonlnu/master
...
screwed up on the font-size for screen last push
2012-03-11 07:29:45 -07:00
Simon L'nu
258a8c0871
screwed up on the font-size for screen last push
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:29:12 -04:00
Simon L'nu
467aa66d37
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-11 10:25:39 -04:00
Simon
ac2a81a273
Merge pull request #122 from simonlnu/master
...
add some '@media handheld' types for dispys
2012-03-11 07:25:27 -07:00
Simon L'nu
fa0cb8514d
add some '@media handheld' types for dispys
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:24:49 -04:00
Simon
48306e1fae
Merge pull request #121 from simonlnu/master
...
fix more stuff
2012-03-11 07:15:35 -07:00
Simon L'nu
62fe48f064
fix more stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:14:31 -04:00
Michael Vogel
eb3b211461
New plugin that shows community pages in the sidebar
2012-03-11 14:22:19 +01:00
Simon
076393c9e7
Merge pull request #120 from simonlnu/master
...
fix some stuff right away
2012-03-11 06:13:10 -07:00
Simon L'nu
57d8370376
fix some stuff right away
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 09:12:31 -04:00
Tobias Hößl
4df08433c6
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-11 11:27:47 +00:00
Tobias Diekershoff
6cbd765e1f
Revert "OpenID: display error msg if ID URL used to register an account does not exist"
...
This reverts commit 3c16850383
.
2012-03-11 12:03:47 +01:00
Tobias Diekershoff
3c16850383
OpenID: display error msg if ID URL used to register an account does not exist
2012-03-11 12:00:32 +01:00
Simon
50863a19eb
Merge pull request #119 from simonlnu/master
...
preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
2012-03-10 22:33:40 -08:00
Simon L'nu
f7ade749b8
preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 01:32:11 -05:00
Simon L'nu
dfdf0f1335
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
bug #328
default the text template var on conversations
bug #327 - composed private message is lost if no recip specified.
revup
fixed login-fields, fixed. notofication.png, changed locations
German translation
* master:
2012-03-11 01:24:59 -05:00
friendica
5915325367
bug #328
2012-03-10 18:52:50 -08:00
friendica
d9c5d9d2eb
default the text template var on conversations
2012-03-10 15:53:36 -08:00
friendica
1bddd48661
bug #327 - composed private message is lost if no recip specified.
2012-03-10 15:50:51 -08:00
friendica
4f606ff633
Merge branch 'pull'
2012-03-10 14:45:23 -08:00
friendica
20d1a16dbb
revup
2012-03-10 14:44:43 -08:00
Michael Vogel
670b571c8a
Caching improved.
2012-03-10 18:19:00 +01:00
Michael Vogel
74b3e9f273
Enabled Caching for items. Changed color of tags in diabook.
2012-03-10 15:50:35 +01:00
tomtom84
c79cb57e1e
Merge pull request #118 from tomtom84/master
...
fixes in diabook-derivates
2012-03-10 04:24:49 -08:00
tommy tomson
0f3255467e
fixed login-fields, fixed. notofication.png, changed locations
2012-03-10 13:22:41 +01:00
Michael Vogel
e098147c24
New config options if ostatus polling should use the priority in the contacts
2012-03-10 11:29:40 +01:00
Tobias Diekershoff
1e37477fdc
German translation
2012-03-10 10:36:20 +01:00
Michael Vogel
15916a2cb7
Mail: Removing signatures, gpg, unnecessary line breaks
2012-03-10 09:52:20 +01:00
Simon L'nu
665ad7e660
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
spec directory
allow user to set number of items to show on network page
revup
* master:
2012-03-10 00:15:29 -05:00
friendica
d50a839c04
Merge branch 'pull'
2012-03-09 19:50:45 -08:00
friendica
0e3b9097f6
spec directory
2012-03-09 19:50:31 -08:00
friendica
a374bbcf81
Merge pull request #117 from unary/issue299
...
allow user to set number of items to show on network page
2012-03-09 19:42:52 -08:00
Michael Johnston
fd1f8fb436
allow user to set number of items to show on network page
2012-03-09 21:29:39 -05:00
Simon L'nu
686fe47b88
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
add js to hide nav-menus, when clicked outside
fixes in css
recover contacts total count which got lost
bug #324 - tinymce used for mail even if editplain being used.
bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed
keep tony from talking to himself
* master:
2012-03-09 19:02:29 -05:00
Michael Vogel
cb1ecf2c5a
diabook: Moving the location between the icons
2012-03-10 00:15:27 +01:00
friendica
a02ffbcc86
Merge branch 'pull'
2012-03-09 14:44:29 -08:00
friendica
92a93642e1
revup
2012-03-09 14:43:48 -08:00
tomtom84
68ca29719e
Merge pull request #116 from tomtom84/master
...
fixes in diabook-derivates
2012-03-09 09:17:01 -08:00
tommy tomson
8fe4645a5d
add js to hide nav-menus, when clicked outside
2012-03-09 18:15:27 +01:00
tomtom84
68541b5dd2
Merge pull request #115 from tomtom84/master
...
fixes in diabook-derivates
2012-03-09 04:24:59 -08:00
tommy tomson
9f441731af
fixes in css
2012-03-09 13:23:38 +01:00
Alexander Kampmann
f8042d0445
splitted test cases.
2012-03-09 12:57:11 +01:00
Alexander Kampmann
21589c5ece
changed a test string
2012-03-09 12:18:37 +01:00
Alexander Kampmann
af34cf019c
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-09 12:17:19 +01:00
Alexander Kampmann
f84c191f8d
added some tests
2012-03-09 12:16:58 +01:00
friendica
42d622d6bf
recover contacts total count which got lost
2012-03-09 02:50:57 -08:00
Michael Vogel
11c29e0cba
Merge commit 'upstream/master'
2012-03-09 11:41:23 +01:00
Tobias Hößl
635958e11d
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-09 10:00:12 +00:00
friendica
2ce78253ae
Merge branch 'pull'
2012-03-09 00:48:16 -08:00
friendica
3878b58f0d
bug #324 - tinymce used for mail even if editplain being used.
2012-03-09 00:47:10 -08:00
friendica
312c175045
bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed
2012-03-09 00:31:17 -08:00
Simon
d050762e4d
Merge pull request #114 from simonlnu/master
...
[theme:dispy] optimised the pngs: bet. 0 and 30% savings in size.
2012-03-08 21:28:35 -08:00
Simon L'nu
81f5b0e2df
[theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style label elemnts.
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-09 00:26:54 -05:00
friendica
2050f886cc
keep tony from talking to himself
2012-03-08 21:14:41 -08:00
Simon
0188e2b3ee
Merge pull request #113 from simonlnu/master
...
dispy stable enough to be considered stable IMO
2012-03-08 21:03:16 -08:00
Simon L'nu
dc8d060d4d
i consider dispy pretty stable at this point, so i'm removing the experimental file
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-09 00:00:56 -05:00
Simon L'nu
20b2090182
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
removed info
add info
fixed star-bug
More improved transparency for smilies
removed dolphin file (wtf?)
.
* master:
2012-03-08 23:59:43 -05:00
tomtom84
e25fb2b2f9
Merge pull request #112 from tomtom84/master
...
fixes in diabook-derivates
2012-03-08 19:39:39 -08:00
tommy tomson
e06b941307
removed info
2012-03-09 04:38:20 +01:00
tomtom84
92ab98f8d8
Merge pull request #111 from tomtom84/master
...
fixes in diabook-derivates
2012-03-08 19:16:01 -08:00
tommy tomson
722f631d15
add info
2012-03-09 04:14:24 +01:00
friendica
ab900eb59e
Merge pull request #109 from beardy-unixer/6ae5962b009cfd88925eae721e24bf895e8b78d5
...
More improved transparency smileys
2012-03-08 18:20:10 -08:00
tomtom84
05561bd905
Merge pull request #110 from tomtom84/master
...
fixes in diabook-derivates
2012-03-08 18:02:25 -08:00
tommy tomson
feda3cfc96
fixed star-bug
2012-03-09 02:59:13 +01:00
Thomas
eb84a22da7
Merge remote-tracking branch 'upstream/master'
2012-03-09 01:50:51 +00:00
Thomas
6ae5962b00
More improved transparency for smilies
2012-03-09 01:49:12 +00:00
Simon L'nu
8d19baadff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
theme info file for testbubble
catalan translation
revup
add theme diabook-blue, fix css
* master:
2012-03-08 20:38:54 -05:00
friendica
b86a08166c
theme info file for testbubble
2012-03-08 16:30:45 -08:00
friendica
af9f7da449
catalan translation
2012-03-08 16:29:22 -08:00
friendica
bacb3207ad
Merge branch 'pull'
2012-03-08 14:35:48 -08:00
friendica
3b47626c15
Merge https://github.com/friendica/friendica into pull
2012-03-08 14:35:47 -08:00
friendica
3cfa83c3db
revup
2012-03-08 14:34:58 -08:00
tommy tomson
b9dda93f0c
add theme diabook-blue, fix css
2012-03-08 23:22:26 +01:00
Simon L'nu
b584b26323
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-08 15:30:47 -05:00
Simon
b52a6ea033
Merge pull request #108 from simonlnu/master
...
make svg from notifications.svg to ease future editing. more dispy tweaks
2012-03-08 10:39:03 -08:00
Simon L'nu
5fe8952c29
make svg from notifications.svg to ease future editing. more dispy tweaks
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-08 13:37:45 -05:00
Alexander Kampmann
2e3116a11e
added library and include to .htaccess
2012-03-08 17:46:40 +01:00
Alexander Kampmann
fbd7e8f8ba
excludes reports from git
2012-03-08 17:44:57 +01:00
Alexander Kampmann
185fcd0701
better tests
2012-03-08 17:43:12 +01:00
Simon L'nu
bc3051e113
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
add links to /profiles, add some icons to diabook/icons, fixes in css
Update README
reworked fix from unary for bug #323 (due to incorrect use of array_key_exists())
* master:
2012-03-08 10:46:40 -05:00
tomtom84
08b5ede5a1
Merge pull request #107 from tomtom84/master
...
fixes in theme diabook
2012-03-08 05:52:14 -08:00
tommy tomson
1fcbc7aa5a
add links to /profiles, add some icons to diabook/icons, fixes in css
2012-03-08 14:49:07 +01:00
friendica
b7bfff12b9
Update README
2012-03-08 16:25:14 +11:00
friendica
03b5e3aa0c
reworked fix from unary for bug #323 (due to incorrect use of array_key_exists())
2012-03-07 21:12:31 -08:00
Simon L'nu
d90c830332
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
still getting parent relays on remote systems
revup
* master:
2012-03-07 22:30:46 -05:00
friendica
395a9530dc
still getting parent relays on remote systems
2012-03-07 18:23:55 -08:00
friendica
6525507a2f
Merge branch 'pull'
2012-03-07 15:55:20 -08:00
friendica
dd3b3c2454
revup
2012-03-07 15:54:37 -08:00
Simon
098c98f62a
Merge pull request #105 from simonlnu/master
...
fix dispy breakage in jot.tpl
2012-03-07 09:36:28 -08:00
Simon L'nu
15d310e4c3
fix jot.tpl buttons. fix up subsequent styling breakage
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-07 12:35:04 -05:00
Simon L'nu
4d58357b15
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-07 12:32:28 -05:00
Simon
58c557b3ad
Merge pull request #104 from simonlnu/master
...
push fix for funky menu action. the overflow-x might break again for some people
2012-03-07 07:08:23 -08:00
Simon L'nu
66d2c52b5f
push fix for funky menu action. the overflow-x might break again for some people
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-07 10:07:36 -05:00
Simon L'nu
62fffdb018
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix in navbar
* master:
2012-03-07 10:05:32 -05:00
Alexander Kampmann
4690d00141
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-07 12:06:20 +01:00
Alexander Kampmann
b2df1205ef
merged
2012-03-07 12:06:09 +01:00
tomtom84
dd2ff7c796
Merge pull request #103 from tomtom84/master
...
fixes in theme diabook
2012-03-06 23:44:18 -08:00
tommy tomson
ec3ce05357
fix in navbar
2012-03-07 08:42:19 +01:00
Simon L'nu
edfa7dbac2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix photos after permissions_sql change
[privacy] rework latest fix
remove stray debugging
* master:
2012-03-06 21:33:56 -05:00
friendica
7ad2dd6565
fix photos after permissions_sql change
2012-03-06 17:52:00 -08:00
friendica
1224e256b1
Merge branch 'pull'
2012-03-06 17:22:13 -08:00
friendica
88cd5800cf
[privacy] rework latest fix
2012-03-06 17:21:14 -08:00
friendica
39a49d51e3
remove stray debugging
2012-03-06 16:28:52 -08:00
Thomas
73fc4cfc72
removed dolphin file (wtf?)
2012-03-07 00:12:24 +00:00
Thomas
30d6b4c10e
.
2012-03-07 00:08:50 +00:00
Simon L'nu
d89cd6569b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
improved smiley transparency
* master:
2012-03-06 19:06:02 -05:00
Simon
fdd269228b
Merge pull request #102 from beardy-unixer/master
...
Improved transparency smileys
2012-03-06 16:05:35 -08:00
Simon L'nu
c4c98a9988
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix in navbar
* master:
2012-03-06 18:57:52 -05:00
Thomas
dadf80f644
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
images/smiley-beard.png
2012-03-06 23:56:37 +00:00
Thomas
22624917e0
improved smiley transparency
2012-03-06 23:54:31 +00:00
tomtom84
05a52b2660
Merge pull request #101 from tomtom84/master
...
fixes in theme diabook
2012-03-06 15:49:32 -08:00
tommy tomson
49b5a1bf20
fix in navbar
2012-03-07 00:47:43 +01:00
Simon L'nu
668892b7a3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-06 18:42:00 -05:00
Simon
18213692db
Merge pull request #100 from simonlnu/master
...
fix up the beards so text.php has the right smiley- prefix for them. make one of them transparent and .png
2012-03-06 15:41:45 -08:00
Simon L'nu
415ca107fd
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix html reshares when editplain in use
* master:
2012-03-06 18:38:44 -05:00
friendica
496a0ce4d1
Merge branch 'pull'
2012-03-06 15:29:18 -08:00
friendica
7431bd9509
fix html reshares when editplain in use
2012-03-06 15:28:27 -08:00
Simon L'nu
a33ca0a731
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
search should be ok, but a little extra security won't hurt
messages-menu translation, add scroll-to-top and theme-bug-report in theme
Fixed...merged with mainline THEN added beards.
added beard smileys
doc/Account-Basics.md
doc/Account-Basics.md
a
doc/Remove-Account.md
doc/Making-Friends.md
doc/Bugs-and-Issues.md
doc/Account-Basics.md
* master:
2012-03-06 18:26:22 -05:00
Simon
1fae778421
Merge pull request #94 from beardy-unixer/master
...
Documentation changes
2012-03-06 15:24:15 -08:00
Simon
decc9e5798
Merge pull request #99 from tomtom84/master
...
fixes in theme diabook
2012-03-06 15:22:55 -08:00
friendica
a464e4d33f
search should be ok, but a little extra security won't hurt
2012-03-06 15:15:59 -08:00
Simon L'nu
94d4cad701
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
string update
[PRIVACY] privacy issue bug #314
* master:
2012-03-06 18:15:45 -05:00
friendica
009a826a49
Merge branch 'pull'
2012-03-06 15:10:22 -08:00
friendica
a5e7c73e67
string update
2012-03-06 15:09:57 -08:00
tommy tomson
6a5c4bab9c
messages-menu translation, add scroll-to-top and theme-bug-report in theme
2012-03-07 00:07:27 +01:00
Simon
886d825869
Merge pull request #98 from simonlnu/master
...
missed some fixes on last request
2012-03-06 15:04:50 -08:00
Simon L'nu
edd450cf06
dispy, dispy, oh what a little lispy
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-06 17:55:05 -05:00
friendica
21887a36fd
[PRIVACY] privacy issue bug #314
2012-03-06 14:53:14 -08:00
Simon L'nu
0badf3110f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
bugs #312 , #313
revup
* master:
2012-03-06 17:52:12 -05:00
friendica
8fb0ea4048
bugs #312 , #313
2012-03-06 14:27:53 -08:00
friendica
4e0524e91a
Merge branch 'pull'
2012-03-06 13:58:26 -08:00
friendica
731b19c025
revup
2012-03-06 13:57:38 -08:00
Simon
073241a77a
Merge pull request #95 from simonlnu/master
...
styling fixes in dispy; typos fixed in settings.tpl
2012-03-06 13:20:20 -08:00
Simon L'nu
bc8b014906
styling fixes in dispy. fix typos in settings.tpl
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-06 16:18:26 -05:00
Thomas
67456bad06
Fixed...merged with mainline THEN added beards.
2012-03-06 20:50:38 +00:00
Thomas
a265afe7eb
added beard smileys
2012-03-06 20:44:53 +00:00
Simon L'nu
d647dbc6af
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
remove "smilie" expansion for Diaspora logo
prevent duplicate likes
quattro: theme settings (a bit hackish)
add img
fixes in diabook
finalise spam storage model, begin driver changes.
fixes
template proc: add variable filters
* master:
2012-03-06 14:51:14 -05:00
Thomas
7e10401ec0
doc/Account-Basics.md
2012-03-06 19:15:40 +00:00
Thomas
bab865b14e
doc/Account-Basics.md
2012-03-06 19:15:24 +00:00
Thomas
aed5a8e2e5
a
2012-03-06 19:11:24 +00:00
Thomas
6720c83a4a
doc/Remove-Account.md
2012-03-06 19:07:15 +00:00
Thomas
2772bb7f58
doc/Making-Friends.md
2012-03-06 19:04:42 +00:00
Thomas
ec1740cd40
doc/Bugs-and-Issues.md
2012-03-06 18:55:45 +00:00
Thomas
1bf9f3823c
doc/Account-Basics.md
2012-03-06 18:48:39 +00:00
fabrixxm
a9690dfe2d
Merge pull request #93 from fabrixxm/master
...
quattro: theme settings
2012-03-06 05:09:03 -08:00
friendica
eec4cff84b
remove "smilie" expansion for Diaspora logo
2012-03-06 04:28:45 -08:00
friendica
23718bfc25
prevent duplicate likes
2012-03-06 02:17:55 -08:00
friendica
c0e0034f06
Merge branch 'pull'
2012-03-06 01:04:16 -08:00
Fabio Comuni
607ee1ff9c
quattro: theme settings (a bit hackish)
2012-03-06 09:50:18 +01:00
Fabio Comuni
be9985a3ae
Merge remote-tracking branch 'friendica/master'
2012-03-06 09:48:08 +01:00
tomtom84
d04fba7048
Merge pull request #92 from tomtom84/master
...
fixes in theme diabbook
2012-03-05 23:34:24 -08:00
tommy tomson
8b0dd349f5
add img
2012-03-06 08:31:54 +01:00
tommy tomson
eaaf030c18
Merge remote-tracking branch 'origin/master'
2012-03-06 08:28:21 +01:00
tommy tomson
b64b1d13a4
fixes in diabook
2012-03-06 08:27:20 +01:00
friendica
3da97e2393
finalise spam storage model, begin driver changes.
2012-03-05 23:20:42 -08:00
Simon L'nu
2a3aaca88d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
some admin page fixes and cleanup
changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero)
string update
some testbubble stuff
can_write_wall documentation
* master:
2012-03-05 23:36:22 -05:00
friendica
321b651635
Merge branch 'pull'
2012-03-05 18:52:15 -08:00
friendica
23460302f5
some admin page fixes and cleanup
2012-03-05 18:51:21 -08:00
Simon
d49dc1434f
Merge pull request #91 from unary/darkzero
...
changed bg color around comment box from white to match page background,...
2012-03-05 18:21:15 -08:00
Michael Johnston
9f44dbbb48
changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero)
2012-03-05 21:10:01 -05:00
friendica
8473444242
string update
2012-03-05 16:43:44 -08:00
friendica
e5de03040e
Merge branch 'pull'
2012-03-05 15:59:28 -08:00
friendica
7b3349f38a
some testbubble stuff
2012-03-05 15:58:26 -08:00
Simon
b6765ad742
Merge pull request #90 from simonlnu/master
...
field_help tweak
2012-03-05 15:19:02 -08:00
Simon L'nu
1aa2367469
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-05 18:18:04 -05:00
Simon L'nu
190650060a
forgot a small change in .field_help
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 18:16:51 -05:00
friendica
c47bae7a5f
Merge branch 'pull'
2012-03-05 15:05:09 -08:00
friendica
c37ffd2999
can_write_wall documentation
2012-03-05 15:04:43 -08:00
Simon
4b456e2273
Merge pull request #89 from simonlnu/master
...
implement more changes
2012-03-05 14:57:51 -08:00
Simon L'nu
50824bddd0
implement more of the changes requested
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 17:57:04 -05:00
Simon L'nu
6a0729d5a4
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
revup
* master:
2012-03-05 17:56:38 -05:00
friendica
0d9c2ca06f
Merge branch 'pull'
2012-03-05 13:38:06 -08:00
friendica
c6dce8dd6b
revup
2012-03-05 13:37:32 -08:00
tommy tomson
a406c16581
fixes
2012-03-05 22:31:03 +01:00
Alexander Kampmann
fbc017cdba
added test blueprints, fixed? encoding issues
2012-03-05 22:22:10 +01:00
Simon
092115ca44
Merge pull request #88 from simonlnu/master
...
multiple ui fixes
2012-03-05 12:57:30 -08:00
Simon L'nu
9d461846e2
multiple fixes; the jot-header works as standalone, not sure what's up.
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 15:55:17 -05:00
Simon L'nu
7f894794e4
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-05 13:17:40 -05:00
Simon
1772037c98
Merge pull request #87 from simonlnu/master
...
contact_block.tpl link fix and dispy page parts
2012-03-05 10:17:26 -08:00
Simon L'nu
02f825ca3c
tweak sizing of <section> and <aside> more; fix link in 'view contacts' in sidebar
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 13:16:28 -05:00
Simon L'nu
e05313f88f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-05 12:23:16 -05:00
Simon
fd240687b9
Merge pull request #86 from simonlnu/master
...
more dispy
2012-03-05 09:23:01 -08:00
Simon L'nu
ef1d02e7bd
still working on jot-header. amending <aside> and other elements
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 12:21:57 -05:00
Simon L'nu
8cce12f28a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-05 10:56:58 -05:00
Simon
e786e4253d
Merge pull request #85 from simonlnu/master
...
hopefully fix overflow issue now
2012-03-05 07:56:43 -08:00
Simon L'nu
65b6ec79ed
hopefully fix the overflow issue everywhere this time
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 10:55:26 -05:00
Simon L'nu
3ab7132b64
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
$name appearing on testbubble items
testbubble notifications
* master:
2012-03-05 10:17:34 -05:00
friendica
965e657c20
$name appearing on testbubble items
2012-03-05 03:10:45 -08:00
friendica
31f192bb57
Merge branch 'pull'
2012-03-05 00:54:25 -08:00
friendica
0d97799324
testbubble notifications
2012-03-05 00:53:42 -08:00
Simon
49d9dd374c
Merge pull request #84 from simonlnu/master
...
more ui bugs fixed \o/
2012-03-04 22:09:56 -08:00
Simon L'nu
7de79a8c49
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
like dislike button
fixes in diabook
* master:
2012-03-05 01:08:54 -05:00
Simon L'nu
fe7a6b070d
yet more ui things, and bug fixing
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 01:08:45 -05:00
tomtom84
9c541dbd67
Merge pull request #83 from tomtom84/master
...
fixes in diabook theme
2012-03-04 20:15:26 -08:00
tommy tomson
fe614b4e7c
like dislike button
2012-03-05 05:14:08 +01:00
Simon L'nu
290fdefa82
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
wrap title and text for editplain in zero and TB themes
correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode
improved contrast in acl selector, and preview (darkzero)
* master:
2012-03-04 22:20:42 -05:00
Simon
04527bd0b1
Merge pull request #80 from unary/darkzero
...
improved contrast in acl selector, and preview (darkzero)
2012-03-04 19:19:45 -08:00
Simon
3b95171824
Merge pull request #82 from simonlnu/master
...
say hello to dispy's younger brother
2012-03-04 19:19:08 -08:00
Simon L'nu
58cdf776b6
more ui thingies with dispy - we'll get you well dispy, we promise
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-04 22:16:10 -05:00
friendica
b57247d6a6
Merge branch 'pull'
2012-03-04 19:15:42 -08:00
Simon L'nu
b34dd1ca71
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fixes in diabook
unused replacement variable displays %1 in all html2bbcode 'code' blocks
revup
style.css fix
* master:
2012-03-04 22:15:28 -05:00
friendica
b9bea3a549
wrap title and text for editplain in zero and TB themes
2012-03-04 19:14:03 -08:00
friendica
fba089012a
correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode
2012-03-04 18:50:32 -08:00
tommy tomson
e52891d8ab
fixes in diabook
2012-03-05 03:08:58 +01:00
tomtom84
d369fcc994
Merge pull request #81 from tomtom84/master
...
fixes in diabook theme
2012-03-04 17:46:48 -08:00
tommy tomson
1653e5a615
fixes in diabook
2012-03-05 02:45:24 +01:00
friendica
4134fd3dce
unused replacement variable displays %1 in all html2bbcode 'code' blocks
2012-03-04 16:26:16 -08:00
Simon L'nu
efb60e603c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-04 17:47:17 -05:00
Michael Johnston
b2035ae0c6
improved contrast in acl selector, and preview (darkzero)
2012-03-04 17:29:00 -05:00
friendica
4b1f3555f1
Merge branch 'pull'
2012-03-04 13:39:53 -08:00
friendica
cd5a11bb0f
revup
2012-03-04 13:39:17 -08:00
Simon
7d8ed95e78
Merge pull request #79 from simonlnu/master
...
more UI fixes
2012-03-04 12:54:57 -08:00
Simon L'nu
2441babbe9
removed extra padding/border on tread-wrapper (heh, tea read :P)
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-04 15:52:50 -05:00
Simon L'nu
6b8cb80ea3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-04 15:27:10 -05:00
Simon
550a98aaae
Merge pull request #78 from simonlnu/master
...
fix ui issue with toolbar and notification icons
2012-03-04 11:56:19 -08:00
Simon L'nu
25510453bf
fix up toolbar so the notifications line up better together
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-04 14:55:09 -05:00
Simon L'nu
e3ad02d0dd
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-04 14:53:57 -05:00
Simon
c0ecd7a925
Merge pull request #77 from simonlnu/master
...
CSS and JS tweaks
2012-03-04 09:22:51 -08:00
Simon L'nu
5f77aff486
more tweakage. stylesheet and jot-header
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-04 12:21:08 -05:00
Simon L'nu
d98ca8e127
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
revup
* master:
2012-03-04 12:19:43 -05:00
tommy tomson
8e49b4332c
style.css fix
2012-03-04 14:19:53 +01:00
friendica
638bbb2171
Merge branch 'pull'
2012-03-04 02:26:13 -08:00
friendica
20d37f2e3e
revup
2012-03-04 02:25:32 -08:00
Simon
ae158aa6f9
Merge pull request #76 from simonlnu/master
...
minor ui things
2012-03-04 02:20:57 -08:00
Simon L'nu
cb57a0ebfd
soften '.shiny' a bit to fit in with colour scheme. tweak wall boxes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-04 05:19:49 -05:00
Simon L'nu
46783d9189
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-04 05:02:28 -05:00
Simon
a7b637b933
Merge pull request #75 from simonlnu/master
...
theme tweaks
2012-03-04 02:02:15 -08:00
Simon L'nu
c28ce8a79c
tweak wall items a bit (nasty-looking wall items...). jot-header tries to count chars and fails :P
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-04 05:00:35 -05:00
Simon L'nu
a6d08ec852
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
some fixes in diabook
* master:
2012-03-04 04:58:12 -05:00
tomtom84
dfa056bb1b
Merge pull request #74 from tomtom84/master
...
fixes in diabook theme
2012-03-03 20:49:09 -08:00
tommy tomson
e0e0224fa6
some fixes in diabook
2012-03-04 05:48:06 +01:00
Simon L'nu
eae6418074
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
tag fix
fix
navbar fix
* master:
2012-03-03 19:24:54 -05:00
Simon
f3c1e2c546
Merge pull request #73 from simonlnu/master
...
dispy! (and minor formatting)
2012-03-03 16:23:07 -08:00
Simon L'nu
09c2f81cb3
these are more finessing on formatting again
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-03 19:20:23 -05:00
Simon L'nu
64400e8d59
first commit for dispy New Edition
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-03 19:19:35 -05:00
tomtom84
74866a96de
Merge pull request #72 from tomtom84/master
...
fixes in diabook theme
2012-03-03 15:10:54 -08:00
tommy tomson
25d6ca3b73
tag fix
2012-03-04 00:10:03 +01:00
tomtom84
f4b9c405da
Merge pull request #71 from tomtom84/master
...
fixes in diabook theme
2012-03-03 14:45:03 -08:00
tommy tomson
b3eeb22401
fix
2012-03-03 23:43:15 +01:00
tomtom84
77db5becb6
Merge pull request #70 from tomtom84/master
...
fixes in diabook theme
2012-03-03 14:13:14 -08:00
tommy tomson
173fb983c5
navbar fix
2012-03-03 23:12:03 +01:00
Simon L'nu
1bed4010aa
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Added docblox default configuration file.
fixed apps css
* master:
2012-03-03 16:49:22 -05:00
Abinoam P. Marques Jr.
952bcc5158
Merge pull request #69 from abinoam/docblox
...
Added docblox default configuration file.
2012-03-03 12:56:17 -08:00
Abinoam P. Marques Jr
a19d8d9e9f
Added docblox default configuration file.
...
Now docblox can be run without arguments on friendica root dir.
The documentation will be generated on ./data/output
2012-03-03 16:53:10 -04:00
tomtom84
7230fa5a94
Merge pull request #68 from tomtom84/master
...
fixes in diabook theme
2012-03-03 12:48:34 -08:00
tommy tomson
42b9887693
fixed apps css
2012-03-03 21:45:59 +01:00
Simon L'nu
da78d8594f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fixed star/unstar
fixed admin fixed editor
* master:
2012-03-03 13:39:56 -05:00
tomtom84
1dfd5c4f85
Merge pull request #67 from tomtom84/master
...
fixes in diabook theme
2012-03-03 10:09:28 -08:00
tommy tomson
d4ac1f2a9c
fixed star/unstar
2012-03-03 19:07:55 +01:00
tomtom84
e84e684fdc
Merge pull request #66 from tomtom84/master
...
fixed editor and admin-sec in theme diabook
2012-03-03 07:54:21 -08:00
tommy tomson
83e9f57459
fixed admin
...
fixed editor
2012-03-03 16:49:48 +01:00
Simon L'nu
2b9ea33e8b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix editor
* master:
2012-03-03 09:45:32 -05:00
tomtom84
792031c36e
Merge pull request #65 from tomtom84/master
...
fix editor in theme diabook
2012-03-03 06:03:34 -08:00
tommy tomson
b3ba2eb4d0
fix editor
2012-03-03 15:01:25 +01:00
Simon L'nu
ba28404470
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix text-editor in theme
german strings as of 28th Feb from transilex
small fix in style.css
fix star/unstar
fixes in wall_item.tpl and style.css in theme diabook
fix in wall_item.tpl new icon link.png
add diabook to default themes
fixed broken tags and notifications in theme
* master:
2012-03-03 08:05:53 -05:00
tomtom84
8ffe15fbb1
Merge pull request #64 from tomtom84/master
...
fix editor in theme diabook
2012-03-03 04:30:31 -08:00
tommy tomson
60adef2463
fix text-editor in theme
2012-03-03 13:27:39 +01:00
Michael
81a8d4f9db
Merge remote branch 'upstream/master'
2012-03-03 13:21:11 +01:00
Tobias Diekershoff
9d885c4801
german strings as of 28th Feb from transilex
2012-03-03 12:17:32 +01:00
Tobias Hößl
02a9fd5dc1
A 'PHP Fatal error: Call to a member function getElementsByTagName() on a non-object in mod/parse_url.php on line 191' occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't be link to in the editor therefore.
2012-03-03 10:44:34 +00:00
tomtom84
b4361e37e0
Merge pull request #63 from tomtom84/master
...
fixes in diabook theme
2012-03-02 21:02:55 -08:00
tommy tomson
83c25b4386
small fix in style.css
2012-03-03 06:00:46 +01:00
tommy tomson
89f667ff76
fix star/unstar
2012-03-03 04:45:34 +01:00
friendica
2ae82ae3c2
Merge pull request #62 from tomtom84/master
...
fixes in diabook theme
2012-03-02 19:32:34 -08:00
tommy tomson
d138d07c05
fixes in wall_item.tpl and style.css in theme diabook
2012-03-03 04:27:06 +01:00
tommy tomson
8f72d95b0e
fix in wall_item.tpl
...
new icon link.png
2012-03-03 01:52:53 +01:00
friendica
a66648356f
add diabook to default themes
2012-03-02 16:24:26 -08:00
Simon L'nu
7ef861907e
minor formatting issues
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-02 19:09:17 -05:00
Simon L'nu
705b4a00ce
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix @mention autocomplete in comments
template proc: fix variables regexp
* master:
2012-03-02 19:05:41 -05:00
Simon
d32edf83d3
Merge pull request #61 from fabrixxm/master
...
fix to variable rexexp and mentions autocomplete in comments
2012-03-02 16:02:02 -08:00
tommy tomson
d3f83c9375
fixed broken tags and notifications in theme
2012-03-03 00:41:02 +01:00
Fabio Comuni
3339428987
fix @mention autocomplete in comments
2012-03-03 00:12:45 +01:00
Fabio Comuni
ae79de3039
Merge remote-tracking branch 'friendica/master'
2012-03-03 00:06:44 +01:00
Fabio Comuni
685686b3e8
template proc: fix variables regexp
2012-03-03 00:00:38 +01:00
Simon
f1efa0991a
Merge pull request #60 from simonlnu/master
...
apply changes to templates to testbubble
2012-03-02 11:01:21 -08:00
Simon L'nu
81de5f7802
apply changes to templates to testbubble
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-02 13:59:28 -05:00
Simon L'nu
02f8e95b1a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
deleted readme.txt from folder diabook
github finally working
adjust3
adjust2
adjust
* master:
2012-03-02 12:28:28 -05:00
Simon
e2e9050d74
Merge pull request #58 from simonlnu/master
...
fix for comment-wwedit-wrapper; CSS class in tpl had a stray $
2012-03-02 09:28:04 -08:00
Simon
d61ee3760d
Merge pull request #59 from tomtom84/master
...
diabook theme
2012-03-02 09:25:42 -08:00
tommy tomson
64a85b2507
deleted readme.txt from folder diabook
2012-03-02 18:01:21 +01:00
Simon L'nu
9c698b1a60
fix for comment-wwedit-wrapper CSS class in tpl had a stray $
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-02 12:00:16 -05:00
tommy tomson
ac1d758f6e
github finally working
2012-03-02 17:47:45 +01:00
tommy tomson
d72520f5f1
adjust3
2012-03-02 17:45:21 +01:00
Michael
ccfe402fb0
Merge remote branch 'upstream/master'
2012-03-02 17:44:09 +01:00
Fabio Comuni
8a51e29824
template proc: add variable filters
2012-03-02 17:22:16 +01:00
tommy tomson
cb46e4a11f
Merge remote-tracking branch 'tomtom84_friendica/master' into master-2
2012-03-02 17:21:06 +01:00
tommy tomson
c26787ab94
adjust2
2012-03-02 17:18:11 +01:00
Simon L'nu
725daf2a5d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
template proc: allow isolation of var name between [ and ]
group: fix create new group form
templates: fix tags
template proc: remove unused function and commented out code
template proc: first optimization
* master:
2012-03-02 10:55:59 -05:00
Simon
a3dcf491f1
Merge pull request #57 from fabrixxm/master
...
template processor optimizations
2012-03-02 07:55:38 -08:00
tommy tomson
e2798cee16
adjust
2012-03-02 16:01:20 +01:00
Fabio Comuni
aef737f376
template proc: allow isolation of var name between [ and ]
...
$var.name -> $[var.name]
2012-03-02 15:53:48 +01:00
Fabio Comuni
5fc3c3ab85
group: fix create new group form
2012-03-02 15:40:17 +01:00
Fabio Comuni
ef34847501
templates: fix tags
2012-03-02 12:41:34 +01:00
Fabio Comuni
0bf087c895
template proc: remove unused function and commented out code
2012-03-02 12:36:22 +01:00
Fabio Comuni
60e5dda1b5
template proc: first optimization
2012-03-02 12:24:35 +01:00
Simon L'nu
bcadd873ee
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
expand multiple heart smilies e.g. <3333
* master:
2012-03-02 04:53:54 -05:00
Michael
20817b4b8e
Merge remote branch 'upstream/master'
2012-03-02 10:34:18 +01:00
Michael
52ea842e87
html2bbcode: don't convert sizes and fonts.
2012-03-02 10:33:39 +01:00
friendica
f1bf6dcdfb
expand multiple heart smilies e.g. <3333
2012-03-02 01:24:20 -08:00
Simon L'nu
f0fdd1a163
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
item table update for file feature
probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type
diabook commit
conversation: remove templating items in code and move it to template.
Enabled automated doc building. Changes: -build.xml, phing build file -@package tags at acl_selector.php and db_update.php -added documentation and some IDE files to .gitignore -automated tool to find files that corrupt the doc build process -removed ansi characters from SSH1.php, docBlox could not handle them
template proc: avoid a notice and allow template name to include to be passed with a variable value
show relation in contact_template
admin: fix small string
fix visualization in groupeditor
less html in mod/group.php, template for group members editor, quattro theme for group edit.
* master:
2012-03-02 04:07:23 -05:00
friendica
90bdddca0d
Merge branch 'pull'
2012-03-02 00:10:05 -08:00
friendica
be231e3466
item table update for file feature
2012-03-02 00:09:10 -08:00
fabrixxm
3a609adfb7
Merge pull request #55 from fabrixxm/master
...
Some minor and one majior mod in templates
2012-03-02 00:00:03 -08:00
friendica
f55ffcd48c
Merge pull request #56 from tomtom84/master
...
diabook theme
2012-03-01 20:03:18 -08:00
tommy tomson
1fac47a247
Merge remote-tracking branch 'upstream/master'
2012-03-02 04:58:37 +01:00
friendica
8207272fbc
Merge branch 'pull'
2012-03-01 18:54:50 -08:00
friendica
58e3372b23
probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type
2012-03-01 18:49:23 -08:00
friendica
a5256b7996
Merge pull request #54 from campino/master
...
Build documentation
This looks good. It may take me some time to get up to speed - and I'm not sure I have all the utilities available via my hosting provider.
2012-03-01 17:54:41 -08:00
tommy tomson
5183e737d0
diabook commit
2012-03-02 02:05:35 +01:00
Alexander Kampmann
dd9432903d
Merge remote-tracking branch 'upstream/master'
2012-03-01 11:49:22 +01:00
Fabio Comuni
b6b7742579
Merge remote-tracking branch 'friendica/master' into randomerror
2012-03-01 11:47:45 +01:00
Fabio Comuni
ed42fa7d59
conversation: remove templating items in code and move it to template.
2012-03-01 11:46:08 +01:00
Alexander Kampmann
e0c659b34b
Enabled automated doc building. Changes:
...
-build.xml, phing build file
-@package tags at acl_selector.php and db_update.php
-added documentation and some IDE files to .gitignore
-automated tool to find files that corrupt the doc build process
-removed ansi characters from SSH1.php, docBlox could not handle them
2012-03-01 11:44:33 +01:00
Fabio Comuni
c462ed9fc5
template proc: avoid a notice and allow template name to include to be passed with a variable value
2012-03-01 11:32:49 +01:00
Fabio Comuni
a26ce7c56b
show relation in contact_template
2012-03-01 11:31:16 +01:00
Fabio Comuni
f0b6e76293
admin: fix small string
2012-03-01 11:28:48 +01:00
Simon L'nu
b7ab2a2fc9
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
yet more work on notifications
notification enhancements
better handling of multiple notifications for same item, and old notifications
* master:
2012-02-29 23:26:49 -05:00
friendica
bd2c8c92f1
yet more work on notifications
2012-02-29 19:23:01 -08:00
friendica
bbebb4c2a0
notification enhancements
2012-02-29 18:19:08 -08:00
friendica
84d5f495e6
better handling of multiple notifications for same item, and old notifications
2012-02-29 16:26:07 -08:00
Fabio Comuni
b71a3af457
Merge remote-tracking branch 'friendica/master' into randomerror
2012-02-29 14:58:37 +01:00
Simon L'nu
6855474146
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Update LICENSE
Update README
cleaned up mess created when both people request friendship and one approves as duplex
call time pass by reference deprecated
From Tobias H - catch some irregularities caused by cut/paste code
* master:
2012-02-29 06:56:59 -05:00
friendica
fb33b4f2bc
Update LICENSE
2012-02-29 21:09:20 +11:00
friendica
aedb7c5f69
Update README
2012-02-29 21:07:33 +11:00
friendica
60ae0d8974
cleaned up mess created when both people request friendship and one approves as duplex
2012-02-28 17:32:44 -08:00
friendica
21803e0cd3
call time pass by reference deprecated
2012-02-28 14:54:17 -08:00
friendica
f40ef1bf46
Merge branch 'pull'
2012-02-28 14:53:41 -08:00
friendica
4dd4a22582
From Tobias H - catch some irregularities caused by cut/paste code
2012-02-28 14:52:23 -08:00
Tobias Hößl
5bb8ed4b8b
Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php
2012-02-28 21:56:42 +00:00
Simon L'nu
21d1dc48a8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix url and network display
* master:
2012-02-28 16:43:08 -05:00
Tobias Hößl
3d249f0edd
Merge remote branch 'upstream/master'
2012-02-28 21:19:02 +00:00
fabrixxm
733f830be4
fix url and network display
2012-02-28 19:10:27 +01:00
Tobias Hößl
36a1a43f06
Avoid notices
2012-02-28 13:42:12 +00:00
Tobias Hößl
f48556cbc0
contact.network is used later to check if a direct link or a redirect by /redir/contactid should be used
2012-02-28 13:40:41 +00:00
Tobias Hößl
1204210c69
wasn't actually changed before
2012-02-28 13:01:58 +00:00
Tobias Hößl
e55d13c2b4
Avoid a notice
2012-02-28 12:56:16 +00:00
Simon L'nu
718c5ea23e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
update globaldir when page-type changes, add spam date field
clicking contact on contacts page broken link
* master:
2012-02-28 05:25:05 -05:00
friendica
53412dacd4
update globaldir when page-type changes, add spam date field
2012-02-27 23:27:16 -08:00
friendica
2b730ae86d
clicking contact on contacts page broken link
2012-02-27 18:46:11 -08:00
Simon L'nu
cf7e141055
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
cleanup notify subject lines
* master:
2012-02-27 21:08:19 -05:00
friendica
6c0fa7a166
Merge branch 'pull'
2012-02-27 17:18:53 -08:00
friendica
d7407f8daa
cleanup notify subject lines
2012-02-27 17:18:19 -08:00
Michael
b84ef3039c
Merge remote branch 'upstream/master'
2012-02-28 00:03:49 +01:00
Tobias Hößl
7c30fca981
Avoid a Notice
2012-02-27 22:17:57 +00:00
Tobias Hößl
e33c2b8f89
Avoid a Notice
2012-02-27 22:08:00 +00:00
Tobias Hößl
35128ef2c9
Avoid a Notice
2012-02-27 22:01:17 +00:00
Simon L'nu
8c2bda46f7
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
revert 01a2791e3a
to avoid random preg internal errors. fix contact_template
* master:
2012-02-27 13:34:19 -05:00
fabrixxm
e11b51aca1
Merge pull request #53 from fabrixxm/master
...
remove template filters support
2012-02-27 10:05:27 -08:00
Fabio Comuni
42d591d257
revert 01a2791e3a
to avoid random preg internal errors. fix contact_template
2012-02-27 18:48:59 +01:00
Michael
cce69f0509
Merge remote branch 'upstream/master'
2012-02-27 16:31:58 +01:00
Simon L'nu
b1cdc5a932
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fixed syntax errors
add plugin hooks to enotify
* master:
2012-02-27 09:08:48 -05:00
Simon
a33031634e
Merge pull request #52 from campino/master
...
Corrected syntax error
2012-02-27 06:07:46 -08:00
Alexander Kampmann
9986fc1910
fixed syntax errors
2012-02-27 14:12:44 +01:00
friendica
153e7beb19
add plugin hooks to enotify
2012-02-26 23:54:04 -08:00
Simon
6e76d9d3a3
Merge pull request #51 from simonlnu/master
...
RFC, request for comments: about the https for html5shiv
2012-02-26 22:20:46 -08:00
Simon L'nu
72e78046af
minor typographical fixes. need to do something about the http on https sites for html5shiv. changed to https on mine
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-02-27 01:04:41 -05:00
Simon L'nu
36d173ca98
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master: (29 commits)
spam db
fix tag icon size
typo in css
tagging missing from wallwall and a couple of themes, star missing from dispy
Mail: New options for actions after importing mails.
relative link redirects
Avoid some notices
Bugfix
is not always defined; but if defined, then always of type integer
1 Bugfix (missing $ character) and avoid some notices
necessare fields not loaded from DB
should probably be a->user['hidewall'] instead of profile['hidewall']
"Vier-Theme" Some more design stuff.
some revision to the German strings
German strings
Wrong variable name
show experimental and unsupported theme status on theme admin page
jumping divs with no scrolling
imrpove contrast on darkzero blockquotes
darkzero-NS theme
...
* master:
2012-02-27 00:56:41 -05:00
friendica
fc036210fb
spam db
2012-02-26 18:53:48 -08:00
friendica
6bc48b29cc
fix tag icon size
2012-02-26 16:40:21 -08:00
friendica
e994b990eb
typo in css
2012-02-26 16:31:51 -08:00
friendica
a1861d1128
tagging missing from wallwall and a couple of themes, star missing from dispy
2012-02-26 16:29:06 -08:00
friendica
89560edde2
Merge pull request #50 from annando/master
...
massive changes in mail and design updates in "vier"
2012-02-26 15:07:34 -08:00
Michael
18679111f5
Merge remote branch 'upstream/master'
2012-02-27 00:03:51 +01:00
friendica
6ddd444afd
Merge pull request #49 from CatoTH/master
...
Bugfix for del_config
2012-02-26 14:49:56 -08:00
Michael
fe3dfbee56
Mail: New options for actions after importing mails.
2012-02-26 23:39:29 +01:00
friendica
b79380f906
Merge branch 'pull'
2012-02-26 14:34:58 -08:00
friendica
bdb14d5aad
relative link redirects
2012-02-26 14:34:01 -08:00
Michael
437e18d7a7
Merge remote branch 'upstream/master'
2012-02-26 21:47:47 +01:00
Tobias Hößl
4b1de0f538
Avoid some notices
2012-02-26 20:43:51 +00:00
Tobias Hößl
ac86407fdf
Bugfix
2012-02-26 20:43:35 +00:00
Tobias Hößl
b102a1d5ec
is not always defined; but if defined, then always of type integer
2012-02-26 20:43:23 +00:00
Tobias Hößl
cbc6ca642a
1 Bugfix (missing $ character) and avoid some notices
2012-02-26 20:41:41 +00:00
Tobias Hößl
792abc3a24
necessare fields not loaded from DB
2012-02-26 20:40:41 +00:00
Tobias Hößl
fd9c12128a
should probably be a->user['hidewall'] instead of profile['hidewall']
2012-02-26 20:39:37 +00:00
Michael
edc44933a4
"Vier-Theme" Some more design stuff.
2012-02-26 21:16:29 +01:00
Tobias Diekershoff
2081e6d507
some revision to the German strings
2012-02-26 17:12:14 +01:00
Tobias Diekershoff
0877fbb42a
German strings
2012-02-26 15:41:27 +01:00
root
aa92901b11
Wrong variable name
2012-02-26 14:29:17 +00:00
friendica
5f7858a688
show experimental and unsupported theme status on theme admin page
2012-02-26 04:17:02 -08:00
friendica
fb8675f349
jumping divs with no scrolling
2012-02-26 01:20:43 -08:00
friendica
484426d3e2
imrpove contrast on darkzero blockquotes
2012-02-26 00:53:31 -08:00
friendica
828034ad23
darkzero-NS theme
2012-02-26 00:48:11 -08:00
Simon
896f97b31a
Merge pull request #48 from abinoam/thmail-5
...
Comment Notifications by Email - Threading Them
2012-02-25 18:01:09 -08:00
friendica
9b6afc2a38
one more attempt
2012-02-25 17:07:38 -08:00
friendica
35b5850af7
missed a spot
2012-02-25 17:04:31 -08:00
Abinoam P. Marques Jr
f3a225437b
Comment notifications by e-mail now are threaded
2012-02-25 16:59:44 -08:00
Abinoam P. Marques Jr
bcfac6c72f
include/items.php pass 'parent' to notification
2012-02-25 16:59:44 -08:00
Abinoam P. Marques Jr
2d5f8b4b48
mod/item.php pass 'parent' to notification
2012-02-25 16:59:44 -08:00
Abinoam P. Marques Jr
da52792d06
DB_UPDATE_VERSION incremented
2012-02-25 16:59:44 -08:00
Abinoam P. Marques Jr
edcc33ab5c
Added notify-threads to update.php
2012-02-25 16:59:42 -08:00
Abinoam P. Marques Jr
3d37a688c7
Added notify-threads to database.sql.
2012-02-25 16:59:42 -08:00
friendica
d075fd8a40
reverse order of links
2012-02-25 16:47:21 -08:00
friendica
da1411af47
do not set notify popup empty anymore (though another solution is needed for firehose mode)
2012-02-25 16:16:52 -08:00
friendica
2c7da5d0de
scale external images
2012-02-25 14:22:51 -08:00
friendica
579738aff7
fixed link for toggling plugin from detail page
2012-02-25 13:00:44 -08:00
Michael
1cf1870512
poller.php: Test for moving to archive, vier-style: notifications fixed
2012-02-25 19:40:05 +01:00
friendica
00edc89c47
notify positioning, theming
2012-02-25 05:00:48 -08:00
friendica
c90bac5727
sysnotify count in wrong location, and wrong number
2012-02-25 04:37:12 -08:00
friendica
4839c235da
theme seen,unseen notifications
2012-02-25 03:28:07 -08:00
Michael
3c68bf25ac
"vier" popup menu looks nicer now (more like quattro again)
2012-02-25 11:13:04 +01:00
Michael
dccefb3c36
"vier": The contacts are now working again. Line break before closing bbcodes removed.
2012-02-25 11:00:35 +01:00
friendica
aa67771eaa
photos in notifications
2012-02-25 00:42:25 -08:00
friendica
18bf5d1402
theme info (like plugin info)
2012-02-25 00:30:14 -08:00
friendica
6092567c97
notifications to zeros, bug in notify link
2012-02-24 23:44:55 -08:00
friendica
9441ff5142
string update for 2.38
2012-02-24 22:47:43 -08:00
friendica
a3cf563b68
update author name across items if changed.
2012-02-24 20:40:09 -08:00
friendica
cb9d0993f1
waitman gobble fix for escaping code blocks in tinymce
2012-02-24 20:07:57 -08:00
friendica
f5c5da742d
attribution issue - don't take author name from contact if available from item.
2012-02-24 20:03:13 -08:00
Michael
01301a6169
Bug fixed where mails where nearly empty. HTML mails can now be received.
2012-02-25 02:37:39 +01:00
Michael
a74b0746b1
multipart messages complete, message-id conversion done.
2012-02-25 01:10:45 +01:00
friendica
b95e3ac496
more privacy docs
2012-02-24 12:52:50 -08:00
Michael
0ba45eb745
Sending mail as multipart/alternative (html and plain text) (very basic by now)
2012-02-24 08:50:42 +01:00
Michael
f6320f3319
Encoding for incoming mails. Fixed invalid message id (with side effect at the moment). Sending mail as text mail. Encoding name when importing mail contact.
2012-02-24 07:11:26 +01:00
friendica
44c23cda8e
theme shakeup commences - themes are now administered in admin panel.
2012-02-23 20:29:09 -08:00
friendica
65ddefe9c5
system notifications to notify module, untranslated string in notifications.tpl
2012-02-23 17:37:03 -08:00
friendica
b4d38f6eed
implement firehose notify in ping, strip links so notify popup displays correctly in all themes
2012-02-23 16:50:29 -08:00
Michael
484a442f2b
GIT problems ...
2012-02-23 20:59:34 +01:00
Michael
0409b5cdba
Merge remote branch 'upstream/master'
...
Conflicts:
include/bbcode.php
2012-02-23 20:53:22 +01:00
Michael
311e35731c
bbcode.php: A list or quote at the beginning wasn't detected
2012-02-23 20:51:44 +01:00
Fabio Comuni
f5b8654818
fix visualization in groupeditor
2012-02-23 16:21:28 +01:00
Fabio Comuni
fd3274ff53
less html in mod/group.php, template for group members editor, quattro theme for group edit.
2012-02-23 16:17:36 +01:00
Simon
8cacff6985
Merge pull request #47 from fabrixxm/master
...
quattro: fix typos
2012-02-23 06:44:06 -08:00
Fabio Comuni
d45e26d6d9
Merge remote-tracking branch 'friendica/master'
2012-02-23 15:23:52 +01:00
Tobias Diekershoff
1dacb2e570
quattro-green: removed contact_template.tpl
2012-02-23 14:16:20 +01:00
Fabio Comuni
6a0c815c1f
Merge remote-tracking branch 'friendica/master'
2012-02-23 14:10:32 +01:00
Fabio Comuni
edd946bcad
quattro: fix typos
2012-02-23 14:10:23 +01:00
Tobias Diekershoff
c03b5b62c0
green-quattro: applied a color for shiny class and preview
2012-02-23 12:54:14 +01:00
fabrixxm
d5adb67ef4
Merge pull request #46 from fabrixxm/master
...
more work on quattro theme and less html in php
2012-02-23 02:52:04 -08:00
Fabio Comuni
cbc60d525e
quattro post preview, style contacts pages, style for "shiny" class, fix contacts list in profile aside.
...
remove html from viewcontacts.php and contacts.php
use contact_template.tpl to print contacts also in viewcontacts
2012-02-23 11:22:32 +01:00
Tobias Diekershoff
85d09f48d0
fix img tag with size attribute
2012-02-23 11:12:36 +01:00
friendica
d9e9fd0359
Merge branch 'master' into notify
2012-02-23 00:30:17 -08:00
friendica
fd43e2c563
more theme notify fixes
2012-02-23 00:28:26 -08:00
Tobias Diekershoff
734cdcef28
Merge branch 'master' of https://github.com/friendica/friendica
2012-02-23 09:04:00 +01:00
Tobias Diekershoff
56f3c00eec
quattro: added styling to pivate message view
2012-02-23 09:02:40 +01:00
friendica
41636a50aa
new notify sort of working in testbubble
2012-02-22 23:34:30 -08:00
Michael Vogel
e1ecf48b8b
README file shortened because this was for my branch only.
2012-02-23 07:55:56 +01:00
Michael Vogel
9f92bbb04c
Removed the export of markdown articles. That was for testing purposes only.
2012-02-23 07:53:45 +01:00
friendica
808b886a3e
Merge branch 'master' into notify
2012-02-22 22:36:07 -08:00
friendica
3c6b127d40
nested quote check fails to account for strpos returning position 0
2012-02-22 20:58:04 -08:00
friendica
d75d49a4c1
restore poller normal operation
2012-02-22 20:31:33 -08:00
friendica
58a9c652de
Merge pull request #45 from annando/master
...
New HTML to BBCode converter, changes to BBCode, nginx support, ...
2012-02-22 20:21:05 -08:00
friendica
8b2189f67f
Merge branch 'pull'
2012-02-22 19:58:01 -08:00
friendica
f9eddad44f
allow forum posts by followers on Diaspora
2012-02-22 19:56:28 -08:00
Michael
e34a648cad
German translation more gender friendly. Some more logging in poller.php
2012-02-22 15:20:49 +01:00
friendica
700b8d2031
Merge pull request #44 from simonlnu/master
...
minor doc fix. there will be more ;)
2012-02-22 03:59:37 -08:00
Simon L'nu
4e3506fce3
clean up Groups help file. there was a stray 'Freindika' in it
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-02-22 06:05:48 -05:00
friendica
390eb15e7d
never enough documentation
2012-02-22 01:50:06 -08:00
friendica
a19ddb48ee
waitman gobble media upload via api patch
2012-02-21 23:35:50 -08:00
friendica
91c3349025
escape smiley conversion in code and pre blocks
2012-02-21 23:13:03 -08:00
friendica
9fe12d1724
some cleanup of tb notifications
2012-02-21 20:22:09 -08:00
friendica
53d3ee8852
new notifications
2012-02-21 19:03:55 -08:00
friendica
3f2497ad20
add full email link to notification
2012-02-21 18:10:15 -08:00
friendica
f03aaf554e
mark all notifications read
2012-02-21 16:59:57 -08:00
friendica
3e69b86bc1
Merge branch 'pull'
2012-02-21 14:32:17 -08:00
friendica
a97cb88b65
logger_debug was used as string instead of constant
2012-02-21 14:15:10 -08:00
fabrixxm
2904a3265a
Merge pull request #43 from fabrixxm/master
...
Add support for variable filters in template
2012-02-21 02:38:52 -08:00
Fabio Comuni
01a2791e3a
template: add support for variable filters
2012-02-21 11:25:22 +01:00
friendica
5910fbf420
fill in notify msg with redirect link after we get the id
2012-02-21 00:02:42 -08:00
friendica
32d9008dd4
more cleanup of community followup detection. Remote worked well but local didn't.
2012-02-20 21:07:40 -08:00
friendica
b821399f00
email notify now redirected through mod_notify, weirdness in local deliver caused by community page changes
2012-02-20 19:50:05 -08:00
friendica
6edd6d8ae1
Merge branch 'pull'
2012-02-20 18:07:16 -08:00
friendica
11871195be
fix twitter title showing up occasionally
2012-02-20 18:06:43 -08:00
friendica
1cfff8fdd1
Merge pull request #42 from friendica/ka2ca-rebased
...
Replaced some ocurrences of Friendika --> Friendica
2012-02-20 18:02:53 -08:00
Abinoam P. Marques Jr
914169472e
view/admin_remoteupdate.tpl - Friendika -> Friendica
2012-02-20 19:47:56 -03:00
Abinoam P. Marques Jr
7404d76126
util/README - Friendika -> Friendica
2012-02-20 19:47:56 -03:00
Abinoam P. Marques Jr
d89a0449d0
htconfig.tpl - Friendika -> Friendica
2012-02-20 19:47:44 -03:00
Abinoam P. Marques Jr
9b2171ecee
mod/match.php - Friendika -> Friendica
2012-02-20 19:41:01 -03:00
Abinoam P. Marques Jr
6797485f6e
mod/dirfind.php - Friendika -> Friendica
2012-02-20 19:38:43 -03:00
Abinoam P. Marques Jr
12a8796854
mod/dfrn_request.php and templates - Friendika -> Friendica
2012-02-20 19:38:43 -03:00
Abinoam P. Marques Jr
6e2ae7bf1e
library/OAuth1 - Friendika -> Friendica
2012-02-20 19:38:43 -03:00
Abinoam P. Marques Jr
cec0542cdd
js/fk.autocomplete.js - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
70dedefde3
INSTALL.txt - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
3ef6344d41
include/nav.php - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
fed6330ea6
include/api.php - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
19fea9c2ce
poller.php - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
7ed1e3f177
acl_selectors.php - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
03834b2433
text.php - Friendika -> Friendica (just to prepare for deprecate the friendika.png at the future)
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
0bca36109a
Scrape.php - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
2219c1b581
friendica.svg - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
friendica
4fbd93f7e7
revup
2012-02-20 13:29:46 -08:00
fabrixxm
2507d09682
Merge pull request #41 from fabrixxm/master
...
fix connection request in mod/ping
2012-02-20 11:44:58 -08:00
Fabio Comuni
dd09c2d125
use info() for successfull dfrn confirmation instead of notice()
2012-02-20 20:39:19 +01:00
Fabio Comuni
edac27c791
ping: return all introductions detail when there are more than one
2012-02-20 20:21:34 +01:00
Michael
3a7695ded1
Fetched some missing styles from testbubble.
2012-02-20 15:11:27 +01:00
Michael
e2f276881e
Some testing stuff
2012-02-20 11:15:22 +01:00
friendica
15e9933ddf
include item links in web notification messages
2012-02-19 20:27:32 -08:00
Michael
0fb22e1284
API is now working on my nginx server.
2012-02-20 01:53:22 +01:00
friendica
2fe479034c
revup
2012-02-19 14:37:01 -08:00
root
b6d7777226
New version of markdown. Playing with stylesheet. Testing line breaks.
2012-02-19 22:47:32 +01:00
Michael
064c843119
Handling nested bbcodes. Some small design changes in html2bbcode. Change in poller.php is just for testing purposes.
2012-02-19 21:07:45 +01:00
Michael
8c8efbdf64
README added
2012-02-19 20:41:55 +01:00
Michael
31653aef64
Brand new html2bbcode. Some other changes in diaspora to bbcode handling
2012-02-19 20:36:59 +01:00
Michael
4713069e68
Many small changes
2012-02-19 20:11:36 +01:00
Michael
cafd400352
Merge remote branch 'upstream/master'
...
Conflicts:
view/theme/vier/style.css
2012-02-19 20:09:42 +01:00
ike
73e0e4d783
New theme "vier" derives from "quattro"
2012-02-19 20:05:51 +01:00
Abinoam P. Marques Jr.
a9ed5915ce
Merge pull request #40 from simonlnu/newsmilies
...
add :headdesk and fix doc/Pages.md to remove the absolute URL to /
2012-02-19 09:58:41 -08:00
Abinoam P. Marques Jr.
f81e9ee3b2
Merge pull request #39 from abinoam/logfile
...
Logfile
2012-02-19 09:56:14 -08:00
Simon L'nu
49179f9033
add :headdesk and fix doc/Pages.md to remove the absolute URL to /
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-02-19 05:17:26 -05:00
Abinoam P. Marques Jr
dedfc300a0
Fixed log file issues on a freshly installed Friendica.
...
* Check to see if log file exists.
* After trying to open it, check to see if it went ok.
* So, check to see if the file size != 0 (fread error with size = 0)
2012-02-18 14:19:35 -08:00
friendica
5734d5f357
change notify messages for web
2012-02-18 03:18:20 -08:00
friendica
1b9c03f6fc
new notifications - implement storage
2012-02-18 02:57:42 -08:00
friendica
4222f506a8
deprecating two-char smilies
2012-02-17 23:44:25 -08:00
friendica
75acc1ed96
support plaintext on editpost, editorinit called before all buttons laid out
2012-02-17 11:49:27 -08:00
friendica
184f6165fc
Merge branch 'pull'
2012-02-17 10:13:34 -08:00
friendica
346b44fbf6
revup
2012-02-17 10:13:06 -08:00
fabrixxm
5bbc2e820b
Merge pull request #38 from fabrixxm/master
...
Revert changes to oembed
2012-02-17 06:36:38 -08:00
Fabio Comuni
7bd43613fa
oembed: revert changes from 48f5bd492d
2012-02-17 15:34:05 +01:00
friendica
8ff6cb8406
a couple more items to make sure forum delegates can't access if the forum login is shared with the site admin account
2012-02-16 23:58:07 -08:00
friendica
0500fc2826
do not under any circumstances allow a delegated forum admin to access the site admin page.
2012-02-16 23:50:57 -08:00
friendica
48f5bd492d
naked link with no protocol being passed from Diaspora
2012-02-16 23:14:36 -08:00
friendica
2abbd81ce1
a few fixes for offsite community members
2012-02-16 18:29:09 -08:00
friendica
6f6d4471d8
Merge branch 'pull'
2012-02-16 15:16:04 -08:00
friendica
7dcef67492
facepalm smiley
2012-02-16 15:15:28 -08:00
Abinoam P. Marques Jr.
7b59ad6148
Merge pull request #37 from abinoam/oex
...
Oexchange Small Fix
2012-02-16 04:53:37 -08:00
Tobias Diekershoff
652622894f
de strings
2012-02-16 11:55:52 +01:00
Abinoam P. Marques Jr
4ac001663e
oexchange small fix [_POST -> _REQUEST]
2012-02-16 02:52:35 -08:00
friendica
c8704040d3
improvements in newmember page
2012-02-16 01:57:59 -08:00
friendica
1b445d511b
another sql typo
2012-02-16 00:08:38 -08:00
friendica
ada2a555dc
sql typo in auto-friend with D*
2012-02-15 23:58:28 -08:00
friendica
d8b82b24a4
Documentation on Friendica changes to B8 and notice of source availability in accordance with LGPL
2012-02-15 23:02:05 -08:00
friendica
b1d31aca51
quick comments
2012-02-15 18:13:41 -08:00
friendica
d054426101
encode email headers on message deliveries
2012-02-15 15:28:32 -08:00
friendica
c965074e53
Merge branch 'pull'
2012-02-15 14:13:20 -08:00
friendica
18b307f983
revup
2012-02-15 14:12:35 -08:00
fabrixxm
16f00cb73b
Merge pull request #36 from fabrixxm/master
...
Missing icons in 'quattro' and ajax events calendar
2012-02-15 03:51:44 -08:00
Fabio Comuni
73bee08ac2
enable ajax calendar with $a->config['experimentals']['new_calendar']=1
2012-02-15 12:47:50 +01:00
Fabio Comuni
fe3e8ee854
quattro: icons for attachments
2012-02-15 11:10:02 +01:00
friendica
07ca8d6574
starred/bookmark searches only returning conversation head without comments
2012-02-14 23:29:24 -08:00
friendica
03171fd7de
preliminary qcomment support, [nosmile] tag to disable smiley processing
2012-02-14 23:13:18 -08:00
friendica
f865939653
localise links to private photos inside messages
2012-02-14 18:07:13 -08:00
friendica
134fdda75f
refactor smilie code to allow for extensions and generation of a table of the entire list
2012-02-14 15:31:08 -08:00
friendica
cbabf9d7ef
Merge branch 'pull'
2012-02-14 13:57:12 -08:00
friendica
7697bde0ca
revup
2012-02-14 13:56:43 -08:00
Vasudev Kamath
8022a46907
Merge pull request #35 from copyninja/master
...
:'( :-! :-/ 8-) :-[ smiley's are mapped.
2012-02-14 09:43:05 -08:00
Vasudev Kamath
e4b1c07727
cry, foot in mouth, cool, undecided and embarassed smiley's are mapped
2012-02-14 23:10:11 +05:30
Fabio Comuni
7140e56d1f
events js: pass only first line of desc as title; item.desc and item.location as html
2012-02-14 16:48:34 +01:00
Fabio Comuni
549c920e6f
events js: don't modify rendered item if not autor specified
2012-02-14 16:28:10 +01:00
Fabio Comuni
22cfb77173
events: first test for full-javascript events calendar
2012-02-14 16:19:48 +01:00
friendica
060ac4ebf1
delete mail message icon not brightening on hover
2012-02-14 02:34:05 -08:00
friendica
d2a9ce9362
more contacts categorisation, page cleanup
2012-02-13 22:48:35 -08:00
friendica
4de67d95ce
proper tab selection when network or search is in effect
2012-02-13 20:42:10 -08:00
friendica
d75b6a00d4
tabs and total count for contacts page
2012-02-13 20:38:00 -08:00
friendica
94c7289a3f
updates to plugin docs
2012-02-13 19:06:15 -08:00
friendica
bcad629633
more stray quotes
2012-02-13 18:40:56 -08:00
friendica
803a7425ea
make hr bbtag shareable, stray quote in duepuntozero wall_item
2012-02-13 18:40:28 -08:00
friendica
c87aa8f927
poll structures
2012-02-13 18:02:43 -08:00
friendica
23f5abfa1f
Merge branch 'pull'
2012-02-13 14:17:20 -08:00
friendica
dc4420c5ec
hr bbcode tag
2012-02-13 14:16:51 -08:00
friendica
52cb63655a
POST should be lowercase these days
2012-02-13 14:15:39 -08:00
Tobias Diekershoff
22bb285c7f
green variation of the quattro theme
2012-02-13 17:05:48 +01:00
fabrixxm
f84309eb92
Merge pull request #34 from fabrixxm/master
...
Allow reshare in display view
2012-02-13 01:30:42 -08:00
Fabio Comuni
8369c243b3
Fix 'item not found' message
2012-02-13 10:19:10 +01:00
Fabio Comuni
850560519a
Merge remote-tracking branch 'friendica/master' into mobile
2012-02-13 09:46:42 +01:00
Fabio Comuni
16d3bc9deb
quattro: pause icon
2012-02-13 09:35:11 +01:00
Fabio Comuni
3e664dbdfe
reshare in "display" view
2012-02-13 09:33:20 +01:00
friendica
85c831bcbf
finish translation of 'xxxxx wrote:'
2012-02-12 20:56:44 -08:00
friendica
fd0bd8433a
Merge pull request #33 from friendica/bbcode
...
Improving BBCode support
2012-02-12 19:57:49 -08:00
Abinoam P. Marques Jr
9697e82331
Merge branch 'master' into bbcode
2012-02-12 18:56:53 -08:00
Abinoam P. Marques Jr
135005571f
Added [th] bbcode tag support.
2012-02-12 17:27:08 -08:00
friendica
3e85c1d330
make 'x minutes ago' fully translateable with argument ordering. string update.
2012-02-12 17:15:09 -08:00
Abinoam P. Marques Jr
e575a3a02c
Fixed bbcode [li] and [*] handling.
2012-02-12 17:10:06 -08:00
Abinoam P. Marques Jr
10e66d293d
Added [quote=Name] bbcode support.
2012-02-12 16:18:58 -08:00
Abinoam P. Marques Jr
3a07973ffa
Added [center] bbcode support.
2012-02-12 15:51:17 -08:00
Abinoam P. Marques Jr
74b529bda2
BBCode [size=50] --> font-size: 50px (with the unit px).
...
This [size=number] without unit is kind of a standard.
It was being rendered like "font-size: 50" and that's not valid CSS style.
2012-02-12 14:59:07 -08:00
Abinoam P. Marques Jr
92a585ed23
Added support to [noparse], [nobb] and [pre] as bbcode escape tags.
2012-02-12 14:35:29 -08:00
friendica
330a876d81
bug #281
2012-02-12 14:18:32 -08:00
Abinoam P. Marques Jr
6a17a3a8e2
Added support for [ol] standard ordered list bbcode.
2012-02-12 12:00:23 -08:00
Abinoam P. Marques Jr
5479142efc
Added support for [ul] standard unordered list bbcode.
2012-02-12 11:59:51 -08:00
Abinoam P. Marques Jr
5107ee52d3
Regexp fix for [LIST=i], [list=i], [LIST=I] and [LIST=i] bbcodes
2012-02-12 06:13:49 -08:00
Tobias Diekershoff
34ac72cffd
Merge pull request #32 from copyninja/master
...
Mapped ;) :D and :-O smileys
2012-02-12 01:42:43 -08:00
Vasudev Kamath
495d0fb80f
Merge branch 'master' of git://github.com/friendica/friendica
2012-02-12 15:06:41 +05:30
Vasudev Kamath
cbf53beec1
;) :D and :-O are also enabled for wink laugh and surprised smiley's
2012-02-12 15:06:12 +05:30
friendica
8b101c6cb8
do not display contact_block if config for num shown is 0
2012-02-11 23:49:05 -08:00
friendica
4cfb1fe0cf
refresh contact record after setting change
2012-02-11 23:17:55 -08:00
friendica
bb19c8ba4e
kissing smilie may need escaping (thanks - Abinoam)
2012-02-11 21:46:48 -08:00
friendica
d856ae1fa5
bug #279 , add network selector widget to contacts page
2012-02-11 21:39:51 -08:00
friendica
0c4606682f
fix link/bookmark reshares
2012-02-11 19:21:41 -08:00
friendica
da946bb9b0
bug #278 show only blocked contacts
2012-02-11 03:07:15 -08:00
friendica
1d5f1723e0
Merge branch 'pull'
2012-02-11 01:25:21 -08:00
friendica
75a62db9c5
show tags (pub_keywords) in advanced profile
2012-02-11 01:24:29 -08:00
Tobias Diekershoff
857f21eb32
fpostit by Devlon Duthied added to utils
2012-02-11 10:03:14 +01:00
Abinoam P. Marques Jr
2984b8d5d2
bug #270 - solved
2012-02-10 14:03:43 -08:00
friendica
d79c3351ea
db installation sync
2012-02-10 13:43:35 -08:00
Fabio Comuni
ed38808aae
hidden jot in "display" to allow reshare
2012-02-10 17:30:22 +01:00
Fabio Comuni
8480550144
quattro: add "view in context" link in search results
2012-02-10 17:29:37 +01:00
friendica
b346f4464c
send notify emails to community pages as well as people
2012-02-10 00:08:23 -08:00
friendica
2f2e331c33
bug #274
2012-02-09 22:44:59 -08:00
friendica
ffe7d8b1e9
item tag notifications
2012-02-09 21:18:50 -08:00
friendica
5859f9dcf6
add render_location hook to both sets of conversations
2012-02-09 18:09:28 -08:00
friendica
e242a391b9
Merge branch 'pull'
2012-02-09 16:03:30 -08:00
friendica
7b0a005441
edit post not working after plaintext editor fixes, missing some recent editor template changes
2012-02-09 15:58:26 -08:00
friendica
795e02aa14
bug #273 - no $baseurl variable expansion in install template
2012-02-09 15:13:34 -08:00
Keith Fernie
14ba3998ac
Merge pull request #30 from Keith2/master
...
Adds a custom YourLS url shortener to slinky.php
2012-02-09 15:08:53 -08:00
friendica
ec26f88be9
render_location hook
2012-02-09 15:02:59 -08:00
friendica
171249966e
add tag notifications to enotify
2012-02-09 14:06:17 -08:00
Keith Fernie
2c9cfb1fe9
modified: library/slinky.php Set up tabs in code correctly.
2012-02-09 21:44:52 +00:00
Keith Fernie
955022e7dc
modified: library/slinky.php Added a custom YourLS shortener to the available shorteners
2012-02-09 20:45:38 +00:00
friendica
f73b6ed7a1
Merge branch 'pull'
2012-02-08 23:31:35 -08:00
Abinoam P. Marques Jr
1c8680d9f9
Install note about PHP path.
2012-02-08 22:01:42 -08:00
friendica
11517a027b
if removing a contact after viewing the third page of contacts, go back to page 3
2012-02-08 21:15:26 -08:00
friendica
03435853b3
fix apps sub-menu on quattro and vier
2012-02-08 18:12:26 -08:00
friendica
1f3b608af2
Merge branch 'pull'
2012-02-08 17:56:55 -08:00
friendica
b0ee8dd409
begin cmin, cmax
2012-02-08 17:56:23 -08:00
Tobias Diekershoff
d8157f73ef
quattro: added delete button to mail list overview
2012-02-08 22:29:38 +01:00
Tobias Diekershoff
ca8a25172e
quattro: added delete buttons to groups and contacts
2012-02-08 22:13:36 +01:00
Tobias Diekershoff
72c30deb64
quattro: group member selection styling
2012-02-08 20:47:52 +01:00
Tobias Diekershoff
9436a9d84b
Merge branch 'master' of https://github.com/friendica/friendica
2012-02-08 19:11:11 +01:00
Tobias Diekershoff
1eb32a0bb5
added theme "vier" by Michael Vogel
2012-02-08 19:09:25 +01:00
friendica
bb22464165
browser being sent to update_community
2012-02-08 03:40:49 -08:00
friendica
e92e3658b2
make individual advanced profile items addressable via script or plugin
2012-02-07 20:34:40 -08:00
friendica
c506bb42a9
:coffee extended smilie
2012-02-07 17:03:09 -08:00
friendica
8a3c1f7930
beer smilie
2012-02-07 15:41:06 -08:00
friendica
a869bd2fe5
don't link tags enclosed inside Diaspora links
2012-02-07 02:16:28 -08:00
friendica
c6cdad946e
more fixes for textmode
2012-02-07 00:13:16 -08:00
friendica
2b77002471
basic support for plaintext editor configuration (disable tinymce), currently only zero themes - and not all the post tools currently work (as some of them emit html).
2012-02-06 20:28:50 -08:00
friendica
76308eca67
add toggle to choose sending "friends with" activity even if contact is not hidden
2012-02-06 16:41:05 -08:00
friendica
3d099bd99a
beer
2012-02-06 01:08:00 -08:00
friendica
57f7083706
style missing on crepair-name
2012-02-05 17:38:32 -08:00
friendica
03956cef33
Merge branch 'master' into spam
2012-02-05 16:11:39 -08:00
friendica
b12e598dba
roll update 1118 forward, enable update 1119
2012-02-05 14:30:24 -08:00
friendica
a8163a6eaf
Merge branch 'master' into spam
2012-02-04 22:26:51 -08:00
friendica
4cf6bd5469
do an optimise after an expunge
2012-02-02 18:02:08 -08:00
friendica
f57fa90228
more work on Friendica db driver for b8
2012-02-01 20:37:05 -08:00
friendica
94e396e6c4
Merge branch 'master' into spam
2012-02-01 19:23:45 -08:00
friendica
64d0616762
add uid variable to b8 classes
2012-02-01 19:23:05 -08:00
friendica
840f69e2c8
add spam flag to item table, DB version not incremented yet, give large sites a heads up to do it manually
2012-02-01 18:50:11 -08:00
friendica
9fc36d3da4
improvements in d* markdown conversion
2012-02-01 17:09:53 -08:00
friendica
c68235d10d
placeholder - spam tab on network page
2012-02-01 00:20:54 -08:00
friendica
c0c0f2dc15
add closeness attribute
2012-01-31 23:54:53 -08:00
friendica
86c0eac27d
transport for email contacts phase II
2012-01-31 20:03:46 -08:00
friendica
c8c062d960
add spam engine
2012-01-31 15:54:41 -08:00
friendica
4fc455d195
revup
2012-01-31 15:50:49 -08:00
friendica
4993f4f1d6
allow plugin to abort message posting, fix half-duplex D* relationship
2012-01-30 20:49:54 -08:00
friendica
95878a3e84
Merge branch 'pull'
2012-01-30 15:14:41 -08:00
friendica
c76b224d8a
prune old expired and deleted items
2012-01-30 15:13:24 -08:00
zzottel
de645516ba
Merge pull request #29 from zzottel/master
...
Small testbubble fix
2012-01-30 13:38:55 -08:00
zottel
3149e3cd3e
testbubble fix: tools for wall-to-wall items now appear at the bottom where they should be
2012-01-30 13:33:25 -08:00
Tobias Diekershoff
d658cdaa84
quattro: small adjustments to the profile edit style
2012-01-30 14:25:24 +01:00
Tobias Diekershoff
43df068d2e
quattro: styling of the edit profile page
2012-01-30 13:22:16 +01:00
friendica
61246cbd1c
some zot-id infrastructure
2012-01-29 15:47:25 -08:00
friendica
e43a3a412c
store moderated flag if set
2012-01-29 02:09:39 -08:00
friendica
955d2b6d83
Merge branch 'pull'
2012-01-28 13:24:53 -08:00
friendica
d54042dd38
mime_content_type requires access to the file, not just the name
2012-01-28 12:09:17 -08:00
Tobias Diekershoff
a5974d1981
moving the pager down below the contact/photo list in quattro
2012-01-28 13:13:21 +01:00
friendica
5161be67e9
logging of manage identities
2012-01-27 12:56:36 -08:00
friendica
039eec360a
typo was also in database.sql
2012-01-27 03:14:16 -08:00
friendica
1bec801523
typo in update - critical
2012-01-26 23:56:47 -08:00
friendica
94b9e9ce6d
for people whose DB's are not updating
2012-01-26 23:08:51 -08:00
friendica
3197a6e8aa
fix some changes lost from another branch
2012-01-26 23:03:27 -08:00
friendica
8fe5168259
restore diaspora test mode
2012-01-26 20:46:42 -08:00
friendica
f1f480c2bf
slackr -> wall-to-wall comment form background different than regular comment
2012-01-26 20:32:05 -08:00
friendica
068cb53a9e
page delegation
2012-01-26 20:08:02 -08:00
friendica
167ab537b5
backend for delegating forums
2012-01-26 16:52:12 -08:00
friendica
10f768630b
D* event formatting
2012-01-25 15:16:43 -08:00
friendica
d2a9341128
new event current date off by one, submit button misplaced
2012-01-25 13:42:06 -08:00
friendica
a24a383dab
by default allow pseudonyms
2012-01-25 00:30:36 -08:00
friendica
e2d0eb4a88
redirect to a useful location after deleting or ignoring a friend request, begin comment moderation logic
2012-01-24 18:59:55 -08:00
friendica
dae0c1ded2
more robust cache api handling (was throwing errors on occasion)
2012-01-24 17:04:49 -08:00
friendica
8ff2bb4cd3
backtrace errant input to base64url_decode
2012-01-24 16:45:58 -08:00
friendica
3a1a4d62d9
bug #254
2012-01-24 16:23:30 -08:00
friendica
a76a497d92
implement "moderate" flag on items
2012-01-23 20:56:11 -08:00
friendica
1f074cb44c
shaka, slackr theme
2012-01-23 15:07:40 -08:00
fabrixxm
e3bcd6ab1b
Merge pull request #28 from fabrixxm/master
...
fix "See all notifications"
2012-01-23 00:25:34 -08:00
Fabio Comuni
9047840ec2
nav: fix "See all notifications"
2012-01-23 09:23:37 +01:00
friendica
11aa83742e
more logging of D* photo transactions
2012-01-22 15:25:29 -08:00
friendica
cf7e56aacb
Merge branch 'pull'
2012-01-22 13:32:54 -08:00
friendica
9f0a836674
revup
2012-01-22 13:31:59 -08:00
fabrixxm
f1e4585c66
Merge pull request #27 from fabrixxm/master
...
fix bug 252
2012-01-22 10:32:48 -08:00
Fabio Comuni
30fcda7576
nav: fix intro notification url, fix "See all notifications" url and make it translatable
2012-01-22 19:27:56 +01:00
friendica
b5ec475906
bug #253 use MSQLI_ASSOC, not MYSQL_ASSOC
2012-01-21 14:07:28 -08:00
friendica
43102e940a
revup
2012-01-20 13:50:02 -08:00
friendica
7a11a6f09b
revup
2012-01-19 17:18:58 -08:00
friendica
8aa2552372
add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
2012-01-18 16:21:30 -08:00
friendica
d840943621
use reltoabs - primarily for github activity feeds
2012-01-17 16:30:32 -08:00
friendica
2cc02716e1
revup
2012-01-16 20:18:20 -08:00
friendica
e3a415d409
add photo upload link to album widget and "upload to this album" ability
2012-01-15 17:48:42 -08:00
friendica
e9fb809a2d
add db_update cmdline script
2012-01-15 15:02:48 -08:00
friendica
e1e6d2fa3e
Merge branch 'pull'
2012-01-15 13:58:02 -08:00
friendica
e12341b716
api post broken with recent change to use REQUEST vars in mod_item
2012-01-15 13:57:00 -08:00
Tobias Diekershoff
40edcec06f
German translation
2012-01-13 15:14:40 +01:00
friendica
a1dc3185be
typo in greenzero
2012-01-12 23:33:20 -08:00
friendica
28edeefc14
reset width of openid input, settings page
2012-01-12 20:35:05 -08:00
friendica
520ba0960b
put openid logo back on openid input box, duepuntozero settings page
2012-01-12 20:31:14 -08:00
friendica
a95000d9f5
manage also needs the new authenticate_success function
2012-01-12 19:18:01 -08:00
friendica
df14d7abc4
allow crepair to change name - as long as it isn't blank
2012-01-12 18:54:35 -08:00
friendica
cdd56dc5de
fix return url when deleting network posts with page params
2012-01-12 18:30:52 -08:00
friendica
bdfe3ba129
missing source file, fix link icon in testbubble
2012-01-12 17:58:55 -08:00
friendica
4d07cfa2d0
and and theme previewing for testbubble
2012-01-12 17:50:02 -08:00
friendica
4b6990e1ff
modularise successful authentication
2012-01-12 15:46:39 -08:00
friendica
0856935d75
use $_REQUEST for all post items, move default api permission code block to simplify logic
2012-01-12 14:20:21 -08:00
friendica
bb888feaef
Merge branch 'pull'
2012-01-12 13:59:07 -08:00
friendica
87c4d1c3cd
bug #251 - privacy settings not working via API
2012-01-12 13:58:17 -08:00
Tobias Diekershoff
9b2669eb5d
profile-match and contact suggestion list styling
2012-01-12 21:21:00 +01:00
fabrixxm
27a9a53b3b
Merge pull request #26 from fabrixxm/master
...
Fix acl in quattro + more style
2012-01-12 01:52:30 -08:00
Fabio Comuni
ea9f14c27b
quattro: style fakelink
2012-01-12 10:42:59 +01:00
Fabio Comuni
3d7857ecdd
quattro: item acl popup panel, max height to notifications menu, style comment preview and wall-to-wall item photos
2012-01-12 10:38:24 +01:00
Fabio Comuni
302d62f7a3
templates: add class to comment preview div, fix search_item.tpl
2012-01-12 10:37:11 +01:00
Fabio Comuni
1f9e8f90a2
fix jot acl
2012-01-12 10:35:50 +01:00
friendica
aa1c28cf39
fine tuning diaspora markdown to bbcode
2012-01-11 22:49:17 -08:00
friendica
792e957842
symbolic bbcode icon
2012-01-11 18:54:10 -08:00
friendica
6573c94d6c
modified item_photo_menu hook
2012-01-11 17:34:02 -08:00
friendica
c5f41d8b6c
fix D* links+text smushed together
2012-01-11 14:03:27 -08:00
friendica
dcc22ab5c5
improve direct login on network page
2012-01-11 13:38:03 -08:00
friendica
99fc4309be
slightly better group icon
2012-01-10 21:09:38 -08:00
friendica
b7ccbfc702
Merge branch 'pull'
2012-01-10 17:48:05 -08:00
friendica
cf7008e575
post preview to loozah
2012-01-10 17:47:11 -08:00
zzottel
792b15c3a2
Merge pull request #25 from zzottel/master
...
New messages.po and German translations update
2012-01-10 08:25:07 -08:00
zottel
690436bd1b
Update messages.po
2012-01-10 08:22:53 -08:00
zottel
bd3dee43c1
New German translations
2012-01-10 08:13:30 -08:00
friendica
375cb82124
move post preview link
2012-01-09 21:02:02 -08:00
friendica
7011f71e8f
post preview
2012-01-09 20:03:00 -08:00
friendica
805eb35a1a
not ready for post preview
2012-01-09 18:54:05 -08:00
friendica
a13156c0f3
bypass D* markdown bug for now
2012-01-09 18:52:49 -08:00
friendica
3bdcb52471
markdown bug is Diaspora's. We can't fix it.
2012-01-08 17:20:03 -08:00
friendica
96031d0e95
show connect link even on restricted profiles
2012-01-08 13:39:41 -08:00
friendica
9d0664ba48
Merge branch 'pull'
2012-01-08 05:17:59 -08:00
friendica
0828ab353f
fix git horkage
2012-01-08 05:16:55 -08:00
friendica
9f6d38a61a
something weird with git
2012-01-08 04:30:35 -08:00
friendica
a6d0a65321
more recovery of lost contact page formatting
2012-01-08 04:16:23 -08:00
friendica
dd7a10a219
contact page float got lost somewhere
2012-01-08 04:13:53 -08:00
friendica
df0f7ef560
make network_to_name extensible
2012-01-08 02:08:20 -08:00
friendica
5c72ead74e
contact photo missing from friend activities
2012-01-08 01:08:57 -08:00
friendica
977a49ad93
fix images with links going to diaspora, the D* markdown processor changed and these are no longer working.
2012-01-08 00:57:36 -08:00
friendica
358b2a46f5
fix photo top view in testbubble, extend network_to_name
2012-01-07 13:00:06 -08:00
friendica
41bb47ca1b
title fixups
2012-01-06 03:59:05 -08:00
friendica
a69ecb3413
Merge pull request #24 from fabrixxm/master
...
fix jot icons in duepuntozero
2012-01-06 01:39:39 -08:00
Fabio Comuni
f70f2eedaf
duepuntozero: get back jot icons
2012-01-06 10:03:20 +01:00
fabrixxm
ad02af4e8f
Merge pull request #23 from fabrixxm/master
...
Theme works
2012-01-06 00:42:06 -08:00
Fabio Comuni
a5a6719283
fix photo album pager
2012-01-06 09:35:29 +01:00
Fabio Comuni
98a8693e9e
quattro: style network widget
2012-01-06 09:27:05 +01:00
friendica
cfe8094b45
nets widget - allow all children of specified parent net regardless of network
2012-01-06 00:23:05 -08:00
Fabio Comuni
f9b0af6f2f
Merge remote-tracking branch 'friendica/master'
2012-01-06 09:11:48 +01:00
Fabio Comuni
efe308b5ac
Use html5 placeholder for title text input
2012-01-06 09:11:25 +01:00
Fabio Comuni
a9670cbb7d
Merge remote-tracking branch 'friendica/master'
2012-01-06 09:10:21 +01:00
friendica
c3ada095f4
network select widget
2012-01-05 20:40:48 -08:00
friendica
291a82c4a4
backend for per-network streams
2012-01-05 18:11:53 -08:00
friendica
b265334c9e
added citations back into ping - lost somehow
2012-01-05 16:47:47 -08:00
friendica
b99cb511ca
comment preview
2012-01-05 16:38:24 -08:00
friendica
53878625f6
backend support for post preview
2012-01-05 15:02:44 -08:00
friendica
5b809328af
send diaspora share notification back to originator for auto friending
2012-01-05 13:25:43 -08:00
friendica
2f73be326e
change to hover function
2012-01-04 21:01:24 -08:00
friendica
c5d27c48f5
more title stuff
2012-01-04 20:43:38 -08:00
friendica
dbb5955469
bit more improvement on dynamic title
2012-01-04 20:35:32 -08:00
friendica
f1c7db593c
better title handling (duepuntozero only at this time)
2012-01-04 20:09:14 -08:00
friendica
47edaf9ad7
dynamic title input box - via fabrixxm
2012-01-04 18:03:09 -08:00
friendica
b0c3dc00b9
fix registration request pings
2012-01-04 16:14:26 -08:00
friendica
378f86d046
Merge branch 'pull'
2012-01-04 14:31:37 -08:00
friendica
d0b743529d
support auto-friend page types for Diaspora
2012-01-04 14:30:25 -08:00
friendica
c1cf6e48c2
Allow Diaspora to post to forums
2012-01-04 13:50:12 -08:00
friendica
48a5a2484e
new smiley
2012-01-04 00:04:19 -08:00
fabrixxm
8d9dc5c56c
Merge pull request #22 from 23n/patch-1
...
Update view/de/strings.php
2012-01-03 23:08:11 -08:00
23n
0077997eb6
Update view/de/strings.php
2012-01-04 07:05:44 +01:00
friendica
fc7d0360bb
add verb and item to notifications to aid in localisation
2012-01-03 20:26:20 -08:00
friendica
8e6c02cda3
remove some old email templates
2012-01-03 18:12:58 -08:00
friendica
969cd145ce
suggestion notifications
2012-01-03 17:29:07 -08:00
friendica
c583d16209
fix reference variable effects on sorting
2012-01-03 14:27:00 -08:00
Fabio Comuni
93563370c9
Merge remote-tracking branch 'friendica/master'
2012-01-03 21:14:48 +01:00
friendica
184230e068
check count before foreach
2012-01-02 22:58:09 -08:00
friendica
0db637bf00
hopefully this will speed up the network updates a wee bit more
2012-01-02 19:33:26 -08:00
friendica
71377291ba
that didn't work - revert
2012-01-02 18:50:28 -08:00
friendica
f4b1d335a5
sql optimisation cont.
2012-01-02 18:40:38 -08:00
friendica
4c35a6b0d7
conversation sql optimisations
2012-01-02 16:54:37 -08:00
friendica
f1ee5f48d4
Merge branch 'pull'
2012-01-02 14:04:08 -08:00
friendica
3f2a492ce7
revup
2012-01-02 13:59:50 -08:00
fabrixxm
bbf491d52b
Merge pull request #21 from fabrixxm/fixinstall
...
Fix install procedure
2012-01-02 13:35:23 -08:00
Fabio Comuni
c7bfd1e1ba
install: fix install procedure
...
install procedure as a wizard
graphical rappresentation of passed/unpassed system checks
db connection test don't try anymore to create the db
admin email and timezone are asked in a separate pass
fix loading of database.sql, removing comments from phpmyadmin export
fix check for .htconfig.php writability
ask for php-cli path if not found in PATH
install_db.tpl use field_* templates to render the form
2012-01-02 20:16:28 +01:00
Fabio Comuni
1fbffc76b1
text: "turn off" logger() if module is "install"
2012-01-02 20:11:06 +01:00
Fabio Comuni
85fbdb00ac
dba: leave unconnected if $server and $user are not defined
2012-01-02 20:10:23 +01:00
Fabio Comuni
f35109827b
datetime: new field_timezone() function, new template field_select_raw.tpl
...
returns a timezone select like select_timezone() but using template field_select_raw.tpl.
field_select_raw get options html as forth argument, instead of array value=>label like field_select
2012-01-02 20:09:25 +01:00
Fabio Comuni
be2fd56aae
Merge branch 'master' of github.com:fabrixxm/friendica
2012-01-02 15:32:37 +01:00
friendica
4b09566579
try again on the network page sql optimisation
2012-01-02 03:40:52 -08:00
friendica
a5144518aa
revert sql optimisation - js updates broken
2012-01-02 00:20:06 -08:00
friendica
fb3a0baa78
long running query on network page - optimise out the double sub-select
2012-01-01 23:07:53 -08:00
friendica
0cd1f5eae4
bug #250 typo in database.sql
2012-01-01 22:46:20 -08:00
friendica
d52f833c5f
extensible notify structure
2012-01-01 22:44:03 -08:00
friendica
0afb636e46
change default ostatus poll interval
2012-01-01 11:45:56 -08:00
friendica
44b4baa0ca
notification data type
2012-01-01 00:39:22 -08:00
friendica
3e162bcf8f
function not defined
2011-12-30 20:48:49 -08:00
friendica
a76be1934a
migrate more notifications
2011-12-29 22:32:30 -08:00
friendica
c735582ead
hide contacts on approval
2011-12-29 00:23:05 -08:00
friendica
da21473c34
add notifications to d* private messages
2011-12-27 15:49:47 -08:00
friendica
aca8c8a13a
Merge branch 'pull'
2011-12-27 14:27:39 -08:00
friendica
0f87f84cfb
notification testing
2011-12-27 14:26:44 -08:00
friendica
5c7df6e964
notify_intro
2011-12-26 15:47:40 -08:00
friendica
356c05c6b3
extending notifications to other types
2011-12-26 14:16:25 -08:00
Tobias Diekershoff
f29507cdba
translation of email templates
2011-12-26 09:16:33 +01:00
Tobias Diekershoff
f1b7ce6ef4
translation of email template
2011-12-26 09:08:32 +01:00
Tobias Diekershoff
02af9cd3b2
translation of the email template
2011-12-26 09:05:02 +01:00
friendica
bb40e54dec
new notification module working for "email message received"
2011-12-25 23:00:19 -08:00
friendica
205dcd8f5b
Merge branch 'master' into notify
2011-12-25 19:14:45 -08:00
friendica
170b841834
more enotify
2011-12-25 16:20:53 -08:00
friendica
629a69f9dc
Merge branch 'pull'
2011-12-25 16:06:09 -08:00
friendica
4a28832e2d
revup
2011-12-25 16:05:25 -08:00
friendica
3e4fa23f3b
Merge pull request #20 from Keith2/master
...
Spelling mistake fix using TLS not TSL
2011-12-25 15:13:20 -08:00
root
09be90be02
modified: settings.php corrected TLS email connector not working due to spelling mistake.
2011-12-25 22:52:15 +00:00
friendica
bef8f95ef3
more enotify
2011-12-24 22:36:17 -08:00
friendica
6f4f3e6929
revup
2011-12-24 22:13:44 -08:00
friendica
0b598dedd0
more work on enotify
2011-12-23 23:07:05 -08:00
friendica
202725e671
Merge branch 'master' into notify
2011-12-23 22:40:04 -08:00
friendica
fc90323cd2
revup
2011-12-23 22:39:43 -08:00
friendica
310527e061
Merge branch 'master' into notify
2011-12-23 01:44:42 -08:00
friendica
f4cd9bd2d8
preparation for 3g email contacts
2011-12-23 01:44:03 -08:00
friendica
949d3f0ff1
preparation for 3rd generation email contacts
2011-12-23 01:38:06 -08:00
friendica
aea5584bf1
Merge branch 'master' into notify
2011-12-22 16:08:17 -08:00
friendica
52137859eb
improved cid search
2011-12-22 16:05:03 -08:00
friendica
95b4bc55bf
Merge branch 'master' into notify
2011-12-22 15:42:01 -08:00
friendica
b602203e6c
revup
2011-12-22 15:41:33 -08:00
Fabio Comuni
0dce36bdbc
Merge remote-tracking branch 'friendica/master'
2011-12-22 16:35:58 +01:00
Fabio Comuni
2ef2d0b79f
quattro: contacts and first photo page
2011-12-22 16:33:14 +01:00
Fabio Comuni
0b4535e6da
quattro: more on editor
2011-12-22 11:24:34 +01:00
friendica
e764990ce4
better handling of the display of conflicting group permissions
2011-12-21 18:04:24 -08:00
friendica
dacbbfaafb
bug #188 diaspora_signed_retraction not removing post
2011-12-21 14:42:12 -08:00
Fabio Comuni
7f2070ca91
Merge remote-tracking branch 'friendica/master'
2011-12-21 17:37:35 +01:00
Fabio Comuni
bf00e4dded
quattro: more on editor
2011-12-21 17:36:42 +01:00
friendica
048fcae40b
bug #247
2011-12-21 01:45:15 -08:00
friendica
d9ede7f7bd
implement max daily registrations
2011-12-20 20:12:29 -08:00
friendica
2e088aad8d
bug #246
2011-12-20 19:11:46 -08:00
friendica
7fbfbdae07
audio/video bb tags showing up on Diaspora
2011-12-20 17:01:41 -08:00
Fabio Comuni
ba732c97c1
Merge remote-tracking branch 'friendica/master'
2011-12-20 17:18:19 +01:00
Fabio Comuni
f3b499f119
quattro: more on editor
2011-12-20 17:17:17 +01:00
friendica
c0c4c46874
remove hashchars from pub keywords
2011-12-20 03:04:20 -08:00
friendica
0bef863015
wrong style for unvisited links
2011-12-19 20:23:11 -08:00
friendica
63f66a5a93
bug 244 multiple birthday reminders from Diaspora if profile changed repeatedly
2011-12-19 19:06:25 -08:00
friendica
79f3bbbf2b
more data checking, cleans up some infrequent php errors
2011-12-19 16:51:57 -08:00
friendica
7c6bc5a93d
invalid thread-id in "nouveau" mode of conversation, bug 245
2011-12-19 13:51:55 -08:00
Fabio Comuni
2a3f94e452
Merge remote-tracking branch 'friendica/master'
2011-12-19 18:04:04 +01:00
Fabio Comuni
c3d12bc77e
quattro: fix icons in oauth settings page
2011-12-19 18:03:03 +01:00
Fabio Comuni
16d45e5c13
quattro: first work on jot style
2011-12-19 18:02:43 +01:00
Fabio Comuni
a6f3b58293
config: set/get arrays with pconfig
2011-12-19 18:01:38 +01:00
Fabio Comuni
84bbf5d3bd
icons: lock and unlock
2011-12-19 18:00:52 +01:00
friendica
177af1fc9d
jquery effects missing from zero derivatives
2011-12-19 01:23:12 -08:00
friendica
ad54a91d4d
poco_load aborting after debug statement
2011-12-19 00:40:00 -08:00
friendica
dc46a01cd4
suggest query for no friends messed up
2011-12-18 13:03:20 -08:00
friendica
eb05d00794
connect on suggest/match - added to testbubble
2011-12-18 12:51:45 -08:00
friendica
622886a33c
make mod-follow "get"-able
2011-12-18 12:41:46 -08:00
friendica
5d6a098ce0
add connect link to suggestion and matches
2011-12-18 01:44:46 -08:00
friendica
974a52a16d
add connect link to friend suggest
2011-12-18 01:08:32 -08:00
friendica
e6b538c046
add webfinger addr to gcontact for friend "connect" links
2011-12-18 00:50:17 -08:00
friendica
c4a5fcaf27
fix xml poco for arrays
2011-12-18 00:39:15 -08:00
friendica
3aab1c7140
typo
2011-12-18 00:22:44 -08:00
friendica
b0718c4f05
typo
2011-12-18 00:21:01 -08:00
friendica
978717a247
add webfinger to poco, if present
2011-12-18 00:14:34 -08:00
friendica
22d59350e9
improve the email regex a bit more
2011-12-16 14:31:39 -08:00
friendica
690b3f57b7
bug 241 - valid emails may contain + on lhs
2011-12-16 14:06:50 -08:00
friendica
efb9157490
eliminate dup identical hashtags in posts
2011-12-16 01:42:45 -08:00
friendica
193435e980
default suggestions not being collected properly
2011-12-15 13:52:52 -08:00
friendica
cc5fd0a136
revup
2011-12-15 12:50:34 -08:00
friendica
6d7781434b
must use named vars in plugin args
2011-12-15 01:09:38 -08:00
friendica
cb2e68c88e
home_init hook
2011-12-15 01:08:19 -08:00
friendica
001e402311
simplify live update
2011-12-14 17:23:41 -08:00
friendica
9768adf719
testing
2011-12-14 16:43:37 -08:00
friendica
84fd2a1501
live update glitches cont.
2011-12-14 15:51:13 -08:00
friendica
ce44e4016a
Merge branch 'pull'
2011-12-14 14:19:16 -08:00
friendica
431a4abd25
name change stragglers, fix newmember links, liveupdate glitch
2011-12-14 14:17:48 -08:00
fabrixxm
8afa852c5f
Merge pull request #19 from fabrixxm/master
...
update messages.po
2011-12-14 07:12:19 -08:00
Fabio Comuni
49507a4356
Update messages.po
2011-12-14 16:11:07 +01:00
friendica
4007e7ec19
"new" view broken after liveupdate fixes
2011-12-14 03:51:50 -08:00
friendica
adcaefce89
string update
2011-12-13 19:21:55 -08:00
friendica
4613e74361
update link locations
2011-12-13 19:17:33 -08:00
friendica
4f2d516920
liveupdate: only modify existing conversations if not page1
2011-12-13 15:21:11 -08:00
friendica
ed725df5f1
Merge branch 'master' into notify
2011-12-12 20:13:12 -08:00
friendica
ee4975f1cd
unnecessary slash in profile update path
2011-12-12 19:08:13 -08:00
friendica
bda7ca2f36
clearup update backlog after commenting
2011-12-12 18:08:09 -08:00
friendica
e67f69df81
default ajax settings after conversion
2011-12-12 17:30:29 -08:00
friendica
e74a960327
change default ajax interval to 40 seconds
2011-12-12 17:10:19 -08:00
friendica
01cae9a50a
remove all plugins from default config
2011-12-12 16:28:33 -08:00
friendica
c45b903178
live update improvements
2011-12-12 16:11:03 -08:00
friendica
80428a33d5
refactor updates
2011-12-12 14:39:25 -08:00
friendica
9a32265fc7
Merge branch 'pull'
2011-12-12 13:43:08 -08:00
friendica
b10e20c599
revup
2011-12-12 13:41:51 -08:00
zzottel
ea638e97ad
Merge pull request #18 from zzottel/master
...
Switch to jquery 1.7.1
2011-12-12 08:13:51 -08:00
zottel
720787b772
Switch to jquery 1.7.1
2011-12-12 08:11:35 -08:00
friendica
cbdc667ba2
separate dfrn introductions from email when it comes to expiration of blocked requests
2011-12-11 23:33:56 -08:00
friendica
a38d3b82b9
browser_update settings
2011-12-11 21:03:33 -08:00
friendica
4f254ffb5b
system support for personal configurable ajax update interval
2011-12-11 20:32:43 -08:00
friendica
50c4b9a780
Merge branch 'master' into notify
2011-12-11 20:03:46 -08:00
friendica
834639ebab
\o/ smiley
2011-12-11 16:58:36 -08:00
friendica
acdc7ca05a
typo in db sql
2011-12-10 01:50:37 -08:00
friendica
ac9f21806e
Merge branch 'pull'
2011-12-09 16:51:15 -08:00
friendica
102ea901c3
cannot register at all when multiple_pages is not allowed
2011-12-09 16:50:13 -08:00
friendica
727661d454
revup
2011-12-09 16:48:15 -08:00
friendica
5b3155579a
fix diaspora's illegal webfinger xml before sending to parser
2011-12-09 16:46:18 -08:00
friendica
3da3cd686c
notifications refactor
2011-12-08 01:28:27 -08:00
friendica
9849a54cde
Merge pull request #17 from zzottel/master
...
Fixed some gltiches in testbubble theme
2011-12-08 00:32:22 -08:00
zottel
f661bb4250
fixed some glitches in testbubble theme
2011-12-08 00:12:51 -08:00
friendica
961e34f67f
missing template
2011-12-07 15:26:17 -08:00
friendica
d100944fe6
api post default to default post permissions was broken
2011-12-07 14:04:34 -08:00
friendica
efeb377a12
w3c valid cleanup
2011-12-06 20:56:51 -08:00
friendica
341fcce75e
preg_quote search strings
2011-12-06 19:51:19 -08:00
friendica
7eba8adbf7
pm replies
2011-12-06 19:15:42 -08:00
friendica
0c24784f5e
include diaspora mentions in personal (requires adding a Diaspora profile url because they don't use ours)
2011-12-06 15:24:01 -08:00
friendica
f6f151433c
Merge pull request #16 from zzottel/master
...
Unpause the stream when posting a comment or liking/disliking
2011-12-06 12:23:43 -08:00
Tobias Diekershoff
06b904ffcb
copied code styling from duepuntozero to quattro theme
2011-12-06 17:10:27 +01:00
zottel
237b4c74c2
unpause the stream when posting a comment or liking/disliking
2011-12-06 01:22:59 -08:00
friendica
f3c91edd95
Merge pull request #15 from zzottel/master
...
Added pausing of automatic stream reloads using Ctrl-Space
2011-12-06 00:35:25 -08:00
friendica
be8e9d3616
d* pm
2011-12-06 00:16:13 -08:00
zottel
cd3a02ab8e
Merge remote branch 'upstream/master'
2011-12-06 00:02:29 -08:00
zottel
c5c99089ff
Added stopping automatic reloads with Ctrl-Space. Will stay stopped till next Ctrl-Space.
2011-12-06 00:00:27 -08:00
friendica
47f369e052
hide some contacts from others
2011-12-05 18:36:26 -08:00
friendica
d2e110abf5
Merge branch 'pull'
2011-12-05 14:07:59 -08:00
friendica
adbc84c48e
maintain backward compatibility with old PMs
2011-12-05 14:06:41 -08:00
fabrixxm
328e3eabaf
Merge pull request #14 from zzottel/master
...
Added #pause to testbubble/style.css
2011-12-05 05:23:13 -08:00
zottel
ced28a8827
added #pause
2011-12-05 05:17:37 -08:00
friendica
c8d5274cee
data structures to support hidden friends
2011-12-05 02:16:59 -08:00
friendica
116e20c89d
add conv structure
2011-12-05 00:35:44 -08:00
fabrixxm
7d721892c3
Merge pull request #13 from zzottel/master
...
added img properties to testbubble/style.css to get good results on all screen sizes
2011-12-05 00:34:14 -08:00
zottel
3d0f17570f
added img properties to get good results on all screen sizes
2011-12-05 00:29:29 -08:00
friendica
6fc9eae9de
more d* PM stuff
2011-12-04 17:26:55 -08:00
friendica
fb01d8bec5
fix incorrect default author
2011-12-04 03:54:40 -08:00
friendica
fb437a874e
typo
2011-12-04 03:50:26 -08:00
friendica
f6dd834284
fix author-name when missing on comments
2011-12-04 03:45:09 -08:00
friendica
8a489b4762
unix style homedir
2011-12-04 03:01:04 -08:00
friendica
acd28bb1ef
add a bookmark index, needed by network queries
2011-12-03 13:53:49 -08:00
friendica
172fdbcdcf
bug #232
2011-12-03 00:08:04 -08:00
fabrixxm
09d8a3b69f
Merge pull request #12 from zzottel/master
...
Fix testbubble photo-menu
2011-12-02 08:27:42 -08:00
zottel
5dcce83927
Take out overflow: hidden; from .wall-item-outside-wrapper to fix
...
problem with photo-menu being cut off.
2011-12-02 08:02:10 -08:00
fabrixxm
e36bdd5c89
Merge pull request #11 from fabrixxm/master
...
mention notification in ping
2011-12-02 07:35:08 -08:00
Fabio Comuni
ccc8486544
ping: mention rewording
2011-12-02 08:34:03 +01:00
friendica
7faa6c3e93
more theme works
2011-12-01 22:44:27 -08:00
friendica
d703f4bc52
theme works d'zero
2011-12-01 20:57:09 -08:00
friendica
513c1c0d68
dynamic delete icons for saved-search on network page
2011-12-01 18:27:45 -08:00
friendica
ac3df5fece
dynamic group edit buttons
2011-12-01 16:33:53 -08:00
Fabio Comuni
6705549d66
ping: add @-tag notifs, fix intros url
2011-12-01 16:36:02 +01:00
friendica
29b5d398fd
everybody group gets id 0
2011-11-30 23:01:42 -08:00
friendica
f1af2c224f
personal notifications
2011-11-30 22:26:02 -08:00
friendica
37730ecc2a
typo
2011-11-30 17:08:16 -08:00
friendica
8f381e01ae
html_entity_decode D* incoming text
2011-11-30 03:22:01 -08:00
friendica
73564df4d8
fine tune personal regex's
2011-11-29 22:49:05 -08:00
friendica
84e197cde9
missing paren
2011-11-29 19:53:18 -08:00
friendica
7474c48022
add tag to personal
2011-11-29 19:52:14 -08:00
friendica
7b9ba3bb03
personal tab on network page
2011-11-29 14:35:20 -08:00
friendica
3bf192ba08
Merge branch 'pull'
2011-11-29 01:19:43 -08:00
friendica
aa73d38845
begininning d* conversation mode
2011-11-29 01:19:09 -08:00
friendica
669f40c342
private notes in testbubble
2011-11-29 01:18:18 -08:00
fabrixxm
f6ff4e582f
Merge pull request #10 from fabrixxm/master
...
small quattro things
2011-11-29 00:32:12 -08:00
Fabio Comuni
68dee0fa71
quattro: "manage" menu item in site menu
2011-11-29 09:30:21 +01:00
Fabio Comuni
938b2bf438
quattro: default user image in item
2011-11-29 09:29:56 +01:00
friendica
3afa248238
use default post permissions when coming from api - unless permissions are explicitly set.
2011-11-28 20:09:10 -08:00
friendica
034038849c
mysql error report fix (no mysqli), suggested friends for new members settings
2011-11-28 19:28:33 -08:00
friendica
f4e1135f79
poco addition to provide a "suggestme" for new members
2011-11-28 15:11:59 -08:00
friendica
ccef899577
start of d* private mail, dba without mysqli
2011-11-27 17:41:23 -08:00
friendica
d9e1ebfc48
wrong length in image extractor
2011-11-27 14:03:49 -08:00
friendica
1055ef3eea
more readable private image extraction for bypassing preg limits
2011-11-27 13:44:45 -08:00
friendica
cf7568efd7
extract private images before bbcode translation since preg has issues with large data sizes.
2011-11-27 04:09:14 -08:00
friendica
0f4a42f550
start on bug #227 - more to do
2011-11-25 22:41:50 -08:00
friendica
6b93324c11
"show more" -> move closer to text
2011-11-24 18:51:14 -08:00
friendica
a1c277ed1a
remove old liveupdate marker
2011-11-24 18:46:07 -08:00
friendica
4b95e8ebe8
rework the liveupdate fixes - what a mess
2011-11-24 18:26:06 -08:00
friendica
757ca5014c
move liveupdate after birthdays/events
2011-11-24 17:32:45 -08:00
friendica
cd81dcfc9d
nasty stuff...
2011-11-24 17:00:20 -08:00
friendica
dcb209152d
more thread update fixes
2011-11-24 16:54:10 -08:00
friendica
9e8053e3bd
fixing conversation updates
2011-11-24 16:42:12 -08:00
friendica
8aae7f047d
comments collapsing on page update
2011-11-24 13:54:21 -08:00
friendica
b795ce4fe7
little stuff - name change, live updates, new network types
2011-11-23 23:17:26 -08:00
friendica
fe0c039d48
Merge branch 'pull'
2011-11-23 14:05:00 -08:00
friendica
7a259d4acb
ensure comment counts update after refactor of collapsed comments
2011-11-23 14:03:53 -08:00
friendica
a628587e90
Merge pull request #9 from felixgilles/patch-1
...
Duplicate KEY 'wall' in TABLE 'item'
2011-11-23 13:34:32 -08:00
felixgilles
16a81c5b01
Duplicate KEY 'wall' in TABLE 'item'
2011-11-23 22:13:38 +01:00
friendica
335c0cddcf
diaspora reshared lists rendering as html
2011-11-23 01:44:07 -08:00
friendica
deb182b92e
string update es,fr
2011-11-22 16:13:23 -08:00
friendica
1443a0c8cd
Merge branch 'pull'
2011-11-22 16:02:12 -08:00
friendica
53590d2166
rework show/hide comments
2011-11-22 16:00:05 -08:00
Tobias Diekershoff
4f555212a1
German strings
2011-11-22 16:48:53 +01:00
friendica
c568493f57
add expire_starred option, fix "delete selected" on some themes, new project name in email templates
2011-11-21 19:01:05 -08:00
fabrixxm
ea04263f52
Merge pull request #8 from fabrixxm/master
...
expire settings, clean html from php, more work on quattro
2011-11-21 04:57:56 -08:00
Fabio Comuni
cb05e677a9
Merge remote-tracking branch 'friendica/master'
2011-11-21 13:52:15 +01:00
Fabio Comuni
a86fd26bd8
more work on quattro. remove html from php for groups and saved searches widgets.
2011-11-21 12:34:22 +01:00
friendica
aaedac8f57
community forums cleanup
2011-11-19 13:45:20 -08:00
friendica
44dcef2948
revup
2011-11-19 13:37:10 -08:00
friendica
191a9b048f
forum cleanup
2011-11-19 03:13:46 -08:00
friendica
4f4a873da8
Merge branch 'master' into groups
2011-11-19 03:08:16 -08:00
friendica
72dd6457b0
first forum test
2011-11-19 03:06:15 -08:00
friendica
d4911f15e9
don't allow space in autocomplete nickname
2011-11-18 23:02:07 -08:00
friendica
6463543832
new approach to secondary delivery fork
2011-11-18 22:20:08 -08:00
friendica
fd4fe24406
Merge branch 'master' into groups
2011-11-18 22:04:41 -08:00
friendica
6893df991e
update user-agent string for remote http requests
2011-11-18 22:03:49 -08:00
friendica
0d77ca1caa
Merge branch 'pull'
2011-11-18 21:56:17 -08:00
friendica
d53db63d41
forum split delivery flag
2011-11-18 21:55:00 -08:00
friendica
fa4742e6ee
comment boxes not work in alternate languages
2011-11-17 15:42:56 -08:00
Fabio Comuni
590f1d2b25
log less in expire items
2011-11-17 16:18:59 +01:00
Fabio Comuni
79603e3146
expire settings for items, notes and photos.
...
show default privacy acl in popup
2011-11-17 15:53:59 +01:00
fabrixxm
32f17e7e24
Merge pull request #7 from fabrixxm/master
...
Fix possibile fatal error with oembed
2011-11-17 04:53:22 -08:00
Fabio Comuni
844a36e2b6
Merge remote-tracking branch 'friendica/master'
2011-11-17 13:40:27 +01:00
Fabio Comuni
02281be0c3
oembed: don't try to fetch media files and add Accept request header to fetch_url
2011-11-17 13:40:11 +01:00
friendica
c9846b745d
allow dup tag names with different urls
2011-11-16 17:09:58 -08:00
friendica
ede25aabce
check all attribute names for validity
2011-11-16 14:23:06 -08:00
friendica
fb8dbfa1bb
Merge branch 'pull'
2011-11-16 04:16:21 -08:00
friendica
b4218614ed
change hide profile setting text
2011-11-16 04:15:14 -08:00
fabrixxm
d0bf9d371c
Merge pull request #6 from fabrixxm/master
...
small fix
2011-11-16 02:30:38 -08:00
Fabio Comuni
d77c87f42a
Merge branch 'master' of github.com:fabrixxm/friendica
2011-11-16 11:28:31 +01:00
Fabio Comuni
ef8b5bc682
fix localize item tag
2011-11-16 11:27:20 +01:00
friendica
306a69b5f4
update
2011-11-15 23:14:25 -08:00
friendica
7b58de743a
add a few more sql indexes
2011-11-15 23:12:56 -08:00
friendica
485f97b3d8
tgroup relays
2011-11-15 20:30:34 -08:00
friendica
3bd2b731b2
Merge https://github.com/friendica/friendica into pull
2011-11-15 12:09:22 -08:00
friendica
6726d406f0
revup - change connector config link in doc
2011-11-15 12:01:21 -08:00
fabrixxm
5a890b0ef9
Merge pull request #5 from fabrixxm/master
...
themes and strings works
2011-11-15 10:43:57 -08:00
Fabio Comuni
281f9edce7
Update IT strings
2011-11-15 19:40:38 +01:00
Fabio Comuni
dc3d47edcf
update messages.po
2011-11-15 17:42:45 +01:00
Fabio Comuni
f5bfe5a1a3
quattro: tags style
2011-11-15 17:42:30 +01:00
Fabio Comuni
9b2cbc33ae
ping: show tags
2011-11-15 17:41:51 +01:00
Fabio Comuni
962467ee68
item tags as array to templates
2011-11-15 17:41:38 +01:00
Fabio Comuni
5c7fb2b0fe
quattro: fix delete selected items
2011-11-15 16:17:36 +01:00
Fabio Comuni
ae43a96d70
Merge remote-tracking branch 'friendica/master'
2011-11-15 16:00:40 +01:00
Fabio Comuni
8e588b530f
duepuntozero: fix input width in aside
2011-11-15 15:59:53 +01:00
friendica
d23452db2b
revup
2011-11-14 19:15:03 -08:00
fabrixxm
7b48b33b49
Merge pull request #4 from fabrixxm/master
...
ping: fix total count and comment/post
2011-11-14 03:10:51 -08:00
Fabio Comuni
4c2680ca6f
ping: fix total count and comment/post
2011-11-14 12:09:11 +01:00
friendica
c659512f32
D* doesn't like html entities in post. Convert our hijack-proof hashtag replacement to utf-8
2011-11-13 19:38:30 -08:00
friendica
973620a9e6
translate vimeo and youtube bbcode to naked links so D* will oembed them again
2011-11-13 19:32:05 -08:00
friendica
ce7a3615b5
d* - remove dupe bbcode code tags
2011-11-13 19:04:59 -08:00
friendica
bbf857ba39
add revision date to main profile photo to overcome cache when updated, other photos (e.g. conversations) must wait for cache update
2011-11-12 17:50:14 -08:00
friendica
240a3431cc
longer lifetime for system message popups so you have time to read them
2011-11-12 14:25:04 -08:00
friendica
ef79a7a4fc
html5 - don't set empty attribute either
2011-11-12 14:05:40 -08:00
friendica
8a19c7c379
warn about photo caching when updating profile pic
2011-11-12 13:47:51 -08:00
friendica
6e52ea805b
moved tiptip a few more pixels away to reduce flashing
2011-11-12 12:42:19 -08:00
friendica
02b11c5d59
several little nits in the hcard template output which could affect parsers
2011-11-12 12:28:21 -08:00
Friendika
9ec4f6e0c9
rename
2011-11-12 04:21:14 -08:00
Friendika
58ba7c3969
Merge branch 'pull'
2011-11-12 04:12:03 -08:00
Friendika
cf82174520
bug #198 - create activitystream 'friends with' message for Diaspora confirmations
2011-11-12 04:06:33 -08:00
friendica
ab6bf767df
Merge pull request #3 from fabrixxm/master
...
fix for #191 and some other
2011-11-12 04:06:14 -08:00
Friendika
d23867f5a0
incorrect total use for get_feedtags
2011-11-12 02:53:53 -08:00
Friendika
78bfb8b14e
some works on autocomplete (return with no selection = cancel, tab = select next)
2011-11-11 22:40:19 -08:00
Friendika
c9014a111f
html5 parser - numeric attribute names chucking a wobbly.
2011-11-11 14:21:52 -08:00
Fabio Comuni
e853549bc8
duepuntozero: add notice and info popups css style
2011-11-11 17:34:15 +01:00
Fabio Comuni
1ff8cddeb6
oembed: replace base64 url for iframe with url site/oembed/url_encoded
...
fix http://bugs.friendika.com/view.php?id=191
2011-11-11 17:33:32 +01:00
Fabio Comuni
25b972bee2
js: start liveupdate after ping returns to stop continuos welcome message
...
As liveupdate start before ping but returns after, it overwrite session
edit by ping, restoring already shown and deleted notices and infos
2011-11-11 17:00:05 +01:00
Friendika
20217c04f0
"follow" link was missing
2011-11-11 02:56:54 -08:00
Friendika
f4f8f7623b
theme birthday/event notifications under testbubble
2011-11-11 01:19:16 -08:00
Friendika
02f21fb74c
some testbubble fixes
2011-11-10 19:53:13 -08:00
Friendika
199da623ff
testbubble showing post jot-tools on edit page - these are not changed so should not be visible
2011-11-10 18:20:25 -08:00
Friendika
c66b886d7e
shared tags for testbubble, prevent tag hijacking of shared tag activities
2011-11-10 17:11:55 -08:00
Friendika
83e55cf9f4
bbcode list styles
2011-11-09 19:32:54 -08:00
Friendika
15f2ce5459
contact edit updates
2011-11-09 19:30:14 -08:00
Friendika
722e8e3d49
add allfriends page
2011-11-09 18:33:08 -08:00
Friendika
e35f3f1ada
Merge branch 'master' into contacts
2011-11-09 18:29:30 -08:00
Friendika
a2018e2d14
vcard position - dpzero
2011-11-09 18:29:05 -08:00
Friendika
2b1e011851
fix to overlapping tabs on testbubble when width too small
2011-11-09 17:55:36 -08:00
Friendika
7fd54ad51f
revup
2011-11-09 16:37:33 -08:00
Friendika
2825c49573
more work on new contact edit page - plus first port to testbubble
2011-11-09 03:46:36 -08:00
Friendika
dbf9711e91
reset theme_info when a profile is loaded (without a theme cookie the default nav template over-rides the nav template for the theme that is loaded afterward)
2011-11-09 01:54:52 -08:00
Friendika
d6d4d3ed3a
various testbubble fixes
2011-11-09 00:29:14 -08:00
Friendika
02d4a742ab
more contact edit page stuff
2011-11-08 21:22:45 -08:00
Friendika
05cabf24a9
first checkin - updated contact_edit, more work remains
2011-11-08 18:30:20 -08:00
Friendika
20ca93191f
cleanup and loose ends
2011-11-08 16:54:32 -08:00
Friendika
02a1fdacd7
strip duplicate code blocks bb2d*
2011-11-08 15:38:06 -08:00
Friendika
6d507a840a
some doc updates
2011-11-08 14:12:01 -08:00
fabrixxm
eeec29c6be
Merge pull request #2 from fabrixxm/master
...
Oauth1 support in API
2011-11-08 00:18:37 -08:00
Friendika
9fabdbf2c9
D* scaled images not containing link to original size
2011-11-07 20:41:12 -08:00
Friendika
aeddfa1e0a
Merge branch 'pull'
2011-11-07 17:26:49 -08:00
Friendika
99a548d4ac
fix friend suggest link in testbubble
2011-11-07 17:25:40 -08:00
fabrixxm
c90e6c6e07
fix db update
2011-11-07 18:41:22 +01:00
Fabio Comuni
0becdb01db
oauth: fix add new app
2011-11-07 17:54:46 +01:00
Fabio Comuni
d7d889bcd0
oauth: db update
2011-11-07 17:48:14 +01:00
Fabio Comuni
00c342e13d
Merge branch 'oauthapi'
2011-11-07 17:41:23 +01:00
Fabio Comuni
b070666120
statusnet-friendika post permalink compatibility
2011-11-07 17:39:00 +01:00
Fabio Comuni
4407fc2c5d
oauth apps/authorization management in settings page
2011-11-07 17:38:30 +01:00
Fabio Comuni
b464b819a1
minimal page layout for oauth authorize
2011-11-07 17:37:49 +01:00
Fabio Comuni
955326acca
add hidden fields in login template
2011-11-07 17:37:25 +01:00
Fabio Comuni
41cbd84a74
api: login with oauth
2011-11-07 17:36:58 +01:00
Fabio Comuni
10e5754e24
oauth: authorize
2011-11-07 17:36:41 +01:00
Fabio Comuni
967f8b575e
New icon 'plugin'
2011-11-07 17:34:47 +01:00
Fabio Comuni
9b1a498061
allow hidden fields in login form
2011-11-07 17:34:29 +01:00
fabrixxm
355026ab7a
Merge pull request #1 from fabrixxm/master
...
Fix #38
2011-11-07 01:20:05 -08:00
Fabio Comuni
a1a07e7287
Add missing $nav_sel in class App
2011-11-07 10:17:44 +01:00
Friendika
327105a4ea
try and fix diaspora multiple items queued issue
2011-11-06 16:48:13 -08:00
Friendika
c991a1a606
darkzero pager links washed out
2011-11-06 01:20:46 -08:00
Friendika
7d8acd038e
button text not closed
2011-11-06 00:49:30 -07:00
Friendika
cc1c015f20
@ completion is a bit too greedy
2011-11-05 21:43:58 -07:00
Friendika
f07c0b2cfb
implement signed_retractions
2011-11-05 14:45:29 -07:00
Friendika
57beadc86b
add diaspora signed_retraction template
2011-11-05 14:25:06 -07:00
Friendika
a203820efe
reduce polling load
2011-11-04 15:21:46 -07:00
Friendika
2765b0ba41
Merge branch 'atcomplete'
2011-11-04 01:52:33 -07:00
Friendika
51b0f583b0
tinymce autocomplete
2011-11-04 01:52:03 -07:00
Friendika
0130052b2c
bbcode lists
2011-11-03 21:30:01 -07:00
Friendika
e19b597180
tinymce tag complete stuff
2011-11-03 20:40:56 -07:00
Friendika
5f531aa537
add js events to ignore button
2011-11-03 16:18:50 -07:00
Friendika
1ff59fd6e8
move ignore link
2011-11-03 16:06:32 -07:00
Friendika
014c91431e
ignore suggestions
2011-11-03 16:00:52 -07:00
Friendika
4f4b03367a
plugin check returning 0 vs false
2011-11-03 15:14:33 -07:00
Friendika
35305fb6d9
fix "do not show status post for photo" setting when used with js_upload (value is string "true/false" not integer or boolean)
2011-11-02 21:53:44 -07:00
Friendika
bd48a016af
fix for multiple consecutive @ tags
2011-11-02 21:07:17 -07:00
Friendika
3ca41fc3bd
make@ tag completion work on /display page
2011-11-02 20:38:19 -07:00
Friendika
a9ec56ace1
prevent duplicate @ tags
2011-11-02 18:52:55 -07:00
Fabio Comuni
69e41f7703
oauth: authorize view, wrong verifier.
2011-11-02 09:54:07 +01:00
Friendika
8582701b70
raise backtrack (pcre) limit
2011-11-02 01:50:15 -07:00
Friendika
e38aa67263
link suggestions into the main code
2011-11-01 21:27:11 -07:00
Friendika
158028a0ac
first cut friend suggestions
2011-11-01 20:29:55 -07:00
Friendika
3d9a9614e2
common friends
2011-11-01 19:16:33 -07:00
Friendika
0975ea8610
add attachments to Diaspora posts
2011-11-01 17:30:52 -07:00
Friendika
573670fa0c
more social graph stuff
2011-11-01 16:08:07 -07:00
Friendika
ae7425dadb
don't send diaspora profile updates in batch mode
2011-11-01 14:24:56 -07:00
Friendika
05eca449c8
bookmarks not getting translated to D*
2011-11-01 02:17:36 -07:00
Friendika
f4518c646a
fixes to diaspora profiles, batch mode duplicates, social graph table name
2011-11-01 00:50:41 -07:00
Friendika
58d21fe20a
update error
2011-10-31 21:39:21 -07:00
Friendika
e28b143fb6
perform poco_load
2011-10-31 20:54:24 -07:00
Friendika
d4644d7339
name change continued, social graph tools and stuctures, fix for spanish province name
2011-10-31 20:39:04 -07:00
Friendika
d5ce13ee12
bug #186 - $type macro not replaced in diaspora 'like' message
2011-10-31 14:30:27 -07:00
Friendika
0eceade2fe
view source of item [bbcode] usage: viewsrc/nnn
2011-10-30 16:28:07 -07:00
Friendika
c00aacf9e5
rename
2011-10-30 15:12:07 -07:00
Friendika
e4dd2a5a9a
begin the name change
2011-10-28 17:29:13 -07:00
Friendika
b025981858
yet more diaspora images to scale
2011-10-28 16:13:54 -07:00
Friendika
2914ffb396
log scale_diaspora_image
2011-10-28 04:35:10 -07:00
Friendika
e5992003e8
better handling of remote urls - especially FB opengraph
2011-10-28 02:50:00 -07:00
Friendika
e5a7b3e24b
add contact-id to auto-complete response to resolve duplicates
2011-10-27 19:12:30 -07:00
Friendika
056fe0a3aa
poco discovery
2011-10-27 14:52:35 -07:00
Friendika
ea0ab6fbac
poco should now be spec compliant
2011-10-27 04:38:33 -07:00
Friendika
abe96155b4
hmmm - why won't poco xml work
2011-10-27 01:54:52 -07:00
Friendika
31502207bd
more poco spec compliance
2011-10-27 00:57:19 -07:00
Friendika
faa078b83f
basic portable contacts http://portablecontacts.net/draft-spec.html no filter/sort, or xml at the moment
2011-10-26 20:09:03 -07:00
Friendika
2f3e39ba15
edit profile quick link
2011-10-26 16:57:25 -07:00
Friendika
2d22a58324
@ tag completion enhancements, show url on hover and respect custom attags
2011-10-26 15:14:12 -07:00
Friendika
1aba538c96
Merge branch 'pull'
2011-10-26 12:51:08 -07:00
Friendika
9f5d7b254b
revup
2011-10-26 12:50:11 -07:00
Fabio Comuni
ff7fc68382
oauthapi: authorize app
2011-10-26 17:15:36 +02:00
fabrixxm
6a8b96709e
Merge pull request #37 from fabrixxm/master
...
autocomplete contacts metions
2011-10-26 05:28:17 -07:00
Fabio Comuni
7060debeca
autocomplete: small fix to js
2011-10-26 14:18:05 +02:00
Fabio Comuni
951c73d825
style autocomplete popup in themes
2011-10-26 14:02:17 +02:00
Fabio Comuni
dc212de960
Merge remote-tracking branch 'friendika/master'
2011-10-26 12:15:38 +02:00
Friendika
6d6136cdb5
fix diaspora cache
2011-10-25 20:30:01 -07:00
Friendika
d9f64deda0
sql error
2011-10-25 20:05:21 -07:00
Friendika
72d74b88be
some dspr fixes
2011-10-25 19:59:57 -07:00
Friendika
1aa1cd2cf5
soften the content-types
2011-10-25 15:52:54 -07:00
Friendika
52038c6b88
event notification stuff
2011-10-25 15:36:49 -07:00
Fabio Comuni
bed0043b30
search delay and hide empty popup
2011-10-25 15:50:34 +02:00
Fabio Comuni
155a09cfdf
filter by contact type
2011-10-25 15:49:53 +02:00
Fabio Comuni
bcb672e7ff
autocomplete contacts nickname while writting in a comment box.
2011-10-25 15:01:58 +02:00
Fabio Comuni
afce790e56
oembed: wrap in iframe only html from remote service
2011-10-25 14:59:31 +02:00
Friendika
1d325f6e76
change event display order
2011-10-25 00:38:43 -07:00
Friendika
323a7e4c9c
need a lower bound for events
2011-10-25 00:36:23 -07:00
Friendika
0b55a7a703
only notify for events that are starting soon - ignore long-running events that are in progress
2011-10-25 00:32:28 -07:00
Friendika
ae12074337
fix tag import for tag owner
2011-10-24 23:55:29 -07:00
Friendika
4ea6f86b20
bug #166
2011-10-24 22:07:42 -07:00
Friendika
318f179408
D* formatting updates [code/blockquote]
2011-10-24 21:29:57 -07:00
Friendika
efe3365431
tag privacy settings
2011-10-24 21:11:05 -07:00
Friendika
b20afbc9e4
@ tags becoming # tags during atom transit
2011-10-24 20:33:54 -07:00
Friendika
1a7badb405
use iframe for oembed - untrusted content
2011-10-24 20:10:46 -07:00
Friendika
790c4a4e1a
tag display with item
2011-10-24 17:25:49 -07:00
Friendika
3b33c0d075
allow tag input to contain leading '#'
2011-10-24 17:00:22 -07:00
Friendika
4218e3f494
Merge branch 'pull'
2011-10-24 15:51:14 -07:00
Friendika
ea9d3b06f6
Merge pull request #35 from fabrixxm/master
...
Use oembed if possible without the addon
Awesome!
2011-10-24 15:49:28 -07:00
Friendika
3b6b0eaa8b
social tag - add UI
2011-10-24 15:47:17 -07:00
Fabio Comuni
2905df527f
fix oembed video thumb display ratio
2011-10-24 17:31:14 +02:00
Fabio Comuni
40ea48bdab
fix vimeo oembed bbcode regexp
2011-10-24 17:28:48 +02:00
Fabio Comuni
75d4f33233
move html for oembeded videos in template. fix oembed discovery
2011-10-24 17:28:28 +02:00
Fabio Comuni
718a9009be
new icon "play"
2011-10-24 17:27:38 +02:00
Fabio Comuni
ac474cf53c
try to use oembed on vimeo tag
2011-10-24 14:39:39 +02:00
Fabio Comuni
a9fb8e4d60
Use oembed for bookmark, audio, video, youtube
2011-10-24 14:30:11 +02:00
Friendika
f48fd5aa16
more tagging
2011-10-24 04:17:46 -07:00
Fabio Comuni
306036c626
cache api
2011-10-24 13:02:38 +02:00
Friendika
87aedacec7
shared tag search
2011-10-23 21:37:11 -07:00
Friendika
fe2c8a1845
Merge branch 'master' into tag
2011-10-23 19:06:04 -07:00
Friendika
3512adda33
never enough comments
2011-10-23 19:05:32 -07:00
Friendika
6eea312c21
workaround for transmitting photos to D*
2011-10-23 16:01:04 -07:00
Friendika
0b2c5bf8f5
fix queue_fns
2011-10-23 01:54:51 -07:00
Friendika
b6f80e8ee7
revup
2011-10-23 00:25:45 -07:00
Friendika
7cbb69d87f
tagging
2011-10-23 00:24:37 -07:00
Friendika
0ada550a02
queue indexes
2011-10-22 01:29:26 -07:00
Friendika
3783d8860c
Merge branch 'pull'
2011-10-21 12:58:52 -07:00
Friendika
1a78416631
revup
2011-10-21 12:58:16 -07:00
fabrixxm
a06c9768be
Merge pull request #34 from fabrixxm/master
...
fixs to oembed
2011-10-21 07:32:12 -07:00
Fabio Comuni
d80c0da3c0
add custom style to object tag in tinymce
2011-10-21 16:26:57 +02:00
Fabio Comuni
6769436f3b
oembed. fix html2bbcode when oembed html contains span and utf8 chars
2011-10-21 16:26:29 +02:00
Friendika
6e76c86ad2
queue api + queue limits
2011-10-21 03:33:34 -07:00
Friendika
d1833cabf6
fix hex2bin for empty input
2011-10-20 19:11:34 -07:00
Friendika
01164c8c2f
fix various html parse errors
2011-10-20 16:48:07 -07:00
Friendika
bef7a5d66b
bug #183 - strlen borking on sysmsg, which is now an array
2011-10-20 14:55:40 -07:00
Fabio Comuni
b06588ffa1
Initial work adding oauth to api
2011-10-20 15:57:35 +02:00
Friendika
da416e0181
bug in diaspora_reshare
2011-10-20 05:43:33 -07:00
Friendika
96c0598737
diaspora_reshare - even more logging
2011-10-20 03:56:10 -07:00
Friendika
796056f810
provide link to missing d* images
2011-10-20 02:21:57 -07:00
Friendika
852ece39f4
more reshare logging to see what's going on
2011-10-20 02:07:38 -07:00
Friendika
33af8b0e20
diaspora_reshare - another try
2011-10-20 01:16:03 -07:00
Friendika
df996a8b5e
fix for errant top-level posts from feeds
2011-10-19 21:54:33 -07:00
Friendika
c4179d989f
more debug reshare
2011-10-19 21:34:48 -07:00
Friendika
10b2661176
suppress blank diaspora messages which are awaiting a photo that hasn't arrived
2011-10-19 15:18:41 -07:00
Friendika
19129e06c3
diaspora_reshare no content found, d* profile message work in progress, network page fix for cid search using post order
2011-10-19 15:08:16 -07:00
Friendika
1148cbab22
fix img link format diaspora share/asphoto
2011-10-19 00:29:43 -07:00
Friendika
9043e704f8
diaspora reshares
2011-10-18 15:56:35 -07:00
Friendika
b14914ee2e
fix tb tabs
2011-10-18 13:07:27 -07:00
Friendika
32808a934d
string update
2011-10-18 04:28:36 -07:00
Friendika
fb5bddb98f
a few issues with diaspora_profile
2011-10-18 01:12:51 -07:00
Friendika
85c644a828
Merge branch 'pull'
2011-10-18 00:28:53 -07:00
Friendika
06096486d4
hopefully solve db update issues bug #182
2011-10-18 00:18:21 -07:00
fabrixxm
a19b33651e
Merge pull request #33 from fabrixxm/master
...
missing template field_openid
2011-10-17 23:56:02 -07:00
Fabio Comuni
3e5a2cb07b
template field_openid
2011-10-18 08:53:01 +02:00
Tobias Diekershoff
cc5974e6c2
Merge pull request #32 from tobiasd/master
...
quattro buttons
2011-10-17 23:21:00 -07:00
Tobias Diekershoff
307b707983
fix for the button height
2011-10-18 08:17:52 +02:00
Friendika
0f24f3b505
post/comment order options
2011-10-17 18:24:23 -07:00
Friendika
42a9817350
"cubbi.es"
2011-10-17 17:39:25 -07:00
Friendika
f0dc77ab6c
Merge branch 'pull'
2011-10-17 14:55:46 -07:00
Friendika
278433eac7
origin flag handling, and bug #137 - provide timezone conversion for events posted across to Diaspora
2011-10-17 14:52:03 -07:00
Tobias Diekershoff
e15aab9b75
Merge pull request #31 from tobiasd/master
...
small thing
2011-10-17 08:41:27 -07:00
Tobias Diekershoff
9254c13f62
reverted rewrite base
2011-10-17 17:40:00 +02:00
fabrixxm
399f630b10
Merge pull request #30 from fabrixxm/master
...
some fix and and some other works
2011-10-17 08:20:26 -07:00
Fabio Comuni
5830682e0c
another fix to tabs in notifications
2011-10-17 17:14:10 +02:00
Fabio Comuni
b22ab4e308
fix buttons in quattro
2011-10-17 17:11:49 +02:00
Fabio Comuni
a2dc8bad2e
fix tabs in notifications
2011-10-17 16:54:21 +02:00
Fabio Comuni
de44072172
works on login form
2011-10-17 16:53:59 +02:00
Fabio Comuni
2116943964
Merge remote-tracking branch 'friendika/master'
2011-10-17 16:37:37 +02:00
Tobias Diekershoff
1df892ebbc
Merge pull request #29 from tobiasd/master
...
separate youtube button removed from dispy and quattro
2011-10-16 23:08:45 -07:00
Tobias Diekershoff
2650ba49c1
video button only for dispy and quattro
2011-10-17 07:48:33 +02:00
Friendika
b820dfa31f
revup
2011-10-16 01:46:00 -07:00
Friendika
5dcc10a5d9
working on long-term solution to relay issue
2011-10-15 03:26:37 -07:00
Friendika
af6ab38100
diaspora birthday notifications
2011-10-14 00:20:37 -07:00
Friendika
05e26e4895
handle diaspora profile update message
2011-10-13 18:32:02 -07:00
Friendika
89c771a26e
remove queued items for contact when removing contact
2011-10-13 15:39:05 -07:00
Friendika
4eae1e5d8a
don't propagate deletions for other people's stuff
2011-10-13 15:32:43 -07:00
Friendika
d60505ffb0
missing arg xmlize x is friends with y
2011-10-13 01:12:03 -07:00
Friendika
2911bf9434
sql issue item_store
2011-10-13 01:00:06 -07:00
Friendika
ac3a6d1d1e
Merge branch 'pull'
2011-10-12 02:28:31 -07:00
Friendika
3db43d5a39
storage race condition
2011-10-12 02:21:18 -07:00
Tobias Diekershoff
f19764c93a
Merge pull request #28 from tobiasd/master
...
some minor stuff for the quattro theme
2011-10-12 00:34:36 -07:00
Tobias Diekershoff
98e50a0559
better do all the buttons (quattro)
2011-10-12 09:28:19 +02:00
Tobias Diekershoff
714319457c
little bit more for quattro
2011-10-12 08:06:41 +02:00
Tobias Diekershoff
0fb119496e
some work on quattro theme
2011-10-12 07:47:41 +02:00
Friendika
df7702709b
common tabs to notifications and mail
2011-10-11 21:30:23 -07:00
Friendika
3ef7dcac4b
solve intro/notify naming issue by providing both or either, theme decides what to do
2011-10-11 20:38:09 -07:00
Friendika
2206d894b3
add contact_widgets and provide widgets on appropriate pages, fix the saved search widget
...
fix directory page on testbubble, don't use system theme for community, directory, and search if the viewer is logged in.
2011-10-11 19:27:58 -07:00
Friendika
557a7d0cec
stuff
...
- background the external network notifications (Facebook, Twitter, Statusnet)
- add vimeo support
- consolidate editor video options (insert video, regardless of source)
- add "Connector Settings" page purely for configuring connectors
- moved mailbox settings to Connectors
- Move the "Connect/Follow" dialogue out of "find people" and move to top.
- Add "Find People" dialogue
- minor theme edits on duepuntozero and testbubble to make all this stuff work
- A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.
2011-10-11 18:24:37 -07:00
Friendika
caf18164f0
Merge branch 'pull'
2011-10-10 12:56:51 -07:00
Friendika
06c268b3db
revup
2011-10-10 12:56:15 -07:00
Fabio Comuni
906addf865
common_tabs in notifications.php
2011-10-10 17:01:14 +02:00
Fabio Comuni
e9eb15373f
Remove full profile html from php and add new template 'profile_advanced.tpl'
2011-10-10 16:48:38 +02:00
fabrixxm
2ea2e7f4b4
Merge pull request #27 from fabrixxm/master
...
Fix url in profile tabs
2011-10-10 07:41:23 -07:00
Fabio Comuni
070e081ae9
Fix url in profile tabs
2011-10-10 16:40:12 +02:00
fabrixxm
ed07a4def3
Merge pull request #26 from fabrixxm/master
...
New common tab template. Updated css
2011-10-10 07:33:41 -07:00
Fabio Comuni
f64e2d63b9
New common tab template. Update css
2011-10-10 15:28:34 +02:00
Friendika
3174847de8
bug #177 - birthday month on profile incorrect if October or later and no year
2011-10-10 01:03:34 -07:00
Friendika
077726a193
redo
2011-10-10 00:26:52 -07:00
Friendika
1cfeb61ddc
more notification cleanup duepuntozero
2011-10-09 21:34:07 -07:00
Friendika
26f2c868da
some notification text cleanup and notification page layout fixes for duepuntozero
2011-10-09 20:26:17 -07:00
Friendika
0657baa0b2
Merge branch 'pull'
2011-10-09 15:50:49 -07:00
Friendika
9f4d3bf567
add first,last to D* vcard
2011-10-09 15:49:51 -07:00
duthied
2f98de1e74
Merge pull request #25 from duthied/master
...
fix for line 117 comment
2011-10-08 22:05:47 -07:00
Devlon Duthie
c49ab66be8
fix for comment on line 117 from github
2011-10-09 00:02:24 -05:00
duthied
0e401b5ad8
Merge pull request #24 from duthied/master
...
fixes to the notifications drop-down
2011-10-08 21:27:20 -07:00
Devlon Duthie
fd6220fb7e
added sorting to drop-down notifications list, added posts to this list as well (now the counts match the items) fixed up a couple of typos
2011-10-08 23:24:16 -05:00
duthied
0963470404
Merge pull request #23 from duthied/master
...
+posts to the notifications page
2011-10-08 20:52:31 -07:00
Devlon Duthie
8eedbf30f1
added posts to network section of the notifications page
2011-10-08 22:45:48 -05:00
Friendika
91bc2fc9b6
Merge branch 'pull'
2011-10-08 18:38:14 -07:00
duthied
999f284ed1
Merge pull request #22 from duthied/master
...
testbubble theme tweak
2011-10-08 17:38:22 -07:00
Devlon Duthie
dfc65f1502
fix for z-index on wall-to-wall avatars in testbubble theme
2011-10-08 19:32:40 -05:00
Friendika
fe0ac848d5
Merge branch 'pull'
2011-10-08 15:23:53 -07:00
Friendika
43973e455a
revup
2011-10-08 15:23:19 -07:00
duthied
986c31c7b8
Merge pull request #21 from duthied/master
...
notification page and drop-down fixes
2011-10-08 15:00:11 -07:00
Devlon Duthie
2cba65bd38
fix for 'show all notifications' on notifications drop-down to handle installations in sub-directories + fix for friend notifications (eg: joe became friends with sam)
2011-10-08 16:57:00 -05:00
Friendika
2474531451
bug #175 - hide_help config option not working
2011-10-08 02:05:33 -07:00
Friendika
1d05c564d4
missing arg to diaspora_transmit from share/unshare
2011-10-07 15:49:41 -07:00
duthied
72af2d610b
Merge pull request #20 from duthied/master
...
Notifications page improvements + testbubble theme tweaks
2011-10-06 23:29:44 -07:00
Devlon Duthie
f5fc8dabe5
Anne set testbubble banner to be fixed, I added the other notification types to /notifcations, added link to notifcations drop-down for all notifications and added notifications drop-down to testbubble theme
2011-10-07 01:25:08 -05:00
Friendika
2802c142cb
local_deliver testing
2011-10-06 19:10:57 -07:00
Friendika
53efeb8d1f
local deliver 1
2011-10-06 17:27:37 -07:00
Friendika
272b838233
revup
2011-10-06 17:26:27 -07:00
Friendika
e232c50c9e
check author url to see if it matches current contact before relay is accepted
2011-10-06 00:26:25 -07:00
Friendika
ce11d231b8
use strpos instead of strstr, faster
2011-10-05 21:04:53 -07:00
Friendika
d0bef869db
ensure D* photos only attached once
2011-10-05 21:02:00 -07:00
Friendika
4c0ee7f41f
bug 173
2011-10-05 20:48:00 -07:00
Friendika
ecd714ae54
provide ability to repair contact photo
2011-10-05 20:01:42 -07:00
Friendika
7d6a67f903
mostly cosmetic changes to make DB tables accurately reflect the conversation members
2011-10-05 19:16:05 -07:00
Friendika
7df6cb850e
Merge branch 'pull'
2011-10-05 15:37:17 -07:00
Friendika
b1e5dfad3c
clean up w3c validation and layout for priv mail and lang selector
2011-10-05 15:35:53 -07:00
Friendika
0b4e3a06ed
Merge pull request #19 from tobiasd/master
...
link Diaspora* to the foundation homepage
2011-10-05 14:16:46 -07:00
Friendika
09fcfe2fe7
Merge branch 'pull'
2011-10-05 13:12:43 -07:00
Friendika
d709225b68
better check for orig post author
2011-10-05 13:11:45 -07:00
Tobias Diekershoff
feaba3d300
point Diaspora* to the foundation homepage instead of joindiaspora.com
2011-10-05 21:01:48 +02:00
Tobias Diekershoff
90870d4872
Merge branch 'master' of git://github.com/friendika/Free-Friendika
2011-10-05 20:59:21 +02:00
duthied
5cb0b0ed45
Merge pull request #18 from duthied/master
...
tweak to notification drop-down line items in testbubble theme
2011-10-05 10:26:05 -07:00
Devlon Duthie
2d89f3b421
wrapped notification line item with the anchros tag instead of the inner, makes the whole line item a link (better)
2011-10-05 12:24:12 -05:00
duthied
a7559fb045
Merge pull request #17 from duthied/master
...
drop-down notification menu support added to testbubble theme
2011-10-05 09:38:36 -07:00
Devlon Duthie
7d5e839664
- added drop-down notification support in testbubble theme
2011-10-05 11:29:25 -05:00
Friendika
924d419378
added prepare_body hooks
2011-10-05 02:35:25 -07:00
Friendika
6c521017f5
document backward compat issue
2011-10-04 22:03:57 -07:00
Friendika
ab50521971
yikes
2011-10-04 22:00:45 -07:00
Friendika
6ff221d5a1
another typo
2011-10-04 21:53:33 -07:00
Friendika
c2d70d005b
and a typo fix
2011-10-04 21:45:15 -07:00
Friendika
159d06df82
notification issue after last checkin
2011-10-04 21:43:21 -07:00
Friendika
7b648e6da8
performance enhancements
2011-10-04 18:53:56 -07:00
duthied
24595c55d7
Merge pull request #16 from duthied/master
...
Minor ui tweaks
2011-10-04 09:13:49 -07:00
Devlon Duthie
f7d055687e
- moved the header for profile permissions out of the scrolling div
...
- tweaks to the testbubble theme's nav
2011-10-04 11:10:57 -05:00
Friendika
4a5079f8fb
urlescape saved search terms
2011-10-04 05:19:25 -07:00
Friendika
aeb83fa063
document multi-pass mode on consume_feed
2011-10-04 04:38:58 -07:00
Friendika
a9802575df
Merge branch 'pull'
2011-10-04 03:58:26 -07:00
Friendika
07b09300a9
improve feed import performance
2011-10-04 03:06:34 -07:00
Olivier Migeot
c0cda02963
Updated french locale.
2011-10-04 12:06:01 +02:00
Olivier Migeot
273594af62
Merge remote branch 'upstream/master'
2011-10-04 11:45:57 +02:00
Friendika
3deaafe320
lrdd attributes for zot changed
2011-10-04 01:47:19 -07:00
Friendika
dfd5cc57c2
tagmatch available to anon, add paging variable to query
2011-10-03 14:47:18 -07:00
Friendika
c6ac438735
item_store: prevent storing a duplicate item with same uri+uid
2011-10-03 06:04:17 -07:00
Friendika
e4b4c1e9f8
Merge pull request #15 from fabrixxm/master
...
some work on quattro theme and a little fix to JS
2011-10-03 05:17:00 -07:00
Friendika
8edab80673
add tagmatch
2011-10-03 05:10:15 -07:00
Friendika
7091173131
removing another potential way a post could have a zero parent.
2011-10-03 02:39:19 -07:00
Friendika
60147d893c
?f did not have = after it
2011-10-03 01:58:01 -07:00
Fabio Comuni
209958a584
move call to ping before call to update_*
2011-10-03 09:39:41 +02:00
Fabio Comuni
4d5580ab77
fix typo
2011-10-03 09:38:58 +02:00
Fabio Comuni
b476575a98
quattro: add comment box
2011-10-03 09:38:17 +02:00
duthied
8bfd405bee
Merge pull request #14 from duthied/master
...
templated 'find similar' content + extended match content in testbubble theme
2011-10-02 23:49:16 -07:00
Devlon Duthie
f84c208ac5
broke 'find similar' matches content into a tpl in core, added an extended tpl to testbubble that lists the profile tags
2011-10-03 01:45:27 -05:00
Fabio Comuni
2465b3274a
Merge remote-tracking branch 'friendika/master'
2011-10-03 08:13:40 +02:00
Friendika
297ab898b7
Merge branch 'pull'
2011-10-02 19:04:11 -07:00
duthied
13007716d2
Merge pull request #13 from duthied/master
...
message tab styling - to set as active depending on url
2011-10-02 18:46:02 -07:00
Devlon Duthie
da53ebf4b3
added activetab var to message.php for templates
...
(testbubble only) added logic to photo header to make tab 'sticky' (active class for styling)
(testbubble only) css fix for avatars in wallitems
2011-10-02 20:37:47 -05:00
Friendika
9c681de787
Merge branch 'pull'
2011-10-02 17:31:36 -07:00
duthied
65e981c4b0
Merge pull request #12 from duthied/master
...
testbubble photo album image tweaks
2011-10-02 17:24:45 -07:00
Devlon Duthie
8e38fe6f47
Merge branch 'master' of http://github.com/friendika/Free-Friendika
2011-10-02 18:39:53 -05:00
Devlon Duthie
f6f5e5b993
aspect ratio fixes for photos in testbubble theme
...
some other testbubble styling tweaks
2011-10-02 18:38:08 -05:00
Friendika
8f9656da92
basic support for AS friend requests
2011-10-02 16:18:01 -07:00
Friendika
7c1968907d
attack of the zombie orphans
2011-10-02 05:32:05 -07:00
Friendika
8c9a6b0512
fix notifications duepuntozero
2011-10-02 02:46:54 -07:00
Friendika
c72883f068
malformed xml in ping
2011-10-02 01:21:51 -07:00
Friendika
7059b8378c
Merge pull request #11 from duthied/master
...
Aspect ratio improvement for photos in album, implemented only in testbubble theme
2011-10-01 23:36:23 -07:00
Friendika
7d7a149811
db updates for server batch key caching, group visibility
2011-10-01 23:19:20 -07:00
Friendika
96e735fdd2
zot protocol update
2011-10-01 18:54:48 -07:00
Friendika
0ad9e7b5f4
option to not post photos to status stream
2011-10-01 06:20:41 -07:00
Friendika
8f47540e9b
darkbubble - event legibility
2011-10-01 04:37:28 -07:00
Friendika
78c00c287d
legibility improvements to darkbubble, mark as a derived theme
2011-10-01 04:25:40 -07:00
Friendika
f4c961b906
override pragma
2011-10-01 02:22:48 -07:00
Devlon Duthie
c15690563d
class and wrapper div added to photo for aspect ratio display
...
testbubble theme styling for aspect ratio on photos
2011-10-01 01:52:06 -05:00
Friendika
8fb2d02d3d
typo last checkin
2011-09-30 18:00:32 -07:00
Friendika
0508ccf50f
restore photo cache
2011-09-30 17:47:33 -07:00
Fabio Comuni
60e0f79b9f
Merge remote-tracking branch 'friendika/master'
2011-09-30 14:31:20 +02:00
Fabio Comuni
dfb3ee6e29
fix star icon viewing profile page as unlogged user
2011-09-30 14:31:01 +02:00
Friendika
30b7c68929
Merge pull request #10 from duthied/master
...
UI work on testbubble theme + core tpl files
2011-09-30 00:56:24 -07:00
Devlon Duthie
6f610eb614
1. added button class to tpl files
...
2. messages - moved delete X into message div and new message form div
3. began work on creating thumbnail versions of albums - needs aspect ratio correction (javascript)
4. changed font-size and font-variation on vcard for better readability.
5. streamlining continued with the CSS file
2011-09-30 01:01:15 -05:00
Friendika
52557b011d
possible sql errors
2011-09-29 21:56:44 -07:00
Friendika
097c1f8da7
do not poll for abandoned accounts
2011-09-29 21:20:19 -07:00
Friendika
c1221cc052
add display_item hook to 'search|new' message display
2011-09-29 15:52:31 -07:00
Friendika
bc98930537
Merge branch 'pull'
2011-09-29 15:33:12 -07:00
Friendika
c68569040e
added back for photos page until we can get rid of it cleanly
2011-09-29 15:32:16 -07:00
Tobias Diekershoff
e88a8564c8
Merge branch 'master' of git://github.com/friendika/Free-Friendika
2011-09-29 09:07:27 +02:00
Tobias Diekershoff
dd316ef6f6
Merge pull request #9 from tobiasd/6cf5da1e4bc43d8446f5789bc93f82673ec64c2e
...
German strings
2011-09-29 00:06:23 -07:00
Tobias Diekershoff
47f38bc3ab
Merge branch 'master' of git://github.com/friendika/Free-Friendika
2011-09-29 09:03:30 +02:00
Tobias Diekershoff
6cf5da1e4b
update to the German strings
2011-09-29 09:03:06 +02:00
Friendika
6d36fab90f
reverting wall_item.tpl
2011-09-28 23:54:22 -07:00
Friendika
0ee9ae23d7
Merge pull request #8 from duthied/master
...
Classes added to core and testbubble theme
It looks to me as if view/wall_item.tpl is an earlier version that somehow didn't get merged. I don't think testbubble is using it, so I'm going to merge and then revert that one file, as I don't see any changes you made to it specifically for this body of work.
2011-09-28 23:53:05 -07:00
Devlon Duthie
0881c04cea
classes added to core + testbubble theme
...
some fixes to testbubble theme related to tab styling
2011-09-29 01:20:39 -05:00
Friendika
ffa3b67365
fix nav-selected duepuntozero
2011-09-28 23:10:23 -07:00
Friendika
26905751ea
path for country.js - now in js directory
2011-09-28 22:32:39 -07:00
Friendika
5279f99278
missing uploads on testbubble
2011-09-28 22:13:33 -07:00
Friendika
50c4077c5b
basic darkbubble - improve as needed
2011-09-28 16:22:08 -07:00
Friendika
bedb4eb715
just hostname not url in hm:host - host xrd document
2011-09-28 15:07:01 -07:00
Friendika
a1786cbf61
fixes for statusnet/identi.ca empty vcard page - which appears to be deprecated. Scrape the feed for everything we used to get from the vcard.
2011-09-28 04:35:44 -07:00
Friendika
d0f45bf281
apps broken in all themes, apps link misplaced in testbubble
2011-09-28 04:19:42 -07:00
Friendika
360a46178b
create zot batch keys
2011-09-28 03:45:48 -07:00
fabrixxm
207f739f90
Merge pull request #6 from fabrixxm/master
...
more work on ui
2011-09-28 01:35:32 -07:00
Fabio Comuni
41617ee987
fix search_item.tpl, fix 'new' view in network page, fix walltowall template in 'quattro' theme
2011-09-28 10:30:32 +02:00
Friendika
4343a73076
move connect button down a smidgin
2011-09-28 00:53:55 -07:00
Fabio Comuni
68a6bfdee5
Items lock icon
2011-09-28 09:43:31 +02:00
Fabio Comuni
c120cc8ea9
added missing "delete selected items" link
2011-09-28 09:32:53 +02:00
Fabio Comuni
3ca3157e53
ping returns notices and infos also to unlogged users
2011-09-28 09:30:22 +02:00
Fabio Comuni
dccd2da356
Merge remote-tracking branch 'friendika/master'
2011-09-28 09:27:59 +02:00
Friendika
44d7c6aac3
connect button overlapping profile details
2011-09-27 22:03:07 -07:00
Friendika
4f9c072d66
requeue deliveries on 503 errors which have 'retry-after' headers
2011-09-27 19:27:47 -07:00
Fabio Comuni
e986fc3e30
quattro: actions in wall_item
...
less html in conversation.php
removed unused tpls
fixed old themes
2011-09-27 16:54:33 +02:00
Friendika
75af366122
zot/salmon new key format for batch keys
2011-09-27 06:50:18 -07:00
Friendika
59525e1e32
restore privacy icons after theme upgrade
2011-09-27 05:24:26 -07:00
Friendika
8e02368341
Merge branch 'pull'
2011-09-27 05:04:23 -07:00
Friendika
7e2284043f
show profile url in ACL hovertips, add fork identifier to json siteinfo
2011-09-27 05:02:25 -07:00
fabrixxm
0691662f5a
Merge pull request #5 from fabrixxm/master
...
fix loozah themes navbar
2011-09-27 04:46:38 -07:00
Fabio Comuni
30df9abeac
fix loozah themes navbar
2011-09-27 13:45:25 +02:00
Friendika
1e288dc8a3
loozah theme vcard float not cleared
2011-09-27 01:32:54 -07:00
Friendika
8c6e7a24cd
Merge branch 'pull'
2011-09-27 01:29:08 -07:00
Friendika
2118dd3160
vcard elements float not cleared
2011-09-27 01:28:22 -07:00
fabrixxm
916633ba34
Merge pull request #4 from fabrixxm/master
...
missing commit :)
2011-09-27 01:21:16 -07:00
Fabio Comuni
3dca29b3d5
port old themes
2011-09-27 10:19:32 +02:00
Friendika
25ac93f44d
Merge pull request #3 from fabrixxm/master
...
Works on UI
2011-09-27 01:04:54 -07:00
Friendika
069a76bff4
Merge branch 'pull'
2011-09-27 01:00:31 -07:00
Friendika
8d3910c78c
sql error diaspora re-queue
2011-09-27 00:58:59 -07:00
Fabio Comuni
e9638b6980
Adds theme info file to define 'parent' theme from where load tpl files
2011-09-27 09:32:20 +02:00
Fabio Comuni
939449602a
Merge remote-tracking branch 'fabrix/newui'
2011-09-27 08:57:16 +02:00
Friendika
7f02617517
Merge pull request #2 from abinoam/master
...
Git url should now point to Free-Friendika repository (Thank you!)
2011-09-26 23:50:22 -07:00
Friendika
7a683c576a
Merge https://github.com/friendika/Free-Friendika into pull
2011-09-26 23:45:49 -07:00
Friendika
e04d9b8646
bug #165
2011-09-26 23:39:47 -07:00
Devlon Duthie
78c3210f6a
fixed a bug I introduced when working on the testbubble theme - user's photo widget header div wasn't closed correctly
...
+ some opera-friendly style changes
2011-09-27 00:29:34 -05:00
Abinoam P. Marques Jr.
7f6e507457
Added addon installation instruction. Exclusive repo.
2011-09-27 00:18:08 -03:00
Abinoam P. Marques Jr.
c52ef08578
Changing the git url to Free-Friendika at Install.md. It's lacking addon install instruction.
2011-09-26 23:51:46 -03:00
Abinoam P. Marques Jr.
e20ba2c271
Changing git url for Free-Friendika
2011-09-26 23:45:08 -03:00
Friendika
ec16525c86
expire expired accounts from poller
2011-09-26 05:43:22 -07:00
Fabio Comuni
8d93eefea8
remove global $lang var in templates. can't work as intended
2011-09-26 12:18:39 +02:00
Fabio Comuni
ae024edbf9
fix "friend of" message in ping.php
2011-09-26 12:14:48 +02:00
Fabio Comuni
ec4061e6fe
quattro: fix star
2011-09-26 11:50:48 +02:00
Fabio Comuni
968e7bb3b1
Fixes for testbubble
2011-09-26 11:48:02 +02:00
Fabio Comuni
5792b3d358
Merge branch 'master' into newui
2011-09-26 11:42:48 +02:00
Friendika
116fc7fcf2
zot endpoint
2011-09-26 02:25:43 -07:00
Friendika
428e676641
fix minor placement issues on old themes from testbubble theme changes
2011-09-25 22:29:30 -07:00
Friendika
20d4fda22f
Merge branch 'pull'
2011-09-25 22:14:40 -07:00
Friendika
c35342dcb6
revision update
2011-09-25 22:12:06 -07:00
Devlon Duthie
c05178c105
notification theming + other misc. styling
2011-09-25 22:09:41 -05:00
Devlon Duthie
7285bb2db9
added templates to testbubble theme to clarify the delete buttons vsxt on the edit group/drop group
...
misc. changes to notifications.png for style-specific icons
2011-09-25 19:23:26 -05:00
Devlon Duthie
1a3cc02b41
moved 'view in contextabove the 'end' line of a wall item so it's clear that the link belongs to that item
...
some various other css tweaks
2011-09-25 18:33:19 -05:00
Devlon Duthie
25dbedd971
fixed jot perms button to be less lame
2011-09-25 18:05:57 -05:00
Devlon Duthie
7dbf112092
added widget class to saved arch block on search page
...
added header to search results where there are results
2011-09-25 16:01:05 -05:00
Devlon Duthie
a1fc1be9da
added contact_edit.tpl to testbubble theme, moved drop iconinto contact-edit-links divs
2011-09-25 15:49:33 -05:00
Devlon Duthie
19963884c2
moved invite friends into 'find people' block
...
misc. styling tweaks
2011-09-25 15:45:03 -05:00
Devlon Duthie
45043b77f1
fixed styling of register link to handle case where registration is closed
...
moved lost plink into div with login submit button
2011-09-25 15:08:31 -05:00
Devlon Duthie
f96d8fba3a
changed class of visible test under profle, was picking up styling for buttons
2011-09-25 14:20:25 -05:00
Devlon Duthie
bbaec4cb78
moved contact group header out of scrolling div so it doens't vanish whenlot
...
more css tweaks
2011-09-25 14:08:08 -05:00
Devlon Duthie
3426ce5f94
Merge remote-tracking branch 'upstream/master'
2011-09-25 13:30:55 -05:00
Devlon Duthie
cb1c6dd1e3
really commiting files this time, still getting the hang of git.
...
some images added, some classes added to groupidebar, contacts sidebar
notification flags moved out of nav and into banner for testbubble the
testbubble css tweaks
2011-09-25 13:20:19 -05:00
Friendika
457303b4ff
strict MIT version
2011-09-25 02:30:50 -07:00
Friendika
44a72f08e9
addon is not managed by our repository any more
2011-09-25 02:19:59 -07:00
Friendika
4846d114a8
project fork
2011-09-25 01:59:14 -07:00
Devlon Duthie
634e52a671
added testbubble mai, and modified some core fle to add classes
2011-09-24 23:54:23 -05:00
Friendika
6a9e22550d
.
2011-09-24 05:45:34 -07:00
Friendika
b13f81bdc5
.
2011-09-24 05:30:15 -07:00
Friendika
37dfe555dc
thanks akron...
2011-09-23 06:03:04 -07:00
Friendika
d04e2dbde7
proofread edits
2011-09-23 05:43:10 -07:00
Friendika
7ea6b0a126
fix message ordering glitch on network page
2011-09-23 05:03:12 -07:00
Friendika
477ba8e574
like the jquery license but better
2011-09-23 04:47:36 -07:00
Friendika
3a2bf8ab7c
w3c compliance fixes, owner attribution on likes defaulting to local owner, not item creator
2011-09-23 03:12:31 -07:00
Friendika
a2b2318106
provide permission error vs "not found" for protected photos
2011-09-22 20:03:09 -07:00
Friendika
fda9e6f252
increase pcre backtrack limit
2011-09-22 17:35:49 -07:00
Friendika
d6b446d63f
starting the big delivery shakeup
2011-09-22 04:11:39 -07:00
Friendika
a6edf2f71c
don't reply to remote facebook conversations if linking is disabled
2011-09-21 18:02:54 -07:00
Friendika
9161d1832e
allow one to toggle into and out of photo edit mode for an entire album
2011-09-21 17:37:02 -07:00
Friendika
542aa22eb9
provide ability to unset session language
2011-09-21 16:00:17 -07:00
Friendika
030e1e82c3
finish up ability to switch languages without function collision
2011-09-21 15:37:16 -07:00
Friendika
c63adcfae0
bug #159 multiple definition of string_plural_form function when changing languages
2011-09-21 07:09:37 -07:00
Friendika
11ca81adba
keychecks
2011-09-21 05:43:26 -07:00
Friendika
9115e9c90b
no need to scrape Twitter profile photo from page - it's no longer there.
2011-09-20 18:07:33 -07:00
Friendika
8294dde936
typo in Twitter probe update
2011-09-20 17:59:18 -07:00
Friendika
38444aedd7
improvements to Twitter probe
2011-09-20 17:56:44 -07:00
Friendika
f681535ccf
oexchange updates to new bookmark API
2011-09-20 16:57:05 -07:00
Friendika
1c8e89bd03
social bookmark API, oexchange enhancements
2011-09-20 16:31:45 -07:00
Friendika
deeae7bdb5
diaspora markdown changes, parse_url format change
2011-09-20 15:23:36 -07:00
Friendika
119cd9c0ce
more multiline regex fixes
2011-09-20 04:07:24 -07:00
Friendika
9edf15d3ef
structures for batch mode (Diaspora/zot)
2011-09-20 01:49:08 -07:00
Friendika
8a11cec61a
allow setting all the bookmarked URL fields via script/API
2011-09-19 22:21:55 -07:00
Friendika
d653d922b1
sorting through key issue
2011-09-19 21:24:16 -07:00
Friendika
660787916e
template escapes
2011-09-19 20:24:32 -07:00
Friendika
c2ccb78869
template escapes
2011-09-19 19:51:14 -07:00
Friendika
63277b57fc
template escapes
2011-09-19 19:46:18 -07:00
Friendika
d6d24f3b6a
personal notes going to wall instead of PN in dispy
2011-09-19 16:51:52 -07:00
Friendika
510eb6d24d
Merge branch 'pull'
2011-09-19 16:40:14 -07:00
Friendika
a810d2a993
put profile photo on photos page
2011-09-19 16:39:23 -07:00
fabrixxm
ad3d2bd6ae
Merge pull request #173 from fabrixxm/master
...
a pair of missing IT email templates
2011-09-19 05:45:43 -07:00
Fabio Comuni
ca71808515
IT: missing email templates
2011-09-19 14:43:17 +02:00
Friendika
97deaa3118
resume strict verification of Diaspora messages
2011-09-19 03:36:41 -07:00
Friendika
fd18b42a5a
Check all keys before use
2011-09-19 03:30:59 -07:00
Fabio Comuni
991656a3ef
Show "404.tpl" instead of using 'notice()' in case of 404
2011-09-19 11:52:32 +02:00
Friendika
0a30a91b14
basic zot discovery framework
2011-09-19 02:13:59 -07:00
Friendika
2aef98f71d
cripple account when expired
2011-09-19 01:17:12 -07:00
Friendika
672ecc7f7d
more tag infrastructure
2011-09-18 22:42:47 -07:00
Friendika
48ee3fa3b9
build diaspora public (batch) message
2011-09-18 20:17:44 -07:00
Friendika
5b3f645939
account expiration structures
2011-09-18 19:53:45 -07:00
Friendika
8bf6a29d4e
optimise the commented date view
2011-09-18 19:04:11 -07:00
Friendika
e2e29b2dea
only header encode if necessary
2011-09-18 17:16:02 -07:00
Friendika
5899c9f406
bug #157 - allow deleted group to be revived, but warn of side effects
2011-09-18 06:20:18 -07:00
Friendika
da05ef2ae4
rfc2047 encode notification email headers
2011-09-18 04:34:17 -07:00
Friendika
309df84172
again fix bbcode image sizes
2011-09-18 00:19:19 -07:00
Friendika
5f4ab62fe3
fix bbcode image size
2011-09-18 00:16:18 -07:00
Friendika
ce77c7287e
show real profile link location on hover
2011-09-16 15:40:34 -07:00
Friendika
6c4ad7df3a
public D* post fix
2011-09-16 14:57:41 -07:00
Friendika
d7243be2ea
log the D* publc messages
2011-09-16 14:51:25 -07:00
Friendika
5a6a3cab8e
may fix diaspora send
2011-09-16 14:46:04 -07:00
Friendika
9b5d5eca07
Merge branch 'friday'
2011-09-16 06:51:33 -07:00
Friendika
9c3503a706
update timestamp on activity change (comment/like)
2011-09-16 06:49:24 -07:00
Fabio Comuni
6b6f45f9f1
quattro: initial style of conversations
2011-09-16 12:51:14 +02:00
Fabio Comuni
80af4f3fe6
new icons
2011-09-16 12:50:15 +02:00
Fabio Comuni
9d2afc2d3c
Merge remote-tracking branch 'friendika/master' into newui
2011-09-16 09:39:29 +02:00
Friendika
2e43b291e7
Facebook wall privacy switch
2011-09-15 20:15:26 -07:00
Friendika
80f94bb12b
federation friday update
2011-09-15 17:47:16 -07:00
Friendika
f32c6c2ee9
Merge branch 'pull'
2011-09-15 03:08:26 -07:00
Friendika
8f1e2efd5b
if photo is uploaded to "profile photos" album it could not be made into profile photo.
2011-09-15 03:06:43 -07:00
Fabio Comuni
d9bce6b852
Fix issue 151
2011-09-15 11:05:09 +02:00
fabrixxm
3ee9f2b3a1
Merge pull request #172 from fabrixxm/master
...
Fix issue 151
2011-09-15 02:03:33 -07:00
Fabio Comuni
019b735ec7
Merge branch 'newui' of github.com:fabrixxm/friendika into newui
2011-09-15 10:39:41 +02:00
Fabio Comuni
7e806429cc
quattro
2011-09-15 10:38:37 +02:00
Friendika
46b220518c
don't allow events to finish before they begin
2011-09-14 23:09:09 -07:00
Friendika
cdf2fe859f
don't escape underscore within links going to diaspora
2011-09-14 21:35:13 -07:00
Friendika
1778e4a315
bloody ampersands
2011-09-14 20:47:49 -07:00
Friendika
58b2bb5848
localtime cleanup
2011-09-14 19:53:13 -07:00
Friendika
5c0e135fe9
diaspora protocol changes
2011-09-14 19:33:42 -07:00
Friendika
93c235a912
capitalise Link
2011-09-14 15:30:05 -07:00
Friendika
44d70a238f
quotes not working on statusnet plugin posts
2011-09-14 01:21:03 -07:00
Friendika
12fec75489
ability to re-order network page (no UI yet)
2011-09-13 18:40:15 -07:00
Friendika
1248a561e1
group_public_members sql query typo
2011-09-13 15:26:47 -07:00
Friendika
21d35e52dd
provide option for viewing by parent created order
2011-09-13 05:13:01 -07:00
Friendika
43da1429cc
import image sizes from html source
2011-09-13 04:53:17 -07:00
Friendika
08fc3e91b6
bug #148 email subscription issue
2011-09-12 22:24:36 -07:00
Friendika
4f24494b0b
Dreamhost's unreliable process model is really getting irritating
2011-09-12 19:42:10 -07:00
Friendika
ff572487a3
smilie hook
2011-09-12 03:21:39 -07:00
Friendika
57d631b47a
supply default value for update
2011-09-11 22:57:12 -07:00
Friendika
17b081f9f7
allow html post to api
2011-09-11 21:52:50 -07:00
Friendika
7a06c7c3bf
bug #146 - br HTML tags showing up in events
2011-09-11 15:44:07 -07:00
Friendika
0e441fe196
bug #147 comments not working on private notes page
2011-09-11 15:09:57 -07:00
Friendika
0c0a604396
block imap function from spitting out errors to the page
2011-09-10 03:14:00 -07:00
Friendika
ebb9af8946
One day we'll have ignored all purely numeric hashtags like #33 . Found yet another edge case.
2011-09-09 17:35:26 -07:00
Friendika
d7a2ab9c1f
send profile visits to 'redir' window
2011-09-09 16:22:32 -07:00
Friendika
f5c9de19d5
network insecure warnings on feeds
2011-09-09 01:37:46 -07:00
Friendika
1e8b3278b0
share not available in display module, as no editor window to paste into
2011-09-08 22:07:16 -07:00
Friendika
3f59f63224
saved searches on search page, templates: Invalid argument supplied for foreach() on line 167
2011-09-08 21:42:52 -07:00
Friendika
f03c2b1b79
Merge branch 'pull'
2011-09-08 20:00:57 -07:00
Friendika
18157769f0
parent eval order issue
2011-09-08 20:00:06 -07:00
fabrixxm
d284f8017c
Merge remote-tracking branch 'friendika/master' into newui
2011-09-08 20:15:27 +02:00
fabrixxm
2fabf8d218
Merge branch 'newui' of github.com:fabrixxm/friendika into newui
2011-09-08 20:12:17 +02:00
fabrixxm
68c23f6c86
Merge pull request #171 from fabrixxm/master
...
fix to network page conversations sort
2011-09-08 05:37:14 -07:00
Fabio Comuni
ad7c111c7c
deal with messages without comments or likes
2011-09-08 14:39:53 +02:00
fabrixxm
0bd10ae01a
Merge pull request #170 from fabrixxm/master
...
Show conversations in network default view ordered by activity
2011-09-08 05:11:06 -07:00
Fabio Comuni
49ffd30e1c
global lang array in templates
2011-09-08 14:09:45 +02:00
Fabio Comuni
694e74d54d
Show conversations in network default view ordered by activity
2011-09-08 11:18:44 +02:00
Fabio Comuni
dbc5ecfe57
light notifications menu icon on new notifs
2011-09-08 10:12:20 +02:00
Fabio Comuni
2f93a4d70d
style vcard infos
2011-09-08 10:11:57 +02:00
Friendika
fdd372a798
speed up friend requests and avoid parse errors by using hcard address instead of profile url
2011-09-07 22:49:58 -07:00
Friendika
c8f6493008
typo fb connector
2011-09-07 14:29:15 -07:00
Friendika
f17d91844f
part of bug #143
2011-09-07 02:23:17 -07:00
Friendika
65d5d0b0cb
clarification of signature details for foreign messages,
2011-09-06 18:51:24 -07:00
Friendika
a5125359d8
faster friend requests (DFRN)
2011-09-06 18:06:19 -07:00
Friendika
18315a1377
Russian translation (80% complete)
2011-09-06 01:52:45 -07:00
Friendika
eeecb412aa
view bookmarks
2011-09-06 00:55:24 -07:00
Friendika
6eb6b8f969
updated documentation
2011-09-05 19:19:58 -07:00
Friendika
e921b97a7f
bug #127 , add Diaspora notes to Connect (dfrn_request) page, get rid of security warnings
2011-09-05 18:34:30 -07:00
fabrixxm
2f5a34ad17
Merge branch 'newui' of github.com:fabrixxm/friendika into newui
2011-09-05 21:05:24 +02:00
Fabio Comuni
08e54234e3
profiles popup menu in sidebar
2011-09-05 16:55:40 +02:00
Fabio Comuni
c7a9b1ae32
add *~ to gitignore
2011-09-05 14:03:38 +02:00
Fabio Comuni
abd65e00ab
Load infos and notices via ping and show them with js popup
2011-09-05 14:01:21 +02:00
Fabio Comuni
14125ce67b
Add tipTip js tooltips
2011-09-05 11:32:40 +02:00
Fabio Comuni
9ab9c28b01
fix profile edit link and d* photo urls
2011-09-05 11:32:07 +02:00
Fabio Comuni
2c1aca7ffe
fix aside contact block, add edit profiles icon
2011-09-05 11:16:08 +02:00
Fabio Comuni
20ca451200
move js to js folder
2011-09-05 11:15:30 +02:00
Fabio Comuni
ab5bda526e
move icons style in new file
2011-09-05 11:14:43 +02:00
Fabio Comuni
c308ac49af
More icons
2011-09-05 11:13:42 +02:00
Fabio Comuni
0283cbfcd3
Merge remote-tracking branch 'friendika/master' into newui
2011-09-05 09:09:34 +02:00
Friendika
7e8100d2cd
custom attags
2011-09-04 22:40:36 -07:00
Friendika
82f7f33cf5
bookmarks + bug #140
2011-09-04 19:58:03 -07:00
Friendika
481853d2cc
saved searches on network page
2011-09-04 17:35:06 -07:00
Friendika
f6a43afb8d
set max height of acl names to avoid wrap
2011-09-04 06:18:26 -07:00
Friendika
e440353013
truncate overflow text on acl selector items (3 themes)
2011-09-04 05:41:11 -07:00
Friendika
260d652168
scrape_url - use feed url if no name can be found
2011-09-04 05:07:25 -07:00
Friendika
1d01b3a088
Merge branch 'pull'
2011-09-04 00:51:42 -07:00
Friendika
9ff1a3444e
add timezone convert module, several other minor or in progress fixes
2011-09-04 00:48:45 -07:00
Friendika
c0a2cc3e98
diaspora has no timezone - use UTC for events
2011-09-03 07:40:05 -07:00
Friendika
59a6a04e26
format events for diaspora
2011-09-03 07:13:12 -07:00
Friendika
c8f61ef890
no plink on imported D* posts
2011-09-03 05:23:36 -07:00
Friendika
b026dcb860
match bbcode multiline
2011-09-03 04:36:45 -07:00
Friendika
c8dbf25f51
provide option to block Facebook wall but still allow social stream
2011-09-03 00:52:26 -07:00
Friendika
7c140c5885
Merge branch 'pull'
2011-09-02 22:21:18 -07:00
Friendika
d49895a8a1
Merge pull request #169 from michal-s/master
...
minor changes of czech translations
2011-09-02 22:20:47 -07:00
Michal Supler
7813f1798f
minor changes of czech translations
2011-09-03 02:01:15 -03:00
Friendika
574470bf1c
Merge branch 'pull'
2011-09-02 19:28:06 -07:00
Friendika
f186863523
revup
2011-09-02 19:27:32 -07:00
Friendika
887d06cf5e
Merge pull request #168 from Erkan-Yilmaz/master
...
typo in German page: admin > log
2011-09-02 19:27:21 -07:00
Erkan Yilmaz
508a13da00
inital info for Facebook + CC by licence
...
further info here:
http://groups.google.com/group/friendika/browse_thread/thread/7562e0b22f815a79
2011-09-03 04:01:24 +02:00
Erkan Yilmaz
652d43955b
Merge remote branch 'upstream/master'
2011-09-03 03:58:40 +02:00
Friendika
9e9b6a3dd1
zot: dealing with foreign messages
2011-09-02 05:46:00 -07:00
Friendika
93b9d71377
completely enclose ~f hashtags so they don't get hijacked by D*
2011-09-02 05:13:38 -07:00
Friendika
7bee0bff0d
protocol update, require a recipient encrypted envelope or it cannot be
...
decrypted.
2011-09-02 01:56:02 -07:00
Erkan Yilmaz
463a136c15
typo in German admin log page
2011-09-02 10:17:17 +02:00
Friendika
ada2384fbb
Merge pull request #167 from Erkan-Yilmaz/master
...
typos, adapt to identi.ca situation
2011-09-01 23:30:36 -07:00
Erkan Yilmaz
0401130246
typos + adapt
2011-09-02 08:15:36 +02:00
fabrixxm
00e1759a54
Merge pull request #166 from Erkan-Yilmaz/master
...
typo in widget plugin text
2011-09-01 23:10:38 -07:00
Erkan Yilmaz
ecd2fe4592
typos in README files of plugins: impressum + statusnet
2011-09-02 07:48:07 +02:00
Erkan Yilmaz
55e138a7c0
typo in widget plugin text
2011-09-02 07:37:09 +02:00
Friendika
16c24b13a0
Merge pull request #165 from Erkan-Yilmaz/master
...
update twitter plugin README: typos + new menu structure
2011-09-01 22:15:48 -07:00
Erkan Yilmaz
5a7934012c
fix README for twitter plugin: typos + change to new menu structure
2011-09-02 07:07:03 +02:00
Friendika
71f71ecf46
error viewing logfiles over 2Gb
2011-09-01 21:54:04 -07:00
Friendika
a33edb0042
infrastructure for personalised @ tags (no UI/settings form yet), allow own comments through statusnet connector
2011-09-01 18:02:08 -07:00
Friendika
ef1b99aa44
Merge branch 'pull'
2011-09-01 06:30:38 -07:00
Friendika
1621630b06
login_hook
2011-09-01 06:29:29 -07:00
Fabio Comuni
058e329dfb
Fix profile vcard and style
2011-09-01 12:37:30 +02:00
fabrixxm
af62c81b8b
Merge pull request #164 from fabrixxm/master
...
small fix to IT strings
2011-09-01 03:36:47 -07:00
Fabio Comuni
18f6d4e639
small fix to IT strings
2011-09-01 12:39:42 +02:00
fabrixxm
f006b8385a
Add some links to external resources
2011-09-01 12:07:17 +03:00
Friendika
0cfc8570d2
save plink for diaspora items so likes will point to right post
2011-08-31 21:46:37 -07:00
Friendika
3cd8ee7161
more clarification w/r/t sender|from
2011-08-31 21:23:40 -07:00
Friendika
344f12c8c4
sender verification
2011-08-31 21:18:23 -07:00
Friendika
d64f9ad97a
allow browser cookies to avoid multiple redirects
2011-08-31 20:23:13 -07:00
Friendika
2bcd43cb1f
xml+atom was backwards
2011-08-31 20:17:21 -07:00
Friendika
8193ff426f
change MUST to SHOULD w/r/t data formats
2011-08-31 19:49:51 -07:00
Friendika
8bb9226471
add new cut of zot/zid protocol
2011-08-31 19:43:59 -07:00
Fabio Comuni
8b615133d5
remove html from profile vcard code
2011-08-31 17:31:44 +02:00
Fabio Comuni
54f0685a03
quattro: more colors
2011-08-31 17:30:48 +02:00
Fabio Comuni
62295af1f2
quattro: cleanup and split of less files
2011-08-31 16:19:17 +02:00
Fabio Comuni
b38d6d97c3
Avoid a small error in admin
2011-08-31 16:18:37 +02:00
Fabio Comuni
5ce6f893a6
Apps popup menu in navbar
2011-08-31 16:18:03 +02:00
Fabio Comuni
71d44d78ec
Installed apps as array instead of string
2011-08-31 16:17:32 +02:00
Friendika
c60d45752d
translate D* images (markdown) before links, they overlap and conflict
2011-08-30 23:24:45 -07:00
Friendika
f0c3a75ff3
youtube redirect fixes
2011-08-30 23:09:39 -07:00
Friendika
b11a0efff1
This *might* fix Diaspora @ tags - or it might not.
2011-08-30 20:20:17 -07:00
Friendika
f0a4a6af61
relayed likes did not verify
2011-08-30 19:20:56 -07:00
Friendika
f8da48a880
unsafe chars in admin, add img to diaspora markdown processor
2011-08-30 18:46:34 -07:00
Fabio Comuni
d0926240a8
Merge remote-tracking branch 'friendika/master' into newui
2011-08-30 11:00:23 +02:00
Friendika
0f1bc6e957
log every possible diaspora return for posts and comments
2011-08-29 22:50:41 -07:00
Friendika
22d9d97d71
remove "online reputation" section on contact editing - nobody ever uses it, and there is no interface to query it.
2011-08-29 19:18:59 -07:00
Friendika
454882812e
wrong time format string, 24hr clock
2011-08-29 18:01:59 -07:00
Friendika
7e79b140f0
don't deliver on first pass if already queued
2011-08-29 17:52:31 -07:00
Friendika
177e0e15d7
allow zero delivery interval on dedicated servers
2011-08-29 00:59:44 -07:00
Friendika
391330d95f
better handling of relayed Diaspora comments
2011-08-29 00:51:08 -07:00
Friendika
bfc708e07b
logging on notifier
2011-08-28 23:05:06 -07:00
Friendika
88e6e4699a
Merge branch 'pull'
2011-08-28 23:01:42 -07:00
Friendika
51615f57ac
flag top level post
2011-08-28 23:00:45 -07:00
Friendika
b61d535f81
remove item from queue
2011-08-28 22:59:49 -07:00
Friendika
846c4cea7c
implement delivery queue in case notifier gets killed
2011-08-28 21:41:42 -07:00
Friendika
f29f228463
bring Diaspora message signing back to the source author - whether they like it or not.
2011-08-28 19:22:27 -07:00
Friendika
030dcbd467
Merge branch 'pull'
2011-08-28 05:05:32 -07:00
Friendika
4572f32603
cleanup
2011-08-28 05:04:49 -07:00
Friendika
41b00a6f3b
allow comment relaying for comments which were never Diaspora signed
2011-08-28 05:00:30 -07:00
Friendika
ada8bee70e
remove public disclosure risk
2011-08-27 18:09:43 -07:00
fabrixxm
3bbdbee87c
Merge pull request #163 from fabrixxm/master
...
API and IT translation: smal fixes
2011-08-27 00:10:25 -07:00
Friendika
e3dbb63393
fix any update issues that may arise from update 1081
2011-08-26 21:51:12 -07:00
Friendika
f48a758a1e
typo in update script
2011-08-26 21:37:00 -07:00
Friendika
721db93e84
check for existing diaspora comment before accepting, add 'Diaspora' app to item, use html_entity_decode so quotes don't get messed up
2011-08-26 17:52:24 -07:00
Friendika
144f241c5d
fix bad embeds
2011-08-26 15:21:21 -07:00
fabrixxm
8438da7d70
Small fix to IT strings
2011-08-26 16:36:02 +02:00
fabrixxm
fcf45db075
API: fix friends profile, statuses etc
2011-08-26 16:35:51 +02:00
Friendika
506853adcd
break up delivery into per-person processes
2011-08-26 07:29:22 -07:00
fabrixxm
5ec4a4e6de
Merge remote-tracking branch 'friendika/master' into newui
2011-08-26 14:44:24 +02:00
Friendika
1861dc1fae
don't allow fullscreen for youtube iframe - this makes it hard to visit the network page when they throw an error
2011-08-26 01:32:22 -07:00
Friendika
a4739aef91
more logging diaspora pubdeliver
2011-08-25 20:35:55 -07:00
Friendika
c15c53d307
one more little tweak to linkificator
2011-08-25 20:12:56 -07:00
Friendika
5eb08d43b6
tweak to bbcode linkificator
2011-08-25 20:09:32 -07:00
Friendika
99ea045723
some minor work on contact edit page
2011-08-25 18:12:42 -07:00
Friendika
21c03fb522
diaspora2bb, salmon fix argument error
2011-08-25 16:37:27 -07:00
Friendika
1b33ba6587
third attempt to get rid of this stupid warning
2011-08-25 06:01:40 -07:00
Friendika
83605cf3dc
theme settings for contact photo menu
2011-08-25 05:15:05 -07:00
Friendika
71fc694c67
contact photo menu
2011-08-24 23:20:04 -07:00
Friendika
74d61ed00b
contact menu beginnings
2011-08-24 22:40:26 -07:00
Friendika
8f6ae2b660
missing salmon key? report it.
2011-08-24 20:40:08 -07:00
Friendika
96adbb6457
Merge branch 'pull'
2011-08-24 15:55:59 -07:00
Friendika
d51d42b7d4
revup
2011-08-24 15:55:27 -07:00
Olivier Migeot
1548449586
Small fix
2011-08-24 18:04:16 +02:00
Tobias Diekershoff
a2a3b75b6d
Merge pull request #162 from omigeot/master
...
French translation
2011-08-24 08:58:07 -07:00
Olivier Migeot
1f5a67c81f
French translation up to date.
2011-08-24 17:47:21 +02:00
Friendika
d6f9e0e2a4
change the way public feeds work just to fix statusnet's bug, because they won't
2011-08-24 05:58:31 -07:00
Friendika
a775474dff
cleaned up the conditions on when to and when not to relay.
2011-08-24 04:42:28 -07:00
Friendika
b6fdd3c76b
turn off notifier - runaway
2011-08-24 01:55:34 -07:00
Friendika
0883a614a2
don't accept pubsub from diaspora
2011-08-24 01:41:27 -07:00
Friendika
0e1f868237
Merge branch 'pull'
2011-08-24 01:29:07 -07:00
Friendika
2aa23843e4
D* queue
2011-08-24 01:21:24 -07:00
Tobias Diekershoff
9cba9d33b9
Merge pull request #161 from tobiasd/master
...
fix for DE strings.php
2011-08-23 22:47:45 -07:00
Tobias Diekershoff
56c29a527d
Merge github.com:tobiasd/friendika
2011-08-24 07:38:05 +02:00
Friendika
2cfdcee29a
author and owner sign exactly the same string - apparently
2011-08-23 19:54:35 -07:00
Friendika
b57a01dc14
that was ugly - let's do better
2011-08-23 19:42:45 -07:00
Friendika
838d89a110
fix for public posts to D*
2011-08-23 19:40:50 -07:00
Friendika
6a052c3586
correct time in photo msg
2011-08-23 19:01:08 -07:00
Friendika
c1acea330c
photo fixes
2011-08-23 18:50:18 -07:00
Friendika
3b4da00495
fix it again
2011-08-23 18:28:17 -07:00
Friendika
b41592f556
fix group public members
2011-08-23 18:22:15 -07:00
Friendika
56d64316f4
diaspora photos ?
2011-08-23 18:17:35 -07:00
fabrixxm
97806544bc
don't add notification details on new posts
2011-08-23 14:02:04 +02:00
fabrixxm
89c5733ca5
add more notification messages
2011-08-23 13:52:20 +02:00
Friendika
91de9edecd
retractions - precedence issue
2011-08-23 04:02:29 -07:00
Friendika
99681e33af
testing retractions
2011-08-23 03:49:38 -07:00
Friendika
0739ae315b
typo
2011-08-23 03:07:26 -07:00
Friendika
afbc46c00f
don't process diaspora communications if no pubkey
2011-08-23 03:06:08 -07:00
Friendika
8cfbe2c432
include bb2diaspora at top level
2011-08-23 03:02:31 -07:00
Friendika
92504b5df7
more testing with images
2011-08-23 01:55:46 -07:00
Friendika
c55d24b451
second try
2011-08-23 01:52:59 -07:00
Friendika
124881903e
forget about the image link we have it in the wrapper
2011-08-23 01:51:37 -07:00
Friendika
508f22f859
photos a bit messed up on d*
2011-08-23 01:47:42 -07:00
Friendika
c1a1b2ab60
updates bb2md
2011-08-23 01:33:58 -07:00
Friendika
561051e805
convert bbcode to markdown for diaspora (first try, will need tweaking)
2011-08-23 01:00:29 -07:00
Friendika
56ea11a561
bad param in like function
2011-08-22 23:18:22 -07:00
Tobias Diekershoff
9cd28af4e8
fixed a missing string in DE
2011-08-23 06:32:21 +02:00
Friendika
58651f7eb8
public posts ~f to D*
2011-08-22 21:15:31 -07:00
Friendika
b9e4668f68
d* retractions
2011-08-22 20:35:34 -07:00
Friendika
b0211499c1
invoke notifier
2011-08-22 19:27:40 -07:00
Friendika
eb2ef6dec4
diaspora admin toggle, update install guide
2011-08-22 18:52:02 -07:00
fabrixxm
d5567eb297
compatiblity for old themes
2011-08-22 14:06:55 +02:00
fabrixxm
d8bd4fbb3e
Merge branch 'master' into newui
2011-08-22 13:56:08 +02:00
Friendika
564ade0685
store key with contact record
2011-08-22 04:55:09 -07:00
Friendika
ef99267b94
Merge branch 'pull'
2011-08-22 01:58:53 -07:00
Friendika
812222fb17
correct the diaspora_like signable string format
2011-08-22 01:57:52 -07:00
Tobias Diekershoff
8c75ede39d
Merge pull request #160 from michal-s/master
...
added Czech translation of mail messages
2011-08-21 22:51:34 -07:00
Michal Supler
f3c5154f0c
added Czech translation of mail messages
2011-08-21 23:45:43 -03:00
Friendika
4ec706cfc7
log the friend request - it's important
2011-08-21 17:48:42 -07:00
Friendika
213f832443
add trailing slash to diaspora notify url on send
2011-08-21 17:24:50 -07:00
Friendika
e3eb4c131f
D* likes not verifying, ignore result until we figure out the signable_string exactly
2011-08-21 04:18:39 -07:00
Friendika
c97652a044
php error when no aliases
2011-08-21 00:13:44 -07:00
Friendika
a3eb73ed11
diaspora sign/verify requires SHA0 hash algorithm
2011-08-20 20:54:03 -07:00
Friendika
c0be5bea16
fix warning of self-signed cert for photos of our own contacts in comment notification emails
2011-08-20 18:27:12 -07:00
Friendika
c6f0d997e6
set author/owner on likes
2011-08-20 18:14:19 -07:00
Friendika
c6cab2cfa8
get_app for diaspora_like
2011-08-20 18:08:43 -07:00
Friendika
f5c0443b91
sql syntax
2011-08-20 18:05:05 -07:00
Friendika
c6a05443f7
stricmp does not exist - strcasecmp does
2011-08-20 17:50:39 -07:00
Friendika
349ea8d475
don't generate guid if one provided wirth msg
2011-08-20 17:46:33 -07:00
Friendika
8fa6f49242
until algorithm is sorted, ignore D* verification failures so we can debug the rest
2011-08-20 15:09:09 -07:00
Friendika
0d9d576aa6
move encryption functions to crypto file
2011-08-20 04:53:11 -07:00
Friendika
6aa633efc8
Merge branch 'pull'
2011-08-19 14:36:08 -07:00
Friendika
8e24db3ef5
incorrect iv length for blocksize
2011-08-19 14:34:28 -07:00
fabrixxm
a66f063e68
Merge pull request #159 from fabrixxm/master
...
Some works on API 2
2011-08-19 11:37:29 -07:00
fabrixxm
46dd2535df
API work. Identicurse compatiblity
2011-08-19 20:33:34 +02:00
fabrixxm
b465d1f30b
Merge pull request #158 from fabrixxm/master
...
Some works on API
2011-08-19 08:03:20 -07:00
fabrixxm
5c78872940
API: private messages (only json)
2011-08-19 16:55:43 +02:00
fabrixxm
43040faf22
move send private message code out of view code
2011-08-19 16:54:41 +02:00
fabrixxm
fc9c73da49
API: missing template and small fix for hotot
2011-08-19 15:09:10 +02:00
fabrixxm
62e939de52
API: add pagination in timelines and add statuses/friends and followers
2011-08-19 14:57:54 +02:00
Friendika
18c8f4d8b5
wrong record
2011-08-19 05:29:07 -07:00
Friendika
2ef82cd347
redirect to added contact, not self
2011-08-19 05:24:07 -07:00
Friendika
9a52b15271
don't allow removal of self contact
2011-08-19 05:20:30 -07:00
Friendika
ef98c7e020
on follow, land on new contact edit page
2011-08-19 04:52:40 -07:00
Friendika
b49175ec5d
more logging
2011-08-19 04:48:54 -07:00
Friendika
9b2d408d73
facebook - don't fetch wall feeds if no linking is set
2011-08-19 04:37:11 -07:00
Friendika
68c237f79f
typo on d* path
2011-08-19 04:11:06 -07:00
Friendika
16129a4b8c
better reporting when d* parent not found
2011-08-19 02:53:44 -07:00
Friendika
395faae0b2
double url encode diaspora communications
2011-08-19 02:24:30 -07:00
Friendika
4cef4ec918
fix d* intros
2011-08-18 22:03:58 -07:00
Friendika
0a0c5013ce
debug
2011-08-18 22:01:35 -07:00
Friendika
9167b2057b
diaspora share - blocked specified twice
2011-08-18 21:50:41 -07:00
Friendika
c05c20aa56
set writable (e.g. writeable) flag for Diaspora contacts
2011-08-18 21:31:34 -07:00
Friendika
d2c6c21a88
lots more diaspora communications - can see light at the end
2011-08-18 21:09:44 -07:00
Friendika
457f8c3e95
use mb_strlen when iterating utf8
2011-08-18 19:14:13 -07:00
Friendika
2df7251b34
notifier issue
2011-08-18 17:30:06 -07:00
Friendika
609741573c
darkzero - friend request - identity address invisible
2011-08-18 17:11:57 -07:00
Friendika
2d90068ec2
Merge branch 'pull'
2011-08-18 16:48:14 -07:00
Friendika
bc5935061b
dfrn friendship issue
2011-08-18 16:47:45 -07:00
Tobias Diekershoff
c8cf2d1773
Merge pull request #157 from tobiasd/master
...
piwik analytics opt-out note now translate able
2011-08-18 09:07:48 -07:00
Tobias Diekershoff
cf64ae0e4b
piwik analytics opt-out note now translate able
2011-08-18 18:04:16 +02:00
Friendika
012e039dae
store signature data if applicable for relaying
2011-08-18 05:08:39 -07:00
Friendika
0808e4c930
Merge branch 'pull'
2011-08-18 04:26:16 -07:00
Friendika
35e65f18bd
Merge pull request #156 from fabrixxm/master
...
That was fast :-)
Issue 120: poormancron plugin uses php cli if available
2011-08-18 04:25:49 -07:00
Friendika
c534dd2969
fill and expire fcontact cache
2011-08-18 04:20:30 -07:00
fabrixxm
6686d1441f
Issue 120: poormancron plugin uses php cli if available
2011-08-18 13:06:17 +02:00
Friendika
f561a82647
Merge branch 'pull'
2011-08-18 01:16:22 -07:00
Friendika
78e1f86110
consistent quotes in vcard
2011-08-18 01:15:48 -07:00
Tobias Diekershoff
bdd71b10be
Merge pull request #155 from tobiasd/master
...
update DE strings
2011-08-18 01:07:33 -07:00
Tobias Diekershoff
bea02876eb
update DE strings
2011-08-18 10:05:33 +02:00
Friendika
69b7c2f0be
documentation
2011-08-17 23:10:55 -07:00
Friendika
9634287839
fix several probe related issues
2011-08-17 23:01:44 -07:00
Friendika
37fc7324b7
fix largest_photo mixup in probe_url
2011-08-17 21:14:21 -07:00
Friendika
c30f523c62
more d* infrastructure for relaying signed messages and storing non-connected people details
2011-08-17 20:52:18 -07:00
Friendika
ff723caae3
Merge branch 'pull'
2011-08-17 18:44:34 -07:00
Friendika
96bcaf4331
poormancron - proc_run executing twice, once as function; once as commandline
2011-08-17 18:43:17 -07:00
fabrixxm
afdc639f17
fix friend request query in ping
2011-08-17 21:59:06 +02:00
fabrixxm
77ceb875d5
Merge pull request #154 from fabrixxm/master
...
Updated IT strings
2011-08-17 11:04:49 -07:00
fabrixxm
8cc368966d
Update IT strings
2011-08-17 19:52:10 +02:00
fabrixxm
07b6c868b3
remove javascript to set selectect nav item. enanche img template prefetch ignoring
2011-08-17 18:36:24 +02:00
fabrixxm
bdf42473a0
Merge remote-tracking branch 'friendika/master' into newui
2011-08-17 17:35:37 +02:00
Friendika
db03b1ab17
diaspora continued...
2011-08-17 04:24:26 -07:00
Friendika
673e114bbd
D* like and start of relay code
2011-08-16 22:31:14 -07:00
Friendika
fafcab70e1
fill in framework for d* outgoing
2011-08-16 20:43:34 -07:00
Friendika
b28b468b21
cleanup
2011-08-16 20:05:02 -07:00
Friendika
98cdf5d315
fix API time - wrong format string
2011-08-16 04:55:38 -07:00
Friendika
2c0404fdc8
cleanup after refactor
2011-08-16 00:52:34 -07:00
Friendika
c7197b99f9
refactor the diaspora contact logic
2011-08-15 23:19:17 -07:00
Friendika
0eb06b3e2d
cronhooks broken
2011-08-15 22:23:17 -07:00
Friendika
3d45f9f133
remove disable oembed
2011-08-15 21:46:52 -07:00
Friendika
d0c8f11dff
typos
2011-08-15 21:01:44 -07:00
Friendika
a589e8e3fe
filename typo
2011-08-15 20:47:09 -07:00
Friendika
37a9a5ea62
stupid browsers not honouring meta base
2011-08-15 20:16:00 -07:00
Friendika
9634bb514f
doh! add body to the item
2011-08-15 19:46:47 -07:00
Friendika
a93b6757b1
set parent-uri for top level posts
2011-08-15 19:39:49 -07:00
Friendika
8e3506048a
diaspora confirm cleanup
2011-08-15 19:31:45 -07:00
Friendika
f7a1674cf6
set proper relation for diaspora in mod_follow
2011-08-15 19:15:56 -07:00
Friendika
240941237a
privacy enforcement on pubmail_enable
2011-08-15 18:29:49 -07:00
Friendika
a6d88fb8f7
diaspora friend approvals
2011-08-15 18:17:19 -07:00
Friendika
44918e2736
turn diaspora posts into x-www-form-urlencoded
2011-08-15 17:14:51 -07:00
Friendika
805770521e
errant debug statement
2011-08-15 06:27:17 -07:00
Friendika
5d6155a968
fixes share from diaspora
2011-08-15 05:27:24 -07:00
Friendika
9cd77b56ab
temporarily disable oembed
2011-08-15 01:29:58 -07:00
Friendika
5b24050875
split off facebook and other cron hooks from poller
2011-08-14 22:59:34 -07:00
Friendika
d723ff4770
diaspora top level status posts, string update
2011-08-14 21:23:02 -07:00
Friendika
0729e205c8
diaspora follow from friendika
2011-08-14 20:38:31 -07:00
Friendika
7952961222
diaspora probe/scrape changes
2011-08-14 18:13:52 -07:00
Friendika
3a0727d496
set network correctly - dfrn_confirm
2011-08-14 05:26:44 -07:00
Friendika
fcf6651299
add diaspora support to dfrn_confirm (friendship confirmation)
2011-08-14 05:23:36 -07:00
Friendika
1b8adf0f12
Merge branch 'pull'
2011-08-14 04:27:34 -07:00
Friendika
bbd545b9ca
honour "post to xxx network by default" when using API
2011-08-14 04:26:41 -07:00
Tobias Diekershoff
f9d2c95c06
removed obsolete proxy setting
2011-08-14 11:06:00 +03:00
Friendika
025485ea69
partially fill in diaspora stub functions for comments and likes - these both need lots more work
2011-08-13 19:03:59 -07:00
Friendika
4b4ff75b72
basic post message from diaspora (untested)
2011-08-13 16:39:59 -07:00
Friendika
c9225a691b
js_upload reporting 43k file too big
2011-08-13 16:05:03 -07:00
Friendika
88f94325a4
incoming diaspora share notification turned into Friendika friend request
2011-08-13 06:52:33 -07:00
Friendika
e15e18e0d1
hopefully fix statusnet bug by altering our feed format slightly
2011-08-12 21:01:51 -07:00
Friendika
e1db136966
but #118 proxy settings in admin panel
2011-08-12 04:05:20 -07:00
Friendika
cef64d4498
Merge branch 'pull'
2011-08-12 03:02:21 -07:00
Friendika
aefc6209a3
improved diaspora discovery
2011-08-12 03:01:11 -07:00
Friendika
fda593caed
introduction fails if confirmation differs by http vs https
2011-08-12 02:58:29 -07:00
Tobias Diekershoff
d80e90cab0
Merge pull request #153 from tobiasd/master
...
SN addon respect proxy setings
2011-08-11 10:00:05 -07:00
Tobias Diekershoff
4fe81736ed
SN addon respects friendika proxy settings now
2011-08-11 14:52:23 +02:00
Friendika
0db145dafa
redirect to home after logging in using login url
2011-08-11 04:28:06 -07:00
Friendika
04b59ac49a
enhanced email privacy
2011-08-11 01:52:31 -07:00
Friendika
3f61f9f2c5
comment box premature close due to race condition with liveupdate
2011-08-10 22:20:59 -07:00
Friendika
ac4ce27e88
keep private emails out of any offsite feeds
2011-08-10 21:46:19 -07:00
Friendika
684ebd2ed8
enhance random_string, block public email replies
2011-08-10 21:06:35 -07:00
Friendika
06408664db
Diaspora logo
2011-08-10 05:28:39 -07:00
Friendika
72873cd827
diaspora function dispatcher
2011-08-10 05:10:48 -07:00
Friendika
ee6806d82b
never enough comments
2011-08-10 01:19:27 -07:00
Friendika
cbfb40c43f
use mailto: to specify a new email contact and over-rider webfinger
2011-08-09 22:11:01 -07:00
Friendika
e3841ce15c
pt-br strings.php update from messages.po change
2011-08-09 19:05:43 -07:00
Friendika
afb04142ce
Merge branch 'pull'
2011-08-09 18:56:06 -07:00
Friendika
1bfe1283aa
crypto stuff
2011-08-09 18:55:46 -07:00
Friendika
8407a4c09a
Merge pull request #152 from abinoam/master
...
Small typo at pt-br localization
2011-08-09 18:54:18 -07:00
Abinoam P. Marques Jr.
4cfe75c6bc
small typo - pt-br localization
2011-08-09 22:34:44 -03:00
Tobias Diekershoff
8ad33f3053
Merge pull request #151 from tobiasd/master
...
German localization
2011-08-09 07:42:23 -07:00
Tobias Diekershoff
34eaae46d3
Merge github.com:tobiasd/friendika
2011-08-09 16:35:55 +02:00
Tobias Diekershoff
997cad8685
Merge branch 'master' of git://github.com/friendika/friendika
2011-08-09 16:35:15 +02:00
Tobias Diekershoff
65a4839925
made SN addon admin panel strings translateable
2011-08-09 16:24:58 +02:00
Tobias Diekershoff
e2873e542b
fixed some typos
2011-08-09 16:19:39 +02:00
Tobias Diekershoff
97b2c56c98
update of the German localization
2011-08-09 15:57:08 +02:00
Friendika
49be394182
diaspora - remove debugging code on encrypt/decrypt
2011-08-09 06:40:28 -07:00
Friendika
70017ebb8c
diaspora encrypt+decrypt working !!
2011-08-09 02:53:51 -07:00
Friendika
07c48191b6
AES_256_CBC
2011-08-08 21:51:56 -07:00
Friendika
df3062c612
basic diaspora encryption
2011-08-08 21:44:29 -07:00
Friendika
6be5da67b1
reparenting imported item was only partially reparenting.
2011-08-08 19:10:36 -07:00
Friendika
7eb7f77413
use separate hcard from profile url
2011-08-07 19:26:44 -07:00
Friendika
0745c00b16
guids on items
2011-08-07 17:33:13 -07:00
Friendika
8812b7f4ca
item guids
2011-08-07 17:29:26 -07:00
Friendika
1eec10329a
guid functions
2011-08-07 16:56:26 -07:00
Friendika
eea493d1f5
upsize guid storage to allow for Diaspora future growth
2011-08-07 16:24:20 -07:00
Friendika
48ffa880f0
cleanup
2011-08-07 16:15:54 -07:00
Friendika
aa3a14ec36
bug #117 , use realname for screen_name in API if nickname missing
2011-08-05 21:30:12 -07:00
Friendika
8ae0a8a94c
fix statusnet_html timelines on api
2011-08-05 07:26:54 -07:00
Friendika
1d659bd854
move public profile warning to top of page
2011-08-05 06:42:27 -07:00
Friendika
5a5a7bfc4c
fallback sha256 openssl_verify code for php releases prior to 5.3
2011-08-05 05:37:42 -07:00
Friendika
112fc59e31
more api tweaks
2011-08-05 05:17:18 -07:00
Friendika
6eec04b09c
updates to Diaspora decrypt/verify from recent testing
2011-08-05 01:34:32 -07:00
Friendika
b8592dba8a
integer values don't show up in xml api results
2011-08-05 01:02:12 -07:00
Friendika
2abcf76ec1
salmon protocol changes magicsig draft-experimental, fixes to hostxrd
2011-08-04 22:37:45 -07:00
Friendika
12d5482fc1
some fields in API timeline JSON must be int
2011-08-04 19:47:45 -07:00
Friendika
f0af4de4a7
wrap text from imported link in [quote]
2011-08-04 19:19:51 -07:00
Friendika
639204c2ec
diaspora structures
2011-08-03 22:05:20 -07:00
Friendika
d45a66e700
allow custom avatar sizes - needed for Diaspora hcard/vcard
2011-08-03 21:05:39 -07:00
Friendika
ad1e827169
several fixes for attachments
2011-08-03 19:18:58 -07:00
Friendika
d0b7723bbc
re-parent api post item with parent_id and no parent_uri
2011-08-03 16:29:25 -07:00
Friendika
e22e823e93
allow group selection from contact edit page
2011-08-02 22:39:35 -07:00
Friendika
6bf800c6c8
Provide a way to lie about textlimit as far as API is concerned.
2011-08-02 20:08:40 -07:00
Friendika
1aaded10b4
api compatibility fixes
2011-08-02 20:02:07 -07:00
Friendika
b774127616
bug #114 , warn about linked Facebook item privacy
2011-08-02 17:04:03 -07:00
Friendika
2637831d90
some more zot changes migrating back to f9a mainline
2011-08-01 21:02:25 -07:00
Friendika
8b31ff15f5
breaking up boot file (part of zot refactor)
2011-08-01 16:51:01 -07:00
Friendika
e76990ae7b
bug #111 - don't parse an @ address as a feed
2011-08-01 16:15:37 -07:00
Friendika
326a873082
merge diaspora/friendika vcard formats - not yet complete
2011-08-01 05:13:59 -07:00
Friendika
823d7ba42a
api/friends/ids, api/followers/ids
2011-07-31 22:22:34 -07:00
Friendika
996425206f
api profiles
2011-07-31 20:01:00 -07:00
Friendika
b0a9ec0a73
better handling of api comments/replies
2011-07-31 17:52:36 -07:00
Friendika
0c9f033505
some api enhancements
2011-07-31 16:35:53 -07:00
Friendika
b96b7d4608
get attribution correct in api items
2011-07-31 00:53:46 -07:00
Friendika
149d52da8b
show correct self profile in api
2011-07-30 20:48:55 -07:00
Friendika
60caffcd77
convert our native pkcs#8 to pkcs#1 for diaspora-public-key xrd field
2011-07-30 01:03:24 -07:00
Friendika
01703f3be6
get_diaspora_key()
2011-07-30 00:51:59 -07:00
Friendika
a61ec584d6
basic diaspora decryption
2011-07-30 00:31:00 -07:00
Friendika
dbc3283681
api/statusnet/version
2011-07-29 18:21:54 -07:00
Friendika
829dc24464
api/statusnet/config does not require login
2011-07-29 17:01:57 -07:00
Friendika
c9d17c78a6
Merge branch 'pull'
2011-07-29 16:05:41 -07:00
Friendika
ef47a1cf97
revup
2011-07-29 16:05:16 -07:00
fabrixxm
ba0a710208
Merge pull request #150 from fabrixxm/master
...
some fix
2011-07-29 08:25:44 -07:00
Fabio Comuni
ac6945eed1
Merge remote-tracking branch 'friendika/master'
2011-07-29 17:23:09 +02:00
Fabio Comuni
b1e766dadb
allow GET or POST data in statuses/update
2011-07-29 17:21:02 +02:00
Fabio Comuni
0111a1231c
re-add pending registrations in ping.php, for admin side menu
2011-07-29 17:14:35 +02:00
Fabio Comuni
6c423feed2
add missing link to navbar
2011-07-29 16:32:01 +02:00
Fabio Comuni
97eea6ecd6
style update
2011-07-29 16:24:18 +02:00
Fabio Comuni
d88ed393f8
notify pending registrations
2011-07-29 16:24:09 +02:00
Fabio Comuni
d12e2cbfe9
Fix nav template and add missing strings
2011-07-29 16:23:47 +02:00
Friendika
f47d582736
api/statusnet/config.xml
2011-07-28 21:56:56 -07:00
Friendika
8e30f6a2f4
one more try - do not link numeric hash tags
2011-07-28 21:05:56 -07:00
Friendika
41c7d71e3b
make profile-jot-desc track lock state changes
2011-07-28 20:44:35 -07:00
Friendika
9b2ddb2cc2
auto-friend profiles showing up in directory as community pages
2011-07-28 19:18:07 -07:00
Friendika
a45b94033e
issue with remote mentions
2011-07-28 19:08:38 -07:00
Friendika
8042f874f3
more progress on key conversion functions
2011-07-28 18:16:57 -07:00
Friendika
0a3c9017d0
Merge branch 'pull'
2011-07-28 16:50:44 -07:00
Friendika
04675e3ec3
revup
2011-07-28 16:49:43 -07:00
Tobias Diekershoff
b9cd244dd9
Merge pull request #149 from tobiasd/master
...
wording for StatusNet and Twitter config cleared
2011-07-28 08:40:23 -07:00
Tobias Diekershoff
cfc7f8308f
Merge branch 'master' of git://github.com/friendika/friendika
2011-07-28 17:36:49 +02:00
Tobias Diekershoff
ea0d5d34ac
config page formatation issues fixed
2011-07-28 17:34:34 +02:00
Tobias Diekershoff
ce36f0bf3d
clearing the wordenting for the addon config
2011-07-28 13:25:41 +02:00
Friendika
c74f0f0cab
show full size photos for album view even when photo has been used as a profile photo
2011-07-28 01:01:19 -07:00
Friendika
822fea9d9d
installer text changes
2011-07-27 21:48:02 -07:00
Friendika
b721fabc3c
show lock icon on private events
2011-07-27 02:21:55 -07:00
Friendika
e6c5afdf4f
privacy issue introduced yesterday
2011-07-26 22:57:48 -07:00
Friendika
c17890ab62
privacy settings on event item not propagated correctly
2011-07-26 22:40:11 -07:00
Friendika
94e027af67
deal with browser pre-fetch of the ACL img template '{0}'
2011-07-26 19:20:29 -07:00
Friendika
454ff3c7f0
configurable format for date input selectors
2011-07-25 20:59:25 -07:00
Friendika
1441fce04e
ignore any fully numeric hash tag
2011-07-25 20:21:16 -07:00
Friendika
06802dd8fe
auto focus jot editor
2011-07-25 20:10:21 -07:00
Friendika
ec52010e16
helper functions for Diaspora cert mangling
2011-07-25 19:57:17 -07:00
Friendika
c0749f18d6
event ownership issues
2011-07-25 18:41:48 -07:00
Friendika
21058cdb47
provide ability to use different port
2011-07-25 15:43:28 -07:00
Fabio Comuni
23d6339a41
change to some nav ids, notice in empty notifications popup
2011-07-25 17:12:42 +02:00
Fabio Comuni
ba4ea589d0
update style
2011-07-25 16:55:43 +02:00
Fabio Comuni
99ab06bad3
js to open close popup nav menu and to populate notification menu via ping.
...
Update mod/ping to return details about messages and intros
2011-07-25 16:54:39 +02:00
Fabio Comuni
5fb2b522f4
move <header> and <nav> tag into nav.tpl. add notification popup items template
2011-07-25 16:53:27 +02:00
Fabio Comuni
e6444adafd
change nav selected css class
2011-07-25 16:52:30 +02:00
Friendika
60ff58d7be
Merge branch 'pull'
2011-07-25 00:18:11 -07:00
Friendika
f1115a1031
revup
2011-07-25 00:17:46 -07:00
Fabio Comuni
dfba0f13c8
Merge branch 'newacl' into newui
2011-07-25 08:59:28 +02:00
Fabio Comuni
363c4c5798
Remove "share" greyed text in jot editor when user reshare an item
2011-07-25 08:56:51 +02:00
fabrixxm
9f34f587ea
Merge pull request #148 from fabrixxm/newacl
...
Remove "share" greyed text in jot editor when user reshare an item
2011-07-24 23:53:37 -07:00
Friendika
57653f4fdf
Merge branch 'pull'
2011-07-24 03:59:18 -07:00
Friendika
2e1f74397c
revup
2011-07-24 03:58:48 -07:00
Tobias Diekershoff
855ce3263b
Merge pull request #147 from tobiasd/master
...
link the community page in dispy when enabled
2011-07-24 02:17:11 -07:00
Tobias Diekershoff
a09bdf5ad6
added link to community page to dispy theme menu
2011-07-24 11:07:39 +02:00
Tobias Diekershoff
4ba29089d2
Merge pull request #146 from tobiasd/master
...
hide the editor and controls if not with focus in dispy theme, resend works
2011-07-24 00:36:06 -07:00
Tobias Diekershoff
a4f7e8e8fe
dispy theme hide editor if without focus
2011-07-24 09:32:20 +02:00
Friendika
0fbaac59f0
revup
2011-07-23 00:22:25 -07:00
Friendika
a486d2cd6a
Merge pull request #145 from tobiasd/master
...
dispy ACL and addon license
2011-07-23 00:21:25 -07:00
Tobias Diekershoff
abc01cad20
Merge branch 'master' of git://github.com/friendika/friendika
2011-07-23 07:43:25 +02:00
Tobias Diekershoff
a213a9babf
dispy ACL into the fancybox
2011-07-23 07:41:20 +02:00
Fabio Comuni
93eda9d9c1
Initial work on new UI
2011-07-22 17:37:51 +02:00
Friendika
4e93c742d5
Merge pull request #144 from fabrixxm/newacl
...
fix "resend" function when editor is disabled
2011-07-22 05:51:11 -07:00
Fabio Comuni
5c9eb19767
fix "resend" function when editor is disabled
2011-07-22 08:46:29 +02:00
Tobias Diekershoff
9cf9753190
Merge github.com:tobiasd/friendika
2011-07-22 06:32:36 +02:00
Friendika
6b806708d9
typo
2011-07-21 20:21:41 -07:00
Friendika
77cea581b0
better fix for bug #107 , last one was flawed
2011-07-21 20:19:55 -07:00
Friendika
f4b4f61f66
provide fake first arg to ajax updater
2011-07-21 17:55:15 -07:00
Friendika
9290283040
revup
2011-07-21 16:14:38 -07:00
Friendika
a13eaf915c
Merge pull request #143 from fabrixxm/newacl
...
Use new ACL selector in photo edit
2011-07-21 06:10:30 -07:00
Tobias Diekershoff
ba8fbb60da
removed the "same as friendika" note from the license line
2011-07-21 11:15:13 +02:00
Friendika
1d7d4bf8c6
wrong path for salmon verify
2011-07-20 23:14:43 -07:00
Friendika
5307225682
ajax pause - any key to resume
2011-07-20 17:17:08 -07:00
Fabio Comuni
096ecba883
Use new ACL selector in photo edit
2011-07-20 14:19:20 +02:00
Friendika
40092c83a5
Merge pull request #142 from fabrixxm/newacl
...
More on ACL and editor
2011-07-20 03:54:10 -07:00
Fabio Comuni
19c93adf84
Use popup ACL selector in photo upload. js_upload use new acl selector.
2011-07-20 11:40:24 +02:00
Fabio Comuni
7a069c1438
Load tinyMCE on post editor only if needed.
2011-07-20 11:08:42 +02:00
Fabio Comuni
11d1d309c2
Recursive string replacement in template
2011-07-20 11:05:41 +02:00
Fabio Comuni
020deefba6
Merge remote-tracking branch 'friendika/master' into newacl
2011-07-20 10:01:12 +02:00
Fabio Comuni
1c9ed08620
show acl selector in a popup with fancybox
2011-07-20 10:00:33 +02:00
Friendika
b27d68633b
register hook
2011-07-19 23:10:09 -07:00
Friendika
9048ecd85c
diaspora encryption xml template
2011-07-19 22:58:38 -07:00
Friendika
e2f22a1827
diaspora salmon endpoint (decryption not yet provided)
2011-07-19 21:23:47 -07:00
Friendika
bf1739aef2
Merge branch 'pull'
2011-07-19 17:25:13 -07:00
Friendika
6ce5bcee9f
revup
2011-07-19 17:24:44 -07:00
Friendika
1d35d1e5a1
Merge pull request #141 from fabrixxm/newacl
...
New jot ACL selector
2011-07-19 17:24:09 -07:00
Fabio Comuni
0a3ae96093
add icons to acl selector
2011-07-19 17:15:34 +02:00
Fabio Comuni
89eefbe46c
Fix style and scrollbar
2011-07-19 16:34:27 +02:00
Fabio Comuni
9debbfde1e
fix group image name
2011-07-19 16:25:40 +02:00
Fabio Comuni
9fa0956966
New jot acl selector
2011-07-19 16:17:58 +02:00
Friendika
0b8aaef09c
lack of guarantee is not a license term, but a disclaimer
2011-07-19 04:24:20 -07:00
Friendika
07a77a4d27
resize editor
2011-07-18 21:25:49 -07:00
Friendika
114a728009
created license with which to renounce the license
2011-07-18 20:52:35 -07:00
Friendika
7008bec045
improved code blocks
2011-07-18 19:17:16 -07:00
Friendika
c0b8e63a3f
basic diaspora discovery
2011-07-18 18:13:46 -07:00
Friendika
25b4aacf3b
green icons for greenzero
2011-07-18 16:42:39 -07:00
Friendika
f3bd216112
bug #104
2011-07-17 21:34:02 -07:00
Friendika
1fa2231c20
invite system
2011-07-17 21:12:31 -07:00
Friendika
43110db749
begin invites, fb setup changes
2011-07-17 16:08:47 -07:00
Friendika
944f03d367
change license
2011-07-17 03:34:16 -07:00
Friendika
2f0ab97fd7
header fix post_url
2011-07-16 15:57:47 -07:00
Friendika
fc3da2d599
Merge branch 'pull'
2011-07-15 15:20:42 -07:00
Friendika
d31f720385
revup
2011-07-15 15:20:16 -07:00
Friendika
37c7f68a23
Merge pull request #140 from tobiasd/master
...
we found a little problem with the SN connector and fixed it
2011-07-15 15:19:53 -07:00
Tobias Diekershoff
542585f62e
fix for login problems with StatusNet
2011-07-15 21:43:23 +02:00
Friendika
09f9e658e9
Merge branch 'pull'
2011-07-15 03:09:07 -07:00
Friendika
69f4db9e12
zot stuff
2011-07-15 03:08:43 -07:00
Friendika
f35a61761a
Merge pull request #139 from fabrixxm/update
...
Experiment with on-line update
2011-07-15 01:29:46 -07:00
Friendika
2efb59e439
make lighttpd patch specific to lighttpd, intros don't work on apache
2011-07-14 15:34:00 -07:00
Friendika
ed94028894
template for statusnet api config.xml
2011-07-14 03:38:25 -07:00
Friendika
c8d969e84c
my -> your
2011-07-14 03:08:48 -07:00
Friendika
7534b8873b
link tips on nav bar
2011-07-14 03:05:54 -07:00
Fabio Comuni
34ab2aa959
move update link in admin aside
2011-07-13 08:58:47 +02:00
Friendika
74a608e1c7
openid settings appearing when disabled, don't tag numbers, install admin not getting set
2011-07-12 23:14:38 -07:00
Friendika
706b6e8c84
email notifications not working - unable to change notification settings
2011-07-12 05:09:07 -07:00
Friendika
55bbe2108a
event ownership from remote feeds messed up, this is one step - may require more
2011-07-12 01:24:07 -07:00
Friendika
180c15cdf8
zot scraper
2011-07-11 18:28:13 -07:00
Friendika
2a65d01ce2
several fixes to parse_url
2011-07-11 17:23:42 -07:00
Friendika
eb604deff5
log twitter post result
2011-07-10 20:46:00 -07:00
Friendika
35edf79abe
bug #102
2011-07-09 15:06:53 -07:00
Fabio Comuni
4fdc5ff30c
First test for friendika "live" update
2011-07-08 17:12:08 +02:00
Friendika
2d2b500639
input the admin email address during install/setup.
2011-07-07 19:12:35 -07:00
Friendika
d99dfbe4ef
friendika-z configuration details in admin page
2011-07-07 18:25:56 -07:00
Friendika
eccaa525cc
'dislike' is not part of activitystreams core schema - use symblic constants instead
2011-07-07 16:56:44 -07:00
Friendika
0470eb7805
Merge branch 'pull'
2011-07-07 15:36:03 -07:00
Friendika
5ab30578ae
revup
2011-07-07 15:35:42 -07:00
Friendika
8cc6e69705
Merge pull request #138 from fabrixxm/master
...
some minor tweaks
2011-07-07 15:33:32 -07:00
Fabio Comuni
bf19b219ef
duepuntozero: style blockquote
2011-07-07 14:27:39 +02:00
Fabio Comuni
4116beb276
duepuntozero: style "connect" link in profile page
2011-07-07 14:03:47 +02:00
Fabio Comuni
9dfd798368
Add post type "event" to like/unlike localizated text
2011-07-07 14:02:58 +02:00
Friendika
d187c39d5d
don't warn about php upload limits. nothing can be done by the user.
2011-07-07 03:03:09 -07:00
Friendika
d7b5a606fb
don't show mailbox settings at all if disabled
2011-07-06 20:27:18 -07:00
Friendika
3f25830076
more friendika-z
2011-07-06 20:16:40 -07:00
Friendika
474156b15c
remove insecure java_uploader, add some debugging to twitter plugin
2011-07-06 19:07:43 -07:00
Friendika
94ca19c016
a few minor fixes to settings page
2011-07-06 16:47:55 -07:00
Friendika
5cf9d9d877
revup
2011-07-06 14:29:04 -07:00
Friendika
e315b2defb
Merge pull request #137 from fabrixxm/master
...
Add missing files from previus checkin
2011-07-06 14:19:16 -07:00
Fabio Comuni
5526afcf76
let js_upload addon be aware of upload image size limit, and return message to user in case of error
2011-07-06 17:26:04 +02:00
Fabio Comuni
23c9af5b26
Another missing file
2011-07-06 17:25:23 +02:00
Fabio Comuni
e8a29c64ca
Merge remote-tracking branch 'friendika/master'
2011-07-06 16:22:16 +02:00
Fabio Comuni
2c2df90dc0
Add missing files from previus checkin
2011-07-06 14:19:03 +02:00
Friendika
e3e27458f8
removed another local line
2011-07-06 04:14:17 -07:00
Friendika
e3f061382b
removed local testing statement from .htaccess
2011-07-06 03:52:51 -07:00
Friendika
358cb38325
Merge pull request #136 from fabrixxm/master
...
Works on settings page and field teplates
2011-07-06 03:39:10 -07:00
Fabio Comuni
e7834e60f8
Update settings page to use field templates.
...
Add tabs to switch user settings/plugin settings
Add new field templates 'custom', 'password', radio' and 'yesno'
Update main.js to support advanced fileds
Update duepuntozero, dispy e loozah themes
2011-07-06 12:10:00 +02:00
Friendika
84d12c3e08
move hidewall to user table - queries are getting too complicated and servers falling over
2011-07-05 23:23:43 -07:00
Friendika
c221d5ea59
honour hidden profiles on display item page
2011-07-05 21:11:38 -07:00
Friendika
40aa6f33b5
incorrect links for "view in context" on community page
2011-07-05 21:03:37 -07:00
Friendika
c552248b7c
item tags instead of feed
2011-07-05 20:32:43 -07:00
Friendika
8992c27fa6
better handling of feed photos (e,g, google+)
2011-07-05 20:29:26 -07:00
Friendika
d7154a4606
ability to link contacts that are "really me, but on another system/network".
2011-07-05 19:55:09 -07:00
Friendika
76e56fd44e
begin work on relocation conversation
2011-07-05 19:19:11 -07:00
Friendika
db30a2342c
undo last checkin
2011-07-05 18:21:56 -07:00
Friendika
1a4a6b5ff9
explicitly close db connections - do not rely on process exit
2011-07-05 17:45:33 -07:00
Friendika
308d98f7ac
hash tags cannot contains spaces
2011-07-05 16:23:27 -07:00
Friendika
24d41e2c6e
purify html before trying to parse wild urls. This way at least it should parse.
2011-07-04 23:02:04 -07:00
Friendika
92831c9416
Merge pull request #135 from fabrixxm/dispy
...
More Dispy css
2011-07-04 22:17:35 -07:00
fabrixxm
4e7a5dc56e
Merge branch 'dispy' of github.com:fabrixxm/friendika into dispy
2011-07-05 07:11:57 +02:00
Friendika
5e1335ac89
don't show delete buttons on community page
2011-07-04 21:52:21 -07:00
Friendika
1048ee744e
reversed logic
2011-07-04 21:13:10 -07:00
Friendika
20d3aa2e77
community page
2011-07-04 20:57:07 -07:00
Friendika
308ffe500a
Merge branch 'pull'
2011-07-04 15:45:01 -07:00
Friendika
246b0f1efe
revup
2011-07-04 15:44:33 -07:00
Friendika
300f59ff3e
Merge pull request #134 from defel/fix-HTTP417-lighttpd-1.4.19-bug2
...
require 'Expect' http-header for non-apache webserver (like lighttpd)
2011-07-04 15:42:51 -07:00
aweiher
f164a63144
require 'Expect' http-header for non-apache webserver (like lighttpd)
2011-07-04 17:22:47 +02:00
Fabio Comuni
2359783b9f
dispy: style private mails
2011-07-04 11:30:53 +02:00
Friendika
78363ecfb1
msearch typo
2011-07-04 00:46:23 -07:00
Friendika
a82e0e32b3
add site info to site json response
2011-07-04 00:44:25 -07:00
Friendika
9871cc8c0e
profile match layout issues
2011-07-03 22:53:11 -07:00
Friendika
e795d1265e
show keywords in match results
2011-07-03 21:30:48 -07:00
Friendika
cd7098501e
change wording of "new item view" to be consistent
2011-07-03 20:18:20 -07:00
Friendika
07ea67e33b
removed stray debug statement
2011-07-03 19:57:20 -07:00
Friendika
5ceeb6752d
starred items
2011-07-03 19:41:04 -07:00
Friendika
bef68a8c7f
posts from hidden walls not allowed in search results
2011-07-03 05:54:40 -07:00
Friendika
3538dc15cc
improved search - ensure you can see all your own content (logged in members). Visitors can only see public wall posts.
2011-07-03 05:00:11 -07:00
Friendika
34df1538f3
one more try at splitting out multiple (> 2) http headers in curl
2011-07-03 03:47:18 -07:00
Friendika
12b114f6ad
use another method to strip out headers
2011-07-03 02:19:43 -07:00
Friendika
cffc4ef14d
alter test for http continuation header. Use regex, ignore length.
2011-07-03 00:34:56 -07:00
Friendika
ab7f209fe3
add starred, unstarred icons to duepuntozero, loozah
2011-07-02 20:51:27 -07:00
Friendika
21b852e8e3
updated icons
2011-07-02 20:44:04 -07:00
Friendika
07dc1c3ca9
db support for starred (favorited) items
2011-07-02 17:56:57 -07:00
Friendika
24836f2966
improvied group highlighting, move new group link down
2011-07-02 02:47:01 -07:00
Friendika
2d4f2f86cb
improved group-selected highlighting
2011-07-02 02:34:19 -07:00
Friendika
e6aaa8b59b
use local 'match people with my interests' if global directory is not configured
2011-07-02 01:21:56 -07:00
Friendika
fb0e758ce7
add some indexes to photos
2011-07-01 22:36:33 -07:00
Friendika
ccb00d6882
set user-agent
2011-07-01 19:29:56 -07:00
Friendika
9534e335aa
doco
2011-07-01 18:21:55 -07:00
Friendika
d28d2ff440
better (more consistent) handling of ostatus contacts
2011-07-01 18:18:01 -07:00
Friendika
c23657ab6e
also check for blocked
2011-07-01 17:45:00 -07:00
Friendika
9816f14d40
statusnet improvements
2011-07-01 17:39:16 -07:00
Friendika
813d6c453c
missed block
2011-07-01 06:26:46 -07:00
Friendika
f53a2d6da9
add group highlight to other pages
2011-07-01 06:23:09 -07:00
Friendika
b1aa77584f
indicate currently selected group in group picker
2011-07-01 06:14:15 -07:00
Friendika
6e5532149a
missing minutes in event listings
2011-06-30 23:27:16 -07:00
Friendika
086dc25dd1
logic reversed
2011-06-30 23:23:50 -07:00
Friendika
762fb878f8
don't allow editing of somebody else's event
2011-06-30 23:21:58 -07:00
Friendika
c08b85777a
too much logging
2011-06-30 22:00:08 -07:00
Friendika
481cd708ac
allow polling to mostly survive minor memory shortages.
2011-06-30 21:56:07 -07:00
Friendika
84ee783a2a
match the documentation
2011-06-30 20:34:49 -07:00
Friendika
cdddfca0b5
photos were not working in private mail
2011-06-30 19:02:11 -07:00
Friendika
9aeccaaa9e
we still need the source file. Don't know why.
2011-06-30 18:36:38 -07:00
Friendika
53653f6a4d
consolidate perrmisions sql, minor duepuntozero validation fixes
2011-06-30 17:35:35 -07:00
Friendika
b03df35b02
Merge branch 'pull'
2011-06-30 15:33:01 -07:00
Friendika
42a6bc81e9
revup
2011-06-30 15:32:39 -07:00
Friendika
4f1213b69f
Merge pull request #132 from fabrixxm/master
...
Some works on addons and other
2011-06-30 15:31:25 -07:00
Fabio Comuni
7778dbb67b
twitter and statusnet plugin settings are not parsed on post if their respective submit buttons was not clicked by user
2011-06-30 17:01:26 +02:00
Fabio Comuni
762bb8de79
update oembed and widgets plugins settings form
2011-06-30 17:00:26 +02:00
Fabio Comuni
c5cddc7428
profile_sidebar hook use byref values in second argument array
2011-06-30 16:44:54 +02:00
Fabio Comuni
a07282ea6f
tinyMCE loads "source" version of bbcode plugin istead of "compressed" one
2011-06-30 16:44:06 +02:00
Fabio Comuni
779292077c
style template field outside admin pages
2011-06-30 16:43:04 +02:00
Fabio Comuni
81e7535914
Add javascript var "baseurl"
...
Add field_richtext template
2011-06-30 16:42:27 +02:00
Friendika
8819c73ba1
bug #99 - don't show album name/link if photos are private
2011-06-30 03:39:08 -07:00
Friendika
994011ddb6
load db configs (config,system) for all "executables"
2011-06-30 01:15:18 -07:00
Friendika
3eb0b4be2a
now that we have admin interface, completely remove register approvals from notifications
2011-06-29 22:38:30 -07:00
Friendika
58d474aa2d
switch to text mode group editor after 'n' contacts
2011-06-29 20:42:16 -07:00
Friendika
ae0275ec2c
collapse multiple spaces in usernames
2011-06-29 19:26:18 -07:00
Friendika
ad5b976978
allow spaces in @ tags
2011-06-29 18:59:05 -07:00
Friendika
f73bc7f010
Merge pull request #131 from fabrixxm/admin
...
re-added last item date in admin user page
2011-06-29 15:30:45 -07:00
Fabio Comuni
f4a1820110
re-added last item date in admin user page. relative_date return 'never' if null is passed
2011-06-29 16:06:32 +02:00
Friendika
baead9f4c8
very minor nit - if $abs is false, return before trying to use false in a numeric calculation
...
also return 'never' if we have an uninitialised date
2011-06-29 03:54:29 -07:00
Friendika
26cd3a4703
Merge pull request #130 from fabrixxm/admin
...
Fix bug #98 , add "never" to relative_date(), fix batch operations
2011-06-29 03:44:05 -07:00
Fabio Comuni
1e307e9869
Fix bug #98 , add "never" to relative_date(), fix batch operations
2011-06-29 12:05:09 +02:00
Friendika
2a57847816
don't allow blocked/unverified users to reset their password.
2011-06-29 00:59:21 -07:00
Friendika
62340ba86b
get app structure needed in regmod
2011-06-29 00:40:43 -07:00
Friendika
48521fa4e1
document better the UPDATE_VERSION
2011-06-28 23:20:58 -07:00
Friendika
d5855967a7
do not translate hidden photo album 'Contact Photos' as it may become unhidden when different language is used.
2011-06-28 22:33:02 -07:00
Friendika
5023eed605
change simplepie path in dispy
2011-06-28 21:30:46 -07:00
Friendika
372c75ee68
how the heck did favicon get into the repo? Gone now...
2011-06-28 21:27:00 -07:00
Friendika
0b221e8945
bug #96 move libraries to library - better alignment of like rotator
2011-06-28 21:11:52 -07:00
Friendika
60caa03494
darkzero textareas hard to read
2011-06-28 19:08:13 -07:00
Friendika
4ca6a9a382
dbg info for photo uploads
2011-06-28 18:59:41 -07:00
Friendika
0a6b4c93fe
Merge pull request #129 from tobiasd/master
...
deleteCheckedItems was missing in dispy
2011-06-28 15:23:56 -07:00
Tobias Diekershoff
399c5aed1e
added deleteCheckedItems to jot-header.tpl
2011-06-28 13:03:19 +02:00
Friendika
02a4d8c39f
Merge pull request #128 from abinoam/patch-1
...
Fixed: Twitter profiles link.
2011-06-27 21:04:33 -07:00
Abinoam P. Marques Jr.
390fd8e74a
Fixed: Twitter profiles link.
2011-06-27 20:51:33 -07:00
Friendika
932397b47b
trim webfinger request
2011-06-27 19:47:55 -07:00
Friendika
4418cb4349
preformat webfinger output
2011-06-27 18:13:44 -07:00
Friendika
29c57f7ad2
don't load configs if no database.
2011-06-27 17:18:13 -07:00
Friendika
1947b74e5b
some basic margins for friend suggestion screen
2011-06-27 16:18:06 -07:00
fabrixxm
cfd59f6ac8
dispy: photos display don't overflow onto sidebar
2011-06-27 18:23:03 +02:00
Friendika
14c002d7a4
make friend suggest themeable
2011-06-27 03:09:45 -07:00
Friendika
06a4c0f703
ignore current contact on friend suggestion picker
2011-06-27 03:03:58 -07:00
Friendika
c410c9013c
friend suggestions
2011-06-26 22:57:08 -07:00
Friendika
23f00aaab4
recipient ui, friend suggestions
2011-06-26 21:55:24 -07:00
Friendika
3fe1e19725
pass notify endpoint with friend suggestions
2011-06-26 19:30:57 -07:00
Friendika
f7964efa52
revisit friend suggestion structures
2011-06-26 17:57:23 -07:00
Friendika
22e8922088
friend suggest structures, cont.
2011-06-26 05:42:32 -07:00
Friendika
c9604ef578
allow cross-site xrd/lrdd/webfinger
2011-06-25 19:40:37 -07:00
Friendika
59d9070d13
suggestion template
2011-06-25 19:10:38 -07:00
Friendika
39b5263e35
added more "what to do if..." notes to INSTALL.txt
2011-06-23 23:23:44 -07:00
Friendika
e320975d73
bug #95
2011-06-23 22:23:26 -07:00
Friendika
694c1c1af4
new contact_selector function to provide more fine-tuned selection options.
2011-06-23 21:55:27 -07:00
Friendika
8ffcd4323b
never enough comments
2011-06-23 18:56:24 -07:00
Friendika
a15bd91d17
don't update an event that hasn't changed.
2011-06-23 18:25:33 -07:00
Friendika
38cf37d3c3
new item view, sort by received date - not posted date.
2011-06-23 17:56:59 -07:00
Friendika
2bc4e24da2
ignore local merge script
2011-06-23 16:10:36 -07:00
Friendika
8242fb4bf0
Merge branch 'pull'
2011-06-23 16:00:37 -07:00
Friendika
5633430a19
don't allow tags in app source
2011-06-23 15:58:43 -07:00
Friendika
b1e2b1c1e1
Merge pull request #127 from tobiasd/master
...
Piwik admin interface
2011-06-23 15:29:21 -07:00
Friendika
0e809b9301
bug #94 mis-spell Czech
2011-06-23 14:11:23 -07:00
Tobias Diekershoff
cb319c6824
fixed a typo
2011-06-23 21:44:25 +02:00
Tobias Diekershoff
6a491db3e0
admin interface stuff for the piwik addon
2011-06-23 20:47:24 +02:00
Friendika
fa778e0040
Merge pull request #126 from fabrixxm/dispy
...
Dispy
2011-06-23 04:10:12 -07:00
Fabio Comuni
e7737d2ea4
dispy: style profile tab
2011-06-23 12:36:36 +02:00
Fabio Comuni
95a933c9a2
dispy: update icons, style events
2011-06-23 12:13:04 +02:00
Fabio Comuni
5de7d0f12f
add profile tabs to "photos", "events" and "notes". in dispy, show active tab.
2011-06-23 11:30:17 +02:00
Friendika
96857389ac
friendika-z initial implementation
2011-06-23 01:57:14 -07:00
Friendika
aa4636d03a
Merge pull request #125 from tobiasd/master
...
impressum plugin
2011-06-22 22:30:09 -07:00
Friendika
723d60194c
security - remove string_translator (has been blocked for the last couple of months)
2011-06-22 22:14:36 -07:00
Tobias Diekershoff
cc71a0676f
initial commit of the impressum plugin
...
plugin to provide additional information about the site owner
and contact possibilities that will be displayed at the /friendika
page. admin interface is implemented.
2011-06-23 07:12:50 +02:00
Friendika
c23c366ff6
receive friendship suggestion over the wire (dfrn) and store
2011-06-22 19:08:30 -07:00
Friendika
673e51826c
couple of minor fixes to oembed settings hooks
2011-06-22 05:03:27 -07:00
Friendika
282373de54
Merge branch 'pull'
2011-06-21 23:08:30 -07:00
Friendika
3da55206ca
reformat
2011-06-21 23:07:45 -07:00
Friendika
6056a6314b
Merge pull request #124 from tobiasd/master
...
little typo in variable names for the admin interface
2011-06-21 23:07:16 -07:00
Tobias Diekershoff
513447a415
typo fix for the variable names
2011-06-22 07:26:49 +02:00
Friendika
a51fc14e69
structures for friend suggestions
2011-06-21 18:03:54 -07:00
Friendika
e6086e2363
missed some images, table border property
2011-06-21 16:45:47 -07:00
Friendika
043bde42a6
fix banding on logo, xhtml compliant list and basic table support
2011-06-21 16:29:43 -07:00
Friendika
ab143a3102
Merge pull request #123 from fabrixxm/api
...
Api
2011-06-21 03:47:27 -07:00
Fabio Comuni
655f5c7b9f
use "contacts/<id_contact>" url as subject id, as statusnet and twitter use urls like "domain/<id_user>".
...
This seem to make StatusNet Desktop client work better.
2011-06-21 12:00:52 +02:00
Fabio Comuni
7cd7a79807
remove duplicate tag in atom response
2011-06-21 11:44:26 +02:00
Fabio Comuni
296f1b0123
add users infos to rss and atom api responses
2011-06-21 11:41:16 +02:00
Friendika
7f387d93ae
only show app on top-level or standalone posts
2011-06-21 00:56:24 -07:00
Friendika
2b11ff65dc
use original application if available
2011-06-21 00:50:54 -07:00
Friendika
5a23440fb4
restrict FB imports which have privacy policies to the post owner.
...
Also add facebook to $item['app'] on imported posts from FB.
2011-06-20 22:18:03 -07:00
Friendika
55112cfdd0
item source
2011-06-20 19:08:40 -07:00
Friendika
db336929cd
add rate limit call so spaz will work
2011-06-20 17:16:13 -07:00
Friendika
285d617569
using pre - one less str_replace for log viewing
2011-06-20 16:10:03 -07:00
Friendika
de24f68112
module to provide local "find people like me" when global dir unavailable
2011-06-20 05:14:42 -07:00
Friendika
f256e31e4f
Merge pull request #122 from tobiasd/master
...
German language stuff
2011-06-20 04:17:37 -07:00
Friendika
b86ae9de7f
use atom_time on atom entries
2011-06-20 01:38:26 -07:00
Tobias Diekershoff
f0c5a1b21b
typo and wording for the German language files
2011-06-20 09:47:42 +02:00
Friendika
f3292e68a2
user and status outputs reversed for api post
2011-06-19 21:08:51 -07:00
Friendika
b56e00c7c5
api post sort of working - output status,user need to be swapped
2011-06-19 20:13:24 -07:00
Friendika
cc7c72be90
statusnet API posting (untested as behind firewall at the moment)
2011-06-19 18:50:18 -07:00
Friendika
c2dcff0d02
move profile privacy settings to the Privacy section of the Settings page
2011-06-19 16:47:03 -07:00
Friendika
76ddbff0b5
Merge branch 'pull'
2011-06-19 15:56:07 -07:00
Friendika
d8e2dc23b9
revup
2011-06-19 15:55:19 -07:00
Friendika
7c28e58932
Merge pull request #121 from fabrixxm/admin
...
Admin update
2011-06-19 15:54:55 -07:00
fabrixxm
001982cac0
Change logic in admin.php to load plugin settings form. Add statusnet settings form.
2011-06-19 15:43:10 +02:00
fabrixxm
b650183cd4
Save in db if addon define "$addon_plugin_admin" function. Add "plugin_admin" column to "addon" table
2011-06-19 15:42:06 +02:00
fabrixxm
10eb79a629
add array support to set_config and get_config
2011-06-19 15:10:31 +02:00
Friendika
fba2056b1f
Merge branch 'pull'
2011-06-19 03:41:57 -07:00
Friendika
f094b32d55
Merge pull request #120 from fabrixxm/dispy
...
Dispy updates and some fixes
2011-06-19 03:40:10 -07:00
fabrixxm
33bafa62aa
dispy code tag style
2011-06-19 12:17:13 +02:00
fabrixxm
4bc8ab6e7d
Update dispy. Add admin link and styles, add help link, other fixes
2011-06-19 11:21:30 +02:00
fabrixxm
c10e913a4b
update admin style in loozah
2011-06-19 11:20:35 +02:00
fabrixxm
3b759585d2
fix banner in duepuntozero
2011-06-19 11:20:13 +02:00
Friendika
1b04c3c8e2
Merge branch 'pull'
2011-06-18 15:40:02 -07:00
Friendika
b58db8420a
revup
2011-06-18 15:39:19 -07:00
Friendika
8f5727430b
Merge pull request #119 from bufalo1973/patch-1
...
Added backslash to $name so it doesn't throws an error.
2011-06-18 15:38:49 -07:00
bufalo1973
ccffd583d1
Added backslash to $name so it doesn't throws an error.
...
Añadida una barra a $name para que no dé error.
2011-06-18 14:01:49 -07:00
Friendika
cf9f23fb74
Merge pull request #118 from fabrixxm/admin
...
Admin work
2011-06-18 00:17:36 -07:00
fabrixxm
4b633d54bb
admin: fix last item date in users list, fix plugins details template
2011-06-18 08:52:51 +02:00
fabrixxm
23931ab719
Admin: add translatable strings, remove 'rino' settings, invert 'no'-setings, add "plugin_admin" hook for global plugins settings. add settings to twitter connector as example.
2011-06-18 08:29:59 +02:00
Friendika
9e2db5d5a6
tooltip for selecting items
2011-06-17 23:06:42 -07:00
Friendika
787f079d13
improved UI for checked items to be deleted
2011-06-17 22:58:15 -07:00
Friendika
484b248f73
add pagination to admin/user page to support large numbers of users
2011-06-17 16:21:11 -07:00
Friendika
4ca730e5d7
remove debug statements
2011-06-16 23:17:25 -07:00
Friendika
fb0b22fb13
fix admin log viewer (will only read the last 5M of the log, and puts the text into a scrolling div)
2011-06-16 22:20:12 -07:00
Friendika
a66083b3e4
imported event should not have wall flag set
2011-06-16 18:11:00 -07:00
Friendika
bb73c0b9f3
Merge branch 'pull'
2011-06-16 15:29:04 -07:00
Friendika
6709beb2ac
Merge pull request #117 from tobiasd/master
...
german strings and green background for the greenzero theme
2011-06-16 15:27:45 -07:00
Friendika
b61a7158da
Merge pull request #116 from fabrixxm/admin
...
Admin pages
2011-06-16 15:27:12 -07:00
Friendika
0f3292fefb
revup
2011-06-16 15:26:39 -07:00
Tobias Diekershoff
6802911522
put the green back in the panel background
2011-06-16 17:22:03 +02:00
Tobias Diekershoff
bca1dcf2d6
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-16 15:30:51 +02:00
Fabio Comuni
a652cd5095
admin styles to loozah. missing user admin template
2011-06-16 15:08:50 +02:00
Fabio Comuni
ede011cc32
Admin users page. some fix to template processor.
2011-06-16 14:56:43 +02:00
Fabio Comuni
c94b809634
fix a small php notice.
2011-06-16 12:14:04 +02:00
Fabio Comuni
5f583fb8d6
Admin: register policy in site page, initial users page. Aside 'Users' link show pending registrations.
2011-06-16 12:05:35 +02:00
Fabio Comuni
ffee5dd69e
ping updates trigger 'nav-update' custom event from <nav>
2011-06-16 12:04:27 +02:00
Fabio Comuni
63390aa800
{{ if }} {{ else }} support in templates
2011-06-16 12:02:05 +02:00
Friendika
c92e6ed929
avoid race condition on delete checked items
2011-06-16 00:38:41 -07:00
Friendika
e5b54e74ba
delete selected items
2011-06-15 20:43:39 -07:00
Tobias Diekershoff
ae3c9b7b2b
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-16 02:09:29 +02:00
Friendika
7659f2a87a
revup
2011-06-15 16:33:02 -07:00
Friendika
7601ce7de7
iframes
2011-06-15 03:41:28 -07:00
Tobias Diekershoff
dbf6ee6a05
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-15 07:02:38 +02:00
Friendika
cee63c7a0d
preserve original timezone adjust selection when editing events
2011-06-14 21:44:27 -07:00
Friendika
c379774300
add some whitespace in event html
2011-06-14 21:22:52 -07:00
Friendika
ca84823437
Dear $username not expanded/replaced in text emails
2011-06-14 20:49:25 -07:00
Friendika
fcdebc2324
event theming
2011-06-14 20:07:40 -07:00
Friendika
5105b3febc
event calendar links, editing
2011-06-14 19:48:37 -07:00
Fabio Comuni
b7dc9f8867
Update info comments in all plugins
2011-06-14 15:08:03 +02:00
Fabio Comuni
00e142e4f7
Load plugin info from plugin file. Show README.md or README from plugin dir in plugin details page
2011-06-14 14:21:43 +02:00
Fabio Comuni
283160901f
update styles
2011-06-14 14:21:00 +02:00
Fabio Comuni
25d1637ec4
simple plugin details and log view in admin
2011-06-14 11:54:14 +02:00
Fabio Comuni
5dc8fbccb2
enable/disable plugins from admin page
2011-06-14 11:16:27 +02:00
Fabio Comuni
b1184f3fde
Merge remote-tracking branch 'friendika-master/master' into admin
2011-06-14 10:37:54 +02:00
Fabio Comuni
5882d8d022
Initial plugins admin page
2011-06-14 10:35:56 +02:00
Tobias Diekershoff
d08b068031
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-14 08:10:38 +02:00
Friendika
a62d33dd48
doco
2011-06-13 22:28:51 -07:00
Friendika
9b9bd35cba
demo plugin for embedded flash games
2011-06-13 22:21:48 -07:00
Friendika
4469f92ea3
prev/next icons (instead of text) for photos
2011-06-13 21:43:21 -07:00
Friendika
dc10178b18
apps is not an array...
2011-06-13 21:37:56 -07:00
Friendika
05eb9ceaba
avoid returning events from getting posted again
2011-06-13 20:42:37 -07:00
Friendika
fb92dbf5d6
link events + personal notes to profile tabs
2011-06-13 20:32:30 -07:00
Friendika
d5fdd4287d
event sharing, cont.
2011-06-13 19:06:49 -07:00
fabrixxm
4ba23df20a
fix a typo in site settings page
2011-06-13 18:29:14 +02:00
Fabio Comuni
ab27f1393e
Admin site page
2011-06-13 18:03:06 +02:00
Fabio Comuni
f80521923d
Add {{ if a==b }} and {{ if a!=b }} to templates
2011-06-13 18:02:40 +02:00
Fabio Comuni
e14d5851a7
fix template's {{ for }} variable lookup
2011-06-13 12:53:41 +02:00
Fabio Comuni
a1c59d6011
Fix it strings
2011-06-13 12:53:03 +02:00
Fabio Comuni
494288ab9f
Add admin page in nav
2011-06-13 12:52:52 +02:00
Fabio Comuni
3364c2a2d8
Initial admin page
2011-06-13 12:52:29 +02:00
Fabio Comuni
afd0f8e4d8
load $a->config from db
2011-06-13 12:51:36 +02:00
Tobias Diekershoff
4d3c6941ca
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-11 08:33:02 +02:00
Friendika
d66056af9d
reduce visibility of lang-select flag (duepuntozero)
2011-06-10 20:39:46 -07:00
Tobias Diekershoff
eb6666e156
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-10 19:14:10 +02:00
Friendika
7c60701efc
fixed a few feed problems affecting activity objects/targets
2011-06-10 01:51:14 -07:00
Tobias Diekershoff
8390e8b19b
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-10 07:02:53 +02:00
Friendika
b857a49bfe
event publish
2011-06-09 21:23:45 -07:00
Friendika
8aaf55c1e6
event item
2011-06-09 20:02:48 -07:00
Friendika
67021c132a
event communication basics
2011-06-09 16:24:29 -07:00
Tobias Diekershoff
7ffd0ee41a
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-09 10:20:47 +02:00
Friendika
9203b48527
default event publish permissions = personal
2011-06-09 01:01:29 -07:00
Friendika
d371241e66
events
2011-06-09 00:58:45 -07:00
Friendika
894dfde122
set permalink on photo tags
2011-06-08 22:34:22 -07:00
Friendika
dea721a3f8
minor fixes to apps (don't show notes if not logged in) and photos (tag delete link is leaking to unauthorised users)
2011-06-08 21:43:32 -07:00
Friendika
df8ac668b8
more calendar work, undo strict_privacy flag to use different approach
2011-06-08 21:06:02 -07:00
Tobias Diekershoff
6f9fd92c2e
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-08 12:01:36 +02:00
Friendika
a10abd4860
remove event if attached item is deleted
2011-06-08 00:47:00 -07:00
Friendika
0bfb6314df
default uploaded photo permissions were wrong
2011-06-07 22:47:15 -07:00
Tobias Diekershoff
9ef5cb1c38
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-08 07:21:19 +02:00
Friendika
e2f1540f25
events, continued. Also better regex matching accounting for empty elements
2011-06-07 22:13:07 -07:00
Friendika
33fe26ecb0
more progress on events
2011-06-07 20:10:43 -07:00
Friendika
d1e9af2c51
Merge pull request #115 from fabrixxm/tr
...
update it strings
2011-06-07 17:12:56 -07:00
Friendika
d2863d1859
first recently uploaded photo (in 3 hours) to an older existing album, post made visible
2011-06-07 16:23:37 -07:00
Tobias Diekershoff
e036434b8a
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-07 20:03:58 +02:00
fabrixxm
16446ab0d0
update it strings
2011-06-07 11:44:20 +02:00
fabrixxm
771c58da62
fix po2php plurals regexp and IT strings.php
2011-06-07 11:39:06 +02:00
Friendika
c1b2e90e37
basic saving of events
2011-06-06 22:27:38 -07:00
Friendika
fcb4316c29
tinymce for event fields
2011-06-06 21:49:07 -07:00
Friendika
bbc65f9832
prev/next links in calendar
2011-06-06 21:28:11 -07:00
Friendika
9f51233451
event listings
2011-06-06 20:17:36 -07:00
Friendika
452245d988
more events framework
2011-06-06 19:59:20 -07:00
Friendika
c0094aa4f8
strict privacy mode (Friendika-Z) - refuse to talk to networks with privacy issues
2011-06-06 16:26:11 -07:00
Friendika
ccf4e3eee5
Merge branch 'pull'
2011-06-06 14:17:33 -07:00
Friendika
c003eda177
revup
2011-06-06 14:16:22 -07:00
Friendika
a37a952f5b
Merge pull request #114 from fabrixxm/dispy
...
Missing icons in dispy
2011-06-06 14:15:49 -07:00
Friendika
f48080335e
Merge pull request #113 from fabrixxm/master
...
Small fix to theme selector
2011-06-06 14:14:38 -07:00
Fabio Comuni
89fc56723d
Add 'attach' and 'language' icons and enable file upload in dispy template
2011-06-06 15:38:21 +02:00
fabrixxm
76f4d85d9a
Small fix to theme selector
2011-06-06 14:55:54 +02:00
Friendika
4c629e274b
begin event module
2011-06-05 23:10:07 -07:00
Friendika
18f4c6094a
bug #88 , Thanks Chris! Added a couple of minor tweaks for identity checking and consistency with other profile viewing links
2011-06-05 21:05:55 -07:00
Friendika
8e3cc8669b
alphabetically sort the language selector
2011-06-05 20:45:46 -07:00
Friendika
edbad772ba
add flag for experimental themes
2011-06-05 18:05:25 -07:00
Friendika
c4cec593ba
position language selector in dispy
2011-06-05 17:51:39 -07:00
Friendika
4284c6f9ee
use icon for language selector instead of hotkey
2011-06-05 17:32:56 -07:00
Friendika
7b02e178a4
more work on facebook re-queue
2011-06-05 02:18:18 -07:00
Friendika
182582eed8
load hooks inside queue
2011-06-05 02:09:31 -07:00
Friendika
dbaf3eca07
fb queue - wrong var
2011-06-05 00:19:22 -07:00
Friendika
6f34f89ddb
mb_string is now required.
2011-06-04 22:48:43 -07:00
Friendika
d53c1bb48a
facebook queue: not enough parameters
2011-06-04 22:43:55 -07:00
Tobias Diekershoff
0e8b2092a0
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-05 04:59:13 +02:00
Friendika
05e06889b3
mbstring is now required
2011-06-04 15:34:28 -07:00
Tobias Diekershoff
ebb8186191
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-03 16:16:27 +02:00
Friendika
e591ed6b30
minor edits
2011-06-03 07:04:43 -07:00
Friendika
980d3864cb
document newmember link so you can find it later.
2011-06-03 06:49:57 -07:00
Friendika
bc3255ab3f
don't serialize entire item
2011-06-03 06:41:52 -07:00
Friendika
86df81352f
show new_member page only on our own profile
2011-06-03 06:22:39 -07:00
Friendika
32bebdfa7e
new_member not new_user
2011-06-03 06:17:43 -07:00
Friendika
00c548cc8f
new member page
2011-06-03 06:12:34 -07:00
Friendika
a27391c33a
facebook queueing on failure, sync update.php with boot.php update version to avoid race condition
2011-06-03 01:16:17 -07:00
Tobias Diekershoff
9b93bd2521
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-03 08:21:28 +02:00
Friendika
f2bdcb19e7
adjust acl_selector max name length to prevent div overflow
2011-06-02 20:58:44 -07:00
Friendika
20d1de4ced
got it wrong - apparently no need to fix json slashes
2011-06-02 20:42:09 -07:00
Friendika
1eb177235b
add queue_deliver plugin hook
2011-06-02 18:26:06 -07:00
Friendika
2fcb5922c3
don't notify failed FB delivery of likes, which have no id.
2011-06-02 17:41:04 -07:00
Friendika
558962169f
warning message if Facebook post does not succeed. It happens quite a lot.
2011-06-02 00:52:26 -07:00
Friendika
55e727de64
make 'visible to everybody' warning toggle correctly in photos and settings
2011-06-01 22:06:53 -07:00
Friendika
1e0d3173f8
i before e, except after....
2011-06-01 21:15:20 -07:00
Tobias Diekershoff
bda839635c
Update to the German language files
2011-06-01 18:34:49 +02:00
Tobias Diekershoff
ef77d53782
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-01 18:34:10 +02:00
Friendika
969a25eab2
add titles to shared items if available
2011-06-01 06:41:12 -07:00
Tobias Diekershoff
2413a6b422
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-01 07:56:27 +02:00
Friendika
fc34641d4a
improve colour balance and banner on html email notifications
2011-05-31 22:41:09 -07:00
Friendika
fa986849c9
Brazilian (portugese) translation
2011-05-31 21:40:57 -07:00
Friendika
b8c4d73377
show group affiliations in contact editor
2011-05-31 19:24:26 -07:00
Friendika
e25ded6d96
don't count wall posts in unseen network total
2011-05-31 17:35:24 -07:00
Friendika
1d2cc5c5ad
put oembed settings into a .settings-block div for consistency
2011-05-30 23:12:39 -07:00
Tobias Diekershoff
745d075397
Merge branch 'master' of git://github.com/friendika/friendika
2011-05-31 07:36:25 +02:00
Friendika
f95ea14478
show linked url on user's contact page
2011-05-30 22:17:04 -07:00
Friendika
9f52e311df
sort wall items by date order instead of id. bug #61
2011-05-30 19:59:54 -07:00
Friendika
656d861b3e
on rare occasions posts do not get a parent. The only thing which could cause it is if we can't find our new post. So we'll check for this and try one more time before failing.
2011-05-29 22:50:36 -07:00
Friendika
dd4d5707b0
order groups by name
2011-05-29 21:45:00 -07:00
Friendika
7fb9aa24fb
bug #87 alert if email settings don't open mailbox, also display last email connect time
2011-05-29 21:20:50 -07:00
Tobias Diekershoff
087f79236e
Merge branch 'master' of git://github.com/friendika/friendika
2011-05-30 06:19:59 +02:00
Friendika
c3478a1485
bug #62 - opt-out of importing FB friends/conversations but still allow FB posting
2011-05-29 20:36:45 -07:00
Friendika
bddcc41518
Czech (cs) language
2011-05-29 20:36:21 -07:00
Friendika
b6200ceff3
readme update
2011-05-29 17:53:24 -07:00
Friendika
547fd1e0e5
small fixes to item post to try and sort out segfault issues on php 5.3 (?)
2011-05-29 15:47:26 -07:00
Tobias Diekershoff
770d1bb7a3
Merge branch 'master' of git://github.com/friendika/friendika
2011-05-28 10:37:33 +02:00
Friendika
69f014d02b
bug #38 ability to restrict profile, wall, photos from non-friends
2011-05-28 00:49:03 -07:00
Friendika
4e8a97f30a
bug #38 posts and photos only visible to friends if so configured
2011-05-28 00:42:01 -07:00
Friendika
b0c383a6d0
begin event module
2011-05-27 21:01:30 -07:00
Friendika
94af6fb064
correct nickname for display link on comment emails
2011-05-27 18:54:43 -07:00
Friendika
73e0986710
item/event linkage
2011-05-27 18:47:28 -07:00
Friendika
a2b26948d8
duplicate likes if we posted it locally and it also comes back from FB
2011-05-27 15:33:01 -07:00
Friendika
b93f0df890
email - search from, to, cc, and bcc
2011-05-27 04:07:44 -07:00
Friendika
763ff827d5
don't reset photo permissions unless photo has owner-only permissions
2011-05-27 02:37:12 -07:00
Friendika
ecb300177c
troublesome feed was a 307 redirect. We didn't recognise 307
2011-05-26 23:10:40 -07:00
Friendika
341f853b04
search from network page
2011-05-26 17:47:33 -07:00
Friendika
7acb8fa6e7
add webfinger diagnostic module
2011-05-26 16:41:36 -07:00
Friendika
5a0690d940
add attachments to FB posts, fix paren string in statusnet, do not insert attach div into post if no attachments
2011-05-26 06:46:55 -07:00
Tobias Diekershoff
5e01432c6f
Merge branch 'master' of git://github.com/friendika/friendika
2011-05-26 08:20:27 +02:00
Friendika
61b730d567
cleanup content type icons
2011-05-25 20:01:53 -07:00
Friendika
3710a6fd07
sort out a couple of email notify issues
2011-05-25 18:15:49 -07:00
Friendika
ce25042a84
explain that blocking profile wall access will effectively block OStatus communications.
2011-05-25 17:25:07 -07:00
Friendika
cd536731c3
minor string update
2011-05-25 17:20:41 -07:00
Friendika
b6b2997b43
remove debug line
2011-05-25 16:02:02 -07:00
Friendika
8e8054bc80
position the attach icon in loozah
2011-05-25 15:54:02 -07:00
Friendika
77d2c44eff
Merge branch 'pull'
2011-05-25 15:49:25 -07:00
Friendika
8e56994e5f
revup
2011-05-25 15:48:21 -07:00
Friendika
c0f529cf38
Merge pull request #111 from fabrixxm/dispy
...
fix profile images and contact selector in group editor in dispy theme
2011-05-25 15:48:02 -07:00
Tobias Diekershoff
e9df9d22c0
typo
2011-05-25 19:51:36 +02:00
Tobias Diekershoff
697e3464ab
German translations
2011-05-25 13:36:12 +02:00
Tobias Diekershoff
4a95b6361b
new german strings
2011-05-25 13:34:57 +02:00
Friendika
3ddb077466
Merge pull request #110 from fabrixxm/master
...
Small tweak to a copule of translatable strings
2011-05-25 03:52:03 -07:00
Fabio Comuni
ad2aded259
Small tweak to a copule of translatable strings
2011-05-25 12:23:45 +02:00
Friendika
2a679b1164
file attachments
2011-05-25 02:08:15 -07:00
Friendika
de482058b8
fix attach icon
2011-05-24 23:01:24 -07:00
Friendika
73b4faca5c
basic file upload/attach
2011-05-24 22:40:52 -07:00
Friendika
eb152fdc24
more position tweaks on attach icons
2011-05-24 21:04:59 -07:00
Friendika
20a1500c25
open attachment in new window
2011-05-24 20:59:56 -07:00
Friendika
3239381447
better margins
2011-05-24 20:56:49 -07:00
Friendika
703ab6f5ee
remove padding
2011-05-24 20:52:23 -07:00
Friendika
e7ef3b82f0
clearup float, fix icon
2011-05-24 20:49:19 -07:00
Friendika
bc8eba4884
turn on attach display
2011-05-24 20:45:02 -07:00
Friendika
87de839974
attachment display
2011-05-24 20:41:29 -07:00
Friendika
4447739702
attachment icons
2011-05-24 20:03:30 -07:00
Friendika
e3d1ef8ef7
ability to hide profile and wall from unknown people
2011-05-24 16:30:52 -07:00
Fabio Comuni
73040891f1
fix profile images and contact selector in group editor in dispy theme
2011-05-24 11:33:34 +02:00
Friendika
21769d7390
improve push_lang and pop_lang to do basically nothing if the new language is the same as existing
2011-05-23 20:37:36 -07:00
Friendika
040fc247a0
bug #85
2011-05-23 20:30:37 -07:00
Friendika
19ccd658eb
Merge branch 'pull'
2011-05-23 18:18:01 -07:00
Friendika
78b2db3a98
Merge branch 'fabrixxm-master'
...
Conflicts:
boot.php
2011-05-23 18:17:02 -07:00
Friendika
cde888f7f8
Merge pull request #108 from fabrixxm/widget
...
Add missing widgets_uninstall function to widgets plugin
2011-05-23 18:12:34 -07:00
Friendika
9a3f5eaf7d
Merge pull request #107 from fabrixxm/oembed
...
Oembed plugin
2011-05-23 18:12:14 -07:00
Friendika
3e6180183b
improved browser language detect, set user language on login
2011-05-23 17:18:36 -07:00
Fabio Comuni
dd32a2366c
update messages.po
2011-05-23 12:00:53 +02:00
Fabio Comuni
e1107b55c6
add info() function. Works like notice() but show messages in a div with class info-message.
...
update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes
2011-05-23 11:39:57 +02:00
Fabio Comuni
f93106de3a
Add missing widgets_uninstall function to widgets plugin
2011-05-23 10:50:22 +02:00
Fabio Comuni
7c5a7a94d4
Add oembed user option for use oembed instead of standard yotube embedding.
...
Remove global option and parse_url use of oembed.
2011-05-23 10:37:09 +02:00
fabrixxm
453a0cff38
fix tiny_mce bbcode embed preview
2011-05-23 09:14:57 +02:00
fabrixxm
ef64c5187d
add config [system][embed_all] to use oembed with links and youtube. Url parse fallback to default if url has not an oembed rappresentation.
2011-05-23 09:14:57 +02:00
fabrixxm
072e414636
Fix missing wrapping span on bbcode to html, split embed data fetch and rappresentation in two functions. Prettier video embed.
2011-05-23 09:13:35 +02:00
fabrixxm
866940ab5d
fix IT string.php
2011-05-23 09:13:35 +02:00
fabrixxm
570a22de74
update oembed plugin. embed preview in editor
2011-05-23 09:13:35 +02:00
Friendika
3ea145fae7
fb contacts getting mixed up.
2011-05-22 21:47:22 -07:00
Friendika
5996e2cd4c
if no FB image and fb link is on our site, use Friendika logo for fb image. Otherwise it's going to end up being a random friend.
2011-05-22 21:20:28 -07:00
Friendika
576f8eda08
more buggy debugging code removed.
2011-05-22 20:18:39 -07:00
Friendika
42acd9462a
set photo height,width as !important if changing defaults
2011-05-22 19:52:54 -07:00
Friendika
ae317296d7
missed two refs
2011-05-22 19:45:29 -07:00
Friendika
36966c72c8
wall item photos use style instead of height, width
2011-05-22 19:40:36 -07:00
Friendika
36f1484223
Merge pull request #106 from chriscase/master
...
Improved Standards Compliance on Some Tags and Fix For Ticket #82 .
2011-05-22 19:33:35 -07:00
Friendika
b3648de6f0
silencing stdclass warnings
2011-05-22 19:20:33 -07:00
Chris Case
150830d38c
Merge remote branch 'upstream/master'
2011-05-22 19:20:12 -07:00
Chris Case
991885f1d4
improved standards compliance of some of the tags and fixed an issue which caused text to bump-over youtube video embeds
2011-05-22 19:18:58 -07:00
Friendika
44a22c2915
more improvements in twitter handling, reduce duplicates from FB when double friended
2011-05-22 18:40:00 -07:00
Friendika
a803652653
Merge branch 'pull'
2011-05-22 14:22:56 -07:00
Friendika
ea0a28ebfb
removed buggy debug code ;)
2011-05-22 14:20:31 -07:00
Friendika
452cb52232
Merge pull request #105 from tobiasd/master
...
added pre configured StatusNet support
2011-05-22 14:20:04 -07:00
Tobias Diekershoff
4c7522a131
added support for pre configured StatusNet credentials
2011-05-22 22:39:43 +02:00
Friendika
f4e47f168f
if xml doesn't parse, don't process it further
2011-05-22 06:05:01 -07:00
Friendika
8510748b19
friendika page hook for German impressum
2011-05-22 01:15:04 -07:00
Friendika
558cb9d898
Merge pull request #104 from chriscase/master
...
Multipart text/html Email Updates
2011-05-21 23:41:57 -07:00
Chris Case
f4cb6b9b08
fixed a couple of bugs
2011-05-21 23:19:50 -07:00
Chris Case
4cff911939
merged multipart email changes
2011-05-21 21:40:16 -07:00
Chris Case
2cf696d0b5
image updates
2011-05-21 19:27:56 -07:00
Chris Case
dfc05af73b
email updates
2011-05-21 19:26:51 -07:00
Chris Case
11dd0c8571
html email updates
2011-05-21 19:23:56 -07:00
Friendika
f3f063c0dd
Drupal doesn't provide absolute URL on feed. Fix to allow importing Drupal "contacts".
2011-05-21 19:15:55 -07:00
Friendika
1ccda19f7a
hooks can't contain direct values, must be variables
2011-05-21 17:17:27 -07:00
Friendika
0dfcbe9c44
better handling of twitter follows, remove ajax anchor /#!/
2011-05-21 17:13:51 -07:00
Friendika
bc2297d933
don't insert link summaries containing javascript bug #75
2011-05-21 05:27:53 -07:00
Friendika
ccbdc9b2fc
regex stuffed up
2011-05-21 01:17:07 -07:00
Friendika
22cf6b3fe6
'mark seen' not getting all msgs on profile page
2011-05-20 19:28:48 -07:00
Friendika
db60d6d78f
photo upload plugin size limit is not working, call photo_end hooks in any error return from mainline so html does not leak into json responses bug #77
2011-05-20 15:57:58 -07:00
Friendika
0abf2f11c6
patches for youtube's change in link and embed formats, please test
2011-05-20 15:46:41 -07:00
Friendika
5f20925220
deny link not clickable on admin approval notification page
2011-05-20 15:11:36 -07:00
Friendika
1fcf8ff5de
replace fopen with fetch_url in statusnet plugin, many sites do not have fopen_url allowed.
2011-05-20 07:08:20 -07:00
Friendika
1b8e93c70b
don't use hashtags for FB message link
2011-05-20 01:48:59 -07:00
Friendika
681885a120
"notes" app
2011-05-20 01:15:02 -07:00
Friendika
9ab6055b24
textlen defined outside function
2011-05-19 20:41:40 -07:00
Friendika
20807ab8b4
dispy jot-header.tpl missing some code updates
2011-05-19 20:11:09 -07:00
Friendika
a27b7fb28d
more indicators of public visibility
2011-05-19 19:55:34 -07:00
Friendika
e51e772abc
typo in email delete sql, add message sender to body for better handling of mailing lists
2011-05-19 18:53:35 -07:00
Friendika
44d5c90af4
better mailing list support, email addr can be either 'from' or 'to'
2011-05-19 17:25:41 -07:00
Friendika
f151565029
bug #73 - move 'view in context' and wall-item-outside-wrapper-end inside wall-item-outside-wrapper so all item content is updated with ajax.
2011-05-18 21:49:41 -07:00
Friendika
a6603a54d9
don't send any potentially large embeds over ajax so as to avoid huge prefetch downloads. Strip them out and provide a notice to reload page to view them. Ensures they will only be loaded once.
2011-05-18 20:34:18 -07:00
Friendika
990d5e82a0
doc updates - connecting to services
2011-05-18 17:29:12 -07:00
Friendika
a0a59e0518
statusnet post by default
2011-05-17 18:25:18 -07:00
Friendika
8fa9ca520b
"show all n comments" comes back after toggled and ajax updated, plus connector doc improvements
2011-05-17 17:40:00 -07:00
Friendika
8fa6049b32
Merge branch 'pull'
2011-05-17 15:19:08 -07:00
Friendika
39d9507ad1
revup
2011-05-17 15:18:02 -07:00
Friendika
2de9b7ea88
Merge pull request #103 from tobiasd/master
...
small spelling fix ;-)
2011-05-17 15:17:39 -07:00
Tobias Diekershoff
c533370873
spelling fix
2011-05-17 16:13:50 +02:00
Friendika
6c397255c8
turn dislike activities into plain text comments for FB delivery
2011-05-17 04:53:05 -07:00
Friendika
01a871c991
Merge pull request #102 from tobiasd/master
...
StatusNet connector fix
2011-05-16 22:43:19 -07:00
Tobias Diekershoff
85dc0826b6
fixed a comment...
2011-05-17 07:27:06 +02:00
Tobias Diekershoff
bc3eba713a
made the connection process to SN more robust
2011-05-17 07:20:26 +02:00
Friendika
f9444c8be5
admin directory view
2011-05-16 18:52:27 -07:00
Friendika
85c6457e6e
bug #65 'show all nn comments', 'show more posts like this' are misleading after they've been clicked once. Solution, hide them once clicked.
2011-05-16 17:57:29 -07:00
Friendika
31d53c5b2a
comments imported from ignored FB contact
2011-05-15 17:04:02 -07:00
Friendika
730322ee5f
bug #70 - error messages on group deletion, warning cleanup
2011-05-15 16:36:49 -07:00
Friendika
45b9bd96ba
wrong author came from feed, not from FB
2011-05-14 06:16:21 -07:00
Friendika
86f2c56152
use best contact id available
2011-05-14 02:25:26 -07:00
Friendika
2b720b5b7c
fix a couple of FB issues, wrong comment author, perhaps fix some missing entries
2011-05-14 00:47:00 -07:00
Friendika
7942192e20
FB reply if replying to local post originally posted to FB
2011-05-13 20:40:28 -07:00
Friendika
4f920e5a61
Merge pull request #101 from fabrixxm/widget
...
Widgets!
2011-05-13 01:02:32 -07:00
Fabio Comuni
55fd53ecbd
More work on widgets addon
2011-05-13 09:04:43 +02:00
Fabio Comuni
9f05b71018
todo widget_like
2011-05-13 09:04:42 +02:00
Fabio Comuni
cd34051b68
modular widgets
2011-05-13 09:04:42 +02:00
Fabio Comuni
7b59ea7b13
add some style to the widget
2011-05-13 09:04:42 +02:00
Fabio Comuni
0f7008a02e
Friendika widgets.
2011-05-13 09:04:42 +02:00
Friendika
c4f7c37835
"installing connectors" help page
2011-05-12 21:56:28 -07:00
Friendika
8674d01432
provide textmode "micropro" (small profile display but without the photo) for better scalability of group selection tools when confronted with huge numbers of contacts
2011-05-12 18:55:28 -07:00
Friendika
75c4e6e9a6
revup
2011-05-12 15:46:27 -07:00
Friendika
869c7df78b
update doco on FB connector
2011-05-12 04:51:54 -07:00
Friendika
df7a4206b7
fix json_encode on url's
2011-05-12 02:15:04 -07:00
Friendika
6c5482f535
Merge pull request #100 from fabrixxm/master
...
Serve friendika node info as json from url /friendika/json/
2011-05-12 02:00:47 -07:00
Fabio Comuni
31aee6b803
missing / in admin profile url
2011-05-12 10:33:59 +02:00
Fabio Comuni
564f9c924a
Serve friendika node info as json from url /friendika/json/
2011-05-12 10:26:34 +02:00
Friendika
b265a2d847
Merge branch 'pull'
2011-05-11 19:26:20 -07:00
Friendika
c7e99cdbe3
revup
2011-05-11 19:25:15 -07:00
Friendika
0c51305c72
Merge pull request #99 from tobiasd/master
...
updats to the DE strings
2011-05-11 19:25:04 -07:00
Friendika
1ca9263c87
bug #66 , identity address string malformed if line wraps
2011-05-11 05:23:45 -07:00
Friendika
b2e92e0af3
deprecate load_view_file
2011-05-11 04:37:13 -07:00
Tobias Diekershoff
7689d81d9a
small changes to the new translations
2011-05-11 10:56:39 +02:00
Tobias Diekershoff
5609353fc3
updated the German translation
2011-05-11 10:49:07 +02:00
Friendika
a00813497f
bring back load_view_file for dispy templates
2011-05-10 23:35:31 -07:00
Friendika
5903ea38f3
@fabrixxm fix for po2php, manually patched
2011-05-10 22:22:05 -07:00
Friendika
d0a86d933f
don't show birthday for deleted contact
2011-05-10 20:53:04 -07:00
Friendika
5eea0d5ecb
photo lockview not working, temp fix for po2php
2011-05-10 20:10:13 -07:00
Friendika
2fffec912c
leave extra line between imported url and content
2011-05-10 18:15:45 -07:00
Friendika
c052d68828
don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version.
2011-05-10 16:12:50 -07:00
Friendika
3ae3658411
Merge branch 'pull'
2011-05-10 15:29:16 -07:00
Friendika
8b2a514e96
revup
2011-05-10 15:26:31 -07:00
Friendika
95887aca63
Merge pull request #97 from fabrixxm/tr
...
Translation
2011-05-10 15:26:11 -07:00
Fabio Comuni
70fdba924e
Update IT strings
2011-05-10 14:20:18 +02:00
Fabio Comuni
4c2c14d34c
Update run_xgettext script and util/messages.po to use with transifex. Fix to po2php
2011-05-10 14:20:00 +02:00
Friendika
944f1a7f4c
extra slashes in header
2011-05-10 02:18:39 -07:00
Friendika
9262291831
re-fetch FB photos that failed
2011-05-09 22:44:14 -07:00
Friendika
a5e0190f23
missing self photo on remote site comment boxes
2011-05-09 22:15:19 -07:00
Friendika
cb6c1f91b7
rolling version number in preparation for release
2011-05-09 16:51:25 -07:00
Friendika
be84d51767
use local contact photo if available
2011-05-09 01:35:24 -07:00
Friendika
3b51f28d25
comment macros showing on photos
2011-05-08 22:58:38 -07:00
Friendika
c2e35d2d35
set permalink on uploaded photo items
2011-05-08 22:47:35 -07:00
Friendika
2c63b65e3c
refactor "which link to show" logic
2011-05-06 06:30:33 -07:00
Friendika
34f3cb68a6
document the end-user steps needed to use optional Facebook connector
2011-05-05 20:35:46 -07:00
Friendika
26d748f6d8
Merge pull request #96 from fabrixxm/api
...
Status.net Api
2011-05-05 04:29:45 -07:00
Friendika
b3fa03d3b4
Merge pull request #95 from fabrixxm/dispy
...
Dispy
2011-05-05 04:29:14 -07:00
Fabio Comuni
0ebb6a5b42
Fix branch
2011-05-05 10:56:21 +02:00
Fabio Comuni
b70a2dad33
Dispy theme works
2011-05-05 10:53:25 +02:00
Fabio Comuni
b3a5fccc9d
template for photo display
2011-05-05 10:53:03 +02:00
Friendika
eb2aae7987
missing is_public in editpost
2011-05-05 00:29:56 -07:00
Friendika
6348e4e47b
contact edit tool buttons a bit crowded
2011-05-04 22:18:36 -07:00
Friendika
5f0b43485a
incorrect count of total pages in normal view mode
2011-05-04 20:49:11 -07:00
Friendika
59fd70e568
issues with private photos - hitting internal size limits
2011-05-04 02:20:44 -07:00
Friendika
64a7d0b578
lost comment boxes on status.net conversations
2011-05-03 18:05:11 -07:00
Friendika
6c1d587ae3
notify not called on new photo album (first item)
2011-05-03 05:27:19 -07:00
Friendika
0f261ef8fa
configurable FB poll interval, default 1hr.
2011-05-02 20:14:37 -07:00
Friendika
4332e39d4d
Merge branch 'pull'
2011-05-02 15:46:11 -07:00
Friendika
c8ac50c845
revup
2011-05-02 15:44:17 -07:00
Friendika
07d4cf53ad
Merge pull request #94 from fabrixxm/dispy.
...
Dispy theme
2011-05-02 15:43:27 -07:00
fabrixxm
c003dbc4a4
remove unneeded file
2011-05-02 22:04:11 +02:00
fabrixxm
d359b5088f
Merge remote-tracking branch 'origin/dispy' into dispy
2011-05-02 22:00:17 +02:00
fabrixxm
1b01eebc1e
Dispy theme works
2011-05-02 21:57:21 +02:00
Friendika
5b8c60d8f3
login - put keyboard focus on name input
2011-05-01 22:39:40 -07:00
Friendika
6c47f262cc
warn if msg is visible to all
2011-05-01 19:50:00 -07:00
Friendika
69dc17eb81
when viewing network group, show my private conversations to the group
2011-04-30 21:53:51 -07:00
Friendika
0db25abcef
don't do an empty query
2011-04-30 17:28:57 -07:00
Friendika
e00068334f
fix private images
2011-04-30 17:24:37 -07:00
Friendika
ebfe536ded
expose "friendika" (about) page
2011-04-29 16:58:19 -07:00
Friendika
48e7e1451d
revup
2011-04-29 16:00:04 -07:00
Friendika
e2e3c1847c
Merged pull request #93 from fabrixxm/dispy.
...
Theme works
2011-04-29 05:48:12 -07:00
Fabio Comuni
2f83e134f9
Dispy: fix user menu order, alignment issues, new items counters not showing up, jot acl, contact edit, location display
2011-04-29 12:37:35 +02:00
Fabio Comuni
dd053ebe22
fix icons in item toolbar and edit contact
2011-04-29 10:40:58 +02:00
Friendika
7d455a0395
missing location after editor was consolidated
2011-04-28 20:04:02 -07:00
Friendika
4e4c002006
slightly better handling of photos and links for FB.
2011-04-28 19:19:36 -07:00
Friendika
b43ed54967
Merge https://github.com/friendika/friendika into pull
2011-04-28 16:08:15 -07:00
Friendika
94a57035b5
revup
2011-04-28 15:49:57 -07:00
Friendika
e14ab2d369
Merged pull request #92 from fabrixxm/dispy.
...
Dispy theme [wip]
2011-04-28 15:43:52 -07:00
fabrixxm
f6984f9929
works on dispy theme
2011-04-28 19:32:35 +02:00
fabrixxm
9393e3321d
Dispy theme
2011-04-28 19:01:46 +02:00
fabrixxm
daa7dc983b
Icons as CSS classes, hide net/home/mail/notify-update divs with no value
2011-04-28 19:01:35 +02:00
Friendika
0ac4d6ecc9
provide a test mode for facebook posts which goes through the motions but doesn't actually post content
2011-04-28 04:44:17 -07:00
Friendika
38cb0a3295
implement contact block/ignore for NETWORK_FACEBOOK
2011-04-28 03:14:30 -07:00
Friendika
0377b6cdad
missed fb prefix on extid
2011-04-27 18:23:39 -07:00
Friendika
64b12e3424
ensure contact exists for toplevel post
2011-04-27 17:06:42 -07:00
Friendika
bd65c0c7b2
empty uid on friend check
2011-04-27 15:59:18 -07:00
fabrixxm
976d1eaf43
API work
2011-04-27 17:46:23 +02:00
Friendika
d45ad7bb6b
suppress duplicate FB posts (incoming after posted locally)
2011-04-27 04:24:00 -07:00
Friendika
61f7b3d754
owner link not getting set
2011-04-26 20:32:18 -07:00
Friendika
0d23f56ed2
doco
2011-04-26 20:11:15 -07:00
Friendika
8fbdb61ee2
generate permalink to source article
2011-04-26 19:01:10 -07:00
Friendika
a5d478233c
misspell
2011-04-26 18:39:19 -07:00
Friendika
cde17704dd
over-ride comment box
2011-04-26 18:36:51 -07:00
Friendika
5f1bdad4bb
missed pulling FB comment timestamp, defaulted to now
2011-04-26 18:14:38 -07:00
Friendika
f97cfa79d9
tracking through issues with FB likes
2011-04-26 17:17:34 -07:00
Friendika
242d4805d5
call post_local_end hook on like/dislike
2011-04-26 17:07:49 -07:00
Friendika
1222362ba0
better handling of FB like activity object
2011-04-26 16:37:26 -07:00
Friendika
5c34a8b219
set debug level for very noisy trace info
2011-04-26 05:57:53 -07:00
Friendika
a01c40a845
no insecure warning on FB connections
2011-04-26 05:45:53 -07:00
Friendika
7bf85eadb2
Merge branch 'fb'
2011-04-26 04:40:34 -07:00
Friendika
245a56f0c1
lots of facebook fixes
2011-04-26 04:39:27 -07:00
Friendika
1ec8fd416b
revup
2011-04-25 15:44:25 -07:00
Friendika
5bcd08f482
facebook poll
2011-04-25 06:22:45 -07:00
Friendika
aaf42d7d3a
revup
2011-04-24 15:22:33 -07:00
Friendika
a0e7d8fa00
redirect to profile photo upload on very first login
2011-04-23 17:31:23 -07:00
Friendika
b603641807
doc updates
2011-04-22 00:11:28 -07:00
Friendika
639d52ec18
block_public should also block the contacts page and 'Connect' page if not logged in
2011-04-21 19:12:22 -07:00
Friendika
eeb3c13ad3
when public access is blocked, profile page should show login box
2011-04-21 18:39:07 -07:00
Friendika
9e19eef194
"firewall" setting - block all public pages from the public if configured to do so
2011-04-21 17:29:47 -07:00
Fabio Comuni
41f6ccc039
More works on api
2011-04-21 17:03:31 +02:00
Fabio Comuni
e472d79b1e
Reworked template processor. support for "if" "for" and "inc" blocks, also nested
2011-04-21 17:03:19 +02:00
Friendika
1d4791d38c
bin2hex not vice versa
2011-04-21 00:43:37 -07:00
Friendika
6e6d143aab
another typo
2011-04-21 00:29:48 -07:00
Friendika
0803abcf53
typo
2011-04-21 00:27:35 -07:00
Fabio Comuni
1fb097951d
work on api.
2011-04-21 09:08:50 +02:00
Fabio Comuni
793fc60a65
add rsd.xml (needs a template)
2011-04-21 09:08:50 +02:00
Fabio Comuni
3208a649a2
allow /name.ext to load mod/name_ext.php
2011-04-21 09:04:15 +02:00
Fabio Comuni
b505e76393
First attemp of api
2011-04-21 09:04:15 +02:00
Friendika
a1ef8f669d
don't show connect link to authenticated visitors
2011-04-20 15:27:10 -07:00
Friendika
b93b04e4a1
macro typo
2011-04-20 06:06:29 -07:00
Friendika
c0b7000a83
missing acl selector after merge
2011-04-20 05:51:02 -07:00
Friendika
e302741e49
merge status editor instances
2011-04-20 05:48:12 -07:00
Friendika
0af6014c94
keep space before t() for legacy string puller
2011-04-20 05:00:58 -07:00
Friendika
afe4cc8bfa
pull request #91 fabrixxm (manual merge)
2011-04-20 04:50:12 -07:00
Friendika
e0e3cc7a72
edit post broke with recent checkin
2011-04-19 22:37:17 -07:00
Friendika
309fdce151
upd8 readme
2011-04-19 21:28:44 -07:00
Friendika
3787e1e500
provide disclosure warning on private network page
2011-04-19 21:09:25 -07:00
Friendika
afdbbaf27d
photos_link not photo_link
2011-04-19 20:55:20 -07:00
Friendika
d874a55178
per contact network page (link in photo menu)
2011-04-19 20:50:02 -07:00
Friendika
29a48de5e2
follow requests most adhere to site allow policy
2011-04-19 16:31:39 -07:00
Friendika
a0179235d2
provide a way to disable mailbox integration
2011-04-18 20:20:04 -07:00
Friendika
2afd4c9d5a
"wait" cursor when submitting comments bug #45
2011-04-18 19:08:50 -07:00
Friendika
b168847b56
still getting a zero
2011-04-18 16:03:07 -07:00
Friendika
4b6a24ec3f
don't try to connect to port 0
2011-04-18 16:00:02 -07:00
Friendika
e2c9d04b36
leave imap port blank if 0
2011-04-18 15:58:01 -07:00
Friendika
9e54a070c2
string update
2011-04-18 15:52:31 -07:00
Friendika
b84f49df10
Merge branch 'translateitems' of https://github.com/fabrixxm/friendika into fabrixxm-translateitems
2011-04-18 15:51:03 -07:00
Friendika
42613902ed
sv update
2011-04-18 15:35:04 -07:00
Friendika
2563c49cdd
Merge branch 'omigeot-master'
2011-04-18 15:20:45 -07:00
Friendika
1e967eddb7
multi-user, do not cache open mbox
2011-04-18 15:16:51 -07:00
fabrixxm
1d8bd89fec
translate "like"/"dislike"/"friends with" messages at print time
2011-04-18 20:38:48 +02:00
Olivier Migeot
8b7b0bd5a2
Mismatched quotes in boot.php (wrecked up scrape_dfrn()).
2011-04-18 17:42:15 +02:00
Fabio Comuni
60fbe0b39b
translate verb items at display time
2011-04-18 17:37:02 +02:00
Fabio Comuni
ee16413935
Merge remote-tracking branch 'friendika-master/master'
2011-04-18 16:58:20 +02:00
Friendika
741a262f1b
updated docs to reflect email contacts
2011-04-18 01:48:29 -07:00
Friendika
4f952979d5
show email contacts in acl selector
2011-04-18 00:55:54 -07:00
Friendika
b81eefbffb
sv language had unquoted quotes in strings
2011-04-17 23:38:12 -07:00
Friendika
229eb9c681
Merge branch 'imap'
2011-04-17 23:28:39 -07:00
Friendika
ab099e9102
email integration, cont.
2011-04-17 23:27:11 -07:00
Friendika
7cc5a9bba9
email follow seems to be stabilising
2011-04-17 15:24:24 -07:00
Friendika
c347a5d6c9
sv language update
2011-04-16 15:57:24 -07:00
Friendika
12571c42f1
we need a profile url. Something.
2011-04-16 15:48:08 -07:00
Friendika
c3d97b7f4c
revup
2011-04-16 14:49:22 -07:00
Friendika
06492b76b1
update updater
2011-04-16 08:45:49 -07:00
Friendika
863ddf1676
mail changes
2011-04-16 08:45:08 -07:00
Friendika
c7bcdf0c18
get meta info for email msgs
2011-04-16 01:14:25 -07:00
Friendika
27cbb830a7
more work on email contacts
2011-04-15 23:40:43 -07:00
Friendika
158b65894a
initial checkin mailbox reading functions - lots more to do
2011-04-15 19:16:37 -07:00
Fabio Comuni
62dbfffe39
darkzero theme, dark variant of duepuntozero
2011-04-15 17:15:40 +02:00
Friendika
13eaa802e4
relocated "follow" url scraping code so it can be used elsewhere (contact repair, etc.)
2011-04-15 00:59:00 -07:00
Friendika
d21144d0a3
spanish fix
2011-04-14 20:48:59 -07:00
Friendika
44c47f118c
"profile locator/address" is now called "Identity Address" to reduce confusion
2011-04-14 20:37:42 -07:00
Friendika
b5ccb8e205
ensure host xrd is correct, even if installed in subpath
2011-04-14 19:43:00 -07:00
Friendika
de131c9e58
set utf-8 on all emails
2011-04-14 17:13:13 -07:00
Friendika
c3b42fdbcb
it's tough getting the photo menu right in all circumstances. Lots of variables. Much better now.
2011-04-14 16:40:14 -07:00
Friendika
e88cf38604
spanish translation update
2011-04-14 15:20:25 -07:00
Friendika
54368e3a0d
initial spanish translation
2011-04-14 02:34:43 -07:00
Fabio Comuni
0afef6b17e
arrays and simple conditional blocks in template, template for nav, load templates from themes
2011-04-14 09:22:38 +02:00
Friendika
f70dd1ee92
more
2011-04-13 23:34:49 -07:00
Friendika
255925d5b6
more minor formatting
2011-04-13 23:31:26 -07:00
Friendika
1a1e18baa0
formatting, minor
2011-04-13 23:27:19 -07:00
Friendika
132144b758
upd8 readme
2011-04-13 23:23:17 -07:00
Friendika
df67793559
sync recent update to loozah theme
2011-04-13 21:26:39 -07:00
Friendika
6683560c7e
upd8 readme
2011-04-13 21:14:09 -07:00
Friendika
974077c06c
contact "repair/relocate URL" tool
2011-04-13 20:14:30 -07:00
Friendika
5198e039df
better visibility of default post permissions
2011-04-13 17:11:24 -07:00
Friendika
17a7dae67d
doco
2011-04-13 16:58:21 -07:00
Friendika
767f165965
local documentation library
2011-04-13 07:07:21 -07:00
Olivier Migeot
0c9c4c1714
Fixed plurals def
2011-04-13 14:49:44 +02:00
Olivier Migeot
e051fa3605
Merge remote branch 'mike/master'
2011-04-13 14:25:13 +02:00
Friendika
21536fcda3
Merge branch 'tobiasd-master'
2011-04-13 05:16:16 -07:00
Friendika
d7a51fe91e
upd8 readme
2011-04-13 05:15:33 -07:00
Tobias Diekershoff
e28f0fe016
Typo and updates
2011-04-13 13:26:08 +02:00
Friendika
0fa05acb45
"social network" is so 2005
2011-04-13 02:13:42 -07:00
Friendika
3c4e501435
convert feed attach to bbcode
2011-04-13 01:53:40 -07:00
Friendika
84b2d5a25b
local attachment storage
2011-04-13 01:18:15 -07:00
Olivier Migeot
aa358b707c
More french.
2011-04-13 10:04:34 +02:00
Friendika
d4bb560e7f
small wording change
2011-04-12 21:37:54 -07:00
Friendika
4a514fa966
minor ui tweaks
2011-04-12 21:29:58 -07:00
Friendika
080efe4d1e
missed file addition
2011-04-12 21:25:00 -07:00
Friendika
2d7366bf81
profile visibility editor
2011-04-12 21:23:21 -07:00
Friendika
e8a0dd40b2
profile visibility editor
2011-04-12 21:21:33 -07:00
Friendika
f04e2e7044
edit group links on network page
2011-04-12 18:22:58 -07:00
Friendika
5654ce926c
move all message display sub-functions from boot.php into conversation.php
2011-04-12 17:58:16 -07:00
Friendika
38014e9b4d
show busy cursor during ajax call
2011-04-12 15:45:41 -07:00
Friendika
e01bc60577
revup
2011-04-12 15:19:28 -07:00
Friendika
b52fd6c2db
Merge branch 'omigeot-master'
2011-04-12 15:18:54 -07:00
Friendika
5545c8ada9
cleanup
2011-04-12 05:37:26 -07:00
Olivier Migeot
cd491fc9a3
French translation updated to reflect the last templates conversion.
2011-04-12 13:55:48 +02:00
Olivier Migeot
85f709320b
Merge remote branch 'mike/master'
2011-04-12 13:55:43 +02:00
Friendika
61915a524d
first cut at group chooser UI
2011-04-12 01:31:55 -07:00
Friendika
6da84027af
visual display of group members
2011-04-11 22:47:16 -07:00
Friendika
98712bce76
no newline at eof
2011-04-11 21:36:04 -07:00
Friendika
5173f5b967
missed one
2011-04-11 21:34:22 -07:00
Friendika
bfffd33ff9
table for email poll driver
2011-04-11 21:30:50 -07:00
Friendika
4cb21fc60b
cleanup
2011-04-11 20:34:10 -07:00
Friendika
0ed2d19ac8
death to comment box oddities (a slow death as it will take some time for everybody to upgrade)
2011-04-11 20:11:21 -07:00
Friendika
de8b381149
bug #44 wallwall in loozah issue after recent template fix
2011-04-11 18:52:29 -07:00
Friendika
0085bf0c10
that's better...
2011-04-11 16:42:41 -07:00
Friendika
a4836ac1ba
wallwall oddities on display page
2011-04-11 16:15:38 -07:00
Friendika
68731a2c39
photo menu added to wallwall template
2011-04-11 16:00:13 -07:00
Friendika
ff15ea0993
wrong variable passed
2011-04-11 15:45:19 -07:00
Friendika
21c48a1476
markdown parser
2011-04-11 05:59:26 -07:00
Friendika
8b323b566f
set writable flag on all stat contacts with notify link
2011-04-11 03:30:25 -07:00
Friendika
c8f32536ff
pull in new 'writable' dfrn flag
2011-04-11 03:22:09 -07:00
Friendika
9133a2384a
all conversations unified except photos
2011-04-11 01:31:04 -07:00
Friendika
2dc7882f74
more validation fixes
2011-04-10 23:03:50 -07:00
Friendika
a0956ee955
some w3c validation issues
2011-04-10 23:01:38 -07:00
Friendika
7192299ff1
first cut at profile page conversation
2011-04-10 21:43:44 -07:00
Friendika
a65c595b16
"display list of status items" moved to include/conversation.php,
...
currently network module has been updated to use it for display, other modules to follow
with whatever special case code they require.
2011-04-10 21:21:16 -07:00
Friendika
9341f2c4d6
little fix
2011-04-10 19:46:40 -07:00
Friendika
3d51518a13
set writable flag on dfrn_poll
2011-04-10 19:29:21 -07:00
Friendika
63030ca51e
protocol update
2011-04-10 18:40:43 -07:00
Friendika
940d216395
initial dfrn update to pass perms
2011-04-10 18:38:55 -07:00
Friendika
12bc4a44cf
[privacy] use owner's default permission settings on "is now friends with..." msg
2011-04-10 15:30:56 -07:00
Friendika
c12927042e
nav link to help & documentation
2011-04-10 05:55:45 -07:00
Friendika
58508201a5
bug #37 , ampersand + everything following in url is stripped when using link icon to share link
2011-04-10 03:36:12 -07:00
Friendika
bf865f0210
bug #34 , line breaks double in retweet/share
2011-04-10 03:00:29 -07:00
Friendika
6b66ac8183
Merge branch 'fabrixxm-master'
2011-04-08 15:30:54 -07:00
Friendika
263eb0c456
revup
2011-04-08 15:30:29 -07:00
Fabio Comuni
0e033eaa43
Fix query for authors in item_photo_menu(), cache authors from extract_item_authors()
2011-04-08 16:52:58 +02:00
Friendika
0ddf84eb5a
Merge branch 'fabrixxm-master'
2011-04-08 04:46:22 -07:00
Fabio Comuni
969cc6996a
Fix a typo, updated IT strings
2011-04-08 12:35:42 +02:00
Friendika
b8479cc2f9
Merge branch 'opensearch' of https://github.com/fabrixxm/friendika into fabrixxm-opensearch
2011-04-08 01:52:01 -07:00
Fabio Comuni
1713ffb41c
add opensearch support
2011-04-08 10:40:04 +02:00
Tobias Diekershoff
c4fe889713
Updates to the German strings
2011-04-08 10:36:58 +02:00
Friendika
e35a5bac55
the rest of the english html templates except for htconfig
2011-04-07 23:10:43 -07:00
Friendika
338ba48554
more templates
2011-04-07 18:00:35 -07:00
Friendika
3a6dfb9862
Merge branch 'tobiasd-master'
2011-04-07 16:26:14 -07:00
Friendika
5d5a94c88a
comment open/close anomolies in non-English languages
2011-04-07 16:19:46 -07:00
Tobias Diekershoff
9f03e871a2
some more German translations
2011-04-07 20:50:19 +02:00
Tobias Diekershoff
818af767f9
German translation updated
2011-04-07 20:17:30 +02:00
Olivier Migeot
294577a48b
Quick fix.
2011-04-07 15:13:31 +02:00
Friendika
000efa6df0
Add some text suggesting that new folks add some basic profile information if they want to make any friends.
2011-04-06 23:38:40 -07:00
Friendika
4043ede080
more templates
2011-04-06 23:03:54 -07:00
Friendika
c32ed16303
more templates converted to string files
2011-04-06 22:42:08 -07:00
Friendika
cc45ac14b5
attachment storage
2011-04-06 21:59:07 -07:00
Friendika
c8d827a671
xmlify enclosure items
2011-04-06 20:36:24 -07:00
Friendika
109c25a1bd
some fixes to attachment output in feed
2011-04-06 20:03:06 -07:00
Friendika
6728a11ee3
support feed attachments/enclosures, and fix for bug #30
2011-04-06 19:42:35 -07:00
Friendika
9c77c57b74
if base url changes radically, save the change.
2011-04-06 05:09:24 -07:00
Friendika
ded449f697
ostatus doesn't accept activitystreams stop-follow verb or multiple verbs, insists on single ostatus unfollow #non-standard
2011-04-05 23:06:03 -07:00
Friendika
d2b28206ce
profile edit link missing in photo menu for non-dfrn contacts
2011-04-05 20:07:54 -07:00
Friendika
438473529c
atom categories and tag import
2011-04-05 17:41:02 -07:00
Friendika
ee19746aa9
revert to regex search when < 3 chars
2011-04-05 06:27:40 -07:00
Friendika
4c5e091b78
better twitter follow support
2011-04-04 20:40:31 -07:00
Friendika
793967a1d3
better handling of troublesome feeds.
2011-04-04 19:36:18 -07:00
Friendika
178362e50b
cleaned up photo_menu check and explanation
2011-04-04 16:00:58 -07:00
Friendika
1bba63fb60
Merge branch 'erikl-master'
...
Conflicts:
view/sv/settings.tpl
2011-04-04 15:46:33 -07:00
Friendika
a0d2747d52
Merge branch 'master' of https://github.com/erikl/friendika into erikl-master
2011-04-04 15:43:54 -07:00
Friendika
91588934d2
revup
2011-04-04 15:43:22 -07:00
erik
3e4e017ffd
Edited view/sv/pagetypes.tpl via GitHub
2011-04-04 13:22:55 -07:00
erik
0de12cd297
Edited view/sv/strings.php via GitHub
2011-04-04 12:51:58 -07:00
Friendika
742bdd3054
make photo menu work better on remote profile logins
2011-04-04 05:52:59 -07:00
Friendika
9f804b936a
remote profile photo menu fix
2011-04-04 03:31:47 -07:00
Friendika
4922fddff9
Merge branch 'fabrixxm-iconpopup'
2011-04-04 03:05:43 -07:00
Friendika
5a62d022a2
Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup
2011-04-04 03:05:30 -07:00
Friendika
933de1769c
item_photo_menu to display page
2011-04-04 02:54:09 -07:00
Fabio Comuni
7bfd0e2c48
show "edit contact" and "sent PM" only to local user
2011-04-04 11:52:30 +02:00
Friendika
94881c15d3
missed merge conflict tag
2011-04-04 01:26:04 -07:00
Friendika
379af25215
Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup
...
Conflicts:
mod/dfrn_poll.php
2011-04-04 01:22:05 -07:00
Friendika
b5bcf44354
profile not set
2011-04-04 01:18:28 -07:00
Fabio Comuni
890753e5b5
add popupmenu links to status, profile and photos if contact is in dfrn
2011-04-04 09:51:20 +02:00
Fabio Comuni
afa0d8ff70
fix profile redirect url in dfrn_poll
2011-04-04 09:50:25 +02:00
Fabio Comuni
92156cd840
Merge remote-tracking branch 'friendika-master/master' into iconpopup
2011-04-04 09:31:12 +02:00
Fabio Comuni
b48e82d12a
put popupmenu above all
2011-04-04 09:28:19 +02:00
Friendika
9b50b0e16f
Public exposure warning on affected network group pages. config-able so a plugin can shut it up.
2011-04-03 20:41:40 -07:00
erik
b2f6bf7c38
Edited view/sv/strings.php via GitHub
2011-04-03 06:01:56 -07:00
Friendika
b500da74b6
user language storage
2011-04-01 14:49:15 -07:00
Friendika
4b356e59ec
allow other destinations according to protocol
2011-04-01 14:39:09 -07:00
erik
89103c99ef
Edited view/sv/strings.php via GitHub
2011-04-01 11:33:46 -07:00
Friendika
e33b6e0b5a
redirect to symbolic rather than absolute URL locations
2011-04-01 00:59:10 -07:00
Fabio Comuni
454c4d0b70
\"View profile\" send to user profile page and not to tab.
2011-04-01 09:04:55 +02:00
Fabio Comuni
b59c504b16
fix typo
2011-04-01 09:00:53 +02:00
Friendika
d728961cbf
translateable time formats (PM & birthdays)
2011-03-31 14:46:16 -07:00
Fabio Comuni
8fbc606616
popup styles to loozah theme
2011-03-31 17:02:13 +02:00
Fabio Comuni
29878d9c26
url \"/message/new/<id>\" preselect contact <id> in \"To\" select box
2011-03-31 16:54:06 +02:00
Fabio Comuni
fe67c346e5
Moved popup logic in boot.php, added 'item_photo_menu' hook
2011-03-31 16:52:51 +02:00
Friendika
08032e0453
change language dynamically - bound to F8 key
2011-03-31 04:57:31 -07:00
Friendika
75ad3219e6
remote deletion - check contact-id
2011-03-30 17:50:18 -07:00
Friendika
89e81862ec
bug #29 - commas not linkified
2011-03-30 16:18:59 -07:00
Friendika
0fe997490d
dfrn remote profile protocol revision
2011-03-30 15:04:18 -07:00
Friendika
f5d782f5c5
Merge branch 'omigeot-master'
2011-03-30 14:33:04 -07:00
Friendika
78058c0a19
revup
2011-03-30 14:31:56 -07:00
Fabio Comuni
3f94721d62
first work
2011-03-30 17:10:14 +02:00
Olivier Migeot
ddf13d8c97
Some corrections to PO workflow, and integrated latest templates "stringization" for french.
2011-03-30 16:46:22 +02:00
Fabio Comuni
9acccb2b90
Merge remote-tracking branch 'friendika-master/master'
2011-03-30 16:05:43 +02:00
Fabio Comuni
05d9035aaa
Merge remote-tracking branch 'origin/master'
2011-03-30 16:05:19 +02:00
Friendika
18da7efa27
undo last commit
2011-03-30 05:22:25 -07:00
Friendika
89df2b19ce
increase suhosin $_GET length limit
2011-03-30 05:10:22 -07:00
Friendika
04cd865cc9
placeholder arg in dfrn conversations
2011-03-30 04:20:40 -07:00
Friendika
f198c5cff8
secure profile failure
2011-03-30 04:07:47 -07:00
Friendika
4aa60a7aaf
oexchange
2011-03-29 21:59:28 -07:00
Friendika
8357c064ae
remove obsolete template
2011-03-29 19:23:02 -07:00
Friendika
066bdca30d
optionally set article title
2011-03-29 18:57:26 -07:00
Friendika
8f547283c0
update comment count as new comments come in
2011-03-29 18:20:52 -07:00
Friendika
a41b4c6e67
cleanup untracked files
2011-03-29 17:46:40 -07:00
Friendika
f1db34eebc
more templates gone
2011-03-29 17:19:12 -07:00
Friendika
e1fd2ecb16
another template
2011-03-29 15:27:14 -07:00
Friendika
97ae3814d9
Merge branch 'fabrixxm-master'
2011-03-29 14:53:11 -07:00
Friendika
c2a0016018
revup
2011-03-29 14:52:15 -07:00
erik
2f48135b71
Edited view/sv/settings.tpl via GitHub
2011-03-29 11:42:04 -07:00
erik
80e3241bc1
Edited view/sv/profile_edit.tpl via GitHub
2011-03-29 11:24:07 -07:00
erik
47169d71fd
Edited view/sv/settings.tpl via GitHub
2011-03-29 11:19:49 -07:00
erik
a406534c00
Edited view/sv/register_open_eml.tpl via GitHub
2011-03-29 11:10:25 -07:00
fabrixxm
341a6f90ec
Updated IT strings
2011-03-29 18:05:24 +02:00
fabrixxm
6631bc64d3
Merge remote-tracking branch 'friendika/master'
2011-03-29 18:00:19 +02:00
Fabio Comuni
e2b975065c
Merge remote-tracking branch 'friendika-master/master'
2011-03-29 14:12:50 +02:00
Friendika
920396e402
off by one
2011-03-28 20:06:45 -07:00
Friendika
6a280c321d
small wording change
2011-03-28 18:06:36 -07:00
Friendika
00b5f6f8a1
added comments, make typo checker work with redefined plural string functions
2011-03-28 17:24:11 -07:00
Friendika
0f8bcacfdd
util/README updated
2011-03-28 16:10:12 -07:00
Friendika
266a93c584
Merge branch 'omigeot-master'
2011-03-28 15:42:01 -07:00
Friendika
15b6792ca0
revup
2011-03-28 15:41:08 -07:00
fabrixxm
2a23147042
Updated IT strings
2011-03-28 21:19:27 +02:00
Olivier Migeot
3b709a074a
French translation considered done, yet not fully tested.
2011-03-28 19:59:16 +02:00
Olivier Migeot
581349de59
Some more templates for french translation
2011-03-28 14:31:57 +02:00
Olivier Migeot
10d44f2bb9
More french templates (except emails, everything should be ok now)
2011-03-28 13:59:05 +02:00
Olivier Migeot
c8fb1008f5
Some more templates translated to french.
2011-03-28 13:50:56 +02:00
Olivier Migeot
da546588db
Merge remote branch 'mike/master'
2011-03-28 12:11:10 +02:00
Friendika
1f6c6c466a
author collapse: close off before pagination
2011-03-28 00:49:20 -07:00
Friendika
77fbd2f78c
tweaks to author collapsing
2011-03-27 20:43:45 -07:00
Friendika
7defb1768b
collapse posts by same author (but not you).
2011-03-27 20:37:44 -07:00
Friendika
b57214cb78
wrong date order profile page
2011-03-27 19:59:27 -07:00
Friendika
c962f5c4bc
comment collapsing, pagination wasn't advancing past 16
2011-03-27 19:53:36 -07:00
Friendika
76918ed5a5
info page
2011-03-27 16:35:56 -07:00
erik
4068a21b37
Edited view/sv/register_verify_eml.tpl via GitHub
2011-03-26 03:11:41 -07:00
erik
17b4f9f8a7
Edited view/sv/register_verify_eml.tpl via GitHub
2011-03-26 03:09:00 -07:00
Friendika
ff8bddb4a8
Merge branch 'tobiasd-master'
2011-03-25 15:11:22 -07:00
Friendika
f7928f15a8
revup
2011-03-25 15:08:40 -07:00
Tobias Diekershoff
9808b0378d
fixed wrong colors for links
2011-03-25 13:03:30 +01:00
Tobias Diekershoff
af0f3a7e05
Merge branch 'master' of git://github.com/friendika/friendika
2011-03-25 12:47:36 +01:00
Friendika
ca113bfaa0
change link to project website
2011-03-24 21:10:51 -07:00
Friendika
6bc5d6f17b
repair duplicate nickname accounts caused by race condition
2011-03-24 15:45:27 -07:00
Friendika
067626380d
Merge branch 'erikl-master'
...
Conflicts:
view/sv/insecure_net.tpl
view/sv/jot-header.tpl
view/sv/msg-header.tpl
view/sv/profile_edit.tpl
view/sv/profile_tabs.tpl
view/sv/strings.php
2011-03-24 04:36:53 -07:00
Friendika
ba99ce3d0a
Merge branch 'master' of https://github.com/erikl/friendika into erikl-master
2011-03-24 04:06:01 -07:00
Friendika
51447932f7
link same as visited
2011-03-24 01:16:14 -07:00
Friendika
f0bd849555
Merge branch 'fabrixxm-master'
2011-03-23 14:32:23 -07:00
Friendika
de8d9ab66d
revup
2011-03-23 14:31:02 -07:00
Fabio Comuni
1f1fe4d5be
Merge branch 'master' of github.com:fabrixxm/friendika
2011-03-23 14:04:35 +01:00
Fabio Comuni
4a14269349
Added plural string for contact block
2011-03-23 13:58:46 +01:00
Friendika
620d7bd770
upd8 readme
2011-03-23 05:33:41 -07:00
Friendika
f0b791fe9a
upd8 readme
2011-03-23 05:30:44 -07:00
Friendika
85e227151b
use correct mime type for json
2011-03-22 16:52:14 -07:00
Friendika
e0202d82a1
add fulltext index on keywords, missed some directory localisations
2011-03-22 16:34:12 -07:00
Friendika
8f31935b7d
items back in personal data download, chunked this time
2011-03-22 16:19:00 -07:00
erik
af12c696cb
Edited view/sv/strings.php via GitHub
2011-03-22 14:12:33 -07:00
erik
eb02adb163
Edited view/sv/wall_received_eml.tpl via GitHub
2011-03-22 12:22:25 -07:00
erik
93b1f32170
Edited view/sv/settings_nick_unset.tpl via GitHub
2011-03-22 12:21:15 -07:00
erik
0353b36f5d
Edited view/sv/settings_nick_subdir.tpl via GitHub
2011-03-22 12:19:04 -07:00
erik
42a5eb5d9b
Edited view/sv/settings_nick_set.tpl via GitHub
2011-03-22 12:18:09 -07:00
erik
b57b89516f
Edited view/sv/settings.tpl via GitHub
2011-03-22 12:17:25 -07:00
erik
fe7e6ad064
Edited view/sv/request_notify_eml.tpl via GitHub
2011-03-22 12:14:59 -07:00
erik
250d467f33
Edited view/sv/registrations.tpl via GitHub
2011-03-22 12:13:15 -07:00
erik
8c245a5d2f
Edited view/sv/registrations-top.tpl via GitHub
2011-03-22 12:12:23 -07:00
erik
61ba37b1ed
Edited view/sv/register_verify_eml.tpl via GitHub
2011-03-22 12:11:15 -07:00
erik
b2089c559c
Edited view/sv/register_open_eml.tpl via GitHub
2011-03-22 12:08:25 -07:00
erik
aa0915a2ad
Edited view/sv/pwdreset.tpl via GitHub
2011-03-22 12:07:38 -07:00
erik
a7601bc1a6
Edited view/sv/profile-in-netdir.tpl via GitHub
2011-03-22 12:04:06 -07:00
erik
5dae05f275
Edited view/sv/profile-in-directory.tpl via GitHub
2011-03-22 12:03:00 -07:00
erik
2856664eeb
Edited view/sv/profile-hide-friends.tpl via GitHub
2011-03-22 12:01:47 -07:00
erik
59a7ff8331
Edited view/sv/profile_tabs.tpl via GitHub
2011-03-22 12:00:49 -07:00
erik
5ead1a8599
Edited view/sv/profile_photo.tpl via GitHub
2011-03-22 11:59:50 -07:00
erik
0cbe80aeea
Edited view/sv/profile_listing_header.tpl via GitHub
2011-03-22 11:59:03 -07:00
erik
143b9ef1d5
Edited view/sv/profile_entry_default.tpl via GitHub
2011-03-22 11:58:04 -07:00
erik
6f2b633787
Edited view/sv/profile_edit.tpl via GitHub
2011-03-22 11:54:48 -07:00
erik
2e6f718f0d
Edited view/sv/profile_advanced.php via GitHub
2011-03-22 11:53:34 -07:00
erik
c7b671aa2d
Edited view/sv/profile.php via GitHub
2011-03-22 11:07:18 -07:00
erik
15ef0e601e
Edited view/sv/passchanged_eml.tpl via GitHub
2011-03-22 11:05:36 -07:00
erik
196ba3c51a
Edited view/sv/pagetypes.tpl via GitHub
2011-03-22 11:04:26 -07:00
erik
82bf55666f
Edited view/sv/msg-header.tpl via GitHub
2011-03-22 11:03:30 -07:00
erik
90826f8a7d
Edited view/sv/mail_received_text_body_eml.tpl via GitHub
2011-03-22 11:02:24 -07:00
erik
091cecec02
Edited view/sv/mail_received_html_body_eml.tpl via GitHub
2011-03-22 11:01:09 -07:00
erik
0f61fa8de1
Edited view/sv/lostpass_eml.tpl via GitHub
2011-03-22 10:59:40 -07:00
erik
d578c45ef8
Edited view/sv/lostpass.tpl via GitHub
2011-03-22 10:58:50 -07:00
erik
f88b5f75ad
Edited view/sv/jot-header.tpl via GitHub
2011-03-22 10:58:03 -07:00
erik
02975027da
Edited view/sv/intros-top.tpl via GitHub
2011-03-22 10:57:00 -07:00
erik
ea1a69c84f
Edited view/sv/intro_complete_eml.tpl via GitHub
2011-03-22 10:56:22 -07:00
erik
06b76e47d9
Edited view/sv/install_db.tpl via GitHub
2011-03-22 10:55:11 -07:00
erik
2f982c9332
Edited view/sv/insecure_net.tpl via GitHub
2011-03-22 10:54:20 -07:00
erik
d99d46631e
Edited view/sv/head.tpl via GitHub
2011-03-22 10:52:45 -07:00
erik
f8faa73fb8
Edited view/sv/group_new.tpl via GitHub
2011-03-22 10:51:30 -07:00
erik
fff72ffe27
Edited view/sv/group_edit.tpl via GitHub
2011-03-22 10:50:36 -07:00
erik
189abd2edf
Edited view/sv/friend_complete_eml.tpl via GitHub
2011-03-22 10:48:52 -07:00
erik
9b7df09e7a
Edited view/sv/follow_notify_eml.tpl via GitHub
2011-03-22 10:46:49 -07:00
erik
232ed2bdc5
Edited view/sv/directory_header.tpl via GitHub
2011-03-22 10:45:16 -07:00
erik
bc49c08dc7
Edited view/sv/dfrn_req_confirm.tpl via GitHub
2011-03-22 10:43:45 -07:00
erik
4eb8270fbe
Edited view/sv/cropbody.tpl via GitHub
2011-03-22 10:42:02 -07:00
erik
8747c12c80
Edited view/sv/contact_edit.tpl via GitHub
2011-03-22 10:41:01 -07:00
erik
6b1348c5f2
Edited view/sv/cmnt_received_eml.tpl via GitHub
2011-03-22 10:38:31 -07:00
erik
771acb9cf7
Edited view/sv/follow_notify_eml.tpl via GitHub
2011-03-22 10:36:15 -07:00
erik
8de46dbc0d
Edited view/sv/directory_header.tpl via GitHub
2011-03-22 10:33:24 -07:00
erik
6c41e6af61
Edited view/sv/dfrn_req_confirm.tpl via GitHub
2011-03-22 10:32:07 -07:00
erik
4a14e51e25
Edited view/sv/cropbody.tpl via GitHub
2011-03-22 10:29:53 -07:00
erik
7c3f3f92c9
Edited view/sv/contact_edit.tpl via GitHub
2011-03-22 10:28:44 -07:00
erik
37811e691b
Edited view/sv/cmnt_received_eml.tpl via GitHub
2011-03-22 10:26:49 -07:00
erik
26f0b37738
commit001
2011-03-22 18:09:19 +01:00
erik
2102ca2fc0
commit001
2011-03-22 18:09:19 +01:00
erik
a5bca7ea4e
commit001
2011-03-22 18:09:02 +01:00
erik
a5e1a4b1dc
Edited view/sv/group_new.tpl via GitHub
2011-03-22 07:48:22 -07:00
erik
60c9c444dc
Edited view/sv/directory_header.tpl via GitHub
2011-03-22 07:45:05 -07:00
erik
c3db186bd9
Edited view/sv/cropbody.tpl via GitHub
2011-03-22 07:42:30 -07:00
erik
29972b4005
Edited view/sv/profile_entry_default.tpl via GitHub
2011-03-22 07:27:07 -07:00
erik
9672d22797
Edited view/sv/profile_listing_header.tpl via GitHub
2011-03-22 07:26:00 -07:00
Friendika
f20464112f
remove items from export - too much memory consumed, will have to stream items,photos
2011-03-22 03:25:43 -07:00
Friendika
83a36cbd13
export posts also
2011-03-22 03:20:41 -07:00
Friendika
c4b292a4f1
account/profile/contacts export
2011-03-22 03:07:46 -07:00
Olivier Migeot
19d7e7fefe
Defined plurals (as explained by Fabio)
2011-03-22 10:28:22 +01:00
Friendika
cd2a0802e4
horizontal match layout
2011-03-22 02:21:53 -07:00
fabrixxm
9350489615
Updated util/messages.po
2011-03-22 08:16:40 +01:00
Tobias Diekershoff
bd60e2ec3f
Merge branch 'master' of git://github.com/friendika/friendika
2011-03-22 08:05:10 +01:00
Friendika
89977cd87c
de keywords not saving
2011-03-21 23:54:03 -07:00
Tobias Diekershoff
767b4f30f7
Merge branch 'master' of git://github.com/friendika/friendika
2011-03-22 06:50:47 +01:00
Friendika
ee11a74d0b
profile match
2011-03-21 21:43:22 -07:00
Friendika
c74367e4c2
pagination in keyword match
2011-03-21 21:26:11 -07:00
Friendika
ee1dff9980
converted json to symbolic references
2011-03-21 19:44:00 -07:00
Friendika
e16bca4f76
first prototype of profile match against global directory (hint: set some keywords)
2011-03-21 19:33:06 -07:00
Friendika
f73e40c188
several install issues sorted out
2011-03-21 17:34:29 -07:00
Friendika
d71db3e064
typo
2011-03-21 15:12:40 -07:00
Friendika
64e92f34d9
Merge branch 'omigeot-master'
2011-03-21 15:09:13 -07:00
Friendika
c3ccd19274
revup
2011-03-21 15:08:04 -07:00
Olivier Migeot
b8b77adad5
More templates frenchized
2011-03-21 14:02:01 +01:00
Olivier Migeot
0926532323
Started to convert french translation to the new format.
2011-03-21 13:45:41 +01:00
Friendika
94cbf3bb80
another template down
2011-03-21 04:10:08 -07:00
Friendika
82bd1ce3cb
installation issues
2011-03-21 03:33:58 -07:00
Friendika
798c83b6aa
localise some more templates
2011-03-21 00:21:35 -07:00
Friendika
5f9f03daf7
simplify insecure network warning
2011-03-20 19:29:01 -07:00
Friendika
b7292bc673
user pref -> block remote wall posting
2011-03-20 17:54:50 -07:00
Friendika
2b0af1456c
editor consistency on profile edit page
2011-03-20 15:51:09 -07:00
Friendika
0609037b9e
Merge branch 'fabrixxm-master'
2011-03-20 00:49:41 -07:00
fabrixxm
c1144912e2
small fix
2011-03-20 08:38:42 +01:00
Friendika
6a56ac2add
language file security
2011-03-19 15:12:04 -07:00
Friendika
be67cf663b
minor edits
2011-03-19 05:10:05 -07:00
Tobias Diekershoff
8fbde780b3
Merge branch 'master' of git://github.com/friendika/friendika
2011-03-19 09:58:07 +01:00
Friendika
7e33c1072a
stuff to make connecting to diaspora profiles easier
2011-03-19 01:19:11 -07:00
Friendika
5034d7333e
Merge branch 'fabrixxm-master'
2011-03-18 13:21:23 -07:00
Friendika
31eedce236
revup
2011-03-18 13:20:11 -07:00
Tobias Diekershoff
878bdeccfd
Merge branch 'master' of git://github.com/friendika/friendika
2011-03-18 18:07:37 +01:00
Fabio Comuni
894e88d792
Updated IT language
2011-03-18 14:35:41 +01:00
Fabio Comuni
54e16d753d
Fix to po2php with '$' in strings
2011-03-18 14:35:23 +01:00
Friendika
9838245c6c
Merge branch 'gettext' of https://github.com/fabrixxm/friendika into fabrixxm-gettext
2011-03-18 05:07:42 -07:00
Friendika
43234a6678
rework post editing a bit
2011-03-18 05:06:16 -07:00
Fabio Comuni
e307846c2d
Updated utils/README
2011-03-18 12:36:34 +01:00
Fabio Comuni
7e4f22a0b6
Fix to po2php on multiline msgstr
2011-03-18 11:25:22 +01:00
Fabio Comuni
8ef6077d4d
Update IT strings
2011-03-18 11:04:12 +01:00
Fabio Comuni
fd4256a13f
php2po script
2011-03-18 11:03:15 +01:00
Fabio Comuni
9bc85162a4
Update po2php script
2011-03-18 11:02:59 +01:00
Fabio Comuni
7df8e18dd1
Update more strings
2011-03-18 11:02:42 +01:00
Friendika
ce754bc0e2
edit to display page
2011-03-18 01:24:34 -07:00
Friendika
9f5201dcaa
edit posting after submission
2011-03-18 00:30:34 -07:00
Friendika
ea03d9fa86
more thorough cleanup on account/contact removal
2011-03-17 21:15:27 -07:00
Friendika
6380d22229
better colour matching on toolbar, replace "share" with "recycle"
2011-03-17 17:31:39 -07:00
Friendika
5d9550e08f
incorrect slinky param
2011-03-17 15:31:46 -07:00
Friendika
a5d5ae5efa
updated swedish templates
2011-03-17 15:26:45 -07:00
Friendika
0bce69fe9c
swedush string update via erikl
2011-03-17 14:55:25 -07:00
Friendika
40956faf6d
swedish string update via erikl
2011-03-17 14:54:15 -07:00
Friendika
6b37e6d48d
Merge branch 'master' of http://github.com/erikl/friendika into erikl-master
...
Conflicts:
view/sv/contact_edit.tpl
view/sv/strings.php
2011-03-17 14:44:06 -07:00
Friendika
90178f86cb
revup
2011-03-17 14:41:36 -07:00
Friendika
3d323fd260
condense birthday display
2011-03-17 00:32:24 -07:00
Tobias Diekershoff
f4f5095e19
Merge branch 'master' of git://github.com/friendika/friendika
2011-03-17 07:08:48 +01:00
Friendika
b3050d3bc8
no birthdays for nonexistent contacts
2011-03-16 22:27:34 -07:00
Friendika
47f0abf27e
no sharing icon for private msgs
2011-03-16 22:04:00 -07:00
Friendika
9d9176f87e
no sharing from thread display page
2011-03-16 21:49:28 -07:00
Friendika
334353e502
vorbis audio/video link buttons
2011-03-16 21:14:22 -07:00
Friendika
9e1ca52e45
small position adjustment
2011-03-16 20:14:19 -07:00
Friendika
8fd989c568
protect tags from double expansion during RT
2011-03-16 19:57:13 -07:00
Friendika
3f432a7b82
share,retweet,relay,forward, whatever
2011-03-16 19:36:59 -07:00
Tobias Diekershoff
0c16d033ef
Merge github.com:tobiasd/friendika
2011-03-16 07:30:08 +01:00
Tobias Diekershoff
c43f647049
Merge branch 'master' of git://github.com/friendika/friendika
2011-03-16 06:52:33 +01:00
Friendika
e2ea341094
facebook parses out punctuation on the left of links but not on right
2011-03-15 17:47:49 -07:00
Friendika
f01538a54f
content expiration
2011-03-15 17:31:49 -07:00
Friendika
73d3758e45
revup
2011-03-15 15:10:03 -07:00
Friendika
4cc20f1288
fix youtube videos that use https:// urls
2011-03-15 00:56:25 -07:00
Friendika
67b0b4600b
Merge branch 'ffind'
2011-03-14 20:21:09 -07:00
Friendika
53dcede278
pub_keywords -> meta keywords
2011-03-14 20:19:45 -07:00
Friendika
852ea1aedd
force last-child on foster children, disallow time travel
2011-03-14 18:34:58 -07:00
Friendika
bae15f9aae
revup
2011-03-14 16:18:32 -07:00
Friendika
7b92b42603
keywords split into public and private. Public will be used by the friend finder.
2011-03-14 00:28:49 -07:00
Friendika
f2734681e5
friend finder support functions
2011-03-13 22:07:56 -07:00
Friendika
79a6b70a26
friend finder data structures
2011-03-13 21:53:39 -07:00
Friendika
0d161c6ef6
Merge branch 'omigeot-master'
2011-03-13 19:13:40 -07:00
Friendika
aebf9bb4d6
non-code change
2011-03-13 19:12:46 -07:00
Friendika
0cf647bf6f
don't let somebody install with a bogus db hostname as this seems to lead to spectacular failure modes
2011-03-13 16:47:41 -07:00
fabrixxm
d6b4940ddd
extract.php extract tt(). Updated strings.php
2011-03-13 13:51:59 +01:00
fabrixxm
a7af6df962
Fix spaces around t() and tt()
2011-03-13 13:50:44 +01:00
Tobias Diekershoff
a89bba724b
resolved some local git quirks
2011-03-13 11:39:09 +01:00
Tobias Diekershoff
a2ee5ebe42
Merge branch 'master' of git://github.com/friendika/friendika
...
Conflicts:
addon/twitter/twitter.php
2011-03-13 11:37:24 +01:00
Friendika
a912a0d3ca
Swedish translation
2011-03-12 03:15:38 -08:00
Friendika
ee210718cc
photo album prev/next links
2011-03-11 20:06:13 -08:00
Friendika
5e2f0ff055
roll back "real people preferred" message - ineffectual
2011-03-11 14:48:58 -08:00
erik
e94ae8d396
commit001
2011-03-11 20:12:32 +01:00
fabrixxm
a00beafe7f
updated strings
2011-03-11 07:28:13 +01:00
fabrixxm
692cb54d35
it messages
2011-03-11 07:12:16 +01:00
Friendika
508636082e
bogus 'no results' message on search page
2011-03-10 20:46:27 -08:00
fabrixxm
ee065da57a
update sh script
2011-03-11 01:23:24 +01:00
fabrixxm
e1766b829f
Changed 'mo' with 'po'.....
2011-03-11 00:41:01 +01:00
fabrixxm
90eab0fbc3
extract string can update existing po file
2011-03-11 00:40:26 +01:00
fabrixxm
9f7878057f
update source strings
2011-03-11 00:22:21 +01:00
fabrixxm
89781ba428
Convert .mo file to strings.php
2011-03-11 00:21:05 +01:00
fabrixxm
a44f5653bf
script sh to run xgettext on code and prepare messages.mo file
2011-03-11 00:20:03 +01:00
fabrixxm
8a40c718fb
Move translation functions. Add tt() for plural cases.
2011-03-11 00:18:29 +01:00
Friendika
439ee37f99
never enough comments
2011-03-10 02:45:37 -08:00
Friendika
0578751cc9
allowed_email matching $host instead of $domain
2011-03-09 23:35:47 -08:00
Friendika
2270e73fcd
show permission denied photo when direct link was accessed and authentication is insufficient to view
2011-03-09 21:29:32 -08:00
Friendika
35c3e12df5
ability to edit image permissions
2011-03-09 21:10:16 -08:00
Friendika
d6e4cd9d6b
bring loozah theme up to date, move name slightly lower
2011-03-09 17:59:26 -08:00
Friendika
7b9dff1db7
automated versioning
2011-03-09 16:57:22 -08:00
Friendika
1c779e2061
fb "post by default" implemented, post_by_default logic fixed for other plugins
2011-03-09 14:39:18 -08:00
Friendika
6f9eadfe6e
Merge branch 'fabrixxm-issue-11'
2011-03-09 02:18:00 -08:00
Friendika
ddaa751222
Merge branch 'issue-11' of https://github.com/fabrixxm/friendika into fabrixxm-issue-11
2011-03-09 02:17:44 -08:00
Friendika
7250b04dbd
EOF
2011-03-09 02:17:08 -08:00
Friendika
32e96d2647
reload plugins if they change
2011-03-09 02:12:32 -08:00
Fabio Comuni
a543ae6d8e
Update search_item.tpl
2011-03-09 09:33:08 +01:00
Friendika
5f54503780
Merge branch 'issue-11' of https://github.com/fabrixxm/friendika into fabrixxm-issue-11
2011-03-09 00:17:47 -08:00
Fabio Comuni
37a87b0f58
reworked wall-to-wall style
2011-03-09 08:43:17 +01:00
Friendika
0de88eb6b0
yet another template converted to language neutral format
2011-03-08 18:53:52 -08:00
Friendika
ea59e199d5
updated INSTALL.txt
2011-03-08 18:19:20 -08:00
Friendika
041f3ca774
detect empty .htconfig.php - in case permissions need to be set on it in order to install
2011-03-08 18:11:36 -08:00
Friendika
c40944fc86
inherit 'wall' setting from parent post on remote item
2011-03-08 14:40:33 -08:00
Friendika
0784c072ce
Italian string file typo
2011-03-08 13:47:10 -08:00
Fabio Comuni
b00abf7e32
reworked items template
2011-03-08 16:51:14 +01:00
Fabio Comuni
33264dc294
Add title attribute to location links
2011-03-08 16:50:10 +01:00
Fabio Comuni
e776024b3a
Fix IT strings
2011-03-08 15:40:23 +01:00
olivierm
8520917571
Autodetect browser language (should we make this optional?)
2011-03-08 14:41:04 +01:00
olivierm
25c674b73a
Merge remote branch 'mike/master'
2011-03-08 14:39:26 +01:00
Friendika
c248b28f92
indicate preference to register/communicate-with real people and not fictitious entities.
2011-03-08 04:06:37 -08:00
Friendika
bc7035408a
twitteroauth library path
2011-03-08 01:43:42 -08:00
Tobias Diekershoff
8fea19dd38
fixed wrong library path
2011-03-08 10:08:50 +01:00
Friendika
6ff6ac4743
profile deletion issues
2011-03-08 00:39:42 -08:00
Friendika
989b1b209e
one more template free from translation, allow for later item editing within jot.tpl
2011-03-07 19:58:22 -08:00
Friendika
fb481e0b2f
sparkle link enhancements to display page
2011-03-07 17:04:26 -08:00
Friendika
58eba782cf
more tweaks #13
2011-03-06 19:48:46 -08:00
Friendika
26c4054652
more improvements on sparkle links bug #13
2011-03-06 19:43:03 -08:00
Friendika
7f1f18675c
sparkle links for friends-of-friends, bug #13
2011-03-06 19:24:01 -08:00
Friendika
fecef140d5
new item view: sparkle links not redirecting
2011-03-04 21:27:38 -08:00
Friendika
216f038456
icon changes, feed security improvements
2011-03-04 20:55:32 -08:00
Friendika
3c076b53fe
use prepare_text instead of prepare_body
2011-03-03 23:13:16 -08:00
Friendika
15d3be18a9
use prepare_body for text preparation
2011-03-03 22:53:20 -08:00
Friendika
71d4810697
photo in mail message getting bogus response
2011-03-03 20:58:39 -08:00
Friendika
69e2252fd6
that would be mysql !i! connect_errno...
2011-03-03 15:47:13 -08:00
Friendika
b8757fb456
make sure db queries never get called if the database isn't open
2011-03-03 15:41:08 -08:00
olivierm
07ebc15612
Merge commit 'mike/master'
2011-03-03 10:09:48 +01:00
Friendika
bfdf4bddc9
"New Item View" had no magic sparkle links
2011-03-02 16:19:38 -08:00
olivierm
593d7037c5
Slight change in strings (now guess better whether 'likes' are plural or singular)
2011-03-02 14:38:30 +01:00
Friendika
6480fd73a7
units conversion app - needs some styling and code cleanup
2011-03-02 03:25:12 -08:00
Friendika
b8740a0a9c
add manage file
2011-03-01 20:36:24 -08:00
Friendika
377f991ac5
switch identities to manage pages
2011-03-01 20:18:47 -08:00
Friendika
5ff1462e1e
install issue (memory exhausted) due to incorrect db open check
2011-03-01 16:24:22 -08:00
Friendika
2d4b3bee60
qsearch_limit, not lsearch
2011-02-28 23:39:59 -08:00
Friendika
80ed4242ee
singleuser site mode plus fix search template layout
2011-02-28 19:44:47 -08:00
Friendika
f089b1610e
feeds: update content when updated/edited changes
2011-02-28 18:24:32 -08:00
Friendika
3308a69320
increase visibility of group filter
2011-02-28 02:56:46 -08:00
Friendika
6ea77889b3
simplify connect/follow text
2011-02-27 18:11:15 -08:00
Friendika
9102fb3a6f
autodiscover community pages for the directory
2011-02-27 14:17:42 -08:00
Tobias Diekershoff
b41b0fcba9
corrected wrong function call for notification of missing API Key
2011-02-27 10:36:52 +01:00
Tobias Diekershoff
2b2d43cce5
more strings translated to German
2011-02-27 10:24:34 +01:00
Tobias Diekershoff
efbe8a46f6
some more translations into German
2011-02-27 10:13:57 +01:00
Tobias Diekershoff
9d9efb2bee
translated some more strings to German
2011-02-27 08:35:01 +01:00
Tobias Diekershoff
403e37fdbf
one replacement of the twitteroauth lib forgotten
2011-02-27 07:40:14 +01:00
Friendika
05d3eb59ec
status.net mentions to non-followers require the numeric profile URL, not the nickname profile URL. Though it works when they are a follower.
2011-02-26 01:53:18 -08:00
Friendika
4efa0f1e81
newline at EOF
2011-02-25 19:57:44 -08:00
Friendika
597d09de1f
handle group results without parsing anything
2011-02-25 19:56:38 -08:00
Friendika
ee4800a4d3
auto-complete contact/group endpoint
2011-02-25 15:28:07 -08:00
Friendika
c3cb3d75e5
use consistent tagging patterns with relationship partner
2011-02-25 12:12:25 -08:00
Friendika
3195ad8d2e
Totally tacky...
2011-02-24 19:17:52 -08:00
Friendika
32b9546d76
provide examples for relationship partner linkage
2011-02-24 19:04:37 -08:00
Friendika
8568c0cf9b
clear floats on oauth inputs (wide screens looked messy)
2011-02-24 17:13:03 -08:00
Friendika
1207bb1b55
silence parse_url on hostile input, need to get_app() for proc_run php location
2011-02-24 15:41:15 -08:00
Friendika
f6788dc5f6
Merge branch 'omigeot-master'
2011-02-24 13:30:03 -08:00
Friendika
fef4e6a155
string fixes
2011-02-24 13:29:19 -08:00
olivierm
d2c47924eb
Merge commit 'mike/master'
2011-02-24 18:52:08 +01:00
Friendika
8ed085c64e
don't truncate names across multi-byte char sequences
2011-02-24 03:48:21 -08:00
Friendika
5641532936
yet another template
2011-02-24 02:46:06 -08:00
Friendika
c98ed12e10
generalise wallwall template and fix "via wall-to-wall" float
2011-02-24 02:32:46 -08:00
Friendika
a247a3cedb
another template down
2011-02-23 20:43:22 -08:00
Friendika
b92150297f
more consistency to plugins
2011-02-23 19:54:29 -08:00
Friendika
15780914ec
another template made language neutral
2011-02-23 19:30:57 -08:00
Friendika
953d8ccb54
added hook but forgot to register
2011-02-23 19:09:49 -08:00
Friendika
834439b730
cleanup plugin and post settings
2011-02-23 18:24:29 -08:00
Friendika
352fef6208
provide privacy policy url as mandated for Facebook apps (how bloody ironic)
2011-02-23 16:39:21 -08:00
Friendika
755c2245e8
move php path setting inside proc_run
2011-02-23 15:16:12 -08:00
Friendika
fdc469ae4c
move directory registration block before redirect
2011-02-23 14:04:00 -08:00
olivierm
42d1474ff1
Changed greetings in french
2011-02-23 20:57:34 +01:00
olivierm
a6870ceb41
More french templates.
2011-02-23 20:41:23 +01:00
olivierm
75a8b684fc
Merge commit 'mike/master'
2011-02-23 20:25:37 +01:00
Friendika
b6ba303f4b
minor proc_run issues encountered during mass directory update.
...
Unclear if it affects "normal" operation but suspect it does.
2011-02-23 03:03:33 -08:00
Friendika
365ff94137
push directory on register - if permitted
2011-02-23 01:37:15 -08:00
olivierm
3ad7c395fb
Merge commit 'mike/master'
2011-02-23 10:18:11 +01:00
Friendika
a5b80e5d56
add some calendaring functions
2011-02-22 20:08:15 -08:00
Friendika
f57f9852b1
pulled strings from one more template
2011-02-22 15:35:33 -08:00
olivierm
fbf0459fb2
A little more french translation.
2011-02-22 19:14:11 +01:00
Friendika
99eef96822
clear float after title for items having title
2011-02-21 20:28:29 -08:00
Friendika
5f2f644064
resolve file inclusion conflicts w/ multiple plugins, improve the typo checker
2011-02-21 20:19:33 -08:00
Friendika
d124c67322
remove note about accounts being hidden in register email
2011-02-21 18:32:26 -08:00
Friendika
c10879efdd
default publish to directory, but offer registration privacy setting.
...
generalise publish option template - so once translated we can merge them all.
Update strings.
2011-02-21 16:50:06 -08:00
Friendika
079e63bba9
Merge branch 'themetests' of https://github.com/fabrixxm/friendika into fabrixxm-themetests
2011-02-21 13:27:03 -08:00
Friendika
0a7b3c111e
convert html entities on conversational emails
2011-02-21 00:20:55 -08:00
Friendika
5c5ff0b87a
localise tictac
2011-02-20 20:38:30 -08:00
Friendika
ee35c06a8d
more punctuation characters added to linkify patterns
2011-02-20 20:20:33 -08:00
Friendika
d609e75b07
facebook plugin: convert html entities
2011-02-20 19:51:00 -08:00
Friendika
c6b28ee5ed
support lrdd priority
2011-02-20 19:12:46 -08:00
Friendika
24cb2eaf63
add calculator addon app
2011-02-20 03:53:41 -08:00
Friendika
93dd2d5682
link to Facebook enable from plugin settings page
2011-02-20 03:32:57 -08:00
Friendika
af0fe4cf42
Merge branch 'chriscase-master'
...
Conflicts:
mod/dfrn_notify.php
2011-02-20 01:42:11 -08:00
Chris Case
9260bb4ce1
updated private message code to use the new EmailNotification library
2011-02-19 05:35:01 -08:00
Chris Case
dba7874131
added reusable EmailNotification library to facilitate more efficient maintenance of email related code
2011-02-19 05:33:42 -08:00
Friendika
3d1b153dec
apps menu file
2011-02-19 01:01:33 -08:00
Friendika
642a71ffde
app menu - and a demo application 'tictac'
2011-02-19 00:56:15 -08:00
Friendika
0bf8e418a8
Merge branch 'chriscase-master'
...
Conflicts:
mod/dfrn_notify.php
2011-02-17 14:05:51 -08:00
Chris Case
9e654f7e57
removed localized multipart email templates, now the multipart settings are configured directly in the code
2011-02-17 13:41:56 -08:00
Fabio Comuni
f5557763d2
Updates to theme dupuntozero
2011-02-17 17:29:29 +01:00
Fabio Comuni
3d69e2a50c
Merge branch 'master' into themetests
2011-02-17 14:14:06 +01:00
Friendika
45bd7d5e29
no delimiter if empty
2011-02-17 01:06:20 -08:00
Friendika
979307ef91
ajax testing continues
2011-02-17 00:52:26 -08:00
Friendika
f7b2f9f5e7
convert update script arg passing to js - remembering the browser prefetch issues
2011-02-17 00:40:35 -08:00
Friendika
3cc63f2e6f
issues found when testing all live network modes
2011-02-16 23:18:43 -08:00
Friendika
0435236192
error return for update process when invalid group
2011-02-16 23:10:18 -08:00
Friendika
9f8b6dff1c
ajax live update for all network pages and subpages
2011-02-16 23:05:48 -08:00
fabrixxm
c948ab8f21
Merge branch 'friendika-master'
2011-02-17 07:37:15 +01:00
fabrixxm
2493877a18
Merge branch 'master' of github.com:fabrixxm/friendika
2011-02-17 07:36:15 +01:00
Friendika
4bff52990e
ajax reload fixes
2011-02-16 21:17:49 -08:00
Friendika
c397a2f89b
properly handle error returns in post w/ajax
2011-02-16 20:25:10 -08:00
Friendika
67bb737aa1
broken image + linkify site link in body
2011-02-16 17:49:52 -08:00
Friendika
527e050ecc
sanitise all incoming url's - also stop them from getting mangled by simplepie
2011-02-16 17:32:15 -08:00
Friendika
9f1f9da89b
Merge branch 'chriscase-master'
2011-02-16 14:41:12 -08:00
Friendika
d6998ffef2
small fixes
2011-02-16 13:19:54 -08:00
Chris Case
5aa6bbbbc5
fixed encoding, i had been experimenting with different ones and forgot to change it back, now UTF-8
2011-02-16 08:05:54 -08:00
Chris Case
2169329547
forgot to check this in earlier... splits up text and html into two different templates and base64 encodes them
2011-02-16 08:05:10 -08:00
Chris Case
e56895123a
changed message sending to use base64 encoding
2011-02-16 05:17:40 -08:00
Fabio Comuni
dc15e8640d
duepuntozero: show desc on image in albums
2011-02-16 12:49:16 +01:00
Friendika
acce5c95a3
set contact permissions on photos uploaded to private messages
2011-02-16 03:14:45 -08:00
Friendika
fb3bb41dc2
Merge branch 'fabrixxm-master'
2011-02-16 02:09:02 -08:00
Friendika
9f02057374
provide permalink for posts, include permalinks in feeds and imported from feeds
2011-02-16 02:07:11 -08:00
Fabio Comuni
c8116932c2
Fix #8 \"recycle symbol getting mangled from status.net retweets\"
2011-02-16 09:22:32 +01:00
fabrixxm
17a0d38d8f
Merge branch 'friendika-master'
2011-02-16 08:07:17 +01:00
fabrixxm
9e746b504f
Merge branch 'master' of github.com:fabrixxm/friendika
2011-02-16 08:06:04 +01:00
Friendika
c5f5102396
Merge branch 'fabrixxm-master'
...
Conflicts:
addon/statusnet/statusnet.php
util/strings.php
2011-02-15 13:40:25 -08:00
Friendika
603dc34fa0
parens in english string
2011-02-15 13:33:33 -08:00
Fabio Comuni
97723ad69f
Fixed parentheses in translable string in statusnet.php. Rebulid util/strings.php. Update it/strings
2011-02-15 15:09:29 +01:00
Fabio Comuni
48e2a6bde9
Updated it language
2011-02-15 14:53:55 +01:00
Fabio Comuni
1bb9effd38
fin un util/strings
2011-02-15 14:41:48 +01:00
Fabio Comuni
5cfefba5c8
Small tweaks to string_translator
2011-02-15 14:40:26 +01:00
Fabio Comuni
70cf5ae3c7
Merge remote-tracking branch 'friendika-master/master'
2011-02-15 14:19:54 +01:00
Friendika
473786d3a0
Merge branch 'chriscase-master'
2011-02-15 03:45:40 -08:00
Chris Case
0d853433eb
fixed error which was causing multiple line breaks, added comments to better document what is occuring, cleaned up code, removed unnecessary parameters from templating step
2011-02-15 03:31:20 -08:00
Fabio Comuni
dd8bbe8202
change \"html\" with \"bb code\" in tinyMce icons
2011-02-15 12:23:47 +01:00
Friendika
69be5b64e0
Merge branch 'tobiasd-master'
2011-02-15 03:17:18 -08:00
Friendika
f856493555
add permalink field to item table
2011-02-15 03:13:38 -08:00
Friendika
1b14f67a86
bug #0000006 , local sparkle links visible in "like" items when remote viewing
2011-02-15 02:30:01 -08:00
Tobias Diekershoff
7a6174298b
deleted the translated file of comment_item.tpl
2011-02-15 10:56:07 +01:00
Tobias Diekershoff
397643a066
masked the / in the config strings to fix problems with the strings.php
2011-02-15 10:03:05 +01:00
Tobias Diekershoff
afdfc725b8
some translations into German
2011-02-15 09:49:38 +01:00
Friendika
0e7b09b41c
bug #0000002 , strip HTML from pasted text in prv messages
2011-02-14 21:33:17 -08:00
Friendika
1dea6a2d71
wrong return url for ajax comments on display and photos pages
2011-02-14 20:21:28 -08:00
Chris Case
7b26500510
Merge remote branch 'upstream/master'
2011-02-14 11:50:08 -08:00
Chris Case
42eb6dd723
fixed a bbcode issue with rich text html messages, fixed some issues with plain text.
2011-02-14 05:44:27 -08:00
Friendika
fe1a37074a
Merge branch 'chriscase-master'
2011-02-14 05:06:16 -08:00
Chris Case
94e0c3c970
fixed the charset on the html version of the message, overlooked this in the last commit, now uses utf-8 in the meta tag
2011-02-14 04:54:44 -08:00
Friendika
b87ddbd58a
Merge branch 'ajaxcomms'
...
Conflicts:
view/comment_item.tpl
2011-02-14 04:46:49 -08:00
Friendika
df20990753
ajax comments
2011-02-14 04:43:49 -08:00
Friendika
39dd36176b
ajax comments
2011-02-14 04:43:19 -08:00
Chris Case
5eebb373e5
revamped private message templates, added multipart messages with text and html versions, updated de, en, fr and it. Translated the french version of the private message template.
2011-02-14 03:59:54 -08:00
Friendika
f37caa0999
try this again
2011-02-14 02:59:22 -08:00
Friendika
ce8c6dfaf7
just in time for valentines day - heart smiley <3
2011-02-13 17:24:42 -08:00
Chris Case
f98ba371cf
updated private message notification to use HTML, still need the foreign language message notifications updated
2011-02-13 14:55:48 -08:00
Friendika
e32cda6542
app not defined
2011-02-13 13:35:08 -08:00
Friendika
2d542e0f98
receiving comment notifications for conversations we aren't "involved" in
2011-02-12 22:29:32 -08:00
Friendika
91190de0f0
fb addon only working from one site - more debug + simplify permission toggle
2011-02-12 19:24:19 -08:00
fabrixxm
53dff2204b
Merge branch 'friendika-master'
2011-02-12 18:31:13 +01:00
Friendika
89cbd17c72
more fb debug msgs
2011-02-12 05:07:24 -08:00
Friendika
ee46a028d6
more test ajax comments
2011-02-12 03:42:57 -08:00
Friendika
3d9845f4a4
preliminary ajax comment setups
2011-02-12 03:14:59 -08:00
Friendika
4081ebe6c5
correct color and indent on wall-wall comments
2011-02-12 02:07:16 -08:00
Friendika
7d0de6dfb7
trim excessive space around message body (though we still need 20px padding to accomodate scrollbars)
2011-02-12 01:51:29 -08:00
Friendika
f79c215293
give all comment input form elements id's
2011-02-12 01:37:21 -08:00
Chris Case
8937ba86a2
set default size for profile photo to improve render appearance/speed
2011-02-11 18:52:30 -08:00
Chris Case
b98b5645e6
fixed a typo in the profile photo wrapper div id
2011-02-11 18:46:54 -08:00
Chris Case
6745f07817
set size of contact images to improve rendering
2011-02-11 18:26:07 -08:00
Friendika
5e02519a13
disable network toggles when ACL's are entered
2011-02-11 04:32:38 -08:00
Friendika
0bfe63e7d8
reinstate send slaps but only at the top level (and followup)
2011-02-11 03:17:16 -08:00
Friendika
c16e86add8
toggles "post to facebook, post to twitter", etc.
2011-02-11 02:35:19 -08:00
Friendika
40574589e2
fb connecter - document installation
2011-02-10 23:10:50 -08:00
Friendika
fc5a3cac14
post to FB is working
2011-02-10 21:25:24 -08:00
Friendika
bd4e7249a3
more work on facebook addon
2011-02-10 18:01:38 -08:00
Friendika
f217a557b8
allow plugins to become cmd modules
2011-02-10 16:17:21 -08:00
Friendika
6da603fbb5
typo in schema
2011-02-10 13:21:17 -08:00
Friendika
a18bb816cd
entirely possible media/links were the only thing posted - don't forward empty message to twitter/SN
2011-02-10 03:51:42 -08:00
Friendika
2e78ed00f6
general purpose callback landing page - e.g. for facebook plugin
2011-02-10 00:32:09 -08:00
Friendika
40777b132b
log ignored pubsub deliveries
2011-02-09 19:56:40 -08:00
Friendika
de2c9531db
post permission hooks
2011-02-09 19:39:49 -08:00
Friendika
05c52ae81d
preserve newlines inside <pre> tags when importing feeds
2011-02-09 17:51:05 -08:00
Friendika
971b16ea4a
Accept pretty much bloody anything inside a [url] tag as a legal URL.
2011-02-09 16:55:31 -08:00
Friendika
1d12a2be69
string update
2011-02-09 00:53:51 -08:00
Friendika
9afbb74bf4
Merge branch 'tobiasd-master'
2011-02-09 00:48:07 -08:00
Tobias Diekershoff
89da23c30e
spaces for the string extractor, check no parent
2011-02-09 09:40:56 +01:00
Friendika
ca826c7ff2
images were left behind in theme rename
2011-02-08 23:24:19 -08:00
Friendika
5899ae9017
Support bbcode size tag - I may regret this...
2011-02-08 21:26:28 -08:00
Friendika
6b8bbef6c7
suppress parse warnings
2011-02-08 20:55:34 -08:00
Friendika
f70a0b0282
more graceful handling of some statusnet followups
2011-02-08 18:44:30 -08:00
Friendika
766c4778cb
modify tag handling and replies to stnet
2011-02-08 15:08:07 -08:00
Friendika
a05b2b4cc7
Merge branch 'tobiasd-master'
2011-02-08 13:30:24 -08:00
Tobias Diekershoff
b8629a0318
added README files for the piwik, twitter and statusnet addon
2011-02-08 19:04:39 +01:00
fabrixxm
26dfb73f48
Merge branch 'friendika-master'
2011-02-08 18:13:41 +01:00
Tobias Diekershoff
ca1b8a267d
post to StatusNet addon for Friendika
2011-02-08 15:17:41 +01:00
Tobias Diekershoff
2a093c5c8b
added link to Redmine of addon author
2011-02-08 14:39:59 +01:00
Tobias Diekershoff
89a33a651e
deletion of OAuth stuff works now, removed ToDo note
2011-02-08 14:38:51 +01:00
Friendika
9a1e5aaf09
tweaks to reworked remote deletion, which also fixes some comment box oddities
2011-02-08 05:08:10 -08:00
Friendika
d8cd693f11
rework remote deletion
2011-02-08 04:25:27 -08:00
Tobias Diekershoff
98db8bc015
Merge branch 'master' of git://github.com/friendika/friendika
2011-02-08 13:00:53 +01:00
Friendika
d280184b87
fix del_pconfig
2011-02-08 02:45:55 -08:00
Friendika
e06cd399b7
close tag on favicon link missing
2011-02-07 23:28:41 -08:00
Friendika
d37ee1b399
at least one server is giving CURL a second set of headers (and it isn't a 100 continue which we've already accounted for)
2011-02-07 23:20:38 -08:00
Friendika
9f5d3000c7
don't change photo visibility if only album name was changed
2011-02-07 21:16:39 -08:00
Friendika
18c5d1ff90
feed cleanup
2011-02-07 17:06:04 -08:00
Friendika
7dd56fa14c
one less paren
2011-02-06 23:06:50 -08:00
Friendika
118f1d7e0a
don't show logout link on 'home' link if remote_user
2011-02-06 23:04:10 -08:00
Tobias Diekershoff
fbb635462a
Merge github.com:tobiasd/friendika
2011-02-07 08:03:29 +01:00
Friendika
0d9ed48738
functionise birthday
2011-02-06 22:41:07 -08:00
Friendika
b96d6c015b
fix contact photo updates - a result of baseurl being wrong for cmdline processes
2011-02-06 19:15:20 -08:00
Friendika
147d7f3bbf
theme name cleanup - rename default to loozah, provide sane fallbacks and change system primary theme.
...
Provide indication on contact edit page of last update success/failure - can be extended later to
show actual timestamp of last successful update.
2011-02-06 15:50:50 -08:00
Friendika
8e988341d0
Merge branch 'fabrixxm-master'
2011-02-06 13:27:52 -08:00
Friendika
3f97344560
Merge branch 'master' of https://github.com/fabrixxm/friendika into fabrixxm-master
2011-02-06 13:27:37 -08:00
fabrixxm
97b608db38
Merge branch 'friendika-master'
2011-02-06 21:27:24 +01:00
fabrixxm
64be33a3ff
fixed missing close parenthesis
2011-02-06 21:24:41 +01:00
Tobias Diekershoff
695e084956
deleted another item from the Twitter addon ToDo list
2011-02-06 18:18:54 +01:00
Tobias Diekershoff
a175027fc1
deleted an item from the ToDo list
2011-02-06 17:37:04 +01:00
Tobias Diekershoff
fd6116296e
Post to Twitter plugin
...
With this plugin a user can choose to post every _public_ message that
s/he posts on Friendika also on Twitter. The message will be shortened
to if longer then 140 characters in length. If shortened a link to the
original posting will be append to the Twitter posting.
2011-02-06 17:27:16 +01:00
Tobias Diekershoff
339a92fe1b
added Slinky library by Beau Lebens for shortening the post url
2011-02-06 17:22:15 +01:00
Friendika
ac3f3a6e9f
kill orphans
2011-02-06 02:33:02 -08:00
Friendika
073f3720ac
Merge branch 'tobiasd-master'
2011-02-06 02:21:45 -08:00
Friendika
4e63b0acb9
ensure that jot_plugins inherit '$visitor' correctly
2011-02-06 01:08:12 -08:00
Tobias Diekershoff
09af200bcc
german choose existing pic for the avatar
2011-02-06 08:51:10 +01:00
Tobias Diekershoff
dd3f21b98a
Merge branch 'master' of git://github.com/friendika/friendika
2011-02-06 08:48:07 +01:00
Friendika
d322bb4613
Merge branch 'fabrixxm-master'
2011-02-05 13:06:20 -08:00
Friendika
8a55168d4f
Merge branch 'ph2pr' of https://github.com/fabrixxm/friendika into fabrixxm-master
2011-02-05 13:05:57 -08:00
Friendika
c26463b65b
Merge branch 'omigeot-master'
...
Conflicts:
view/fr/strings.php
2011-02-05 13:01:28 -08:00
Friendika
c4ddee005e
Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master
2011-02-05 12:59:04 -08:00
olivierm
4e913d59ea
Fixed some typo (prevented Friendika to load with french locale)
2011-02-05 15:19:28 +01:00
Tobias Diekershoff
0c83fb4d80
Merge branch 'master' of git://github.com/friendika/friendika
2011-02-05 09:19:03 +01:00
Friendika
8cced061bb
found it - typo
2011-02-04 13:40:51 -08:00
Friendika
1d0d765344
more error checking on posts
2011-02-04 13:37:04 -08:00
Tobias Diekershoff
acd5f49d43
wording
2011-02-04 21:56:43 +01:00
Friendika
6bb8f677c2
Merge branch 'fabrixxm-master'
2011-02-04 04:46:05 -08:00
Friendika
2a9bfae2b7
prevent runaway notifications when parent=0 due to race condition
2011-02-04 04:25:53 -08:00
Fabio Comuni
ebbdb7b301
Upload profile photo page it title
2011-02-04 10:32:29 +01:00
Fabio Comuni
fb7959cfc0
Add a link to user photos in Upload Profile Photo page
2011-02-04 10:30:56 +01:00
Fabio Comuni
d72f248b3c
Allow to set a photo from albums as profile photo
2011-02-04 10:18:28 +01:00
Fabio Comuni
cc6a5f59b4
Merge branch 'master' of https://github.com/friendika/friendika.git
2011-02-04 08:44:17 +01:00
Friendika
5c98032893
Merge branch 'photos' of https://github.com/fabrixxm/friendika into fabrixxm-photos
2011-02-03 23:25:33 -08:00
fabrixxm
9cf04b6110
small fix to IT strings
2011-02-04 07:36:57 +01:00
Friendika
1eef647edb
warn folks that changing your domain name after making friends is not supported at this time.
2011-02-03 20:55:55 -08:00
Friendika
ac3cbe380f
found the issue - remove the extra tracing stuff
2011-02-03 19:39:04 -08:00
Friendika
c6b00f7230
allow parentless items from SN - add more tracing on notify failures
2011-02-03 17:40:04 -08:00
Friendika
e2c8bedfe5
allow changing album name in photo edit page
2011-02-03 15:13:38 -08:00
fabrixxm
b5c3fb1545
remove an erroneously pasted line
2011-02-03 19:42:32 +01:00
Fabio Comuni
c15c550a06
Fix tabs
2011-02-03 17:25:10 +01:00
Fabio Comuni
bed0391e6f
Show lock info on photos
2011-02-03 17:24:58 +01:00
Fabio Comuni
9b3131861f
Extend lockview to show info on items, photos and events
2011-02-03 17:20:40 +01:00
Friendika
01cd7cc9f2
don't parse garbage in phase2 of dfrn_deliver either
2011-02-03 04:19:05 -08:00
Friendika
a4cbdc2414
remove self
2011-02-03 03:58:47 -08:00
Friendika
01c83f0e93
Merge branch 'tobiasd-master'
2011-02-02 23:55:16 -08:00
Tobias Diekershoff
5e73f9da86
double $ in de/strings.php corrected
2011-02-03 08:35:23 +01:00
Friendika
1558cd8085
Merge branch 'tobiasd-master'
2011-02-02 23:27:12 -08:00
Friendika
33b2490a91
Merge branch 'fabrixxm-master'
2011-02-02 23:24:04 -08:00
Tobias Diekershoff
73c2ccbc78
updates to the German strings.php file
2011-02-03 08:17:07 +01:00
Friendika
2a4d1fa858
append jotplugin tools to current toolbar row
2011-02-02 23:07:01 -08:00
fabrixxm
2f6ef7b5eb
IT string update
2011-02-03 07:42:40 +01:00
fabrixxm
97bb80c00f
Merge branch 'friendika-master'
2011-02-03 07:24:58 +01:00
Friendika
0a32370e32
silence php notices about $manual_id not being defined
2011-02-02 19:56:27 -08:00
Friendika
a8cea3f30c
don't try to parse non-xml in dfrn_deliver
2011-02-02 19:28:40 -08:00
Friendika
25c2640c17
be more forgiving about the order of link parameters in html->bb
2011-02-02 18:09:27 -08:00
Friendika
1a18f4bcde
get media-rss thumbnail if available and nothing else was found (e.g. github).
2011-02-02 17:32:25 -08:00
Friendika
46c37fc779
string update, allow js_upload file selection text to be localised
2011-02-02 16:51:55 -08:00
Friendika
ee45dee932
suppress some scraping errors when confronted with hybrid/strange
...
feeds that provide insufficient content-type and choke the html parser.
2011-02-02 14:48:27 -08:00
fabrixxm
a3fd84661f
Merge branch 'friendika-master'
2011-02-02 08:00:50 +01:00
Friendika
fce9988f73
backward compatibility
2011-02-01 22:45:46 -08:00
Friendika
a347d040f0
protocol reversal, roll dfrn_version to 2.1
2011-02-01 21:21:47 -08:00
Friendika
777c47aaa6
silence a few notice warnings
2011-02-01 20:23:58 -08:00
Friendika
22acba2460
trying to solve the double encoding issue
2011-02-01 18:20:25 -08:00
Friendika
bafae56b39
make sure content is unaltered
2011-02-01 17:50:49 -08:00
Friendika
968e8bb9c4
typo
2011-02-01 17:05:17 -08:00
Friendika
6a4ae2e845
get correct article timestamp for feeds with no 'published' and with non-utc stamps
2011-02-01 16:50:19 -08:00
Friendika
8c5c07b265
don't try to scrape atom/rss feeds. missing param in contact store (mod_follow)
2011-02-01 14:55:29 -08:00
Friendika
b4f2aac7e7
truncate long names
2011-02-01 14:09:47 -08:00
fabrixxm
670dba6666
update jot-headers
2011-02-01 18:52:16 +01:00
fabrixxm
9065270694
Merge branch 'friendika-master'
2011-02-01 18:46:31 +01:00
fabrixxm
58e0129433
Merge branch 'master' of github.com:fabrixxm/friendika
2011-02-01 18:46:28 +01:00
Friendika
8acc76a3c6
provide ability to survive transport mangling when travelling through html networks
2011-02-01 05:10:04 -08:00
Fabio Comuni
042aa2e169
Merge remote branch 'friendika-master/master'
2011-02-01 10:17:27 +01:00
Fabio Comuni
1151124fee
Merge branch 'master' of github.com:fabrixxm/friendika
2011-02-01 10:17:19 +01:00
Friendika
89313235d2
it's a bbcode editor, not an html editor
2011-01-31 23:23:37 -08:00
Friendika
9d561d4471
oembed contsant name, fix dfrnpubdeliver, add 'code' editor button
2011-01-31 23:06:45 -08:00
fabrixxm
0bec0fc5fb
Merge branch 'friendika-master'
2011-02-01 07:18:23 +01:00
Friendika
7dbdf8e6fa
let there be purple! ;-)
2011-01-31 20:52:23 -08:00
Friendika
2cd1da5462
readjust name length limits - acl selector
2011-01-31 19:53:40 -08:00
Friendika
e2544abd50
truncate names in acl selector
2011-01-31 19:49:56 -08:00
Friendika
837cce8a75
email cc recipients (front end)
2011-01-31 19:07:13 -08:00
Friendika
8965db24cc
post to email recips (backend)
2011-01-31 18:18:28 -08:00
Friendika
082909fe1a
Merge branch 'fabrixxm-oembed'
2011-01-31 15:26:02 -08:00
Friendika
fc20fb17c2
force text paste in editor
2011-01-31 14:21:23 -08:00
Friendika
1908c7ad82
deliver up to 150 contacts per person using dfrn - in case hub is whacked
2011-01-31 14:01:38 -08:00
Fabio Comuni
bdbbfe17b0
cache oembed request
2011-01-31 17:23:55 +01:00
Fabio Comuni
3dbca2a804
delete old cache in poller.php
2011-01-31 17:16:35 +01:00
Fabio Comuni
6efc78e0e4
add cache table
2011-01-31 17:10:36 +01:00
Fabio Comuni
49ea05b8ff
use microformat to mark html from [embed] tag, convert html with oembed microformat to [embed] tag
2011-01-31 16:45:58 +01:00
Fabio Comuni
6ea87223d3
Add 'system''no_oembed' config option
2011-01-31 11:00:35 +01:00
Fabio Comuni
23d1b994cc
Move [embed] bbtag from oembed plugin to core
2011-01-31 10:38:49 +01:00
Fabio Comuni
e962561f8d
Merge remote branch 'friendika-master/master'
2011-01-31 09:54:08 +01:00
Friendika
d8877b88d6
limit privacy ACL's to networks which can handle privacy
2011-01-30 22:45:02 -08:00
Friendika
6935d34e76
disable "take me home" hotkey, different on FF (shift-home), IE ($).
2011-01-30 19:49:26 -08:00
Friendika
3eefe8b500
more ssl_policy cleanup, allow manual feed update per contact when hub is whacked, log feed parse errors
2011-01-30 19:38:03 -08:00
Friendika
a598f17e6d
wrong ref in ssl policy
2011-01-30 18:25:41 -08:00
Friendika
e8d52d879b
more debugging to see if the google push hub is even trying to publish our content.
2011-01-30 15:28:50 -08:00
Friendika
c012843282
identify email-only contacts
2011-01-29 23:47:40 -08:00
Friendika
8673b08c1c
even more cleanup prior to push
2011-01-29 22:41:01 -08:00
Friendika
a362dc46e3
cleanup ssl_policy implementation
2011-01-29 22:38:58 -08:00
Friendika
f970d9ab4d
implement SSL redirection policy (none, full, selfsign)
2011-01-29 22:35:11 -08:00
Friendika
45bbf1cd3f
document poormancron as alternative in INSTALL.txt
2011-01-29 01:25:46 -08:00
fabrixxm
e7d87e4ab3
Merge branch 'master' of github.com:fabrixxm/friendika
2011-01-29 10:14:14 +01:00
fabrixxm
5b35ceefb9
Merge branch 'friendika-master'
2011-01-29 09:39:38 +01:00
Friendika
26cc2e02fe
Merge branch 'fabrixxm-master'
...
Conflicts:
boot.php
2011-01-28 18:50:20 -08:00
Fabio Comuni
302acda089
updated poormancron plugin
2011-01-28 14:04:40 +01:00
Fabio Comuni
ef33ca6750
modded scripts to be runned in cli so they can be included and executed in main program
2011-01-28 14:04:18 +01:00
Fabio Comuni
517d6812da
cal proc_run hook before string escape
2011-01-28 14:01:50 +01:00
Fabio Comuni
bf8dadb970
Merge remote branch 'friendika-master/master'
2011-01-28 10:08:39 +01:00
fabrixxm
8257b1b684
Merge branch 'friendika-master'
2011-01-28 07:26:57 +01:00
Friendika
5d77bd9489
tag finder tweak
2011-01-27 21:24:21 -08:00
Friendika
33037754d8
removed java photo uploader from mainline. Photo uploaders are now plugins, but a single item upload is available by default.
2011-01-27 18:45:19 -08:00
Friendika
ebba294189
remote links
2011-01-27 14:34:11 -08:00
Friendika
58309829a1
Merge branch 'omigeot-master'
2011-01-27 13:10:43 -08:00
Friendika
1d9f677438
Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master
2011-01-27 13:09:58 -08:00
olivierm
bfe6380d90
More translation
2011-01-27 16:50:39 +01:00
olivierm
8c6319394c
Done head.tpl
2011-01-27 16:48:54 +01:00
olivierm
e93385a355
French translation : Done strings.php, started template files.
2011-01-27 16:44:55 +01:00
Friendika
620aae5b50
still not quite ready for the big photos rollover
2011-01-27 03:55:40 -08:00
Friendika
076c25e103
Revert "Revert "roll version - now in alpha 2.1""
...
This reverts commit e8a3166fa9
.
2011-01-27 03:52:18 -08:00
Friendika
e8a3166fa9
Revert "roll version - now in alpha 2.1"
...
This reverts commit df4f77dadd
.
2011-01-27 03:50:56 -08:00
Friendika
df4f77dadd
roll version - now in alpha 2.1
2011-01-27 03:46:09 -08:00
fabrixxm
444d82a532
Merge branch 'friendika-master'
2011-01-27 07:14:55 +01:00
Friendika
d2dddd995a
set update frequency to twice daily for 'feed' contacts, unable to set update frequency on contact edit form.
2011-01-26 20:29:32 -08:00
Friendika
b4642ca650
search icons (?)
2011-01-26 14:25:36 -08:00
Friendika
05350082fa
Merge branch 'oembed' of https://github.com/fabrixxm/friendika into fabrixxm-oembed
2011-01-26 13:59:20 -08:00
Fabio Comuni
43be72297a
Rewrite oembed plugin to use new bbcode tag [embed] and make discovery server-side
2011-01-26 17:17:02 +01:00
Fabio Comuni
6ca1e2ddfe
remove fixed width from wall-item-content
2011-01-26 17:11:56 +01:00
Fabio Comuni
62fda0a120
oembed consumer plugin
2011-01-26 16:20:12 +01:00
Fabio Comuni
af8ab8cb53
add [img=wxh][/img] support in tinymce bbcode plugin
2011-01-26 16:19:40 +01:00
Fabio Comuni
4a2c0fcc36
Add 'jot_tool' hook, plugins can add tool icons.
2011-01-26 16:17:28 +01:00
Tobias Diekershoff
c3691b3331
Piwik plugin for Friendika
...
This plugin allows you to enter the code necessary for Piwik analytics
at the bottom of every page that Friendika produces. Displaying an opt-out
link is possible (optional). For details about the configuration the the
header of the PHP file.
2011-01-26 15:03:10 +01:00
Friendika
c7ace10ffb
dissolve relationship (new protocol) working
2011-01-26 02:32:00 -08:00
Friendika
2fc89deaea
work in progress js_uploader plugin, turn java uploader into plugin - not done yet
2011-01-26 00:34:39 -08:00
Friendika
abbd498a8b
whitespace only
2011-01-26 00:19:54 -08:00
Friendika
696eff1031
no comment box if no notify, not no poll
2011-01-25 18:25:04 -08:00
fabrixxm
6558ee1e22
Merge branch 'friendika-master'
2011-01-25 19:03:41 +01:00
Friendika
bb5ad77e2a
smilies on new item view
2011-01-25 05:26:12 -08:00
Friendika
b23de4fa90
greenzero stripped to bare essentials, imported from duepuntozero
2011-01-25 04:30:46 -08:00
Friendika
167ab039ab
renamed theme - it was a bit too long
2011-01-25 04:03:47 -08:00
Friendika
e83db7876d
Merge branch 'master' of https://github.com/tobiasd/friendika into tobiasd-master
2011-01-25 04:00:46 -08:00
Friendika
5a7ff660c4
"unfriend" protocol
2011-01-25 03:57:10 -08:00
Tobias Diekershoff
5eacc57800
Merge git://github.com/tobiasd/friendika
2011-01-25 12:47:02 +01:00
Tobias Diekershoff
529b036dbe
some more strings translated into German
2011-01-25 12:44:14 +01:00
Fabio Comuni
1f95ba5c34
Merge remote branch 'friendika-master/master'
2011-01-25 10:16:47 +01:00
Fabio Comuni
f2789132ce
fixed width on wall-item-wrapper
2011-01-25 10:16:15 +01:00
Tobias Diekershoff
ce6a2c83f9
a green variation of the duepuntozero theme
...
for this variation of the theme the header image and the link colors
were set to some tone of green that fit my current likings.
2011-01-25 09:04:08 +01:00
Tobias Diekershoff
4c717b38ae
Merge branch 'master' of git://github.com/tobiasd/friendika
2011-01-25 08:54:10 +01:00
Tobias Diekershoff
bb1afd867d
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-25 08:53:39 +01:00
Friendika
b0ab3e468b
leave room for vertical scrollbar (when needed)
2011-01-24 23:08:39 -08:00
Friendika
fc5316fe21
allow a video and/or photo to fit with scrollbars
2011-01-24 20:21:14 -08:00
Friendika
0f64e1e623
restrict post height, we may back this out later and replace with [show all] toggles
2011-01-24 20:13:52 -08:00
Friendika
08d6fe5ae7
allow RSS for feed contacts, but no comments
2011-01-24 19:36:20 -08:00
Friendika
8e3c2634cb
wrong branch
2011-01-24 18:56:25 -08:00
Friendika
34502f1cde
main plugin files
2011-01-24 18:54:32 -08:00
Friendika
f5674558ca
propagate name changes to 'self' contact record
2011-01-24 18:18:47 -08:00
fabrixxm
3a575cdfde
first try of 'poormancron' whith 'proc_run' hook
2011-01-24 22:02:53 +01:00
fabrixxm
2020ea23b1
Mods to script runned via CLI to permits to run also included
2011-01-24 22:01:56 +01:00
fabrixxm
e9251499dd
Added proc_run() and modified all occurrence of proc_close(proc_open()) to use proc_run()
2011-01-24 22:00:02 +01:00
fabrixxm
a282042ffc
Bigger subject in messages
2011-01-24 19:50:34 +01:00
root
7e007b6c07
Merge branch 'master' of git://github.com/tobiasd/friendika
2011-01-24 13:35:23 +01:00
Tobias Diekershoff
35918a9f1f
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-24 13:34:57 +01:00
Friendika
163e614a3b
don't translate CR-LF
2011-01-24 03:08:20 -08:00
Friendika
29ae9e0920
Merge branch 'fabrixxm-master'
2011-01-24 03:03:56 -08:00
Friendika
834f1a9327
version roll
2011-01-24 01:01:20 -08:00
Fabio Comuni
7bb15680a3
Merge branch 'master' of github.com:fabrixxm/friendika
2011-01-24 09:38:05 +01:00
Friendika
a068f8e614
linkify - need at least one character after ://
2011-01-24 00:00:57 -08:00
root
80a7e68528
Merge branch 'master' of git://github.com/tobiasd/friendika
2011-01-24 07:44:08 +01:00
Tobias Diekershoff
4198efe035
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-24 07:33:56 +01:00
Friendika
205a2b8930
owner's sparkle link, sometimes not author's - on display page
2011-01-23 21:26:09 -08:00
Friendika
5be98e3ec8
following random feeds
2011-01-23 20:09:34 -08:00
Friendika
00d2b58358
fix a few issues with code blocks, ignore tags within blocks, fold multi-line blocks to one, also turn html br into two LFs.
2011-01-23 16:29:30 -08:00
Friendika
1460fc0d71
add cc-license text to all content pages
2011-01-23 14:56:14 -08:00
Friendika
1100d7b958
sync template updates en => fr
2011-01-23 14:35:22 -08:00
Friendika
f649692c25
Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master
2011-01-23 14:19:42 -08:00
Friendika
950e5f6693
given a tag @foo, don't also link/replace words like food in msg body
2011-01-23 13:49:21 -08:00
Tobias Diekershoff
2319bc43bf
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-23 21:33:08 +01:00
fabrixxm
655ab0c526
IT strings fix
2011-01-23 18:18:55 +01:00
fabrixxm
fde10d5d47
string.php translation utility
2011-01-23 18:18:32 +01:00
olivierm
320059a506
Done timezones + marital statuses and a few time-related translations
2011-01-23 16:49:15 +01:00
Friendika
ab62b8f712
fix quotes (again)
2011-01-23 03:25:03 -08:00
Friendika
461625e378
new network types
2011-01-23 02:45:37 -08:00
root
71294faf2c
Merge branch 'master' of git://github.com/tobiasd/friendika
2011-01-23 08:46:57 +01:00
Tobias Diekershoff
43dc0b4280
updated profile_advanced.php from changes in view/en
2011-01-23 08:45:30 +01:00
Tobias Diekershoff
60c5e76b2d
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-23 08:43:30 +01:00
Friendika
6c0218563f
linkify naked urls when they are at the beginning of the text
2011-01-22 05:19:53 -08:00
Friendika
f278d17910
wrong verb in dislike activity body
2011-01-22 03:59:13 -08:00
Friendika
844b177791
birthday timezone is absolute
2011-01-22 03:21:15 -08:00
Friendika
a80ab19483
typo
2011-01-22 02:51:31 -08:00
root
0dc7e0975a
Merge branch 'master' of git://github.com/tobiasd/friendika
2011-01-22 09:22:16 +01:00
Tobias Diekershoff
96620520a8
wording in email template adjusted
2011-01-22 09:20:52 +01:00
Tobias Diekershoff
c000510c27
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-22 09:18:05 +01:00
olivierm
70db9369b4
A little more...
2011-01-21 21:41:15 +01:00
Friendika
c0a0710f97
incorrect item owner on like/dislike activity body when remote-auth profile
2011-01-21 12:20:05 -08:00
olivierm
555a4e2fd8
More translation, added FIXME where not completely satisfying.
2011-01-21 18:39:51 +01:00
olivierm
0bb7777bfe
Translated more french
2011-01-21 18:24:14 +01:00
root
f54f8ca63a
Merge branch 'master' of git://github.com/tobiasd/friendika
2011-01-21 14:56:09 +01:00
Tobias Diekershoff
3f847d5b0f
variable name spelling mistake in template corrected
2011-01-21 14:55:03 +01:00
root
e8897d4079
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-21 14:38:29 +01:00
Tobias Diekershoff
9a30055aae
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-21 14:38:03 +01:00
Friendika
d347026094
don't urlencode $_GET vars
2011-01-21 05:21:13 -08:00
root
130cc252a7
Merge branch 'master' of git://github.com/tobiasd/friendika
2011-01-21 13:19:24 +01:00
Tobias Diekershoff
61f0a0d903
more strings
2011-01-21 13:18:51 +01:00
Tobias Diekershoff
258c79ccd9
spelling ;-)
2011-01-21 13:01:19 +01:00
root
8d1fb88498
Merge branch 'master' of git://github.com/tobiasd/friendika
2011-01-21 13:00:23 +01:00
Tobias Diekershoff
ac845a1d95
minor wordening
2011-01-21 12:59:51 +01:00
Tobias Diekershoff
991185404c
minor wording correction
2011-01-21 12:54:07 +01:00
root
ecc7fff4e2
Merge branch 'master' of git://github.com/tobiasd/friendika
2011-01-21 12:47:31 +01:00
Tobias Diekershoff
734476c5e2
minor correction to profile_edit.tpl more strings
2011-01-21 12:46:33 +01:00
Tobias Diekershoff
b23c941991
made this notification header consisten with the other
2011-01-21 12:34:25 +01:00
root
fdddf93ccc
Merge branch 'master' of git://github.com/tobiasd/friendika
2011-01-21 12:20:22 +01:00
Tobias Diekershoff
a2723f8206
minor thing with the strings
2011-01-21 12:19:57 +01:00
root
251727021b
Merge branch 'master' of git://github.com/tobiasd/friendika
2011-01-21 12:16:35 +01:00
Tobias Diekershoff
6a87fe4a0f
german translation of registrations-top.tpl
2011-01-21 12:15:43 +01:00
root
a180b29c7d
Merge branch 'master' of git://github.com/tobiasd/friendika
2011-01-21 12:06:01 +01:00
Tobias Diekershoff
55fb33d85d
some more strings
2011-01-21 12:05:26 +01:00
root
e0d6d68f60
Merge branch 'master' of git://github.com/tobiasd/friendika
2011-01-21 11:56:47 +01:00
Tobias Diekershoff
c61defb2b0
german translation of install_db.tpl
2011-01-21 11:54:04 +01:00
Tobias Diekershoff
ffdcbd798f
german translation of jot.tpl
2011-01-21 11:48:42 +01:00
Tobias Diekershoff
a3ef818d1d
german translation of lostpass.tpl and lostpass_eml.tpl
2011-01-21 11:36:30 +01:00
Tobias Diekershoff
c199309e7d
german translation of netfriend.tpl
2011-01-21 11:12:50 +01:00
Tobias Diekershoff
31ccd924f4
german translation of passchanged_eml.tpl pagetypes.tpl
2011-01-21 11:10:20 +01:00
olivierm
6035f22caf
More strings translated for french locale.
2011-01-21 11:08:12 +01:00
Tobias Diekershoff
5863199b8d
german translation of the profile* files
2011-01-21 10:58:32 +01:00
olivierm
e1c0b5c7c5
Started the french translation (up to the "TODO" comment in view/fr/strings.php)
2011-01-21 10:39:15 +01:00
Tobias Diekershoff
57a1731678
german translation of pwdreset.tpl
2011-01-21 10:27:23 +01:00
Tobias Diekershoff
38ede4f3be
german translation of register-link.tpl
2011-01-21 10:24:18 +01:00
Tobias Diekershoff
41bba5534e
german translation of register_open_eml.tpl
2011-01-21 10:23:10 +01:00
Tobias Diekershoff
10be4f6d29
german translation of register_verify_eml.tpl
2011-01-21 10:14:29 +01:00
Tobias Diekershoff
d4496c5118
german translation of request_notify_eml.tpl
2011-01-21 10:03:51 +01:00
Tobias Diekershoff
5b0db3d228
german translation of wallwall_item.tpl
2011-01-21 09:59:13 +01:00
Tobias Diekershoff
bd512ab60c
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-21 07:09:51 +01:00
root
21bc6982ac
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-21 07:08:02 +01:00
Friendika
c574e4c587
repair double-encoded double quotes
2011-01-20 21:02:02 -08:00
Friendika
aeb585fee1
profile edit hooks
2011-01-20 15:30:45 -08:00
Friendika
623ae24109
per fabrix, except do the login "on page"
2011-01-20 14:25:44 -08:00
fabrixxm
707b4eed6f
Fixs to IT languages
2011-01-20 20:19:56 +01:00
fabrixxm
28ebbe38d6
Netwok page redirect to login page if not local_user
2011-01-20 20:19:20 +01:00
fabrixxm
2ea85fd67e
show 'login' tab selected on login page
2011-01-20 20:16:57 +01:00
Tobias Diekershoff
ed37b1d166
german translation of settings_nick_set.tpl
2011-01-20 18:45:48 +01:00
Tobias Diekershoff
b4049f67ea
german translation of settings_nick_subdir.tpl
2011-01-20 18:21:32 +01:00
Tobias Diekershoff
723aca6109
german translation of settings_nick_unset.tpl
2011-01-20 18:15:12 +01:00
Tobias Diekershoff
76ed216aaa
german translation of wall_item_drop.tpl
2011-01-20 18:01:04 +01:00
Tobias Diekershoff
787496b7c2
german translation of settings.tpl
2011-01-20 16:43:59 +01:00
Tobias Diekershoff
07db945921
german translation of wall_received_eml.tpl
2011-01-20 15:43:51 +01:00
Tobias Diekershoff
a8b9b21915
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-20 08:17:41 +01:00
root
030f6f306c
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-20 08:17:07 +01:00
Friendika
2ffe0d0b1d
do a better job of comparing same URLs.
2011-01-19 19:51:34 -08:00
Friendika
d59585d89d
fix context links
2011-01-19 18:31:04 -08:00
Friendika
b1d67c8d3c
network view all item types by date
2011-01-19 17:56:36 -08:00
Friendika
e7c5f9e7de
undo sql change in f9f018ef08
(02-DEC-2010), not relevant and incorrect
2011-01-19 14:19:40 -08:00
root
8e22c669a0
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-19 17:55:27 +01:00
Tobias Diekershoff
b43ec25955
german translation mail_received_eml.tpl
2011-01-19 16:37:59 +01:00
Tobias Diekershoff
ea010de863
german translation of like.tpl
2011-01-19 16:33:42 +01:00
Tobias Diekershoff
ba9e85261b
german translation of jot-header.tpl
2011-01-19 16:27:28 +01:00
Tobias Diekershoff
387e1aefbc
german translations of insecure_net.tpl intro_complete_eml.tpl and
...
intros-top.tpl
2011-01-19 16:21:41 +01:00
Tobias Diekershoff
5702782caa
german translation of friend_complete_eml.tpl
2011-01-19 15:45:55 +01:00
Tobias Diekershoff
fcf1f573e8
german translation of group_new.tpl
2011-01-19 15:33:23 +01:00
Tobias Diekershoff
990aafbfcf
german translation of view/dev/group_edit.tpl
2011-01-19 15:32:19 +01:00
Tobias Diekershoff
8a17ce6da1
added
2011-01-19 15:31:50 +01:00
Tobias Diekershoff
d8f9458663
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-19 15:21:06 +01:00
Fabio Comuni
ab72d86aa7
Small fixs to IT language
2011-01-19 14:48:30 +01:00
Friendika
766ade06d5
SECURITY: update java uploader
2011-01-19 01:02:12 -08:00
Friendika
b093bdeace
new profile_sidebar_enter hook, changed profile_sidebar to array
2011-01-18 20:05:44 -08:00
Friendika
3da2b24951
list network page (parent items) by creation date thx:fabrix
2011-01-18 19:41:30 -08:00
Friendika
b40281802f
personal title
2011-01-18 19:25:28 -08:00
Tobias Diekershoff
468c182405
german translation view/de/follow_notify_eml.tpl
2011-01-18 13:44:46 +01:00
Tobias Diekershoff
6c42edf351
german translation view/de/directory_header.tpl
2011-01-18 12:47:03 +01:00
Tobias Diekershoff
11d95896f2
german translation of view/de/dfrn_req_confirm.tpl
2011-01-18 12:46:13 +01:00
Tobias Diekershoff
f7b0a4569d
german translation of view/de/cropbody.tpl
2011-01-18 12:44:28 +01:00
Tobias Diekershoff
fe00d451a7
german translation of view/de/contact_edit.tpl
2011-01-18 11:40:27 +01:00
Tobias Diekershoff
80e77516c8
german translation of cmnt_received_eml.tpl
2011-01-18 11:24:52 +01:00
Tobias Diekershoff
0c77263a85
update to view/en placed into de
2011-01-18 11:18:23 +01:00
root
13fa27f757
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-18 11:14:28 +01:00
Tobias Diekershoff
8b99779181
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-18 11:05:18 +01:00
Friendika
028460a5c1
tracking errant bin2hex call
2011-01-17 21:08:16 -08:00
Friendika
fa1f2ce8f3
fix some linebreak issues
2011-01-17 19:50:18 -08:00
Friendika
050618a2b6
repair any bad links in activity objects
2011-01-17 16:28:32 -08:00
Friendika
710cb7d13c
activity object link had incorrect attribute, highlight critical install steps
2011-01-17 16:06:22 -08:00
Friendika
9322214293
Merge branch 'fabrixxm-master'
2011-01-17 03:02:59 -08:00
Friendika
46c4bb6d4c
ensure birthday "today" calculation is relative to UTC.
2011-01-17 02:51:26 -08:00
Fabio Comuni
bb2130ca7f
Mods to duepuntozero .shiny class
2011-01-17 11:45:06 +01:00
Friendika
d5ac7e938b
newlines were getting stripped
2011-01-16 23:48:44 -08:00
Friendika
1002f9dc96
there were some bug fixes, roll version number
2011-01-16 19:01:13 -08:00
Friendika
2e0a3e0693
birthday notifications: missing div close
2011-01-16 17:56:26 -08:00
Friendika
3811923c14
put birthday reminders on default network page, add smileys to private mail
2011-01-16 16:40:09 -08:00
Friendika
fa9e1a9abb
apply date translation to birthday in profiles
2011-01-16 15:23:34 -08:00
Friendika
f4ebd2a213
Don't send conversation slaps, only immediate replies. Redundant and flawed.
2011-01-16 14:58:07 -08:00
Tobias Diekershoff
b5c9f80919
some more German translation
2011-01-15 21:13:42 +01:00
Tobias Diekershoff
31d7973e7f
some more German strings
2011-01-15 14:39:16 +01:00
Tobias Diekershoff
abf976bb36
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-15 08:55:19 +01:00
root
3323f256c3
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-15 08:54:41 +01:00
Friendika
e7ae4ad3fa
cannot pass null by reference
2011-01-14 14:56:13 -08:00
fabrixxm
061e6eb33b
Updated IT language
2011-01-14 20:33:12 +01:00
Friendika
456a7a9740
string update
2011-01-14 02:16:30 -08:00
Friendika
a1c069ee02
compatibility: version discovery
2011-01-14 02:04:09 -08:00
Tobias Diekershoff
a118f83ee2
initial stuff for the german translation
2011-01-14 10:28:19 +01:00
root
30551b24ec
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-14 07:15:57 +01:00
Friendika
5bfb0ba4c2
birthday notifications working
2011-01-13 20:28:33 -08:00
Friendika
3494b23bfe
create birthday event from feed
2011-01-13 15:45:42 -08:00
root
c472799b8d
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-13 14:17:52 +01:00
Friendika
f3bb789061
newline
2011-01-13 02:08:57 -08:00
Friendika
b0a03c328f
Merge branch 'dev'
2011-01-13 02:07:57 -08:00
Friendika
5559893293
event and birthday data structures
2011-01-13 02:01:00 -08:00
root
44ff96e0cf
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-13 08:31:20 +01:00
Friendika
9d6f3aa4dd
add owner's birthday information to feed (if allowed to)
2011-01-12 21:04:49 -08:00
Friendika
89a28bf0f7
preserve body content in feed to extract microformat stuff
2011-01-12 13:21:37 -08:00
Friendika
2d80c601df
string extraction
2011-01-12 12:44:22 -08:00
Friendika
b11963f9ac
first checkin fortunate plugin
2011-01-11 18:46:37 -08:00
Friendika
91db3b3f41
more doco on header/nav region
2011-01-11 14:20:01 -08:00
Friendika
1c7dc1879c
removed function was still referenced
2011-01-11 14:05:40 -08:00
root
e972375403
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-11 14:57:33 +01:00
Friendika
9493c29810
more defensive measures against failed or lost DB
2011-01-10 20:14:19 -08:00
Friendika
cb1832a755
fallback dbesc() when db is not there
2011-01-10 13:57:59 -08:00
Friendika
b2176538f4
add page start/end hooks, cleanup couple of notice msgs
2011-01-10 13:45:42 -08:00
root
b500f7ffac
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-10 08:17:01 +01:00
Friendika
85b0eca9c1
call get_app()
2011-01-09 13:18:56 -08:00
root
d6b8e8c6a9
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-08 08:24:24 +01:00
Friendika
618adb1593
missing 'else'
2011-01-07 14:31:05 -08:00
Friendika
6048d89fd2
moved notify counters (.nav-ajax) down to match new layout
2011-01-07 12:23:17 -08:00
fabrixxm
29f483c71c
removed FreeSans font, changed .shiny background, fixed head area
2011-01-07 16:56:12 +01:00
Friendika
335abb6a09
darkness theme cleanup
2011-01-07 04:45:39 -08:00
Friendika
4d1e68e430
darkness: input fields were invisible
2011-01-07 04:38:30 -08:00
Friendika
2a269e0c18
use default system theme for system pages
2011-01-07 04:33:34 -08:00
Friendika
d1432fe7b5
more goldenrod stuff
2011-01-07 04:26:15 -08:00
Friendika
d3a826947f
fix goldenrod after recent changes
2011-01-07 04:23:41 -08:00
Friendika
0147520e90
add contact edit hooks
2011-01-07 03:15:52 -08:00
Friendika
6598947049
Merge branch 'master' of file:///home/macgirvin/friendika/friendika
2011-01-07 02:59:01 -08:00
Friendika
ffbdad7041
friend request homecoming - ensure login redirects back to confirmation page,
...
prune old introductions that remain blocked over 30 minutes.
2011-01-07 02:57:26 -08:00
Friendika
fb736b984d
firend request homecoming - ensure login redirects back to confirmation page,
...
prune old introductions that remain blocked over 30 minutes.
2011-01-07 00:24:08 -08:00
Friendika
502d59089b
schema typo
2011-01-06 23:41:14 -08:00
Friendika
fd1abe1c54
undo freesans temporarily due to poor legibility.
2011-01-06 13:26:25 -08:00
root
1a60291222
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-06 22:20:16 +01:00
Friendika
919fbdfb9b
clarify license for addon themes
2011-01-06 12:42:58 -08:00
Friendika
166424c92e
Merge branch 'fabrixxm-master'
2011-01-06 12:42:29 -08:00
fabrixxm
0d73897b3a
Added shiny class to duepuntozero theme
2011-01-06 16:03:03 +01:00
root
05708c9a8d
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-06 08:37:44 +01:00
Friendika
95ec0767d8
plugin settings were getting changed
2011-01-05 13:10:47 -08:00
fabrixxm
c967f55bad
make the name stand out another bit more, and load FreeSans font from site in css3-enabled browsers
2011-01-05 19:18:13 +01:00
root
011e0c3f81
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-05 18:06:35 +01:00
Friendika
b358e8afe2
make the name stand out just a bit more
2011-01-05 04:00:36 -08:00
Friendika
16d2682610
fix geolocation
2011-01-05 02:32:18 -08:00
Friendika
1b0ddc928d
make home tab work from remote profile, fix link in comment notify emails
2011-01-05 01:53:34 -08:00
Friendika
f257569713
couple minor issues with reg queue
2011-01-04 23:31:51 -08:00
Friendika
95507cf90f
secure admin hijacking from openid
2011-01-04 23:18:52 -08:00
root
830a56723c
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-05 07:37:01 +01:00
Friendika
bb0c24bd4f
prevent admin hijacks
2011-01-04 22:17:58 -08:00
Friendika
45c1559b38
Merge branch 'fabrixxm-master'
2011-01-04 16:42:11 -08:00
Friendika
45d8676dc2
use shift-home instead to take you home
2011-01-04 14:35:12 -08:00
fabrixxm
ea978af9c1
Merge branch 'friendika-master'
2011-01-04 14:48:19 +01:00
fabrixxm
0df91fd9a2
Manage user registrations in REGISTER_APPROVE mode.
2011-01-04 14:46:08 +01:00
root
cbace1639e
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-04 14:21:43 +01:00
Friendika
64628c800d
provide "return home" key
2011-01-04 05:06:10 -08:00
fabrixxm
2bf99df385
Updated IT strings
2011-01-04 13:04:23 +01:00
Friendika
236474da0b
convert received ostatus unfollow verb to activity streams stop-following
2011-01-04 02:20:00 -08:00
Friendika
15c81716e8
much better solution to privacy on ajax wall photos
2011-01-04 02:01:07 -08:00
root
51bcfb649f
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-04 09:22:43 +01:00
Friendika
f057cc3a70
missing pagination in photo collections
2011-01-04 00:06:36 -08:00
Friendika
dbab3100de
set_config anomaly
2011-01-03 23:53:37 -08:00
Friendika
20cc007655
set permissions of uploaded wall photo to match those of the
...
associated status post.
2011-01-03 23:05:20 -08:00
Friendika
7ae8486b36
settings: ensure system theme is default selection
2011-01-03 21:55:21 -08:00
Friendika
8bd9e31f20
string update
2011-01-03 13:54:31 -08:00
Friendika
0cba6b128a
fix typo, check for empty group in network page
2011-01-03 13:53:26 -08:00
Friendika
a51a1007a3
email check failed, translate wall_item template
2011-01-03 13:26:43 -08:00
Friendika
36b241c02b
change activitystreams unfollow to stop-follow but also send out OStatus unfollow
2011-01-03 05:58:27 -08:00
fabrixxm
cdf626e0e7
Stupid fix in boot.php
2011-01-03 10:20:42 +01:00
fabrixxm
11a44a107d
add plugin hook to home page content
2011-01-03 10:08:53 +01:00
fabrixxm
c061603746
import items from feeds in inverse date order
2011-01-03 10:04:54 +01:00
fabrixxm
8805635293
Add sitename in page title
2011-01-03 10:03:21 +01:00
fabrixxm
9ebd34b703
Fix secure cursor and aside position in duepuntozero theme
2011-01-03 09:49:50 +01:00
fabrixxm
0e45c4332a
Fix to Italian language
2011-01-03 09:48:41 +01:00
fabrixxm
43283fd35f
Merge branch 'friendika-master'
2011-01-03 09:45:13 +01:00
root
f3005918af
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-03 09:27:13 +01:00
Friendika
d92659560b
site config to force publish in site directory
2011-01-02 22:09:54 -08:00
Friendika
de5495f90b
don't process empty or non-existent group array
2011-01-02 21:53:00 -08:00
Friendika
527ff13f77
validate the openid url as well. We won't change it if it's bogus, but we won't use it either.
2011-01-02 21:25:38 -08:00
Friendika
03e15bd22f
don't update openidserver if openid is empty
2011-01-02 21:20:17 -08:00
Friendika
0a485e6664
don't use openid CURL wrapper if open_basedir is set (even if safe_mode isn't)
2011-01-02 21:01:07 -08:00
Friendika
0fb3aa1b57
valid host checks were returning true on TXT records and other useless garbage
2011-01-02 19:05:11 -08:00
Friendika
b381dfa6c6
typo slipped through
2011-01-02 14:36:30 -08:00
Friendika
b3f39aa2b0
alt profiles not clickable
2011-01-02 14:30:17 -08:00
Friendika
c907c22eda
missing thumbnail in new profiles
2011-01-02 14:26:23 -08:00
Friendika
4f796c68d2
declare key size/algorithm to ensure key gets generated
2011-01-02 14:12:22 -08:00
root
0b4a6f8eac
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-02 10:35:52 +01:00
Friendika
be3cfe8b65
add plugin hooks to personal XRD
2011-01-01 15:03:49 -08:00
Friendika
d8985b3a54
try to auto-fill the profile address if we actually do know it.
2011-01-01 13:12:31 -08:00
root
e024360d44
Merge branch 'master' of git://github.com/friendika/friendika
2011-01-01 13:00:50 +01:00
Friendika
e68f68007c
new year
2010-12-31 15:48:57 -08:00
root
31d447126a
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-31 10:14:24 +01:00
Friendika
ca83d24c02
and slashes - sigh...
2010-12-30 23:48:11 -08:00
Friendika
cf88b28378
add twitter plugin
2010-12-30 23:28:33 -08:00
Friendika
e490c9459d
and right angles
2010-12-30 21:09:58 -08:00
Friendika
53928bec87
oops escape left angles in expressions
2010-12-30 21:08:06 -08:00
Friendika
afaacd134c
linkify audio/video links for non-html5 browsers (or those with unsupported codecs?)
2010-12-30 18:43:42 -08:00
Friendika
9296d178b3
html5 video/audio support - still needs multiple source
...
selection, and check that it isn't blocked by html purifier
2010-12-30 18:32:49 -08:00
Friendika
98dcc19511
page_header hook
2010-12-30 14:36:35 -08:00
Friendika
279469ab35
plugin hooks for bbcode conversions
2010-12-30 14:21:05 -08:00
Friendika
fd71d19463
upd8
2010-12-30 00:22:34 -08:00
root
ed6416b4ff
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-30 07:58:18 +01:00
Friendika
f632a4a53a
yeah in the garage on an old PC too.
2010-12-29 14:13:49 -08:00
Friendika
bcc7d88566
strip tabs
2010-12-29 14:03:44 -08:00
Friendika
a8aba766bd
upd8s
2010-12-29 13:57:47 -08:00
Friendika
bf60ec070b
more upd8s
2010-12-29 12:31:38 -08:00
Friendika
710f024de3
upd8
2010-12-29 03:43:33 -08:00
Friendika
edc7a920dd
more upd8
2010-12-29 02:45:25 -08:00
Friendika
ce11d0f005
upd8 readme
2010-12-29 02:09:20 -08:00
fabrixxm
dcaf4003ec
duepuntozero theme
2010-12-28 15:44:57 +01:00
fabrixxm
efc4e76c7a
'system','theme' config to set default site theme
2010-12-28 15:38:16 +01:00
Friendika
7b6385df94
freeform text area for private contact info - notes or things you just want to remember (addresses, phone numbers, birthdays, whatever)
2010-12-28 01:06:34 -08:00
Friendika
76d92d3f62
doco on state of FB connector
2010-12-27 23:36:19 -08:00
Friendika
caf93fffac
move facebook post to addon - and under the AGPL
2010-12-27 23:28:34 -08:00
root
8e07525dfb
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-28 00:22:46 +01:00
Friendika
bdc4cd63e1
wrong file location
2010-12-27 15:02:23 -08:00
Friendika
fd9b506c2f
Add sample external authentication plugin (ldap)
2010-12-27 14:59:26 -08:00
Friendika
2e19af4b1e
Merge branch 'fabrixxm-master'
2010-12-27 13:06:20 -08:00
root
b39f2e3fac
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-27 04:43:35 +01:00
Friendika
2abdfb462a
plugin changes to contact_block, also configurable limit
2010-12-26 15:48:44 -08:00
Friendika
e8a63b2abb
preliminary plugin hook documentation
2010-12-26 14:04:24 -08:00
root
3208d6afcb
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-26 08:18:10 +01:00
Friendika
10dda88684
if sub-projects cannot mandate any terms to our license, we should not force any
...
conditions or license terms on them either.
2010-12-25 18:16:17 -08:00
Friendika
b211adfb12
more hooks
2010-12-25 17:46:25 -08:00
Friendika
3857478955
updated LICENSE
2010-12-25 16:07:37 -08:00
Friendika
f6556e0a72
more plugin hooks
2010-12-25 15:01:02 -08:00
fabrixxm
e5875f2bda
Fix some IT strings typos
2010-12-25 23:30:57 +01:00
Friendika
d6a75a0391
secure profile redirect failed with duplex relationship
2010-12-25 13:51:39 -08:00
root
c6a93d5cec
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-25 19:11:39 +01:00
Friendika
7b51713ba3
addon/plugin licenses may be copyleft/AGPL/GPL
2010-12-25 02:20:11 -08:00
Friendika
c0aa8f9312
new string wasn't configured for translation.
2010-12-25 01:24:51 -08:00
root
c5cf9de32a
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-25 09:24:24 +01:00
Friendika
7382c353e5
minor nits after proof-reading
2010-12-24 23:50:06 -08:00
Friendika
d045fd04d4
provide separate plugin settings page, update demo plugin, fix hook_register
2010-12-24 23:44:17 -08:00
Friendika
6891d44e0b
link italian creative commons license to italian cc page
2010-12-24 20:28:34 -08:00
Friendika
ded2812799
show creative commons coverage on registration page
2010-12-24 20:23:49 -08:00
Friendika
3ba322889f
undo one of the hooks from last checkin - passing objects led to error
2010-12-24 19:04:40 -08:00
Friendika
10731ea361
more plugin hooks
2010-12-24 18:32:23 -08:00
Friendika
c217e9da34
add authentication plugin hooks
2010-12-24 15:59:12 -08:00
root
6f8c4169e5
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-24 11:19:31 +01:00
Friendika
1438b3d67d
more comments plus an id rename
2010-12-23 19:31:53 -08:00
Friendika
cbb724e1c0
typo in comments
2010-12-23 19:20:22 -08:00
Friendika
18c3977b6a
add sample plugin code + fix a couple html issues on settings page
2010-12-23 19:09:17 -08:00
Friendika
a1a838f69e
debugging the plugin logic, couple of issues found
2010-12-23 17:07:19 -08:00
Friendika
cd073f94f8
slight change on last commit - server discovery for legacy openid
2010-12-23 14:54:34 -08:00
root
2f532f579c
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-23 23:50:54 +01:00
Friendika
c55cb45855
revised openid patch, added fix for Windows servers, make "is now friends with" commentable, fix settings form hook to be inside form
2010-12-23 14:40:32 -08:00
fabrixxm
68868fd74b
OpenID delegation degrade gracefully if database table is not updated.
2010-12-23 21:52:51 +01:00
fabrixxm
e47a816a8f
IT language
2010-12-23 21:34:26 +01:00
fabrixxm
dd83923057
Translatable "Welcome to" in home
2010-12-23 21:33:45 +01:00
fabrixxm
fa756ffcb9
OpenID delegation in profile page
2010-12-23 21:32:13 +01:00
root
a1d593613d
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-23 07:39:23 +01:00
Friendika
d8969bb84b
add more plugin hooks, etc.
2010-12-22 20:23:41 -08:00
Friendika
e287014b98
navigation aid: show server name on page
2010-12-22 20:04:20 -08:00
Friendika
0e6eb4d002
link the logo text
2010-12-22 19:23:54 -08:00
Friendika
294dc27e17
double profile image on friend requests
2010-12-22 17:27:14 -08:00
Friendika
f2242826d8
warnings when no plugins installed
2010-12-22 17:25:58 -08:00
Friendika
b302012581
send new friend activity when appropriate
2010-12-22 17:25:04 -08:00
Friendika
6808d53d0f
plugin/addon API landing - still things left to do before it's useful
2010-12-22 14:16:22 -08:00
Friendika
eb6cefaea3
more notes on Windows install
2010-12-22 14:07:27 -08:00
Friendika
ad86a5193e
some Windows (and other) installation issues
2010-12-22 13:55:44 -08:00
root
780ab072f5
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-22 06:37:33 +01:00
Friendika
5b1fde8b0f
allow configurable poll interval override when hub is used
2010-12-21 14:51:26 -08:00
root
8cfa93b730
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-21 07:14:58 +01:00
Friendika
ddec422de6
begin plugin api
2010-12-20 19:38:34 -08:00
Friendika
1a9f8eacc4
missing key
2010-12-20 14:21:12 -08:00
Friendika
0ff3ae5587
change heading to reflect new scope
2010-12-20 03:13:42 -08:00
Friendika
878067101f
block connection/friend request spam
2010-12-20 00:27:00 -08:00
Friendika
2632c23130
string update
2010-12-19 20:01:02 -08:00
Friendika
b9ca44678d
match the documentation
2010-12-19 19:55:03 -08:00
Friendika
2d9718fee9
do a slightly better job at finding relevant content from scraping submitted links
2010-12-19 19:04:37 -08:00
Friendika
24a9a41f96
added "secret" profile search keywords
2010-12-19 17:46:26 -08:00
Friendika
4a2d83fcff
don't send any private messages over the facebook channel
2010-12-19 13:41:55 -08:00
root
ad32d85cfa
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-18 10:56:44 +01:00
Friendika
d3987416c5
facebook connector - initial checkin (untested)
2010-12-17 22:36:35 -08:00
root
f6ee615a79
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-17 11:53:05 +01:00
Friendika
d1261e50c6
don't ask
2010-12-16 20:12:23 -08:00
Friendika
70f4f172dc
pull strings from connection request templates
2010-12-16 19:38:52 -08:00
Friendika
f60f82727f
register/login timestamps
2010-12-16 16:35:45 -08:00
root
79ab5b2ff8
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-16 11:28:51 +01:00
Friendika
df2e79dcaf
prevent concurrent ajax updates
2010-12-15 14:41:24 -08:00
root
961a0c13c7
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-15 12:07:14 +01:00
Friendika
83939f1541
clean up comments
2010-12-14 16:34:49 -08:00
Friendika
d8c5c1cd6b
added brand link
2010-12-14 15:21:31 -08:00
Friendika
78d8bcbc60
personal config storage, template the vcard profile, logging failed uri's to help track down transient dreamhost issues
2010-12-14 14:15:31 -08:00
Friendika
46bc84b2f2
upd8
2010-12-14 01:13:39 -08:00
Friendika
7a174c1cc8
upd8
2010-12-14 00:56:54 -08:00
Friendika
050bae56c2
upd8
2010-12-14 00:39:46 -08:00
root
b4b65521fe
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-13 06:50:06 +01:00
Friendika
57eb0576b0
make both content and people search POSTable
2010-12-12 18:43:32 -08:00
Friendika
1cffecd1be
footer is serving no useful purpose.
2010-12-12 17:40:23 -08:00
Friendika
0e39f60c04
replace quick fix with correct fix
2010-12-12 14:33:04 -08:00
Friendika
004193e849
display request issue
2010-12-12 13:59:16 -08:00
root
2e9dca7c9f
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-12 10:34:34 +01:00
Friendika
a50343830f
preparing for the future
2010-12-11 04:41:51 -08:00
Friendika
6b5a83b9b8
profile load optimisation
2010-12-11 04:16:58 -08:00
Friendika
18823fe546
never enough comments
2010-12-10 20:21:34 -08:00
Friendika
e70551eeec
set encryption vars to empty when contact not found
2010-12-10 14:21:33 -08:00
Friendika
f027e7e920
add link to album photo when status photo upload
2010-12-10 05:19:04 -08:00
Friendika
d5355da368
never enough comments
2010-12-10 04:04:35 -08:00
Friendika
7f89bfb708
never enough comments
2010-12-09 20:41:42 -08:00
Friendika
9fb0bd5114
Raise network timeout during friend acceptance, because
...
encryption/decryption might slow things down.
2010-12-09 14:29:38 -08:00
Friendika
7d1c35f5cc
found the cause of intermittent friend confirmation glitch (but not with 100% certainty)
2010-12-09 14:03:28 -08:00
Friendika
b7abdf8795
fix youtube videos on FF
2010-12-09 13:41:08 -08:00
root
037cd5d809
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-09 11:56:26 +01:00
Friendika
03c1e5a5ad
never enough comments
2010-12-08 23:08:59 -08:00
Friendika
eb13833d2a
smiley filter
2010-12-08 17:05:51 -08:00
Friendika
4d0f0f9a94
more instrumentation on dfrn_confirm to help track down why it quietly gives up on occasion with no helpful log messages.
2010-12-08 15:30:26 -08:00
root
a96da92571
Merge branch 'master' of git://github.com/friendika/friendika
2010-12-08 06:54:13 +01:00
root
af48dbec7f
a littdle addition
2010-12-08 06:53:48 +01:00
Friendika
a42b9ea3de
display the fact that a conversation is private without disclosing the details of who can/cannot see it.
2010-12-07 20:47:53 -08:00
Friendika
e241c401cf
significantly enhanced profile security
2010-12-07 19:40:12 -08:00
Friendika
5763d31b4f
db prepare for enhanced magic profiles and remote privacy indicators, fixed $lang setting to use system config var, some other syntax issues
2010-12-07 18:13:51 -08:00
Friendika
8b086a76e5
stray debugging statement
2010-12-07 17:16:05 -08:00
Friendika
e59377d96b
highlight any messages on page newer than 12 hours
2010-12-07 16:27:30 -08:00
Friendika
f3e8b55a7a
removed high-bit angle-char stripping from input filter - interfering with utf-8 chars
2010-12-07 14:37:56 -08:00
Friendika
32881234d0
bring back full name check but without utf-8 regex's
2010-12-07 14:11:26 -08:00
Friendika
dd185daf90
remove first (space) last registration restriction due to confusion
...
this will increase spammers and bogus registrations dramatically(!)
2010-12-07 04:44:34 -08:00
Friendika
0afc71a95a
trim trailing LF in imported link
2010-12-06 16:26:32 -08:00
Friendika
1ee1df3747
RINO encryption now enabled by default on new installs
2010-12-06 14:34:00 -08:00
Friendika
8eea856131
no newline at EOF
2010-12-05 19:42:28 -08:00
Friendika
184f8e143e
use local photo in email, email photo upload point to new url
2010-12-05 19:28:47 -08:00
Friendika
75306b6294
allow community page members to upload photos and assorted other stuff which was previously restricted to the page owner
2010-12-05 18:08:36 -08:00
Friendika
e9a1abd133
flatten conversation hierarchy to one level on import but preserve all thread info
...
in case somebody wants to write a plugin to display as multi-level thread
2010-12-04 23:16:16 -08:00
Friendika
4507a571d3
profile page not showing remote profile avatars when their site is down
2010-12-04 22:09:16 -08:00
Friendika
b09ab4ef2c
"with" is optional - don't show anything if not present.
2010-12-04 00:38:34 -08:00
Friendika
4be5e57afd
relationship targets (linked if applicable)
2010-12-03 22:46:42 -08:00
Friendika
20f96c2c53
revise the last checkin a wee bit to ensure notifications are still sent out
2010-12-03 12:37:57 -08:00
Friendika
4d5d93a902
found the elusive comment box bug
2010-12-03 12:27:54 -08:00
Friendika
fac04eda32
getting ready to add partner info
2010-12-02 23:04:28 -08:00
Friendika
da62055bf2
thought we got rid of the "introduction" word
2010-12-02 22:48:46 -08:00
Friendika
4d84a87ce4
cache result of (expensive) security check for visitor rights
...
begin tightening x-profile security
2010-12-02 21:09:55 -08:00
Friendika
041933db87
more install notes
2010-12-02 19:02:10 -08:00
Friendika
a077b311c5
update installation doc - subdirs should work now - cross fingers
2010-12-02 18:47:39 -08:00
Friendika
e09d164882
ignore malformed xml before it hits the parser.
2010-12-02 18:32:46 -08:00
Friendika
2ef6ad80a4
fix installation into subdir of domain
2010-12-02 17:31:48 -08:00
Friendika
e818170c9f
linkify the advanced profile
2010-12-02 15:04:47 -08:00
Friendika
42d66874be
improved linkification of naked text urls
2010-12-01 21:13:09 -08:00
Friendika
1adf69a049
more string extraction
2010-12-01 20:37:42 -08:00
Friendika
f9f018ef08
potential for privacy leakage, plus photo not showing occasionally
2010-12-01 14:01:04 -08:00
Friendika
9513f1f166
rino recipient patch
2010-12-01 13:39:00 -08:00
Friendika
99bbc29747
rino landing
2010-11-30 18:32:34 -08:00
Friendika
67e827e128
paranoid option to reduce session hijacking by enforcing an IP match on session validation. This is not claimed to be a perfect solution to the problem by any stretch, it merely raises the bar on the script kiddies to the detriment of those whose dynamic IPs aren't long lived. For these reasons it is opt-in.
2010-11-29 23:16:14 -08:00
Friendika
3672335dec
15 gender choices, 12 sexual preference choices and 30 relationship status options are probably adequate. :-)
2010-11-29 20:56:54 -08:00
Friendika
5c515940fa
update string table
2010-11-28 21:00:28 -08:00
Friendika
62bb471ba0
localise login template, allow openid to be disabled
2010-11-28 20:58:23 -08:00
Friendika
34a8fb935d
no newlines in tags
2010-11-28 14:43:14 -08:00
Friendika
9a921b829b
update string table
2010-11-26 11:56:21 -08:00
Friendika
d6caf59f35
verify all the display links in emails
2010-11-26 03:47:04 -08:00
Friendika
846fa8d5f7
notify link again
2010-11-26 03:19:41 -08:00
Friendika
bdabc89026
fix links in notification emails
2010-11-26 03:12:30 -08:00
Friendika
1cd20e1757
array_unique didn't have a second argument before PHP 5.2.9
2010-11-26 02:38:41 -08:00
Friendika
e15b1a8755
don't attempt to deliver queued items to sites which have already timed out
2010-11-25 23:42:03 -08:00
Friendika
1f69e12e1e
make profile name clickable
2010-11-25 19:35:17 -08:00
Friendika
12c0983384
updated installation instructions
2010-11-25 19:22:32 -08:00
Friendika
cce7380756
more optimising when confronted with dead servers
2010-11-25 18:50:28 -08:00
Friendika
60ef474d46
log queue startup
2010-11-25 18:31:33 -08:00
Friendika
a1458f899a
change remote welcome message
2010-11-25 18:22:54 -08:00
Friendika
847c264787
wrong function name
2010-11-25 17:27:56 -08:00
Friendika
289a0dc268
curl_code tests
2010-11-25 16:15:44 -08:00
Friendika
555c377fda
need app
2010-11-25 16:13:10 -08:00
Friendika
041df1c011
queue logging
2010-11-25 15:50:08 -08:00
Friendika
9fb967ae34
more pre-install checks to sort out broken environments
2010-11-25 15:33:32 -08:00
Friendika
0a03a710b3
ensuring all non-deliveries get in the queue
2010-11-25 15:03:59 -08:00
Friendika
ca706ccbed
added more notifier logging
2010-11-25 02:53:19 -08:00
Friendika
9d7130e403
tag search boolean mode
2010-11-24 19:25:47 -08:00
Friendika
d855371fa5
no pagination on search page
2010-11-24 18:37:10 -08:00
Friendika
48eab3e99c
coloured text confusing the tag finder
2010-11-24 17:21:31 -08:00
Friendika
d98a695689
use local_user()
2010-11-24 16:35:35 -08:00
Friendika
3757c9cae5
use sha1 keys for friends as well
2010-11-24 16:07:42 -08:00
Friendika
4bd7667a48
whirlpool not universally supported for key generation, use sha1
2010-11-24 15:53:26 -08:00
Friendika
85a6e9634a
report failure to generate keys
2010-11-24 14:49:35 -08:00
Friendika
81636f6f5f
undo magic quotes setting if present
2010-11-23 23:42:45 -08:00
Friendika
dd52aec243
use optional openid photo for registration - if supplied
2010-11-23 20:56:20 -08:00
Friendika
f9f08b4355
send unfollow before removing ostatus contact
2010-11-23 19:29:38 -08:00
Friendika
81e1e4245b
premature removal of queue item
2010-11-23 17:08:35 -08:00
Friendika
9be4b3482e
drop mail delivered flag now that queue is implemented
2010-11-23 16:08:48 -08:00
Friendika
15f011b34c
more logging in dfrn_notify
2010-11-23 15:55:11 -08:00
Friendika
1278305de9
salmon error handling issue
2010-11-22 19:58:35 -08:00
Friendika
1b14c1733b
relax content-type check on yadi discovery document
2010-11-22 16:36:42 -08:00
Friendika
fb58801aa4
schedule the queue re-delivery process
2010-11-22 15:30:52 -08:00
Friendika
0bcb68200e
queue/redeliver module
2010-11-22 14:53:25 -08:00
Friendika
2528c40269
return code is no longer a string
2010-11-21 23:07:25 -08:00
Friendika
de6c777d3f
infrastructure for queueing, redelivery
2010-11-21 23:00:01 -08:00
Friendika
552c56102e
oauth2 db
2010-11-21 19:10:23 -08:00
Friendika
890b77a547
force tinymce to preserve linebreak formatting
2010-11-21 18:16:59 -08:00
Friendika
09117b1dc7
she'll be right
2010-11-21 17:44:59 -08:00
Friendika
83e3cc34d2
something wrong - undo last checkin until fixed
2010-11-21 17:38:27 -08:00
Friendika
72fd6eec4b
make sure to use local avatar if we have one
2010-11-21 17:36:01 -08:00
Friendika
6a3815e751
don't invoke slap if there's no endpoint configured
2010-11-21 15:44:26 -08:00
Friendika
f1630780e9
add google buzz
2010-11-21 15:25:10 -08:00
Friendika
f7760a9f5b
search items do not get indented
2010-11-20 22:50:52 -08:00
Friendika
4afb9c5087
update i18n notes with recent changes
2010-11-20 15:23:41 -08:00
Friendika
d7b577e455
bring back the sparkle
2010-11-19 23:59:23 -08:00
Friendika
e4bbffe18c
"like" attributed to wrong person on oocasion
2010-11-19 14:28:28 -08:00
Friendika
ef39bd080f
more dfrn_confirm logging
2010-11-18 21:14:16 -08:00
Friendika
a37301288f
log xml_status error replies
2010-11-18 21:01:54 -08:00
Friendika
e0b392b06e
add a bit more logging to friend accept
2010-11-18 20:58:46 -08:00
Friendika
3b7dc43d3b
network was not yet set before testing type
2010-11-18 20:28:41 -08:00
Friendika
1131b2ea53
minor layout stuff
2010-11-18 17:42:23 -08:00
Friendika
75248512cc
more pre-install checking
2010-11-18 15:57:09 -08:00
Friendika
0c7ae3aeee
smooth a few rough edges of openid
2010-11-18 15:06:33 -08:00
Friendika
abc6199c17
more pre-install checks, try and create db if doesn't exist
2010-11-18 02:59:59 -08:00
Friendika
b4c277da22
provide config option to not use gravatar during registration
2010-11-17 23:24:43 -08:00
Friendika
6516de06df
minor style nit
2010-11-17 21:06:40 -08:00
Friendika
90b601c3dd
openid registration
2010-11-17 20:35:50 -08:00
Friendika
38eff190ea
missing advanced profile from yesterday i18n re-org
2010-11-17 17:28:29 -08:00
Friendika
875b31fb8e
openid logins working
2010-11-17 17:03:27 -08:00
Friendika
1d420e473f
add openid settings
2010-11-17 15:41:18 -08:00
Friendika
ab6b4c389d
more strings
2010-11-17 14:58:25 -08:00
Friendika
56ccf0920a
add linked hashtags to item tag
2010-11-17 14:56:41 -08:00
Friendika
5e6e92a10b
quote the quote
2010-11-16 23:27:53 -08:00
Friendika
c2086ec50e
pull some template strings
2010-11-16 23:26:14 -08:00
Friendika
f9d5aafe9c
finish moving english files
2010-11-16 20:13:18 -08:00
Friendika
22f7ffc2d7
enumerate required php modules
2010-11-16 15:38:56 -08:00
Friendika
efd8ab6c72
more i18n reorg
2010-11-16 01:14:04 -08:00
Friendika
4240a23a8a
i18n re-arrange
2010-11-15 23:27:12 -08:00
Friendika
21c18cedc7
isolate translateable files
2010-11-15 21:22:22 -08:00
Friendika
5d47417711
more view cleanup
2010-11-15 21:06:44 -08:00
Friendika
8c395f96de
view directory cleanup
2010-11-15 21:02:59 -08:00
Friendika
3374c698a2
i18n update
2010-11-15 20:33:01 -08:00
Friendika
949842a88d
validate email addresses to see if the hostnames actually resolve before committing a new user
2010-11-15 20:22:40 -08:00
Friendika
f9497bcb95
refactor rego in preparation for openid import
2010-11-15 20:10:19 -08:00
Friendika
93c33f0eb3
html escape the raw message
2010-11-15 19:27:15 -08:00
Friendika
b4e5b133a1
redirect to registration (rather than login) upon install complete
2010-11-15 18:16:57 -08:00
Friendika
5e81c615a4
openid lib
2010-11-15 18:06:33 -08:00
Friendika
f8a4bf5987
document need to create empty DB for installation
2010-11-15 18:02:01 -08:00
Friendika
c2b4791af0
prevent redirect loop if an account is manually removed while logged in
2010-11-15 16:55:11 -08:00
Friendika
9be5a7c750
use gravatar for default avatars
2010-11-15 16:49:27 -08:00
Friendika
eae34f323b
add openid slot to db
2010-11-14 15:17:27 -08:00
Friendika
0851669b39
clean up some regex's for i18n, and eliminate old ereg patterns.
2010-11-14 00:32:31 -08:00
Friendika
7db4a0dd2e
give orphans a second chance, linkify naked links
2010-11-11 20:32:20 -08:00
Friendika
16ba93a5b1
can't send privmail off network
2010-11-11 17:03:34 -08:00
Friendika
4c5f3fbf79
auth manager update, increased verbosity on salmon logs
2010-11-11 14:53:39 -08:00
Friendika
7be66b1d91
ff account manager
2010-11-11 02:49:28 -08:00
Friendika
0abaa6724d
set autocomplete=false to prevent browser prefilling passwd change, set return_url on all contact forms
2010-11-10 17:30:14 -08:00
Friendika
d6312abfc1
loosen some restrictions on insecure networks (but advise)
2010-11-10 02:28:33 -08:00
Friendika
b62d0d8b3f
upd8 readme
2010-11-09 23:14:05 -08:00
Friendika
29b9d18871
lint
2010-11-09 20:38:24 -08:00
Friendika
84052bdc09
caveat about installing to subdir of domain
2010-11-09 19:02:55 -08:00
Friendika
0e1af81d42
provide default photo and text limits (which can be over-ridden)
2010-11-09 18:31:43 -08:00
Friendika
f4fd679928
couple of issues w/ profile photo update propogation
2010-11-09 18:24:35 -08:00
Friendika
70bcf000e3
if pre-existing relationship, don't set duplex
2010-11-09 17:53:20 -08:00
Friendika
76b5e984e1
that didn't work - we need to be able to see .well-known/host-meta
2010-11-09 17:06:54 -08:00
Friendika
2531dc067e
upd8 readme
2010-11-09 15:34:49 -08:00
Friendika
f7c0480f1b
use raw db queries wherever query items could contain '%'
2010-11-09 15:11:47 -08:00
Friendika
c50f491c3d
improved lockout of version control directories from browsing
2010-11-09 14:10:33 -08:00
Friendika
b4c7b6a77a
prevent repository leakage on the web
2010-11-09 13:59:22 -08:00
Friendika
098478e3a5
linkify hash tags
2010-11-08 22:39:03 -08:00
Friendika
9f606be540
loosen search restrictions
2010-11-08 21:10:53 -08:00
Friendika
1f4048067e
more refactor remote reply off network
2010-11-08 20:56:09 -08:00
Friendika
e521dfd5e6
refactor outgoing comment ability for off network contacts
2010-11-08 20:43:58 -08:00
Friendika
188b1d2d6f
participate in public conversations
2010-11-08 20:15:42 -08:00
Friendika
57fe19da72
minor positioning adjustment on search items
2010-11-08 18:36:08 -08:00
Friendika
4514927128
added search
2010-11-08 17:30:00 -08:00
Friendika
01f171bce7
ability to remove individual photo tags
2010-11-08 14:37:58 -08:00
Friendika
efcff91456
upd8 readme
2010-11-08 03:12:00 -08:00
Friendika
2c27bda385
don't include blocked contacts in total
2010-11-08 02:45:22 -08:00
Friendika
a8d6d72b7b
use date ordering on public feeds
2010-11-08 01:11:50 -08:00
Friendika
fbb0166690
lint
2010-11-07 21:07:47 -08:00
Friendika
d3ead4e690
rm unnecessary images
2010-11-07 19:39:19 -08:00
Friendika
0d5ea176fd
string update
2010-11-07 19:33:43 -08:00
Friendika
9e35fb26f7
lint
2010-11-07 17:29:30 -08:00
Friendika
d825db3649
lint
2010-11-07 15:46:49 -08:00
Friendika
82d9783c35
unseen email conversations in bold, seen are normal links
2010-11-07 14:39:45 -08:00
Friendika
67707c89f6
full name tags => items
2010-11-07 14:04:37 -08:00
Friendika
a6ed67d25f
contact list missing url param
2010-11-07 03:46:14 -08:00
Friendika
fbcb74099a
show larger images for profile photos on summary photos page
2010-11-07 03:41:28 -08:00
Friendika
944c14b9e6
could not delete photos
2010-11-07 03:36:03 -08:00
Friendika
ce2f8c939d
remove 65535 char post limit
2010-11-07 03:16:58 -08:00
Friendika
a3ddbb5d7c
issues with friendship again
2010-11-06 22:56:39 -07:00
Friendika
36d286d062
more fixes to introduction discards
2010-11-06 17:01:57 -07:00
Friendika
8c9aa975fa
unable to discard notify
2010-11-06 16:54:21 -07:00
Friendika
be203d592d
don't show blocked/pending contacts
2010-11-06 16:34:26 -07:00
Friendika
ea4c6080f9
new network choice layout migrated to auto request
2010-11-06 15:28:34 -07:00
Friendika
05236adf0f
notification email on follow activities
2010-11-06 14:40:19 -07:00
Friendika
964ca0e079
install messages persist, some colour coordination
2010-11-06 05:07:10 -07:00
Friendika
db22a6cbe0
installation var mis-tagged
2010-11-05 22:23:11 -07:00
Friendika
05cd91129e
branding
2010-11-05 22:20:33 -07:00
Friendika
ce28d219d4
validate
2010-11-05 05:14:13 -07:00
Friendika
7ddbf68d22
lengthen contact block
2010-11-05 05:09:50 -07:00
Friendika
3cc662aa63
friend/contact sidebar block
2010-11-05 05:01:54 -07:00
Friendika
206eee0229
preserve newlines on all networks
2010-11-05 02:19:39 -07:00
Friendika
b94cb8d234
add micro profile photo
2010-11-04 23:50:32 -07:00
Friendika
71ae08d506
add display link to notify emails
2010-11-04 20:58:08 -07:00
Friendika
4cba826a2f
hub anomolies & swat0 compliance
2010-11-04 20:47:44 -07:00
Friendika
9718fffd71
make a photo visible if it is liked
2010-11-04 03:57:49 -07:00
Friendika
8341ce9ce8
ativity rel links went to target instead of object
2010-11-04 03:23:09 -07:00
Friendika
95a425a1f3
minor stuff
2010-11-04 00:37:29 -07:00
Friendika
4f8445760c
cleanup photo page a bit more, some work on branding
2010-11-04 00:19:10 -07:00
Friendika
b3856a797b
show like/dislike when no comments yet, bit of lint
2010-11-03 19:47:07 -07:00
Friendika
a90e5f438b
clean up photo edit layout
2010-11-03 17:20:46 -07:00
Friendika
a985ad4a54
add activity target to items, allow multiple link relations
2010-11-03 16:48:21 -07:00
Friendika
98a508532f
fix like/dislike refresh on photos/display items
2010-11-02 22:21:49 -07:00
Friendika
07b78e9d1c
more branding
2010-11-02 21:25:59 -07:00
Mike Macgirvin
2a23a7e840
project rename
2010-11-02 20:17:46 -07:00
Mike Macgirvin
26f97b8284
like,dislike for photos (still needs a bit of tweaking)
2010-11-02 16:24:23 -07:00
Mike Macgirvin
d8630dbdd8
infrastructure for swat0 (#fsw)
2010-11-01 23:42:26 -07:00
Mike Macgirvin
36a77c6db2
build feeds rather than template them
2010-11-01 17:56:36 -07:00
Mike Macgirvin
4f4d6bace6
add rel=mentioned links for tagged persons
2010-10-31 21:57:30 -07:00
Mike Macgirvin
b376f21533
notify folks who have been tagged in a post
2010-10-31 20:36:59 -07:00
Mike Macgirvin
b919a1e35a
more lint
2010-10-31 16:40:09 -07:00
Mike Macgirvin
f0b6400584
more lint
2010-10-31 16:38:22 -07:00
Mike Macgirvin
ceabd7629b
no longer required
2010-10-30 18:20:22 -07:00
Mike Macgirvin
fab63ca751
-Wall cleanup
2010-10-30 13:25:37 -07:00
Mike Macgirvin
768acb0a3f
-Wall cleanup
2010-10-30 04:59:10 -07:00
Mike Macgirvin
cbaf0f2dc9
another typo
2010-10-30 01:16:51 -07:00
Mike Macgirvin
2fc4677173
messages need subjects to link to
2010-10-29 23:00:10 -07:00
Mike Macgirvin
30fe8e39d6
security issue
2010-10-29 22:18:05 -07:00
Mike Macgirvin
7ae75101f1
upd readme
2010-10-29 00:26:08 -07:00
Mike Macgirvin
f34c1ce66a
provide the means to tag link a person by full_name
2010-10-29 00:02:26 -07:00
Mike Macgirvin
6301de1032
catch a couple of edge cases with the tag linkifier
2010-10-28 20:11:50 -07:00
Mike Macgirvin
051fb7107e
linkify @person and @person@domain.com tags
2010-10-28 18:18:20 -07:00
Mike Macgirvin
f7e1e907bc
typo
2010-10-28 16:06:34 -07:00
Mike Macgirvin
a0f6f8ad53
preserve utf-8 on notification emails
2010-10-28 16:05:09 -07:00
Mike Macgirvin
42e6b6cfe4
accepted but ignored - should probably be a 202 http code
2010-10-27 17:29:30 -07:00
Mike Macgirvin
f01e8743fc
match schemeless activities per the latest activity spec
2010-10-27 15:50:44 -07:00
Mike Macgirvin
78351df785
we need this file
2010-10-26 22:09:51 -07:00
Mike Macgirvin
2028e1695c
rework the logging interface
2010-10-26 22:09:13 -07:00
Mike Macgirvin
eb5e6aae72
a few more fsw tweaks
2010-10-26 19:01:16 -07:00
Mike Macgirvin
d453560be9
more robust (though wasteful) salmon, try both encodings
2010-10-26 15:56:19 -07:00
Mike Macgirvin
d2e20d029a
de-duplicate photo importation logic
2010-10-26 14:50:38 -07:00
Mike Macgirvin
c16f314ec3
two-way subscriptions working with federated social accounts
2010-10-25 21:52:30 -07:00
Mike Macgirvin
1335ef7595
no sparkle on federated network
2010-10-24 21:10:52 -07:00
Mike Macgirvin
b41218ca30
workflow for federated/non-dfrn followers
2010-10-24 20:39:24 -07:00
Mike Macgirvin
b8b227b328
add nicknames to contact records (going forward and retroactive)
2010-10-23 01:20:26 -07:00
Mike Macgirvin
d850badf2b
pull out follow, unfollow and as:actor for handling
2010-10-21 21:48:22 -07:00
Mike Macgirvin
16b9c58412
rely on feed item (e.g. salmon) to declare namespaces. This way we
...
don't cause conflict with any chosen NS prefix in the feed
2010-10-21 20:51:21 -07:00
Mike Macgirvin
8d59ff3c06
aid salmon discovery for feed scrapers that look for the old-style rel type.
2010-10-21 18:07:22 -07:00
Mike Macgirvin
d193763aa8
fixed it. Twas the infernal 100 continue headers
2010-10-21 16:45:26 -07:00
Mike Macgirvin
a266217a6d
temporary fix until I figure out why the header is leaking
2010-10-21 16:26:25 -07:00
Mike Macgirvin
a8a88d2532
clean up the salmon consumer bits
2010-10-21 15:32:09 -07:00
Mike Macgirvin
81be82ddab
put lrdd link into html headers for completeness
2010-10-21 14:32:29 -07:00
Mike Macgirvin
5edee3c4d1
magic-envelope verification, status.net appears to do it wrong.
...
Ultimately we need to do it right (or why bother having a spec?),
and fallback to doing it wrong if we're talking to a broken system - which
ironically seems to include most of the federated social web projects.
2010-10-21 04:53:43 -07:00
Mike Macgirvin
39b19cd089
fakelink was being inherited incorrectly by the ACL selector
2010-10-20 03:44:18 -07:00
Mike Macgirvin
68464b5d93
ability to clear browser location on individual posts
2010-10-20 00:33:17 -07:00
Mike Macgirvin
b91e9545f7
we'll need this for browser geotagging of course
2010-10-19 20:58:01 -07:00
Mike Macgirvin
a8e4ec7801
use browser geolocation when desired
2010-10-19 20:52:05 -07:00
Mike Macgirvin
81835acc36
default the geotag privacy preference
2010-10-19 17:33:22 -07:00
Mike Macgirvin
7c9b323e25
provide choice of using browser geotag
2010-10-19 17:30:15 -07:00
Mike Macgirvin
bf727dc3e8
db support for relationship->with in profiles
2010-10-19 17:15:00 -07:00
Mike Macgirvin
d58ff1a8df
duplex wasn't getting set correctly on group pages
2010-10-19 16:23:05 -07:00
Mike Macgirvin
9d807ba66f
oops
2010-10-19 16:10:16 -07:00
Mike Macgirvin
d715c062c0
clean up the html layout on profile page
2010-10-19 16:09:10 -07:00
Mike Macgirvin
0b2d85891e
lrdd link on profile page (for salmon m/e), remove dfrn-template, qualify some contact lookups, some cleanup of app/boot
2010-10-19 15:51:56 -07:00
Mike Macgirvin
3876cab8ea
sorting out the last(?) quirks in group pages.
2010-10-18 16:38:48 -07:00
Mike Macgirvin
ac824fe83e
eradicate redundant get_uid function
2010-10-18 14:34:59 -07:00
Mike Macgirvin
103814ab8e
hordes sounds better
2010-10-18 03:38:12 -07:00
Mike Macgirvin
44853c6453
readme update
2010-10-18 03:32:53 -07:00
Mike Macgirvin
664cf8ac8e
pass community page permissions through notification feeds
2010-10-18 03:02:51 -07:00
Mike Macgirvin
fbc64baf31
we probably need the page template for the last checkin
2010-10-18 00:47:43 -07:00
Mike Macgirvin
511c761fec
group/community/celebrity pages
2010-10-18 00:43:49 -07:00
Mike Macgirvin
be981a4f8a
wrong type comparison (string, int) which was the cause of the last problem.
2010-10-17 20:27:27 -07:00
Mike Macgirvin
1d2fdb259e
funny behaviour with post permissions after recent changes
2010-10-17 20:24:58 -07:00
Mike Macgirvin
3789c288a7
dash, not underscore
2010-10-17 20:13:45 -07:00
Mike Macgirvin
0f47ac282c
celebrity/group/community pages about 75% implemented
2010-10-17 20:04:17 -07:00
Mike Macgirvin
f5a8a92df1
infrastructure for supporting pages/groups
2010-10-16 22:11:21 -07:00
Mike Macgirvin
36e1afa6ae
allow login by username and multiple unique email addresses on system - this will provide support for group/celebrity pages (coming soon).
2010-10-16 20:38:27 -07:00
Mike Macgirvin
6d646e9df5
don't allow ignored contacts to post through the hub, change default poll
...
for hub subscribers to once a day now that we can utilise multiple hubs.
2010-10-15 04:58:13 -07:00
Mike Macgirvin
a1d37b6cc4
add recipient url to pubsub instrumentation
2010-10-15 04:36:39 -07:00
Mike Macgirvin
35a9b49ed0
allow for multiple pubsub hubs so everything can still work when/if one goes flaky
...
(Google's hub has been particularly unreliable recently and the symptoms are that
you just stop receiving updates, and/or updates you send are silently dropped and
never delivered). Also add more instrumentation to help debug pubsub issues.
2010-10-15 04:20:42 -07:00
Mike Macgirvin
e9aa6eb0c7
readme
2010-10-14 05:26:20 -07:00
Mike Macgirvin
ba957e9fe9
readme update
2010-10-14 04:20:39 -07:00
Mike Macgirvin
d96ae0f9f5
can no longer avoid recording the curl response code
2010-10-13 22:01:23 -07:00
Mike Macgirvin
bf77043b51
set correct content-type on feeds, status.net is fussy and ignores the one declared in the xrd
2010-10-13 19:06:52 -07:00
Mike Macgirvin
957827bda7
proofreading nits
2010-10-13 15:04:52 -07:00
Mike Macgirvin
6f11c20bf2
updated readme
2010-10-13 06:13:37 -07:00
Mike Macgirvin
5c020b4aae
updated readme
2010-10-13 05:42:51 -07:00
Mike Macgirvin
0f660c25d9
publish both forms of profile pictures in feeds for compatibility. Also set sizes.
2010-10-13 03:27:15 -07:00
Mike Macgirvin
c1fb819d34
mostly cosmetic
2010-10-13 02:47:32 -07:00
Mike Macgirvin
033935c194
cleanup to ensure protocol version is passed properly. We will need it if/when any incompatible protocol changes are introduced.
2010-10-12 20:29:04 -07:00
Mike Macgirvin
3c440f70c6
Provide the ability to subscribe to our user from other federated sites.
...
This is a read-only relationship until the rest of the salmon
magic-envelope stuff lands
2010-10-12 19:32:15 -07:00
Mike Macgirvin
f1977d420e
minor cleanup
2010-10-12 17:11:06 -07:00
Mike Macgirvin
744edcf2ab
modularise webfinger and make it service agnostic
2010-10-12 16:50:12 -07:00
Mike Macgirvin
a340f70c51
i18n strings update
2010-10-12 04:46:22 -07:00
Mike Macgirvin
dba866c689
more comprehensive XRD linkages
2010-10-12 04:39:32 -07:00
Mike Macgirvin
013d2604f8
inline salmon magic keys
2010-10-12 04:07:03 -07:00
Mike Macgirvin
cc64742e23
auto-update - create 's' keys for all users that don't have 'em
2010-10-12 01:14:50 -07:00
Mike Macgirvin
b9d768972e
added 's' keys - salmon keys, small keys, stupid keys, whatever...
2010-10-11 23:22:38 -07:00
Mike Macgirvin
6b67d00fce
if pubkey is encrypted, it will also be packaged for safe transport
2010-10-11 04:01:24 -07:00
Mike Macgirvin
eafd225bdd
protocol revision, send dfrn_confirm binary items as hex
2010-10-11 03:16:25 -07:00
Mike Macgirvin
dcb7bc5e71
Use dual delivery when dealing with flaky hub, reduce poll to once/hour
2010-10-10 21:08:25 -07:00
Mike Macgirvin
70bd7a6509
activity objects weren't escaped properly
2010-10-10 20:02:29 -07:00
Mike Macgirvin
d8283a35ba
google hub not working, this fix may be temporary or it may be permanent if the hub cannot be relied on.
2010-10-10 19:42:07 -07:00
Mike Macgirvin
524f73e306
A bit more telemetry of friend confirms and lots of extra doco
...
to understand what is happening and why.
2010-10-10 18:25:34 -07:00
Mike Macgirvin
3531f466e5
further enhance the friend confirm reporting
2010-10-10 16:33:28 -07:00
Mike Macgirvin
0ddfdce6a4
make it much easier to debug friend acceptance issues
...
by reporting specific error conditions across the wire.
2010-10-10 16:16:29 -07:00
Mike Macgirvin
e23ec64c90
put the correct cursor on the jot links, still having some
...
issues with the photo upload link, since it's overlayed with an ilayer
2010-10-10 01:39:14 -07:00
Mike Macgirvin
dcaadada35
allow leading/trailing whitespace in passwords
2010-10-09 16:19:52 -07:00
Mike Macgirvin
006ca54f92
ensure regmod redirects to itself after login
2010-10-09 06:00:07 -07:00
Mike Macgirvin
948cb29302
after login from arbitrary page, send back to that page
2010-10-09 01:05:53 -07:00
Mike Macgirvin
9dc0e659d6
issue #1 , need login link on profile pages
2010-10-09 00:45:09 -07:00
Mike Macgirvin
beb9fe3ff1
couldn't distinguish links from black text, changed them to the header background colour
2010-10-08 23:40:18 -07:00
Mike Macgirvin
4714f3a9e1
sort out the magic cursor
2010-10-08 22:21:34 -07:00
Mike Macgirvin
938b1677f8
new default theme (thx: Manu Revah)
2010-10-08 04:44:08 -07:00
Mike Macgirvin
f9ff5b36bf
match patterns against the encoder
2010-10-07 21:18:26 -07:00
Mike Macgirvin
ee1162f2db
doco for fallback config file
2010-10-07 04:08:03 -07:00
Mike Macgirvin
4daed0a009
Needed for salmon which seems to have a fixation with forcing you to encode/decode ASN.1. Sick.
2010-10-07 02:53:31 -07:00
Mike Macgirvin
9c10ada906
salmon-magic-public-freaking-nasty-keys
2010-10-06 21:13:15 -07:00
Mike Macgirvin
a0ecdd025e
infrastructure for salmon
2010-10-06 19:46:44 -07:00
Mike Macgirvin
98ebcada61
language strings update
2010-10-06 18:32:54 -07:00
Mike Macgirvin
66a6fd8df0
more instrumentation
2010-10-06 18:14:11 -07:00
Mike Macgirvin
c7c3db8c54
i18n officially ready for prime time.
2010-10-06 17:40:58 -07:00
Mike Macgirvin
9f0cedad8e
remove debugging statement
2010-10-06 16:00:19 -07:00
Mike Macgirvin
32602c5f87
disallow viewing raw templates from http
2010-10-06 04:04:12 -07:00
Mike Macgirvin
09606dbac2
more doco
2010-10-06 00:33:11 -07:00
Mike Macgirvin
a6c7a233a6
more little stuff
2010-10-05 21:05:37 -07:00
Mike Macgirvin
036964de4d
friend acceptance sets up lots of important stuff, so we
...
need to be absolutely bulletproof when (not if) things go wrong.
2010-10-05 19:56:09 -07:00
Mike Macgirvin
1b35018992
file needed to parse public keys to generate salmon magic-sigs.
2010-10-05 18:55:07 -07:00
Mike Macgirvin
c2db740b71
typo
2010-10-05 16:05:08 -07:00
Mike Macgirvin
23f03b18b7
script to update/repair installed db between Sep22-Oct6,2010
2010-10-05 15:45:16 -07:00
Mike Macgirvin
9da61d3418
schema was out of date
2010-10-05 15:39:32 -07:00
Mike Macgirvin
8424f31aad
a bit more robust about loading external pics
...
also friend confirm was getting wrong email
2010-10-04 16:04:52 -07:00
Mike Macgirvin
8abac5e5c7
some tools we'll require going forward
2010-10-04 05:13:10 -07:00
Mike Macgirvin
941b2331f1
xrd cannot be called before db is open to get language
2010-10-04 04:22:34 -07:00
Mike Macgirvin
b8a9581acb
force lowercase nickname
2010-10-02 17:55:41 -07:00
Mike Macgirvin
336aea26dc
notify hub only on public updates
2010-10-02 03:38:53 -07:00
Mike Macgirvin
6ad1a22a05
add pubsubhubbub to default configuration
2010-10-01 05:46:10 -07:00
Mike Macgirvin
7658acbe0a
automatically subscribe to hub if conditions are right
2010-10-01 04:41:53 -07:00
Mike Macgirvin
f5615068ca
trialing pubsubhubbub - operational tweaks
2010-10-01 02:28:06 -07:00
Mike Macgirvin
2ae38e3fbf
pass params as string rather than array so it doesn't
...
get changed to multipart/forma-data
2010-09-30 22:30:18 -07:00
Mike Macgirvin
0d2650b29b
the rest of pubsubhubbub except for the UI that actually turns it on
2010-09-30 21:38:45 -07:00
Mike Macgirvin
632c557008
pubsubhubbub db refinements
2010-09-30 21:00:06 -07:00
Mike Macgirvin
465ba71b58
pubsubhubbub - discovery and notifier
2010-09-30 20:24:03 -07:00
Mike Macgirvin
abe6a3286e
pubsubhubbub endpoint
2010-09-30 19:41:22 -07:00
Mike Macgirvin
7ad27f5737
implement rel alternate, some corresponding last minute touchups on display module
2010-09-30 16:06:53 -07:00
Mike Macgirvin
a0a7c3be8b
add linebreak to invisibility notice
2010-09-30 05:13:13 -07:00
Mike Macgirvin
948061e241
notify people when they are invisible
2010-09-30 05:10:25 -07:00
Mike Macgirvin
b0c81b025e
i18n strings refresh
2010-09-30 01:29:13 -07:00
Mike Macgirvin
d0bb2d3036
bloody ie8
2010-09-29 23:19:19 -07:00
Mike Macgirvin
dda5195418
show members of locked conversations
2010-09-29 22:11:26 -07:00
Mike Macgirvin
d2ecdd0668
doco on the utils dir and i18n
2010-09-29 18:35:21 -07:00
Mike Macgirvin
e25e40f1ef
i18n string extraction util
2010-09-29 18:11:23 -07:00
Mike Macgirvin
8ba3737b3b
moved a couple of translatable strings from js include file to translatable view
2010-09-29 16:09:10 -07:00
Mike Macgirvin
d150b8e8b1
inherit parent ACL's on remote children
2010-09-28 22:32:48 -07:00
Mike Macgirvin
18287a3656
show lockstate on messages, sparkle failure on profile page,
...
comments on typo checker
2010-09-28 22:12:27 -07:00
Mike Macgirvin
dd3f754e23
found yet another typo, so created a typo finder
2010-09-28 16:10:44 -07:00
Mike Macgirvin
27946c102d
animate the sparkler, author was getting sparkled on own page
2010-09-27 22:43:30 -07:00
Mike Macgirvin
55351114fa
you and me babe
2010-09-27 19:58:37 -07:00
Mike Macgirvin
01d36785b0
fixed photo comments, msg typo, and changed cursor when hovering
...
over "special friends" where SSO is allowed
2010-09-27 19:48:45 -07:00
Mike Macgirvin
0c66172292
doco
2010-09-27 17:16:52 -07:00
Mike Macgirvin
4d8e8de0bf
clarify birthday doco, Facebook really screwed this one up.
2010-09-27 00:46:29 -07:00
Mike Macgirvin
627c65b49f
doco
2010-09-27 00:38:26 -07:00
Mike Macgirvin
0765323b17
more readme chgs
2010-09-26 22:38:52 -07:00
Mike Macgirvin
f9fa80bd6b
updated readme
2010-09-26 20:29:35 -07:00
Mike Macgirvin
84d2ad8ebf
cleaned up ACL expansion to remove unwanted '0' elements
2010-09-26 19:44:03 -07:00
Mike Macgirvin
34eedb503a
stronger type checking on comparisons
2010-09-26 17:24:20 -07:00
Mike Macgirvin
1105cdb065
configurable logo banner
2010-09-26 16:56:45 -07:00
Mike Macgirvin
b91494d22e
preliminary network abstraction, configurable debugging.
2010-09-26 16:30:21 -07:00
Mike Macgirvin
0ebd4aa783
per design spec, hide global directory if update url not present
2010-09-23 18:33:07 -07:00
Mike Macgirvin
4c2fbc81a0
for corp and edu sites, allow registration only to certain email addrs
2010-09-23 15:36:21 -07:00
Mike Macgirvin
aedae07af6
oops - slipped on last commit, profile tab broke
2010-09-22 21:32:44 -07:00
Mike Macgirvin
d5a13b1e4c
localisation path for all view templates
2010-09-22 18:00:19 -07:00
Mike Macgirvin
124129e2a0
greatly simplify sorting by relation type, though it still isn't fully implemented.
2010-09-21 20:52:13 -07:00
Mike Macgirvin
188dc1fcf8
relationship direction was too confusing to work with. instead of "in,out,both" it's now declared by role e.g. "vip,fan,bud".
2010-09-21 19:51:08 -07:00
Mike Macgirvin
399b6828f6
remove debugging on public repository
2010-09-21 17:16:34 -07:00
Mike Macgirvin
2342d41bcd
update README with a few features
2010-09-21 16:51:21 -07:00
Mike Macgirvin
16bcbd8b21
not used in project
2010-09-21 16:25:41 -07:00
Mike Macgirvin
db89a1eb44
prepare for open source server release
2010-09-21 16:01:19 -07:00
Mike Macgirvin
85fbee3aa4
local file, should not be in repository
2010-09-21 04:04:45 -07:00
Mike Macgirvin
a428695f8e
pass vars via javascript, not html. Also fix broken pause img on IE
2010-09-20 22:27:33 -07:00
Mike Macgirvin
b9247f1dcc
fix layout issues, deletable items and wall-wall
2010-09-20 21:26:18 -07:00
Mike Macgirvin
cd61b46009
polling horked on certain relationships
2010-09-20 20:26:55 -07:00
Mike Macgirvin
3ad52463f6
more robust feed error handling, at the expense of performance.
...
Pass profile owner through HTML (yuk) to the ajax updater - as
browser pre-fetch totally buggers passing it via the server session.
2010-09-20 19:34:44 -07:00
Mike Macgirvin
177a6d7f79
provide visual indicator when pausing ajax updates
2010-09-20 01:13:19 -07:00
Mike Macgirvin
e583ba0bff
improved "friendship accepted" emails enumerating what has
...
changed in the relationship and what you can do now.
2010-09-19 22:00:31 -07:00
Mike Macgirvin
9a03834cef
simplify wording throughout application to concepts which do not need explanations.
2010-09-19 20:52:39 -07:00
Mike Macgirvin
2e35d7010b
remove the cheesy "what's on your mind"
2010-09-19 20:18:35 -07:00
Mike Macgirvin
71c8026383
...
2010-09-19 00:18:39 -07:00
Mike Macgirvin
18c02e4852
more sell page work
2010-09-18 21:53:08 -07:00
Mike Macgirvin
f2a417d391
sell page improvements
2010-09-18 21:43:08 -07:00
Mike Macgirvin
971b7d7519
don't set tab to selected if visiting
2010-09-18 21:29:22 -07:00
Mike Macgirvin
65a420b227
theme cleanup
2010-09-18 21:11:18 -07:00
Mike Macgirvin
881037a0d9
show lock state changes as recipients and groups are added/removed
2010-09-18 01:52:44 -07:00
Mike Macgirvin
2bae548b35
no profile after returning from visitor mode with a selected profile
...
put bottom margin on non-profile pages as well
2010-09-17 18:26:20 -07:00
Mike Macgirvin
22429cd432
friends not being correctly unmarked for death after contact resumed
2010-09-17 16:50:30 -07:00
Mike Macgirvin
68004fc962
force a bottom margin
2010-09-17 15:49:57 -07:00
Mike Macgirvin
6c812a9158
added clean theme
2010-09-17 15:08:36 -07:00
Mike Macgirvin
40bb8d195f
fix missing colours
2010-09-17 15:06:37 -07:00
Mike Macgirvin
9cda87c327
cleanup home page
2010-09-17 05:19:56 -07:00
Mike Macgirvin
4eb1c1eb1a
our implementation of "aspects" functionally complete
2010-09-17 03:43:03 -07:00
Mike Macgirvin
a50947a4bc
like, dislike, activity streams, etc.
2010-09-17 03:10:19 -07:00
Mike Macgirvin
c5031139eb
abstractify items, check photos for birthday paradox
2010-09-13 22:57:31 -07:00
Mike Macgirvin
38fde6672e
provide allow list of friend sites for education/corporate environments,
...
pattern matchable
2010-09-13 17:12:54 -07:00
Mike Macgirvin
2c96ad7739
tag each side of the duplex
2010-09-12 21:25:37 -07:00
Mike Macgirvin
19661d4c25
reverse sort order for public feeds
2010-09-10 01:45:58 -07:00
Mike Macgirvin
7d5ace644e
item wall flag => photos
2010-09-10 01:27:56 -07:00
Mike Macgirvin
ca8566008d
upgrading the photo and name update
2010-09-10 00:42:53 -07:00
Mike Macgirvin
f7cff0eb5a
license, generator for feeds
2010-09-09 22:36:40 -07:00
Mike Macgirvin
3a69413f86
more preparation for activities
2010-09-09 22:02:28 -07:00
Mike Macgirvin
2e6041d1b6
activity verbs
2010-09-09 21:16:40 -07:00
Mike Macgirvin
3a3bf273c7
item cleanup
2010-09-09 19:48:08 -07:00
Mike Macgirvin
49c9860e61
fix item
2010-09-09 19:20:35 -07:00
Mike Macgirvin
887a8add2d
populate wall element
2010-09-09 19:14:42 -07:00
Mike Macgirvin
82986cc993
fixes
2010-09-09 18:49:19 -07:00
Mike Macgirvin
bbc0200661
feed defs
2010-09-09 17:55:59 -07:00
Mike Macgirvin
a587d550b9
doco
2010-09-09 17:25:08 -07:00
Mike Macgirvin
440a3fea3f
redirection to wrong profile in multi-user mode
2010-09-09 17:09:38 -07:00
Mike Macgirvin
62fdf346ff
cleanup
2010-09-09 16:48:33 -07:00
Mike Macgirvin
e8c39ff49f
found the missing comment box bug
2010-09-09 05:25:01 -07:00
Mike Macgirvin
f1e17b1707
undo debug statements
2010-09-09 02:00:54 -07:00
Mike Macgirvin
c59948f1dc
more fixes from landing
2010-09-09 02:00:01 -07:00
Mike Macgirvin
bc9e175ced
fixing typos from 2.0 landing
2010-09-09 01:49:03 -07:00
Mike Macgirvin
e800dba185
onemore missing paren
2010-09-09 01:41:02 -07:00
Mike Macgirvin
f8160ed076
missing paren
2010-09-08 20:52:43 -07:00
Mike Macgirvin
8a87ad9b88
update global directory on change of profile photo
2010-09-08 20:46:10 -07:00
Mike Macgirvin
ffb1997902
mistpark 2.0 infrasturcture lands
2010-09-08 20:14:17 -07:00
Mike Macgirvin
b49858b038
start on 2way comms, 2.0 dev
2010-09-02 00:31:11 -07:00
Mike Macgirvin
19a28434c4
potential xss exploit
2010-09-01 17:26:02 -07:00
Mike Macgirvin
2c1a27b2ae
webfinger client
2010-08-30 21:08:45 -07:00
Mike Macgirvin
e71672a409
acct uri may have double slashes after scheme, may be url encoded
2010-08-30 20:59:56 -07:00
Mike Macgirvin
2d76a5c76b
fix last-child in face of deletions
2010-08-29 21:55:57 -07:00
Mike Macgirvin
5d59a77cd9
hide introduction link for self
2010-08-27 17:25:52 -07:00
Mike Macgirvin
1ddb91a5a1
fix default birthday
2010-08-27 17:02:49 -07:00
Mike Macgirvin
99a903ed66
better intro text
2010-08-27 15:35:41 -07:00
Mike Macgirvin
c35dab713d
can't use ActivityStreams for location. Grrr.
2010-08-24 16:25:02 -07:00
Mike Macgirvin
828316ce70
ajax stop/resume hot key
2010-08-23 20:48:47 -07:00
Mike Macgirvin
b02e30f1cf
sort out notify x-domain
2010-08-22 20:57:20 -07:00
Mike Macgirvin
024f2019e6
store default location
2010-08-21 16:31:46 -07:00
Mike Macgirvin
709c86b2da
added location tagging
2010-08-20 14:33:15 -07:00
Mike Macgirvin
82174bbfa8
cleanup tinymce
2010-08-19 22:51:37 -07:00
Mike Macgirvin
071d3affb9
change wording on publish to site directory
2010-08-19 22:27:51 -07:00
Mike Macgirvin
f7c56106e7
rename new password field so form filling browsers don't always populate it
2010-08-19 22:18:06 -07:00
Mike Macgirvin
cac8aa7a69
increase visibility of visibility settings
2010-08-19 22:04:18 -07:00
Mike Macgirvin
f9f284ba70
share youtube videos
2010-08-19 20:52:49 -07:00
Mike Macgirvin
0ea5e7fc95
fat fringers
2010-08-19 19:07:19 -07:00
Mike Macgirvin
8ef81fc772
some quick theming
2010-08-19 19:03:10 -07:00
Mike Macgirvin
43adabcd20
multi-user fixes
2010-08-19 17:23:13 -07:00
Mike Macgirvin
adad23a0ea
cached config glitch
2010-08-19 07:15:41 -07:00
Mike Macgirvin
b16be9e76a
marital "heart" status no longer an array
2010-08-19 05:29:43 -07:00
Mike Macgirvin
e0045a43e2
mongo checkin, global directory, redir rework, location basics
2010-08-19 04:59:31 -07:00
Mike Macgirvin
6ed5b642a4
item delete -> nuke contents
2010-08-17 18:56:33 -07:00
Mike Macgirvin
1a1f9b296c
contact search + sync to personal edition, installer db check + curl proxy
2010-08-17 18:44:13 -07:00
Mike Macgirvin
478f84d9f2
sql typo
2010-08-17 04:08:35 -07:00
Mike Macgirvin
4d34ec85cf
misc little fixes
2010-08-16 22:05:04 -07:00
Mike Macgirvin
facca43e2d
no more url in cmdline
2010-08-16 20:47:40 -07:00
Mike Macgirvin
ce515ac2e8
prepare for federation
2010-08-16 19:38:07 -07:00
Mike Macgirvin
30e3a65c0f
full theming support
2010-08-16 05:23:26 -07:00
Mike Macgirvin
4bcf380296
fix notification msgs
2010-08-15 22:43:42 -07:00
Mike Macgirvin
35e29e10e6
installer changes, pe sync
2010-08-15 21:49:29 -07:00
Mike Macgirvin
7294a3aab1
add geotag/location
2010-08-14 20:05:28 -07:00
Mike Macgirvin
51f6671466
only escape dbg tags when running in server mode
2010-08-14 19:48:32 -07:00
Mike Macgirvin
2370a3f89b
code cleanup for server release
2010-08-14 19:39:28 -07:00
Mike Macgirvin
f44a499ca7
schema auto-update
2010-08-14 19:31:10 -07:00
Mike Macgirvin
d763485752
put in config framework for auto-update ability, plugins, etc.
2010-08-14 18:11:36 -07:00
Mike Macgirvin
8f83c4ab64
make rego button business compliant
2010-08-14 17:06:32 -07:00
Mike Macgirvin
47e9613acd
mongo notification checkin, wall, comments, settings
2010-08-14 07:55:18 -07:00
Mike Macgirvin
2ee1b00c9c
missed escape on email receive
2010-08-13 05:59:59 -07:00
Mike Macgirvin
e9a0d07f3a
cleanup
2010-08-13 05:52:28 -07:00
Mike Macgirvin
485708bd9a
tweaking sql for netwrk page
2010-08-13 05:47:16 -07:00
Mike Macgirvin
e79cb38217
fix regression in profile query
2010-08-13 00:43:44 -07:00
Mike Macgirvin
03664327ce
added local push
2010-08-12 15:49:06 -07:00
Mike Macgirvin
2a47f5ab46
make it harder for the Russian spammers to register
2010-08-12 15:44:13 -07:00
Mike Macgirvin
dfd3cef734
added code, quote styles to editor
2010-08-12 01:47:08 -07:00
Mike Macgirvin
8d0ba93436
make debugging safe
2010-08-11 22:24:08 -07:00
Mike Macgirvin
1f2f483531
bare naked linefeed \n crept into SQL
2010-08-11 21:45:27 -07:00
Mike Macgirvin
3d7bb9c37c
network groups now filtered by parent in group
2010-08-11 15:40:18 -07:00
Mike Macgirvin
d2c6fa3fa1
group removal
2010-08-11 04:14:47 -07:00
Mike Macgirvin
f4e634ad52
group drop
2010-08-11 01:48:43 -07:00
Mike Macgirvin
eb6b2677cb
tracking mail notifications
2010-08-10 22:14:17 -07:00
Mike Macgirvin
9662c44a17
even more fixes
2010-08-10 21:22:36 -07:00
Mike Macgirvin
06bdf8a4cf
atom auto-discover, fix image preloading in ajax
2010-08-10 16:54:36 -07:00
Mike Macgirvin
04e65823d7
more post branch bug fixes
2010-08-10 05:58:22 -07:00
Mike Macgirvin
503f403b3b
selective update
2010-08-10 03:21:39 -07:00
Mike Macgirvin
a8ce910362
wrap comments
2010-08-10 01:46:30 -07:00
Mike Macgirvin
0a4c5a694d
fix item type
2010-08-10 01:21:38 -07:00
Mike Macgirvin
1c60e6c553
add mail notification
2010-08-09 23:01:47 -07:00
Mike Macgirvin
6fa5557994
post branch fixes
2010-08-09 22:58:58 -07:00
Mike Macgirvin
d11c1c63c0
lots of fixes - most recent photo updates for contacts
2010-08-08 21:03:08 -07:00
Mike Macgirvin
0bcd552231
photo album finish, general cleanup begins
2010-08-08 17:08:39 -07:00
Mike Macgirvin
c9d8211ae7
photo editing
2010-08-08 01:58:26 -07:00
Mike Macgirvin
5933f13ab7
default acl's
2010-08-07 23:54:22 -07:00
Mike Macgirvin
adce88e564
photo editing
2010-08-07 06:20:27 -07:00
Mike Macgirvin
edff5b5289
character counter
2010-08-07 02:53:59 -07:00
Mike Macgirvin
4a7643b3ec
allow 640 image to display directly, add album name to photo
2010-08-06 17:16:52 -07:00
Mike Macgirvin
69fe1efa98
added hearts
2010-08-06 17:02:05 -07:00
Mike Macgirvin
a48efe0bc0
photo comments
2010-08-06 06:30:25 -07:00
Mike Macgirvin
72b20a6eb1
progress on photos
2010-08-05 21:15:24 -07:00
Mike Macgirvin
40a06771ff
reciprocal verification on notify, poll
2010-08-05 02:57:03 -07:00
Mike Macgirvin
b294ff6302
fixed zero uid in imported contact photo
2010-08-04 20:11:14 -07:00
Mike Macgirvin
d090033a0a
more photo progress
2010-08-04 20:03:38 -07:00
Mike Macgirvin
3540ada84f
added data passing variable in $a (app) for photos
2010-08-03 22:33:53 -07:00
Mike Macgirvin
2af943d752
cleanup sysmsg
2010-08-03 19:34:33 -07:00
Mike Macgirvin
b38f875732
i18n
2010-08-03 19:14:57 -07:00
Mike Macgirvin
6af2a79e90
fix rego page
2010-08-03 19:05:07 -07:00
Mike Macgirvin
8f7e81a8b3
front page
2010-08-03 18:17:42 -07:00
Mike Macgirvin
4b39cc5f9b
add default album names to photos
2010-08-02 20:21:21 -07:00
Mike Macgirvin
93d0ef4042
fixup image on wall
2010-08-02 19:06:36 -07:00
Mike Macgirvin
3fd4b4264e
set frequency of poll per contact, other misc fixes (photo now has contact-id)
2010-08-01 05:46:51 -07:00
Mike Macgirvin
a4a46d82df
ui cleanup
2010-07-31 16:38:42 -07:00
Mike Macgirvin
eaea2a6370
lighter colours
2010-07-31 02:18:37 -07:00
Mike Macgirvin
aea121ea2a
message fixes
2010-07-30 22:27:41 -07:00
Mike Macgirvin
56fc81f57e
mail more or less working
2010-07-30 21:22:52 -07:00
Mike Macgirvin
b399b20dee
mail, i18n, etc.
2010-07-30 06:09:20 -07:00
Mike Macgirvin
f83aa6c8a5
new registration options
2010-07-29 01:22:00 -07:00
Mike Macgirvin
15d21a293d
register message
2010-07-29 01:09:54 -07:00
Mike Macgirvin
864e7e690f
verified registrations working
2010-07-28 23:15:10 -07:00
Mike Macgirvin
d8d6f9adbd
profile editor cleanups
2010-07-28 21:02:36 -07:00
Mike Macgirvin
8aeb1976b8
contact-edit cleanup
2010-07-28 20:16:45 -07:00
Mike Macgirvin
050be99034
added friend viewer
2010-07-28 18:24:07 -07:00
Mike Macgirvin
7feed93a56
added invitation module
2010-07-28 16:28:39 -07:00
Mike Macgirvin
eaf713bd15
wrong profile in update_profile when local_user() looks at different profile on same site
2010-07-28 05:01:52 -07:00
Mike Macgirvin
fac6e7e60b
link email to nav
2010-07-28 04:46:44 -07:00
Mike Macgirvin
da766f1159
starting on email
2010-07-28 04:45:07 -07:00
Mike Macgirvin
aaa06c57e6
i18n nav menu
2010-07-28 04:13:26 -07:00
Mike Macgirvin
887a324956
readonly support for polling
2010-07-28 01:29:45 -07:00
Mike Macgirvin
fa154248dc
working on readonly contact attribute
2010-07-27 22:32:21 -07:00
Mike Macgirvin
2e5fb9c37e
lots of formatting, bug fixes on profile updates, i18n
2010-07-27 19:27:14 -07:00
Mike Macgirvin
e15265be3c
start at i18n
2010-07-26 22:48:08 -07:00
Mike Macgirvin
d6b3d091a6
added album to photos
2010-07-26 21:42:19 -07:00
Mike Macgirvin
6d7b018237
minor edit to last commit
2010-07-26 20:45:54 -07:00
Mike Macgirvin
8c1adbefe3
redirect to contact editor after introduction approval
2010-07-26 20:30:52 -07:00
Mike Macgirvin
7a6665b5cf
item deletion and hover images
2010-07-26 17:01:37 -07:00
Mike Macgirvin
17808daf5e
item delete
2010-07-26 04:22:19 -07:00
Mike Macgirvin
557ebe4700
working on delete
2010-07-26 03:33:56 -07:00
Mike Macgirvin
9f81c3345b
fixup of some nits with live update and remote comment display on profile page
2010-07-25 22:51:45 -07:00
Mike Macgirvin
52a2c7eb46
group select on network page
2010-07-25 16:27:22 -07:00
Mike Macgirvin
fc8379b108
live updates sort of working
2010-07-24 23:20:20 -07:00
Mike Macgirvin
6368bd1656
more live update
2010-07-24 15:21:33 -07:00
Mike Macgirvin
d6dbcf8581
schema update
2010-07-24 07:39:50 -07:00
Mike Macgirvin
a93f5627c1
live update
2010-07-24 06:56:02 -07:00
Mike Macgirvin
1db8ab907b
css change to allow live inserts
2010-07-24 05:52:29 -07:00
Mike Macgirvin
cb0d45385c
updated with dfrn profile
2010-07-23 17:33:15 -07:00
Mike Macgirvin
89c15cc092
added webfinger support
2010-07-23 16:33:34 -07:00
Mike Macgirvin
938247427d
acl border
2010-07-23 03:10:53 -07:00
Mike Macgirvin
25afc87368
fix null return on url
2010-07-22 23:21:40 -07:00
Mike Macgirvin
7a07a2cf31
enhance url parse
2010-07-22 23:17:41 -07:00
Mike Macgirvin
36b66dccb6
ajaxify the wall poster
2010-07-22 22:41:45 -07:00
Mike Macgirvin
88bfe21bea
first cut at ajax photo upload
2010-07-22 20:22:03 -07:00
Mike Macgirvin
11f2eaa16d
introduction cleanup - email notification flags
2010-07-22 02:13:39 -07:00
Mike Macgirvin
a9befec59e
add mail module
2010-07-22 02:12:56 -07:00
Mike Macgirvin
7ef0207cea
additions
2010-07-21 21:24:22 -07:00
Mike Macgirvin
023dd993f6
more intro fix
2010-07-20 21:00:49 -07:00
Mike Macgirvin
db99f3abda
fixes
2010-07-20 20:48:08 -07:00
Mike Macgirvin
b4d5af63af
yuck
2010-07-20 20:43:46 -07:00
Mike Macgirvin
21ab8356b0
try this
2010-07-20 20:41:31 -07:00
Mike Macgirvin
91fd835754
fix intro bug
2010-07-20 20:38:08 -07:00
Mike Macgirvin
f78c252d37
updated schema
2010-07-20 05:38:30 -07:00
Mike Macgirvin
466267fbb5
lotsoflittlestuff
2010-07-20 05:21:19 -07:00
Mike Macgirvin
ba8da761e6
more cleanup - start on ajax
2010-07-19 22:52:31 -07:00
Mike Macgirvin
c3fd5ed732
one true profile photo, force nicknames
2010-07-19 19:09:58 -07:00
Mike Macgirvin
6695b4a203
more bugs
2010-07-19 06:58:03 -07:00
Mike Macgirvin
bbe53699f2
bug fixes
2010-07-19 05:24:22 -07:00
Mike Macgirvin
9b0584e593
revamp of item structure
2010-07-18 23:23:18 -07:00
Mike Macgirvin
3c0c8a2dc1
poller
2010-07-18 20:49:54 -07:00
Mike Macgirvin
21f0cd206d
more poll stuff ahead of item revamp
2010-07-18 20:49:10 -07:00
Mike Macgirvin
07274bb922
feed generator
2010-07-18 06:02:55 -07:00
Mike Macgirvin
5bdff4d44c
more dfrn_poll
2010-07-18 06:02:19 -07:00
Mike Macgirvin
5ed87a44e6
fix reference to if(item->remote-id), which now gets set more often
2010-07-18 02:54:47 -07:00
Mike Macgirvin
95d0a9e2bf
dfrn_poll underway
2010-07-18 02:49:38 -07:00
Mike Macgirvin
83ee7909cd
password reset
2010-07-18 01:24:51 -07:00
Mike Macgirvin
aff4f63ff8
remote comments working now
2010-07-17 19:26:00 -07:00
Mike Macgirvin
2a17c20fb8
remote comments - though still needs a bit more work
2010-07-17 07:03:06 -07:00
Mike Macgirvin
f937de932d
fixing stuff that broke with the last big code push
2010-07-16 23:14:37 -07:00
Mike Macgirvin
5e4df4b3f7
added network page
2010-07-16 17:16:50 -07:00
Mike Macgirvin
059e090b53
sorting out visitor sessions
2010-07-16 06:24:41 -07:00
Mike Macgirvin
56a37deb73
mostly done with dfrn-notify
2010-07-16 01:26:42 -07:00
Mike Macgirvin
d20e1a6f93
feed related
2010-07-14 23:04:10 -07:00
Mike Macgirvin
43f8dd6802
change atom templates
2010-07-14 23:03:23 -07:00
Mike Macgirvin
4631a3c282
fix inheritance
2010-07-13 16:18:14 -07:00
Mike Macgirvin
c4f31ec65a
child conversations inherit ACL's from parent
2010-07-13 16:09:53 -07:00
Mike Macgirvin
e4325bc565
.
2010-07-13 04:18:57 -07:00
Mike Macgirvin
c3273dfcdc
group editor cleanup
2010-07-13 04:05:23 -07:00
Mike Macgirvin
323697d9dc
more group editor
2010-07-13 02:26:28 -07:00
Mike Macgirvin
c6267a2cd2
turn groups back into numbers
2010-07-13 02:00:53 -07:00
Mike Macgirvin
7e16f8cdae
groups and acls
2010-07-12 23:08:07 -07:00
Mike Macgirvin
a4dbd6657c
fix friggin ' for IE
2010-07-12 21:16:30 -07:00
Mike Macgirvin
58fd9647a2
misc fixes
2010-07-12 20:16:27 -07:00
Mike Macgirvin
9a20216e51
acl cleanup
2010-07-12 19:53:56 -07:00
Mike Macgirvin
baad288430
acl stuff
2010-07-12 18:00:58 -07:00
Mike Macgirvin
acdfee2327
lock images
2010-07-12 16:59:32 -07:00
Mike Macgirvin
f30dfa8513
here if it's needed
2010-07-12 16:44:56 -07:00
Mike Macgirvin
e0e2a032cf
mongo commit
2010-07-12 16:43:59 -07:00
Mike Macgirvin
b0f8cd5fe6
facebook style comments
2010-07-12 00:49:06 -07:00
Mike Macgirvin
4e40156607
sort out some permissions, comments, fetch
2010-07-11 23:10:52 -07:00
Mike Macgirvin
8e22178b8a
tweaks
2010-07-11 06:24:10 -07:00
Mike Macgirvin
83dc89d859
group creation
2010-07-11 06:06:30 -07:00
Mike Macgirvin
0d14d88ef4
tweak
2010-07-11 05:00:58 -07:00
Mike Macgirvin
c34189c033
fix birthday
2010-07-11 04:54:39 -07:00
Mike Macgirvin
aeac832728
schema updates
2010-07-11 04:40:17 -07:00
Mike Macgirvin
ff57833d02
Merge branch 'master' of /home/macgirvin/mike.macgirvin.com/../dfrn/dev
2010-07-11 04:33:51 -07:00
Mike Macgirvin
53ac7983f1
cleanup after deploy
2010-07-11 04:32:50 -07:00
Mike Macgirvin
2d83a1a9af
style tabs
2010-07-11 04:32:13 -07:00
Mike Macgirvin
751bc378fa
tab file
2010-07-11 04:10:54 -07:00
Mike Macgirvin
cf1b5c47dc
tabs
2010-07-11 04:09:43 -07:00
Mike Macgirvin
a6cde63fd8
fix register loophole
2010-07-11 03:35:33 -07:00
Mike Macgirvin
c2106cb9df
add install notes
2010-07-11 03:35:06 -07:00
Mike Macgirvin
7a21a000a2
lots of little stuff
2010-07-11 02:52:47 -07:00
Mike Macgirvin
a42c9616f9
contact editor
2010-07-10 23:03:54 -07:00
Mike Macgirvin
b9bbe0cec2
advanced profile
2010-07-10 19:43:55 -07:00
Mike Macgirvin
30a88a41e5
remove hidden country/state vars
2010-07-10 17:11:43 -07:00
Mike Macgirvin
bdd1156cac
missed two files in update
2010-07-10 16:50:04 -07:00
Mike Macgirvin
79725b28cf
profile extra fields, profile deletion
2010-07-10 16:47:10 -07:00
Mike Macgirvin
e3b86cc583
adding profile fields
2010-07-10 08:18:58 -07:00
Mike Macgirvin
44b1984136
profile additions
2010-07-10 07:09:57 -07:00
Mike Macgirvin
970a2d4f1e
...
2010-07-10 03:26:21 -07:00
Mike Macgirvin
a4850cb3d7
added pager
2010-07-10 00:45:18 -07:00
Mike Macgirvin
cb54cda174
more directory work
2010-07-09 22:47:32 -07:00
Mike Macgirvin
51b51bd039
removed testing cruft
2010-07-09 22:46:54 -07:00
Mike Macgirvin
4a92de7563
directory enhancements
2010-07-09 17:39:55 -07:00
Mike Macgirvin
03689fa6b0
dbesc the profile clone
2010-07-09 16:45:43 -07:00
Mike Macgirvin
db31c293a8
new profile tables, profile clone
2010-07-09 16:28:50 -07:00
Mike Macgirvin
110a39ae61
todo
2010-07-09 07:04:02 -07:00
Mike Macgirvin
d24038d558
country/state selector more or less working (arghhh)
2010-07-09 07:02:22 -07:00
Mike Macgirvin
d733b39b2d
direcotry cleanups
2010-07-09 03:10:28 -07:00
Mike Macgirvin
64bbf395f0
directory stuff
2010-07-09 01:17:20 -07:00
Mike Macgirvin
deaff556ff
more to resolve photo inconsitency
2010-07-09 01:12:53 -07:00
Mike Macgirvin
1eb68ca6f9
start directory view
2010-07-09 00:05:21 -07:00
Mike Macgirvin
62d6eb1918
new todo list
2010-07-08 23:50:17 -07:00
Mike Macgirvin
c60a512765
nick fix
2010-07-08 20:34:10 -07:00
Mike Macgirvin
fa8c005ca6
more nick stuff
2010-07-08 20:29:50 -07:00
Mike Macgirvin
a26f4eeff6
new nickname policy
2010-07-08 20:25:05 -07:00
Mike Macgirvin
9cd9ce9c17
update to new function defs
2010-07-08 18:12:52 -07:00
Mike Macgirvin
5ca174ae34
fix register policy
2010-07-08 17:59:19 -07:00
Mike Macgirvin
bec3d15c52
more work
2010-07-08 17:49:41 -07:00
Mike Macgirvin
d81365c123
db update script
2010-07-08 16:16:00 -07:00
Mike Macgirvin
9a6a60a9c1
mucho progress on notifier, email style dfrn url's
2010-07-08 07:03:25 -07:00
Mike Macgirvin
e98aaa3cbd
getting deeper into notifications
2010-07-08 00:18:23 -07:00
Mike Macgirvin
4b4d680dc4
sort out anon profile display and write permissions
2010-07-07 22:44:22 -07:00
Mike Macgirvin
ac48009180
add throbber image
2010-07-07 21:23:27 -07:00
Mike Macgirvin
dea552b74f
some fixes after cloning to a new site
2010-07-07 06:29:32 -07:00
Mike Macgirvin
c10e772318
schema updates
2010-07-07 05:34:07 -07:00
Mike Macgirvin
9cc49f27e6
minor stuff, getting ready for notify
2010-07-06 23:08:38 -07:00
Mike Macgirvin
1ea69ae275
bizzy
2010-07-06 05:07:28 -07:00
Mike Macgirvin
6817c5d59a
lots of work, 2way friends, comments...
2010-07-05 21:39:55 -07:00
Mike Macgirvin
3713a9291c
no need for simplepie test suite
2010-07-05 03:36:10 -07:00
Mike Macgirvin
9f7ae0e95f
Add simplepie
2010-07-05 03:34:42 -07:00
Mike Macgirvin
f5826105bf
group work, dfrn_poll
2010-07-05 03:33:02 -07:00
Mike Macgirvin
766b317070
some changes
2010-07-04 20:45:56 -07:00
U-SOUND\mike
7c890c2860
not needed
2010-07-03 22:03:35 +10:00
Mike Macgirvin
25567fa04b
use notice function
2010-07-03 01:45:23 -07:00
U-SOUND\mike
fa3073a5cf
fix typo
2010-07-03 18:36:24 +10:00
Mike Macgirvin
1270243d80
start on contact page sort order
2010-07-02 18:55:43 -07:00
Mike Macgirvin
9bd8ee1aae
more work on contact page and added new site directory
2010-07-02 18:37:43 -07:00
Mike Macgirvin
0ecfe292b0
Added database schema to repo
2010-07-02 17:25:37 -07:00
Mike Macgirvin
3e1fe042e7
use notice function instead of appending to sysmsg
2010-07-02 17:02:41 -07:00
Mike Macgirvin
b9e1a126c5
found good city/state selector
2010-07-01 20:47:01 -07:00
Mike Macgirvin
001d8e5d35
image updates
2010-07-01 20:30:30 -07:00
Mike Macgirvin
9b4ccb8f60
icon changes
2010-07-01 20:29:19 -07:00
Mike Macgirvin
21736e1c65
doc
2010-07-01 16:54:19 -07:00
Mike Macgirvin
6348e70daa
Initial checkin
2010-07-01 16:48:07 -07:00