]>
git.mxchange.org Git - friendica.git/log
Simon L'nu [Tue, 24 Apr 2012 07:33:46 +0000 (03:33 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Tue, 24 Apr 2012 05:42:48 +0000 (22:42 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Tue, 24 Apr 2012 05:41:32 +0000 (22:41 -0700)]
separate tag search from body search
friendica [Tue, 24 Apr 2012 05:22:05 +0000 (22:22 -0700)]
Merge pull request #260 from mschmitt/master
Martin Schmitt [Tue, 24 Apr 2012 04:52:36 +0000 (06:52 +0200)]
Esperanto at 100% again
friendica [Tue, 24 Apr 2012 04:10:53 +0000 (21:10 -0700)]
Merge pull request #259 from beardy-unixer/master
Thomas Willingham [Tue, 24 Apr 2012 03:55:39 +0000 (04:55 +0100)]
Improvements to diabook-dark
Thomas Willingham [Tue, 24 Apr 2012 03:54:14 +0000 (04:54 +0100)]
Merge remote-tracking branch 'upstream/master'
friendica [Tue, 24 Apr 2012 02:42:57 +0000 (19:42 -0700)]
move unfriend to standalone function for use in account removal
friendica [Tue, 24 Apr 2012 01:28:33 +0000 (18:28 -0700)]
more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips
Thomas Willingham [Tue, 24 Apr 2012 01:18:51 +0000 (02:18 +0100)]
Merge remote-tracking branch 'upstream/master'
Simon L'nu [Mon, 23 Apr 2012 22:25:14 +0000 (18:25 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Tobias Diekershoff [Mon, 23 Apr 2012 18:55:48 +0000 (20:55 +0200)]
DE strings, correction of a typo
tommy tomson [Mon, 23 Apr 2012 16:42:37 +0000 (18:42 +0200)]
diabok-themes: fixed bug in green-wide and dark-wide
tommy tomson [Mon, 23 Apr 2012 15:22:22 +0000 (17:22 +0200)]
diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders
tommy tomson [Mon, 23 Apr 2012 13:47:18 +0000 (15:47 +0200)]
diabook-themes: bugfix in admin-section
friendica [Mon, 23 Apr 2012 12:42:46 +0000 (05:42 -0700)]
allow bbcode representation of html symbols such as © by wrapping in bb brackets
friendica [Mon, 23 Apr 2012 12:16:57 +0000 (05:16 -0700)]
protect jappixmini/proxy from typo check, more work on email2 connector
Simon L'nu [Mon, 23 Apr 2012 02:22:52 +0000 (22:22 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Mon, 23 Apr 2012 02:19:02 +0000 (19:19 -0700)]
bug #388 - notify_comment received after post deleted
friendica [Sun, 22 Apr 2012 23:25:02 +0000 (16:25 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Sun, 22 Apr 2012 23:24:29 +0000 (16:24 -0700)]
don't allow non-existent themes as choices
friendica [Sun, 22 Apr 2012 22:43:24 +0000 (15:43 -0700)]
Merge pull request #258 from unary/api
friendica [Sun, 22 Apr 2012 22:41:47 +0000 (15:41 -0700)]
Merge pull request #257 from CatoTH/master
tommy tomson [Sun, 22 Apr 2012 21:58:34 +0000 (23:58 +0200)]
diabook-themes: bugfix
tommy tomson [Sun, 22 Apr 2012 20:31:44 +0000 (22:31 +0200)]
diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer
Michael Johnston [Sun, 22 Apr 2012 17:37:25 +0000 (13:37 -0400)]
api: add support for StatusNet-style media param to API
Simon L'nu [Sun, 22 Apr 2012 16:27:59 +0000 (12:27 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Tobias Hößl [Sun, 22 Apr 2012 13:31:07 +0000 (13:31 +0000)]
Merge branch 'master' of git://github.com/friendica/friendica
Tobias Hößl [Sun, 22 Apr 2012 13:28:54 +0000 (13:28 +0000)]
Add a hook
Tobias Diekershoff [Sun, 22 Apr 2012 11:13:27 +0000 (13:13 +0200)]
DE strings update
tommy tomson [Sun, 22 Apr 2012 10:59:00 +0000 (12:59 +0200)]
diabook-themes: comment-bbcode-bugfix
Simon [Sun, 22 Apr 2012 05:23:13 +0000 (22:23 -0700)]
Merge pull request #256 from simonlnu/master
Simon L'nu [Sun, 22 Apr 2012 05:22:29 +0000 (01:22 -0400)]
fix tinymce themingSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Sun, 22 Apr 2012 05:17:13 +0000 (01:17 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Sun, 22 Apr 2012 02:29:08 +0000 (19:29 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Sun, 22 Apr 2012 02:28:45 +0000 (19:28 -0700)]
rev update
tommy tomson [Sun, 22 Apr 2012 01:15:06 +0000 (03:15 +0200)]
diabook-themes: deleted obsolete diabook-folder & minor bug-fixes
Simon L'nu [Sat, 21 Apr 2012 08:34:56 +0000 (04:34 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Sat, 21 Apr 2012 08:18:46 +0000 (01:18 -0700)]
rev update
Simon [Sat, 21 Apr 2012 00:19:49 +0000 (17:19 -0700)]
Merge pull request #255 from simonlnu/master
Simon L'nu [Sat, 21 Apr 2012 00:18:47 +0000 (20:18 -0400)]
fix checkbox/radio buttons for some browsersSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Sat, 21 Apr 2012 00:16:06 +0000 (20:16 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
tommy tomson [Fri, 20 Apr 2012 23:06:17 +0000 (01:06 +0200)]
diabook-themes: add diabook-dark
tommy tomson [Fri, 20 Apr 2012 15:16:42 +0000 (17:16 +0200)]
diabook-themes: add diabook-green and some minor css/bug-fixes
friendica [Fri, 20 Apr 2012 13:31:38 +0000 (06:31 -0700)]
rev update
Simon [Fri, 20 Apr 2012 10:43:55 +0000 (03:43 -0700)]
Merge pull request #254 from simonlnu/master
fabrixxm [Fri, 20 Apr 2012 10:42:50 +0000 (03:42 -0700)]
Merge pull request #253 from fabrixxm/master
Simon L'nu [Fri, 20 Apr 2012 10:42:08 +0000 (06:42 -0400)]
fix the buttons. don't hide the buttons once shownSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Fri, 20 Apr 2012 09:56:54 +0000 (05:56 -0400)]
optimise imgs; add some comment editing knobsSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Fri, 20 Apr 2012 09:52:08 +0000 (05:52 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Fabio Comuni [Fri, 20 Apr 2012 09:39:36 +0000 (11:39 +0200)]
escape email template var names. fix bug n385.
Fabio Comuni [Fri, 20 Apr 2012 07:25:51 +0000 (09:25 +0200)]
Merge remote-tracking branch 'CatoTH/master' into req245
Simon L'nu [Fri, 20 Apr 2012 04:02:18 +0000 (00:02 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
tomtom84 [Thu, 19 Apr 2012 23:55:24 +0000 (16:55 -0700)]
Merge pull request #252 from tomtom84/master
tommy tomson [Thu, 19 Apr 2012 23:44:20 +0000 (01:44 +0200)]
diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
Simon L'nu [Thu, 19 Apr 2012 22:47:54 +0000 (18:47 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Thu, 19 Apr 2012 17:41:25 +0000 (10:41 -0700)]
Merge pull request #251 from simonlnu/master
Simon L'nu [Thu, 19 Apr 2012 17:02:52 +0000 (13:02 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 19 Apr 2012 17:02:41 +0000 (13:02 -0400)]
fix .item-selectSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon [Thu, 19 Apr 2012 16:55:36 +0000 (09:55 -0700)]
Merge pull request #250 from simonlnu/master
Simon L'nu [Thu, 19 Apr 2012 16:54:53 +0000 (12:54 -0400)]
tweak drop-down and add in filebrowserSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Thu, 19 Apr 2012 16:32:09 +0000 (12:32 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
fabrixxm [Thu, 19 Apr 2012 07:30:45 +0000 (00:30 -0700)]
Merge pull request #248 from fabrixxm/tmcefilebrowser
fabrixxm [Thu, 19 Apr 2012 06:18:50 +0000 (23:18 -0700)]
Merge pull request #249 from mschmitt/master
Martin Schmitt [Thu, 19 Apr 2012 04:51:52 +0000 (06:51 +0200)]
Hadn't merged fixed typo from upstream.
Martin Schmitt [Thu, 19 Apr 2012 04:45:54 +0000 (06:45 +0200)]
EO translation fixes
Simon L'nu [Thu, 19 Apr 2012 03:48:41 +0000 (23:48 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Fabio Comuni [Wed, 18 Apr 2012 13:15:52 +0000 (15:15 +0200)]
filebrowser: fix style, show 10 recent photos if not in an album
Fabio Comuni [Wed, 18 Apr 2012 12:56:03 +0000 (14:56 +0200)]
filebrowser: more style, load min and max scale photos
Fabio Comuni [Wed, 18 Apr 2012 12:55:21 +0000 (14:55 +0200)]
tinymce: add inlinepopups plugin
Fabio Comuni [Wed, 18 Apr 2012 11:23:42 +0000 (13:23 +0200)]
tinymce: add filebrowser for photos and attached files
Simon [Wed, 18 Apr 2012 10:20:10 +0000 (03:20 -0700)]
Merge pull request #247 from simonlnu/master
Simon L'nu [Wed, 18 Apr 2012 10:17:20 +0000 (06:17 -0400)]
only affect immediate li childrenSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Wed, 18 Apr 2012 10:11:54 +0000 (06:11 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Wed, 18 Apr 2012 10:10:34 +0000 (06:10 -0400)]
fix silly abandonded typo. shouldn't affect translationsSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon [Wed, 18 Apr 2012 10:01:02 +0000 (03:01 -0700)]
Merge pull request #246 from simonlnu/master
Simon L'nu [Wed, 18 Apr 2012 09:59:50 +0000 (05:59 -0400)]
fix alignment issues with toolbarSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Tobias Hößl [Wed, 18 Apr 2012 07:36:48 +0000 (07:36 +0000)]
XSRF protection and PHPdoc for mod/admin.php
Tobias Hößl [Wed, 18 Apr 2012 07:24:47 +0000 (07:24 +0000)]
XSRF protection and PHPdoc for mod/admin.php
Simon L'nu [Wed, 18 Apr 2012 04:24:33 +0000 (00:24 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
tommy tomson [Wed, 18 Apr 2012 00:36:30 +0000 (02:36 +0200)]
diabook-themes: some css/bug-fixes
friendica [Wed, 18 Apr 2012 00:09:16 +0000 (17:09 -0700)]
Merge pull request #244 from mschmitt/master
friendica [Wed, 18 Apr 2012 00:09:04 +0000 (17:09 -0700)]
Merge pull request #243 from CatoTH/master
Martin Schmitt [Tue, 17 Apr 2012 20:50:44 +0000 (22:50 +0200)]
messages.po/strings.php at 100% Esperanto
Simon L'nu [Tue, 17 Apr 2012 19:36:45 +0000 (15:36 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Tobias Hößl [Tue, 17 Apr 2012 19:31:06 +0000 (19:31 +0000)]
Typo
tommy tomson [Tue, 17 Apr 2012 17:45:53 +0000 (19:45 +0200)]
diabook-themes: theme-settings: "wide"-option and new screenshots
Simon [Tue, 17 Apr 2012 17:22:39 +0000 (10:22 -0700)]
Merge pull request #242 from simonlnu/master
Simon L'nu [Tue, 17 Apr 2012 17:21:30 +0000 (13:21 -0400)]
[SECURITY] finish ripping out fpostitSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Tue, 17 Apr 2012 17:17:13 +0000 (13:17 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Tue, 17 Apr 2012 17:16:56 +0000 (10:16 -0700)]
Merge pull request #241 from simonlnu/master
Simon L'nu [Tue, 17 Apr 2012 17:15:11 +0000 (13:15 -0400)]
rip out fpostitSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Tobias Diekershoff [Tue, 17 Apr 2012 16:07:20 +0000 (18:07 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Tue, 17 Apr 2012 16:06:28 +0000 (18:06 +0200)]
update to the German string files
tommy tomson [Tue, 17 Apr 2012 14:15:49 +0000 (16:15 +0200)]
diabook-themes: removed fpostit due to security issues and small fix in german translation
friendica [Tue, 17 Apr 2012 13:50:09 +0000 (06:50 -0700)]
Merge pull request #240 from CatoTH/master
friendica [Tue, 17 Apr 2012 13:11:41 +0000 (06:11 -0700)]
naked br appearing when attaching and textplain
Tobias Hößl [Tue, 17 Apr 2012 11:33:50 +0000 (11:33 +0000)]
Some Bugfixes, and variable checks
friendica [Tue, 17 Apr 2012 05:59:09 +0000 (22:59 -0700)]
Merge https://github.com/friendica/friendica into pull
projects / friendica.git / log