This website requires JavaScript.
329a26d62e
move community_pages to right_aside, fixes in css
2012-03-25 08:47:17 +02:00
ea29a26059
Merge branch 'pull'
2012-03-24 23:05:33 -07:00
6780b76b0c
improved the inivitations and added a bit of sales pitch.
2012-03-24 23:04:18 -07:00
1d56224b08
increase version to 1.0 for dispys \o/
2012-03-25 01:12:28 -04:00
f0b08290fc
Merge pull request #164 from simonlnu/master
2012-03-24 22:04:23 -07:00
8fe77e5b86
implement filer/file-as
2012-03-25 01:01:59 -04:00
5bd4f62210
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-25 00:59:25 -04:00
f1cb287742
bug #329 - compress the plugin list on the friendica info page
2012-03-24 21:50:04 -07:00
d06ddeb1cc
bug #346 - add oembed maxwidth to oembed request
2012-03-24 21:26:50 -07:00
8a6c407282
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-24 19:38:54 -04:00
3ae43c2448
prevent duplicate friend suggestions
2012-03-24 15:53:53 -07:00
3aacc119a1
block filed items from deletion
2012-03-24 04:16:27 -07:00
8c4fbc3b4d
add the bang
2012-03-24 03:11:45 -07:00
72c2386edf
Merge branch 'pull'
2012-03-24 02:32:15 -07:00
db5ec58863
network filter is now a permission group
2012-03-24 01:33:50 -07:00
8451b22d42
small fix in css
2012-03-24 08:56:26 +01:00
b23ad806ec
Merge pull request #163 from tomtom84/master
2012-03-24 00:15:31 -07:00
ba027f174d
add right_aside to diabook-blue
2012-03-24 08:13:48 +01:00
64397ff09f
Merge pull request #162 from tomtom84/master
2012-03-23 22:20:25 -07:00
378762fed2
add connectable services to right_aside
2012-03-24 06:17:14 +01:00
ef27af623e
Merge pull request #161 from tomtom84/master
2012-03-23 20:06:48 -07:00
d76b052f90
add PostIt to right_aside, fixes in css
2012-03-24 04:05:21 +01:00
fabd4f4d2e
Merge remote branch 'upstream/master'
2012-03-24 01:31:05 +01:00
803f79e091
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-23 10:41:55 -04:00
ce8cfb7b05
Merge pull request #160 from fabrixxm/master
2012-03-23 07:41:32 -07:00
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
14f81eca00
Merge remote branch 'upstream/master'
2012-03-23 13:29:02 +01:00
82cc86a41a
user settings: don't show emoticons
2012-03-23 12:07:22 +01:00
6f79cde024
Merge remote-tracking branch 'friendica/master'
2012-03-23 10:45:10 +01:00
c35b9ec24f
fix in css right_aside
2012-03-23 10:16:11 +01:00
5fadf68fb4
Merge remote branch 'upstream/master'
2012-03-23 08:39:00 +01:00
7706a8f9d8
small fix
2012-03-23 07:28:48 +01:00
149b3f3018
Merge pull request #159 from tomtom84/master
2012-03-22 23:03:55 -07:00
687fa80094
fix 1024resolution
2012-03-23 07:02:21 +01:00
42d231f8bf
Merge pull request #158 from tomtom84/master
2012-03-22 20:19:44 -07:00
bf4dd8ad17
add right_aside to theme diabook
2012-03-23 02:36:34 +01:00
528d795fb6
ability to change tags in edited posts
2012-03-22 16:17:10 -07:00
e7d80a79ff
Merge remote branch 'upstream/master'
2012-03-22 16:03:14 +01:00
d5a6e7b176
Merge remote-tracking branch 'friendica/master'
2012-03-22 14:56:23 +01:00
622b25df5f
Merge branch 'pull'
2012-03-22 06:20:32 -07:00
40d19d5b8c
normalise comparison link on delegation page
2012-03-22 06:19:27 -07:00
586c07681b
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-22 14:10:53 +01:00
07c5b0af5a
quattro(-green) styling the 'filed under: remove' text
2012-03-22 14:09:21 +01:00
c7dcc58673
Merge pull request #157 from campino/master
2012-03-22 05:49:08 -07:00
1e86e3fb26
it's only item.filer ;-)
2012-03-22 13:46:05 +01:00
5babf5c8b4
Merge branch 'quattrofiler'
2012-03-22 13:42:10 +01:00
6df7fae4b5
non static filer text
2012-03-22 13:41:41 +01:00
19eaed60d5
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-22 13:38:59 +01:00
9ba5fff865
new lines removed
2012-03-22 13:05:34 +01:00
43f672877f
removed some new lines to cut down number of changed files
2012-03-22 13:03:28 +01:00
ad9d0dadb3
removed unneccessary stuff
2012-03-22 12:52:24 +01:00
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
tommy tomson
friendica
Simon L'nu
Simon
tomtom84
zottel
Fabio Comuni
Tobias Diekershoff
Alexander Kampmann
Michael Vogel
tony baldwin