This website requires JavaScript.
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
3bbd82abb3
Merge remote branch 'upstream/master'
2012-03-17 02:25:22 +01:00
4a6f114ec0
Merge pull request #144 from simonlnu/master
2012-03-16 18:24:26 -07:00
75883b196e
remove auto-complete from darkzero-NS, dispys, since the comment one is now global
2012-03-16 21:23:24 -04:00
49540fb958
make auto-complete work in more places
2012-03-16 21:20:23 -04:00
030c8a089a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-16 21:19:17 -04:00
c56e3c5dd4
Merge remote branch 'upstream/master'
2012-03-17 01:49:17 +01:00
8af36b92bb
Merge pull request #143 from simonlnu/master
2012-03-16 17:31:24 -07:00
368d93625d
make auto-complete in darkzero-NS. other themes can use this easily. might need to edit the id it hooks into
2012-03-16 20:29:02 -04:00
6bc2d58a98
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-16 20:26:38 -04:00
82f2bfea5b
convert boolean or int settings to strings to work around issues with template processing
2012-03-16 16:05:16 -07:00
0e9d5e0ce8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-16 18:35:50 -04:00
949c6d47b5
add "send pm" link to photo dropdown for Diaspora contacts
2012-03-16 15:19:38 -07:00
141ae076ad
Merge branch 'pull'
2012-03-16 15:08:32 -07:00
58940175e1
wrong link in d* comment notifications
2012-03-16 15:07:45 -07:00
c7dd52be62
Merge pull request #142 from simonlnu/master
2012-03-16 13:44:39 -07:00
91fee866b7
make profiles-menu disappear when clicked outside it
2012-03-16 16:43:34 -04:00
01f8710832
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-16 16:41:19 -04:00
1246a40ec2
Merge pull request #141 from CatoTH/master
2012-03-16 10:54:20 -07:00
90bb32ab73
Bugfix of old IEs
2012-03-16 17:47:40 +00:00
27054964fe
Forgot to remove a debug line
2012-03-16 17:46:26 +00:00
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
925b9c5b9c
Merge pull request #140 from simonlnu/master
2012-03-16 10:35:19 -07:00
7b15f27ba4
weee, dispys get another update
2012-03-16 13:31:59 -04:00
a8c1cbc655
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-16 13:28:22 -04:00
28f941193d
syntax error from pasted text, remove ^M's
2012-03-16 06:02:26 -07:00
224dfa848b
bug #335 network search broken after new ssl policy settings
2012-03-16 05:51:04 -07:00
805087af67
whitespace
2012-03-16 05:41:29 -07:00
be1bd9ff4e
notification for disapora comments
2012-03-16 05:19:29 -07:00
ea4c806c5c
Merge remote branch 'upstream/master'
2012-03-16 08:33:01 +01:00
74c64ef2d2
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-16 07:13:14 +01:00
47e1b8d0c0
Merge pull request #139 from simonlnu/master
2012-03-15 22:58:54 -07:00
e21bf3341b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-16 01:57:59 -04:00
d965f73ef1
missing close double quote in mail_list.tpl
2012-03-16 01:57:27 -04:00
cecd62373b
Merge pull request #138 from simonlnu/master
2012-03-15 22:56:46 -07:00
6bdb71f01c
more changes in dispy-dark
2012-03-16 01:55:34 -04:00
f727b44c08
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-16 01:51:25 -04:00
be4e4dfb0d
turn indexes back off (this is from an errant checkin a year or more ago)
2012-03-15 20:07:30 -07:00
33e03a8df0
Merge branch 'pull'
2012-03-15 19:56:32 -07:00
5a12383b78
undo git stuffup
2012-03-15 19:55:58 -07:00
0b509fd763
Merge pull request #137 from tomtom84/master
2012-03-15 19:55:10 -07:00
02395c8af5
added icons to profile_side, fixes in css
2012-03-16 03:49:43 +01:00
41d595d5bc
Merge branch 'pull'
2012-03-15 16:39:21 -07:00
7684f63ecd
track whether contact is a community page or not
2012-03-15 16:38:26 -07:00
5d2c590fa9
Merge pull request #136 from annando/master
2012-03-15 15:30:52 -07:00
5c75d40c0b
fixed the sidebar edit thingy. haven't synced dispy yet.
2012-03-15 17:27:06 -04:00
eee2eed588
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-15 17:25:22 -04:00
b5120888cf
html2bbcode: Disabled size conversion
2012-03-15 21:17:51 +01:00
9243c9fc14
Merge commit 'upstream/master'
2012-03-15 21:11:58 +01:00
ab89aa90ca
Merge pull request #135 from simonlnu/master
2012-03-15 12:08:59 -07:00
friendica
Thomas
Fabio Comuni
zottel
Simon L'nu
Simon
Tobias Hößl
Michael Vogel
Tobias Diekershoff
tomtom84
tommy tomson