This website requires JavaScript.
cea7ca1df4
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-22 12:50:02 +01:00
29900febb3
removed problem from previous commit
2012-03-22 12:45:11 +01:00
f208e7af36
tests for the template engine
2012-03-22 12:43:03 +01:00
54c08b2b0f
adding filer functionality to quattro(-green)
2012-03-22 12:41:51 +01:00
808180ce5f
missing tooltip for "file as"
2012-03-22 04:07:37 -07:00
5f7715529d
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-22 11:54:09 +01:00
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
3f3c4aec79
Merge remote branch 'upstream/master'
2012-03-22 09:16:10 +01:00
576eb6cc38
Merge pull request #156 from tomtom84/master
2012-03-21 22:57:29 -07:00
e37c4f69b4
add file_as-option to diabook-derivates
2012-03-22 06:54:18 +01:00
8e29669b81
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-22 01:29:55 -04:00
5189a56ef8
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-22 06:27:13 +01:00
d81256d7b0
support lowercase :-p smilie
2012-03-21 21:45:45 -07:00
ec890f3ce2
Merge branch 'pull'
2012-03-21 21:43:10 -07:00
f1bbe03df1
work around doubled linefeeds in tinymce3.5b2
2012-03-21 21:42:27 -07:00
294d39f96f
Merge pull request #155 from tomtom84/master
2012-03-21 20:39:19 -07:00
72d0756fa6
add icons to aside diabook, fixes in css
2012-03-22 04:33:21 +01:00
c1d6ece98e
revert permissions relaxation on community
2012-03-21 14:56:06 -07:00
89028f2e2f
add comix-plain
2012-03-21 13:55:37 -07:00
56495e04b2
smooth the comix comment box
2012-03-21 06:48:04 -07:00
3ad02a749b
make autocomplete work with updated tinymce
2012-03-21 05:27:08 -07:00
792edfe9c8
New parameter in html2plain for plain text exports. More compatibility in API
2012-03-21 10:08:40 +01:00
1a98f3c067
ika to ica
2012-03-21 00:35:33 -07:00
86d8d3f442
private file in repository
2012-03-21 00:34:12 -07:00
88bbc5e0bc
Merge remote branch 'upstream/master'
2012-03-21 08:08:23 +01:00
adcf52d02d
facepark is unsupported ATM
2012-03-21 00:08:06 -07:00
db02eebde1
Merge branch 'pull'
2012-03-20 23:59:02 -07:00
6c7b619b34
remove stray template variable from old code
2012-03-20 23:57:33 -07:00
efd7c14c24
Merge pull request #154 from tonybaldwin/master
2012-03-20 23:31:12 -07:00
0dc4c3f484
add comix theme
2012-03-20 22:54:20 -07:00
4d39b0658f
use password field for DB input
2012-03-20 22:53:19 -07:00
e5c29fcc78
Merge remote branch 'upstream/master'
2012-03-21 01:36:23 -04:00
cf17606d0f
added Vijay's theme from facepark.in
2012-03-21 01:33:48 -04:00
b4a2dae085
added README to mcefixes to explain what is going on.
2012-03-20 21:04:09 -07:00
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
810e69ef0a
more friend suggestions
2012-03-20 19:06:26 -07:00
be50cc03b8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-20 21:41:34 -04:00
ef33cfcc9a
move friend suggestions to top of contact page, add default contact profile photos if missing
2012-03-20 16:05:32 -07:00
def0e35e21
Merge branch 'pull'
2012-03-20 15:45:32 -07:00
a72a23b6d6
missed a default profile photo replacement in notifications
2012-03-20 15:43:34 -07:00
894278dbcc
change default profile photo to something more interesting than a reddish brown square
2012-03-20 15:41:06 -07:00
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
d71cbb3034
Merge pull request #153 from simonlnu/master
2012-03-20 08:39:42 -07:00
de0298e67e
some tweakings for intro boxes (finally got an intro i could see :). dispy synced with dispy-dark
2012-03-20 11:37:51 -04:00
f4ca441148
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-20 11:33:52 -04:00
9df7972993
bug #339 - lostpass sending to username, not email
2012-03-20 01:50:20 -07:00
5642e9fa38
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-20 03:20:37 -04:00
cf34766416
Merge remote branch 'upstream/master'
2012-03-20 08:08:42 +01:00
5a5aadb743
add IP address to failed login log message
2012-03-19 21:58:21 -07:00
f7e380cdc6
Merge pull request #152 from beardy-unixer/84f8e2eaa87c90473ce79ebcd4f76f3657258f27
2012-03-19 15:56:16 -07:00
64a2b00cdc
Merge remote-tracking branch 'main/master'
2012-03-19 22:33:06 +00:00
84f8e2eaa8
modified: include/text.php Stupid bug fixed
2012-03-19 22:32:19 +00:00
a156ce196e
Merge pull request #150 from fabrixxm/master
2012-03-19 15:29:32 -07:00
b8f6312408
cleanup after openid refactoring
2012-03-19 15:10:14 -07:00
9e133d6412
refactor openid logins/registrations
2012-03-19 15:03:09 -07:00
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
2012-03-19 21:59:06 +00:00
4f927392f8
Merge remote-tracking branch 'main/master'
2012-03-19 21:53:13 +00:00
e193091dfe
Merge remote-tracking branch 'friendica/master'
2012-03-19 16:41:32 +01:00
139a86dbd3
some openid fixes, use identity url from openid server and normalise it.
2012-03-19 06:48:11 -07:00
2b3b97df09
Merge remote branch 'upstream/master'
2012-03-19 12:32:07 +01:00
ea4be0db89
Merge remote-tracking branch 'friendica/master'
2012-03-19 12:24:40 +01:00
2349852b4a
support "no_smilies"
2012-03-19 03:18:39 -07:00
6d31e3d6ef
Merge remote branch 'upstream/master'
2012-03-19 09:34:39 +01:00
cf2edb5b9a
ctrl + left|right cursor keys to prev/next photos
2012-03-19 01:20:53 -07:00
236eaf6ed0
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-19 03:41:26 -04:00
283bc51acf
Merge pull request #149 from CatoTH/master
2012-03-19 00:40:51 -07:00
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
cca524495c
community discovery cont., cleanup of DB debugging
2012-03-18 22:12:36 -07:00
5e2a9c99a6
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-18 21:09:25 -04:00
02786d6ed0
Merge branch 'pull'
2012-03-18 17:57:54 -07:00
37f4cbd732
revup
2012-03-18 17:57:29 -07:00
c286681158
Merge pull request #147 from CatoTH/master
2012-03-18 17:54:12 -07:00
6aab641bfd
Merge pull request #148 from simonlnu/master
2012-03-18 15:47:25 -07:00
e84095182f
fix the comment box being too wide and looking off-kilter
2012-03-18 18:33:38 -04:00
3393d80ac1
API: added max_id
2012-03-18 19:00:24 +01:00
77e77027b4
API: Now threading seems to work
2012-03-18 18:21:51 +01:00
6f10142b2e
API: Seesmic is now working. Optimizing text export.
2012-03-18 17:52:51 +01:00
8b13358ce3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-18 12:02:33 -04:00
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
09ed17df99
Merge pull request #146 from CatoTH/master
2012-03-18 03:59:49 -07:00
72894b0e91
replace split() by explode(); split is deprecated
2012-03-18 10:36:49 +00:00
751e4181e5
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-18 07:19:20 +01:00
4bb280bc2f
lost changes to tinymce/bbcode
2012-03-17 22:18:21 -07:00
9e731506c2
remove admin view of local directory
2012-03-17 22:14:17 -07:00
67fd539f53
bug #337 , call template_unescape() only at the end of template processing
2012-03-17 18:15:36 -07:00
939c8d3c8d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-17 20:03:34 -04:00
df78c9be0b
Merge remote branch 'upstream/master'
2012-03-18 01:02:30 +01:00
5fd03583a4
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-17 12:29:21 +01:00
f5db142d93
Quotes with author are now having an "open/close" link
2012-03-17 12:15:59 +01:00
94fac6d767
queue optimisation - back off delivery attempts to once per hour after the first 12 hours.
2012-03-17 03:43:02 -07:00
8a1f175df0
New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements
2012-03-17 11:07:49 +01:00
26258bca77
compare ssl_policy precisely in case somebody was bitten by template processor bug
2012-03-17 02:36:59 -07:00
e0e008fb8d
template processor broken with foreach k=>v and k is integer 0
2012-03-17 02:26:52 -07:00
96da328acf
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-17 08:44:36 +01:00
c7759af8c5
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-17 03:23:46 -04:00
057a142b8c
cut/paste error
2012-03-17 00:08:52 -07:00
511d8a30a0
scheme checking for webservers without $_SERVER['HTTPS']
2012-03-16 23:51:49 -07:00
2785bb413e
Merge pull request #145 from simonlnu/master
2012-03-16 23:05:37 -07:00
87fdae2dd8
[fix] whitespace in photo_view and like_noshare. dispy-dark clean up
2012-03-17 01:55:40 -04:00
2b06b081d3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-17 01:47:53 -04:00
Alexander Kampmann
Tobias Diekershoff
friendica
zottel
tomtom84
tommy tomson
Simon L'nu
Michael Vogel
tony baldwin
Simon
Thomas
Fabio Comuni
Tobias Hößl