Simon L'nu
1c88a7ef5d
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:
2012-04-20 05:52:08 -04:00
Fabio Comuni
6af5a3a485
escape email template var names. fix bug n385.
2012-04-20 11:39:36 +02:00
Fabio Comuni
3bb785fdad
Merge remote-tracking branch 'CatoTH/master' into req245
2012-04-20 09:25:51 +02:00
Simon L'nu
83683b516e
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:
2012-04-20 00:02:18 -04:00
tomtom84
c88dd1485f
Merge pull request #252 from tomtom84/master
...
diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
2012-04-19 16:55:24 -07:00
tommy tomson
f5f1956e8b
diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
2012-04-20 01:44:21 +02:00
Simon L'nu
ccdac0cd99
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-04-19 18:47:54 -04:00
Simon
4a292e4137
Merge pull request #251 from simonlnu/master
...
fix .item-select
2012-04-19 10:41:25 -07:00
Simon L'nu
6055d636ed
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-04-19 13:02:52 -04:00
Simon L'nu
05173d0a8a
fix .item-select
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-19 13:02:41 -04:00
Simon
51967edfe8
Merge pull request #250 from simonlnu/master
...
tweak drop-down and add in filebrowser
2012-04-19 09:55:36 -07:00
Simon L'nu
4fd1a17f06
tweak drop-down and add in filebrowser
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-19 12:54:53 -04:00
Simon L'nu
caa6bc96f3
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:
2012-04-19 12:32:09 -04:00
fabrixxm
44f4b4b9d1
Merge pull request #248 from fabrixxm/tmcefilebrowser
...
TinyMCE file browser
2012-04-19 00:30:45 -07:00
fabrixxm
42e120586c
Merge pull request #249 from mschmitt/master
...
EO translation fixes
2012-04-18 23:18:50 -07:00
Martin Schmitt
25f6753a1f
Hadn't merged fixed typo from upstream.
2012-04-19 06:51:52 +02:00
Martin Schmitt
7e3c183601
EO translation fixes
2012-04-19 06:45:54 +02:00
Simon L'nu
5916bc6539
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-04-18 23:48:41 -04:00
Fabio Comuni
fddf21d983
filebrowser: fix style, show 10 recent photos if not in an album
2012-04-18 15:15:52 +02:00
Fabio Comuni
0630120455
filebrowser: more style, load min and max scale photos
2012-04-18 14:56:03 +02:00
Fabio Comuni
56efb42223
tinymce: add inlinepopups plugin
2012-04-18 14:55:21 +02:00
Fabio Comuni
e2e6b56c44
tinymce: add filebrowser for photos and attached files
2012-04-18 13:23:42 +02:00
Simon
91d1ef36d8
Merge pull request #247 from simonlnu/master
...
fix silly abandonded typo. shouldn't affect translations
2012-04-18 03:20:10 -07:00
Simon L'nu
a30ea16218
only affect immediate li children
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-18 06:17:20 -04:00
Simon L'nu
4b9bcb39e0
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-04-18 06:11:54 -04:00
Simon L'nu
311f39f12f
fix silly abandonded typo. shouldn't affect translations
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-18 06:10:34 -04:00
Simon
b7bda7530f
Merge pull request #246 from simonlnu/master
...
fix alignment issues with toolbar
2012-04-18 03:01:02 -07:00
Simon L'nu
af3e37ce20
fix alignment issues with toolbar
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-18 05:59:50 -04:00
Tobias Hößl
b885fedee1
XSRF protection and PHPdoc for mod/admin.php
2012-04-18 07:36:48 +00:00
Tobias Hößl
d7e750ad74
XSRF protection and PHPdoc for mod/admin.php
2012-04-18 07:24:47 +00:00
Simon L'nu
f087fd5581
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:
2012-04-18 00:24:33 -04:00
tommy tomson
1b6c84d8f4
diabook-themes: some css/bug-fixes
2012-04-18 02:36:30 +02:00
friendica
c53d4498b8
Merge pull request #244 from mschmitt/master
...
Esperanto translation
2012-04-17 17:09:16 -07:00
friendica
34144a3b4a
Merge pull request #243 from CatoTH/master
...
Typo in Constant
2012-04-17 17:09:04 -07:00
Martin Schmitt
2fbd5127ba
messages.po/strings.php at 100% Esperanto
2012-04-17 22:50:44 +02:00
Simon L'nu
74b237d46d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: theme-settings: "wide"-option and new screenshots
* master:
2012-04-17 15:36:45 -04:00
Tobias Hößl
e3af818263
Typo
2012-04-17 19:31:06 +00:00
tommy tomson
5b407b5ee7
diabook-themes: theme-settings: "wide"-option and new screenshots
2012-04-17 19:45:53 +02:00
Simon
97c50a0924
Merge pull request #242 from simonlnu/master
...
[SECURITY] finish ripping out fpostit
2012-04-17 10:22:39 -07:00
Simon L'nu
f4ff75cace
[SECURITY] finish ripping out fpostit
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-17 13:21:30 -04:00
Simon L'nu
d92bab6693
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:
2012-04-17 13:17:13 -04:00
Simon
04af5d9e2c
Merge pull request #241 from simonlnu/master
...
rip out fpostit
2012-04-17 10:16:56 -07:00
Simon L'nu
1b2209fb3c
rip out fpostit
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-17 13:15:11 -04:00
Tobias Diekershoff
dbff4252d4
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-17 18:07:20 +02:00
Tobias Diekershoff
757e3429ac
update to the German string files
2012-04-17 18:06:28 +02:00
tommy tomson
b30c761aae
diabook-themes: removed fpostit due to security issues and small fix in german translation
2012-04-17 16:15:49 +02:00
friendica
8269d6aa19
Merge pull request #240 from CatoTH/master
...
Some bugfixes / Notices
2012-04-17 06:50:09 -07:00
friendica
e6330e3b96
naked br appearing when attaching and textplain
2012-04-17 06:11:41 -07:00
Tobias Hößl
720c8324c7
Some Bugfixes, and variable checks
2012-04-17 11:33:50 +00:00
friendica
a742199035
Merge https://github.com/friendica/friendica into pull
2012-04-16 22:59:09 -07:00
