This website requires JavaScript.
09959b1b1c
Merge pull request #375 from fermionic/diaspora-prevent-fcontact-race-conditions
2012-07-05 18:05:32 -07:00
5dcce1ed93
add some timeouts to prevent deadlock
2012-07-05 19:01:13 -06:00
d7920c4c25
term (tag, mention, category, file, etc.) table
2012-07-05 17:59:56 -07:00
8af78079cb
Merge https://github.com/friendica/friendica into pull
2012-07-05 16:06:43 -07:00
9951071b5b
rev update
2012-07-05 16:06:01 -07:00
fe984963ed
Merge pull request #373 from fermionic/more-list-fixes
2012-07-05 16:03:29 -07:00
10336651ba
Merge pull request #374 from fermionic/diaspora-prevent-fcontact-race-conditions
2012-07-05 15:57:28 -07:00
2edfc3b539
final db updates after testing
2012-07-05 14:31:19 -06:00
e0607e0238
cleanup some syntax errors in lock.php
2012-06-23 14:25:18 -06:00
75ed37fb3d
"lock" is a reserved MySQL keyword
2012-06-17 11:25:36 -06:00
46068935d0
minor cleanup in lock.php
2012-06-16 11:28:44 -06:00
20c4ecbcd9
cleanup obsolete comments
2012-06-14 21:01:59 -06:00
168ae40dd2
add rudimentary locking capability to Friendica functions
2012-06-14 20:58:25 -06:00
041aeaf4a1
fix small bug in lists and revert Diaspora list processing to non-Markdownify version
2012-07-05 12:52:20 -06:00
360c35e438
recycle symbol woes with multiple html entity encode/decode cycles going on
2012-07-04 23:24:59 -07:00
e29dd081ca
render the recycle symbol correctly on Diaspora reshares
2012-07-04 22:44:04 -07:00
f40b056e3b
some initial code and benchmarking for "red" content rendering engine
2012-07-04 20:37:15 -07:00
0990269555
restore translation of bbcode videos, events, bookmarks, etc. to diaspora
2012-07-04 19:12:09 -07:00
5589bca1e0
fix !@#$ tinymce linebreaks for the thousandth time
2012-07-04 17:15:43 -07:00
fd626022ec
add smarty engine, remove some obsolete zot1 stuff
2012-07-03 22:23:08 -07:00
13b4962531
Merge https://github.com/friendica/friendica into pull
2012-07-03 21:41:05 -07:00
c726a92a3f
punycode hostname
2012-07-03 21:40:13 -07:00
badaa68340
Diabook directory wide variants.
2012-07-04 01:08:50 +01:00
b550b1326b
Merge https://github.com/friendica/friendica into pull
2012-07-03 16:26:58 -07:00
7926a0d171
add link to shares
2012-07-03 16:26:14 -07:00
e3828fe675
Merge pull request #372 from rdc/master
2012-07-03 12:58:57 -07:00
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
14d4635be6
Merge pull request #371 from fermionic/option-to-limit-max-image-pixel-length
2012-07-02 19:12:58 -07:00
3fe5bdbd8d
add ability to set maximum pixel length of uploaded pictures
2012-06-28 10:33:21 -06:00
f7144e671c
fix diabook directory pages (only the normal style - any volunteers for the wide?)
2012-07-02 16:56:37 -07:00
ced0a208d8
fix double lines
2012-07-02 16:34:01 -07:00
64fc1318c6
Merge https://github.com/friendica/friendica into pull
2012-07-02 01:13:30 -07:00
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
a9c65dfe27
"babel" diagnostic - convert bbcode to different formats and back again
2012-07-01 23:00:25 -07:00
610c78f9e0
Merge branch 'master' of https://github.com/friendica/friendica
2012-07-02 03:41:27 +01:00
74a819980f
Various theme stuff.
2012-07-02 03:40:12 +01:00
ab2b3304dc
...and the other bit
2012-07-01 19:40:03 -07:00
e2a725ff98
pagination start off by one
2012-07-01 19:17:21 -07:00
dd71f9446b
config to disable email validation
2012-07-01 18:56:00 -07:00
696d78d658
Merge pull request #369 from rdc/master
2012-07-01 16:44:21 -07:00
c102a5f7cd
Merge pull request #370 from mschmitt/master
2012-07-01 15:37:19 -07:00
85c078f862
Esperanto -> 100%
2012-07-01 19:13:24 +02:00
2214cd74e5
Added more profile data and CSS styling to the /directory page
2012-07-01 14:46:03 +03:00
7747f6fc96
rev update
2012-06-30 17:38:02 -07:00
a3dfb55029
bug #437
2012-06-30 06:27:46 -07:00
6cc844b2f9
restore 'shareable' to feeds after recent feed privacy re-factoring
2012-06-30 05:16:30 -07:00
31718968c6
advanced profile theming
2012-06-30 01:29:29 -07:00
ffd5217ffa
Merge https://github.com/friendica/friendica into pull
2012-06-29 20:12:44 -07:00
78e03abed8
convert ent_quotes for jquery calendar title/summary
2012-06-29 20:11:36 -07:00
1b27e24bb7
Merge pull request #368 from fabrixxm/master
2012-06-29 16:34:23 -07:00
a03e6b96ea
quattro: fix Forum widget, hide edit profile link
2012-06-29 05:47:53 -04:00
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
0fb08e3642
nav: pass $baseurl to template
2012-06-29 05:29:29 -04:00
be658788de
maintain page position when hovering on pop-outs
2012-06-28 22:19:12 -07:00
7b63e5792a
more pager limits
2012-06-28 21:39:02 -07:00
43036bee98
wrong column name (- vs _)
2012-06-28 21:32:49 -07:00
0ecba60503
undefined fn
2012-06-28 21:15:43 -07:00
1830ecc9ba
remote_self feeds are not private
2012-06-28 18:52:49 -07:00
a3edbf7e5d
create third privacy state - public post but not searchable or publicly visible
2012-06-28 17:43:29 -07:00
43d3721fa9
css smiley class
2012-06-28 16:42:40 -07:00
d7f35c81db
Merge https://github.com/friendica/friendica into pull
2012-06-28 16:05:28 -07:00
de93c61e0d
remove titles in ostatus even when edited date differs from created date
2012-06-28 16:04:00 -07:00
3bd0975c07
Merge pull request #367 from simonlnu/master
2012-06-28 09:16:53 -07:00
ecf9ad9a08
fix item-delete-selected* css
2012-06-28 12:15:32 -04:00
4ae5589df7
Merge remote-tracking branch 'remotes/upstream/master'
2012-06-28 12:12:43 -04:00
26156e1dc4
Merge pull request #366 from fermionic/fix-big-monster-list-logic
2012-06-27 20:24:18 -07:00
cd9ce0ecb3
fix logic for nested lists--should be OR, not AND
2012-06-27 21:21:26 -06:00
4f488c7e3c
Merge remote-tracking branch 'remotes/upstream/master'
2012-06-27 13:11:22 -04:00
3968e71d4c
Friendicaland - couple of new 'countries'
2012-06-27 16:06:02 +01:00
04397865f9
Merge pull request #365 from ridcully/master
2012-06-27 01:36:03 -07:00
eb3bbd9081
insidious little parsing bug
2012-06-26 22:32:07 -07:00
f995a11641
have no idea why the if/endif macro block was getting printed and not processed.
2012-06-26 21:35:03 -07:00
fa2a8fa9bd
highlight js events-reminder on birthday events
2012-06-27 13:49:35 +10:00
5b35a02d26
Merge remote-tracking branch 'remotes/upstream/master'
2012-06-26 22:31:15 -04:00
b02c733967
service class restrict the email connector
2012-06-26 18:30:20 -07:00
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
0f0fb2e2f3
Merge branch 'master' of https://github.com/friendica/friendica
2012-06-26 08:33:41 +02:00
a4b407eb54
stray s
2012-06-25 22:01:32 -07:00
d32d0e2154
typos
2012-06-25 21:39:07 -07:00
78ede4744f
add event titles to discovered birthday events
2012-06-25 21:37:38 -07:00
0f0ffce1b6
change required doco
2012-06-25 21:27:34 -07:00
359a98cd22
change event behaviour so that title is required but description is not
2012-06-25 21:20:08 -07:00
fbaca4b742
event summary/title
2012-06-25 20:55:27 -07:00
53f0aee82d
Merge https://github.com/friendica/friendica into pull
2012-06-25 18:16:55 -07:00
f1991a5952
propagate remote deletes
2012-06-25 18:15:56 -07:00
32f5d4e04a
Merge pull request #364 from fermionic/diaspora-refactor-and-better-disabling
2012-06-25 18:09:39 -07:00
28526dbf21
remove possibly unnecessary checks for likes or comments created by Diaspora users
2012-06-23 12:40:53 -06:00
9e8573507e
store signature info for remote users too
2012-06-23 12:09:01 -06:00
f495ba2bcb
was passing the wrong arguments to the signature storage function
2012-06-16 11:29:56 -06:00
5773241537
add some debug logging
2012-06-12 19:05:01 -06:00
c0c50ece0f
revert extra Diaspora disabling changes to try to eliminate Mustard double-posting
2012-06-12 18:38:24 -06:00
8bb7ab88fb
Clean up the Diaspora connectivity:
2012-06-09 18:39:21 -06:00
f0b41709eb
improve remote delete forwarding
2012-06-25 17:45:33 -07:00
fad2679c7e
Merge https://github.com/friendica/friendica into pull
2012-06-25 16:05:42 -07:00
b044cd922d
typos in bbcode, add service class restrictions to jot uploads
2012-06-25 16:03:46 -07:00
c291581e13
Merge pull request #363 from simonlnu/master
2012-06-25 15:50:35 -07:00
f04647ca4b
Merge remote-tracking branch 'remotes/upstream/master'
2012-06-25 18:49:46 -04:00
939ebe16f8
fix typo and syntax error
2012-06-25 18:49:36 -04:00
33b7cd32a6
Merge pull request #362 from simonlnu/master
2012-06-25 15:43:02 -07:00
eb6bf7e7fa
fix margin of wall-item-body
2012-06-25 18:42:18 -04:00
friendica
Zach Prezkuta
Thomas Willingham
Zvi ben Yaakov (a.k.a rdc)
Martin Schmitt
Fabrixxm
Simon
Simon L'nu
Sebastian Egbers