]>
git.mxchange.org Git - friendica.git/log
Simon L'nu [Fri, 20 Apr 2012 09:52:08 +0000 (05:52 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
XSRF protection and PHPdoc for mod/admin.php
XSRF protection and PHPdoc for mod/admin.php
* master:
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'
* remotes/upstream/master:
diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
* master:
tomtom84 [Thu, 19 Apr 2012 23:55:24 +0000 (16:55 -0700)]
Merge pull request #252 from tomtom84/master
diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
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'
* remotes/upstream/master:
* master:
Simon [Thu, 19 Apr 2012 17:41:25 +0000 (10:41 -0700)]
Merge pull request #251 from simonlnu/master
fix .item-select
Simon L'nu [Thu, 19 Apr 2012 17:02:52 +0000 (13:02 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
* master:
Simon L'nu [Thu, 19 Apr 2012 17:02:41 +0000 (13:02 -0400)]
fix .item-select
Signed-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
tweak drop-down and add in filebrowser
Simon L'nu [Thu, 19 Apr 2012 16:54:53 +0000 (12:54 -0400)]
tweak drop-down and add in filebrowser
Signed-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'
* remotes/upstream/master:
Hadn't merged fixed typo from upstream.
EO translation fixes
filebrowser: fix style, show 10 recent photos if not in an album
filebrowser: more style, load min and max scale photos
tinymce: add inlinepopups plugin
tinymce: add filebrowser for photos and attached files
* master:
fabrixxm [Thu, 19 Apr 2012 07:30:45 +0000 (00:30 -0700)]
Merge pull request #248 from fabrixxm/tmcefilebrowser
TinyMCE file browser
fabrixxm [Thu, 19 Apr 2012 06:18:50 +0000 (23:18 -0700)]
Merge pull request #249 from mschmitt/master
EO translation fixes
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'
* remotes/upstream/master:
* 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
fix silly abandonded typo. shouldn't affect translations
Simon L'nu [Wed, 18 Apr 2012 10:17:20 +0000 (06:17 -0400)]
only affect immediate li children
Signed-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'
* remotes/upstream/master:
* master:
Simon L'nu [Wed, 18 Apr 2012 10:10:34 +0000 (06:10 -0400)]
fix silly abandonded typo. shouldn't affect translations
Signed-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
fix alignment issues with toolbar
Simon L'nu [Wed, 18 Apr 2012 09:59:50 +0000 (05:59 -0400)]
fix alignment issues with toolbar
Signed-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'
* remotes/upstream/master:
diabook-themes: some css/bug-fixes
messages.po/strings.php at 100% Esperanto
Typo
* 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
Esperanto translation
friendica [Wed, 18 Apr 2012 00:09:04 +0000 (17:09 -0700)]
Merge pull request #243 from CatoTH/master
Typo in Constant
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'
* remotes/upstream/master:
diabook-themes: theme-settings: "wide"-option and new screenshots
* 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
[SECURITY] finish ripping out fpostit
Simon L'nu [Tue, 17 Apr 2012 17:21:30 +0000 (13:21 -0400)]
[SECURITY] finish ripping out fpostit
Signed-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'
* remotes/upstream/master:
update to the German string files
diabook-themes: removed fpostit due to security issues and small fix in german translation
naked br appearing when attaching and textplain
Some Bugfixes, and variable checks
rev update
* master:
Simon [Tue, 17 Apr 2012 17:16:56 +0000 (10:16 -0700)]
Merge pull request #241 from simonlnu/master
rip out fpostit
Simon L'nu [Tue, 17 Apr 2012 17:15:11 +0000 (13:15 -0400)]
rip out fpostit
Signed-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
Some bugfixes / Notices
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
friendica [Tue, 17 Apr 2012 05:58:52 +0000 (22:58 -0700)]
rev update
Simon [Tue, 17 Apr 2012 04:29:05 +0000 (21:29 -0700)]
Merge pull request #239 from simonlnu/master
multiple ui and other fixes
Simon L'nu [Tue, 17 Apr 2012 04:26:37 +0000 (00:26 -0400)]
finally fix the ui in the settings. it was fugly.... other bug fixes too
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Tue, 17 Apr 2012 02:58:28 +0000 (22:58 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: (22 commits)
diabook-themes: bugfix (sry, necessary)
diabook-themes: small bug/css-fixes ---> ver. 1.019
diabook-themes: bug-fixes
diabook-themes: minor bugfixes
turn on comment edit
propagate edited comments
edited comments weren't being relayed
rev update
diabook-themes: css-fixes
open contact edit in same window
where did this "lang" string come from and why?
function name typo
track requested profile error msg
DBA: Reverting back to original source
DBA: Nothing really done ..
DBA: Deactivation of the mysqli-class for testing purposes.
API: Improved the timeline. Several (disabled) tests with caching of photos.
html2plain: changed behaviour for the "hr" element.
API: Tweetdeck is now working
API: Added Public Timeline
...
* master:
tommy tomson [Mon, 16 Apr 2012 17:23:11 +0000 (19:23 +0200)]
diabook-themes: bugfix (sry, necessary)
tommy tomson [Mon, 16 Apr 2012 16:51:08 +0000 (18:51 +0200)]
diabook-themes: small bug/css-fixes ---> ver. 1.019
tommy tomson [Mon, 16 Apr 2012 15:12:08 +0000 (17:12 +0200)]
diabook-themes: bug-fixes
tommy tomson [Mon, 16 Apr 2012 14:05:29 +0000 (16:05 +0200)]
diabook-themes: minor bugfixes
friendica [Mon, 16 Apr 2012 10:51:48 +0000 (03:51 -0700)]
turn on comment edit
friendica [Mon, 16 Apr 2012 09:09:00 +0000 (02:09 -0700)]
propagate edited comments
friendica [Mon, 16 Apr 2012 08:35:27 +0000 (01:35 -0700)]
edited comments weren't being relayed
friendica [Sun, 15 Apr 2012 23:21:20 +0000 (16:21 -0700)]
rev update
friendica [Sun, 15 Apr 2012 23:00:07 +0000 (16:00 -0700)]
Merge pull request #238 from annando/master
API: Support of the statusnet application
tommy tomson [Sun, 15 Apr 2012 17:58:26 +0000 (19:58 +0200)]
diabook-themes: css-fixes
friendica [Sun, 15 Apr 2012 13:34:01 +0000 (06:34 -0700)]
open contact edit in same window
friendica [Sun, 15 Apr 2012 13:04:54 +0000 (06:04 -0700)]
where did this "lang" string come from and why?
friendica [Sun, 15 Apr 2012 12:12:14 +0000 (05:12 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Sun, 15 Apr 2012 12:11:52 +0000 (05:11 -0700)]
function name typo
Simon [Sun, 15 Apr 2012 07:20:12 +0000 (00:20 -0700)]
Merge pull request #237 from simonlnu/master
REALLY fix fpostit this time
Simon L'nu [Sun, 15 Apr 2012 07:18:55 +0000 (03:18 -0400)]
REALLY fix fpostit this time
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Sun, 15 Apr 2012 07:17:01 +0000 (03:17 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
* master:
Simon [Sun, 15 Apr 2012 06:14:52 +0000 (23:14 -0700)]
Merge pull request #236 from simonlnu/master
fix fpostJS, add and fix some other stuff
Simon L'nu [Sun, 15 Apr 2012 06:13:36 +0000 (02:13 -0400)]
fix fpostJS, add and fix some other stuff
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Sun, 15 Apr 2012 04:40:21 +0000 (00:40 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-themes: added js for auto-growing comment-textareas
diabook: theme-settings: add a wide-option
Another bunch of executable permission removal
Removed execution permission: lintian warning in Debian packaging
* master:
tommy tomson [Sun, 15 Apr 2012 02:39:33 +0000 (04:39 +0200)]
diabook-themes: added js for auto-growing comment-textareas
tommy tomson [Sun, 15 Apr 2012 00:50:16 +0000 (02:50 +0200)]
diabook: theme-settings: add a wide-option
friendica [Sat, 14 Apr 2012 21:50:54 +0000 (14:50 -0700)]
Merge pull request #234 from copyninja/master
Executable permisson removal on files which are not elf/script
friendica [Sat, 14 Apr 2012 21:45:09 +0000 (14:45 -0700)]
track requested profile error msg
Simon [Sat, 14 Apr 2012 20:25:51 +0000 (13:25 -0700)]
Merge pull request #235 from simonlnu/master
string fix: typo. slow down scroll to top in dispys
Simon L'nu [Sat, 14 Apr 2012 20:24:35 +0000 (16:24 -0400)]
string fix: typo. slow down scroll to top in dispys
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Sat, 14 Apr 2012 19:12:39 +0000 (15:12 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
bogus empty list element in dfrn_request page when emailnet not enabled
zrl on random profile
zrl hook
bug #372 - category feeds
pass zrl's to/through global directory
* master:
Vasudev Kamath [Sat, 14 Apr 2012 14:46:06 +0000 (20:16 +0530)]
Another bunch of executable permission removal
Vasudev Kamath [Sat, 14 Apr 2012 14:34:54 +0000 (20:04 +0530)]
Removed execution permission: lintian warning in Debian packaging
friendica [Sat, 14 Apr 2012 12:32:31 +0000 (05:32 -0700)]
bogus empty list element in dfrn_request page when emailnet not enabled
friendica [Sat, 14 Apr 2012 12:07:00 +0000 (05:07 -0700)]
zrl on random profile
friendica [Sat, 14 Apr 2012 11:54:26 +0000 (04:54 -0700)]
zrl hook
Michael Vogel [Sat, 14 Apr 2012 11:35:11 +0000 (13:35 +0200)]
DBA: Reverting back to original source
friendica [Sat, 14 Apr 2012 11:19:41 +0000 (04:19 -0700)]
bug #372 - category feeds
Michael Vogel [Sat, 14 Apr 2012 11:17:58 +0000 (13:17 +0200)]
DBA: Nothing really done ..
Michael Vogel [Sat, 14 Apr 2012 11:15:25 +0000 (13:15 +0200)]
Merge commit 'upstream/master'
friendica [Sat, 14 Apr 2012 10:51:41 +0000 (03:51 -0700)]
pass zrl's to/through global directory
Simon L'nu [Sat, 14 Apr 2012 05:34:25 +0000 (01:34 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
one more
additional marital status selectors
* master:
friendica [Sat, 14 Apr 2012 00:39:12 +0000 (17:39 -0700)]
one more
friendica [Sat, 14 Apr 2012 00:34:02 +0000 (17:34 -0700)]
additional marital status selectors
Simon [Sat, 14 Apr 2012 00:14:46 +0000 (17:14 -0700)]
Merge pull request #233 from simonlnu/master
lighten wrapper shadow a bit on dispy
Simon L'nu [Sat, 14 Apr 2012 00:14:09 +0000 (20:14 -0400)]
lighten wrapper shadow a bit on dispy
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Sat, 14 Apr 2012 00:13:30 +0000 (20:13 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
* master:
Simon [Fri, 13 Apr 2012 23:31:25 +0000 (16:31 -0700)]
Merge pull request #232 from simonlnu/master
neat little changes. hopefully the shadow will be well recieved
Simon L'nu [Fri, 13 Apr 2012 23:30:07 +0000 (19:30 -0400)]
neat little changes. hopefully the shadow will be well recieved
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Fri, 13 Apr 2012 23:26:18 +0000 (19:26 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
well that was a silly mistake...
setting wasn't being applied
rev update
diabook-themes: theme-settings: users can set font-size and line-height for posts and comments
diabook: theme-settings: users can set font-size and line-height for posts and comments
diabook-themes: small fixes
quattro: language icon in navbar
move html out of lang_selector() and new template lang_selector.tpl
display settings: show theme screenshot on page load
quattro: add admin theme settigs. darker items background with a bottom border.
admin: change global theme settings
quattro: work on "like" activitiy items less visible fixes to widths popup notification out of navbar category input in jot
validate_url allow naked subdomain if is "localhost"
* master:
friendica [Fri, 13 Apr 2012 23:12:06 +0000 (16:12 -0700)]
well that was a silly mistake...