aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* rev updatefriendica2012-04-202-7/+7
|
* Merge pull request #254 from simonlnu/masterSimon2012-04-2021-21/+1803
|\ | | | | add some knobs to comment boxes
| * fix the buttons. don't hide the buttons once shownSimon L'nu2012-04-204-14/+2
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * optimise imgs; add some comment editing knobsSimon L'nu2012-04-2021-21/+1815
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2010-39/+118
| |\ | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: XSRF protection and PHPdoc for mod/admin.php XSRF protection and PHPdoc for mod/admin.php * master:
| * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-20471-28/+75613
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes * master:
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master:
* | | | Merge pull request #253 from fabrixxm/masterfabrixxm2012-04-208-50/+50
|\ \ \ \ | |_|_|/ |/| | | fix bug n385
| * | | escape email template var names. fix bug n385.Fabio Comuni2012-04-208-50/+50
| | |/ | |/|
* | | Merge remote-tracking branch 'CatoTH/master' into req245Fabio Comuni2012-04-2010-39/+118
|\ \ \ | |/ / |/| |
| * | XSRF protection and PHPdoc for mod/admin.phpTobias Hößl2012-04-183-6/+15
| | |
| * | XSRF protection and PHPdoc for mod/admin.phpTobias Hößl2012-04-188-33/+103
| | |
* | | Merge pull request #252 from tomtom84/mastertomtom842012-04-19471-28/+75613
|\ \ \ | |_|/ |/| | diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
| * | diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink ↵tommy tomson2012-04-20471-28/+75613
|/ / | | | | | | and some bug/css-fixes
* | Merge pull request #251 from simonlnu/masterSimon2012-04-192-4/+2
|\ \ | | | | | | fix .item-select
| * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-190-0/+0
| |\ \ | |/ / |/| | | | | | | | | | | * remotes/upstream/master: * master:
* | | Merge pull request #250 from simonlnu/masterSimon2012-04-194-4/+5
|\ \ \ | | | | | | | | tweak drop-down and add in filebrowser
| | * | fix .item-selectSimon L'nu2012-04-192-4/+2
| |/ / | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | tweak drop-down and add in filebrowserSimon L'nu2012-04-194-4/+5
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-196-27/+237
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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:
* | | Merge pull request #248 from fabrixxm/tmcefilebrowserfabrixxm2012-04-194-2/+212
|\ \ \ | | | | | | | | TinyMCE file browser
| * | | filebrowser: fix style, show 10 recent photos if not in an albumFabio Comuni2012-04-182-2/+9
| | | |
| * | | filebrowser: more style, load min and max scale photosFabio Comuni2012-04-182-46/+57
| | | |
| * | | tinymce: add inlinepopups pluginFabio Comuni2012-04-182-2/+2
| | | |
| * | | tinymce: add filebrowser for photos and attached filesFabio Comuni2012-04-184-0/+192
| | |/ | |/|
* | | Merge pull request #249 from mschmitt/masterfabrixxm2012-04-182-25/+25
|\ \ \ | | | | | | | | EO translation fixes
| * | | Hadn't merged fixed typo from upstream.Martin Schmitt2012-04-192-2/+2
| | | |
| * | | EO translation fixesMartin Schmitt2012-04-192-27/+27
|/ / /
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-180-0/+0
| |/ |/| | | | | | | | | * remotes/upstream/master: * master:
* | Merge pull request #247 from simonlnu/masterSimon2012-04-1814-14/+14
|\ \ | | | | | | fix silly abandonded typo. shouldn't affect translations
| * | only affect immediate li childrenSimon L'nu2012-04-182-2/+2
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-180-0/+0
| |\ \ | |/ / |/| | | | | | | | | | | * remotes/upstream/master: * master:
* | | Merge pull request #246 from simonlnu/masterSimon2012-04-184-76/+105
|\ \ \ | |_|/ |/| | fix alignment issues with toolbar
| | * fix silly abandonded typo. shouldn't affect translationsSimon L'nu2012-04-1812-12/+12
| |/ | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * fix alignment issues with toolbarSimon L'nu2012-04-184-76/+105
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-1832-88/+8975
| |\ | |/ |/| | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: some css/bug-fixes messages.po/strings.php at 100% Esperanto Typo * master:
* | diabook-themes: some css/bug-fixestommy tomson2012-04-1829-86/+441
| |
* | Merge pull request #244 from mschmitt/masterfriendica2012-04-172-0/+8532
|\ \ | | | | | | Esperanto translation
| * | messages.po/strings.php at 100% EsperantoMartin Schmitt2012-04-172-0/+8532
| | |
* | | Merge pull request #243 from CatoTH/masterfriendica2012-04-171-2/+2
|\ \ \ | |/ / |/| | Typo in Constant
| * | TypoTobias Hößl2012-04-171-2/+2
|/ /
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-170-0/+0
|/ | | | | | | * remotes/upstream/master: diabook-themes: theme-settings: "wide"-option and new screenshots * master:
* diabook-themes: theme-settings: "wide"-option and new screenshotstommy tomson2012-04-1728-32/+25069
|
* Merge pull request #242 from simonlnu/masterSimon2012-04-172-10/+0
|\ | | | | [SECURITY] finish ripping out fpostit
| * [SECURITY] finish ripping out fpostitSimon L'nu2012-04-172-10/+0
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-170-0/+0
|/ | | | | | | | | | | * 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:
* Merge pull request #241 from simonlnu/masterSimon2012-04-1712-328/+0
|\ | | | | rip out fpostit
| * rip out fpostitSimon L'nu2012-04-1712-328/+0
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-04-1749-2358/+1783
|\ \
| * | diabook-themes: removed fpostit due to security issues and small fix in ↵tommy tomson2012-04-1733-754/+39
| | | | | | | | | | | | german translation