-
0630120455
filebrowser: more style, load min and max scale photos
Fabio Comuni
2012-04-18 14:56:03 +02:00
-
56efb42223
tinymce: add inlinepopups plugin
Fabio Comuni
2012-04-18 14:55:21 +02:00
-
e2e6b56c44
tinymce: add filebrowser for photos and attached files
Fabio Comuni
2012-04-18 13:23:42 +02:00
-
91d1ef36d8
Merge pull request #247 from simonlnu/master
Simon
2012-04-18 03:20:10 -07:00
-
-
a30ea16218
only affect immediate li children
Simon L'nu
2012-04-18 06:17:20 -04:00
-
4b9bcb39e0
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-18 06:11:54 -04:00
-
-
-
-
311f39f12f
fix silly abandonded typo. shouldn't affect translations
Simon L'nu
2012-04-18 06:10:34 -04:00
-
b7bda7530f
Merge pull request #246 from simonlnu/master
Simon
2012-04-18 03:01:02 -07:00
-
-
-
-
af3e37ce20
fix alignment issues with toolbar
Simon L'nu
2012-04-18 05:59:50 -04:00
-
b885fedee1
XSRF protection and PHPdoc for mod/admin.php
Tobias Hößl
2012-04-18 07:36:48 +00:00
-
d7e750ad74
XSRF protection and PHPdoc for mod/admin.php
Tobias Hößl
2012-04-18 07:24:47 +00:00
-
-
-
f087fd5581
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-18 00:24:33 -04:00
-
-
-
-
1b6c84d8f4
diabook-themes: some css/bug-fixes
tommy tomson
2012-04-18 02:36:30 +02:00
-
c53d4498b8
Merge pull request #244 from mschmitt/master
friendica
2012-04-17 17:09:16 -07:00
-
-
34144a3b4a
Merge pull request #243 from CatoTH/master
friendica
2012-04-17 17:09:04 -07:00
-
-
2fbd5127ba
messages.po/strings.php at 100% Esperanto
Martin Schmitt
2012-04-17 22:50:44 +02:00
-
-
-
74b237d46d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-17 15:36:45 -04:00
-
-
-
e3af818263
Typo
Tobias Hößl
2012-04-17 19:31:06 +00:00
-
-
5b407b5ee7
diabook-themes: theme-settings: "wide"-option and new screenshots
tommy tomson
2012-04-17 19:45:53 +02:00
-
97c50a0924
Merge pull request #242 from simonlnu/master
Simon
2012-04-17 10:22:39 -07:00
-
-
f4ff75cace
[SECURITY] finish ripping out fpostit
Simon L'nu
2012-04-17 13:21:30 -04:00
-
d92bab6693
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-17 13:17:13 -04:00
-
-
04af5d9e2c
Merge pull request #241 from simonlnu/master
Simon
2012-04-17 10:16:56 -07:00
-
-
1b2209fb3c
rip out fpostit
Simon L'nu
2012-04-17 13:15:11 -04:00
-
dbff4252d4
Merge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff
2012-04-17 18:07:20 +02:00
-
-
757e3429ac
update to the German string files
Tobias Diekershoff
2012-04-17 18:06:28 +02:00
-
b30c761aae
diabook-themes: removed fpostit due to security issues and small fix in german translation
tommy tomson
2012-04-17 16:15:49 +02:00
-
8269d6aa19
Merge pull request #240 from CatoTH/master
friendica
2012-04-17 06:50:09 -07:00
-
-
e6330e3b96
naked br appearing when attaching and textplain
friendica
2012-04-17 06:11:41 -07:00
-
720c8324c7
Some Bugfixes, and variable checks
Tobias Hößl
2012-04-17 11:33:50 +00:00
-
-
a742199035
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-16 22:59:09 -07:00
-
-
7ebca2b37d
rev update
friendica
2012-04-16 22:58:52 -07:00
-
621bf6bab4
Merge pull request #239 from simonlnu/master
Simon
2012-04-16 21:29:05 -07:00
-
-
-
68e1523496
finally fix the ui in the settings. it was fugly.... other bug fixes too
Simon L'nu
2012-04-17 00:26:37 -04:00
-
4e967fc79f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-16 22:58:28 -04:00
-
-
-
f08844a8a5
diabook-themes: bugfix (sry, necessary)
tommy tomson
2012-04-16 19:23:11 +02:00
-
15dc8f4b21
diabook-themes: small bug/css-fixes ---> ver. 1.019
tommy tomson
2012-04-16 18:51:08 +02:00
-
b32a731517
diabook-themes: bug-fixes
tommy tomson
2012-04-16 17:12:08 +02:00
-
947b6073b1
diabook-themes: minor bugfixes
tommy tomson
2012-04-16 16:05:29 +02:00
-
-
041f74dc77
Merge remote branch 'upstream/master'
zottel
2012-04-16 13:53:05 +02:00
-
-
-
-
fd2f7dd6ae
turn on comment edit
friendica
2012-04-16 03:51:48 -07:00
-
0b838e4cc7
propagate edited comments
friendica
2012-04-16 02:09:00 -07:00
-
c8598e7da6
edited comments weren't being relayed
friendica
2012-04-16 01:35:27 -07:00
-
37bb3c330d
rev update
friendica
2012-04-15 16:21:20 -07:00
-
93df525f5c
Merge pull request #238 from annando/master
friendica
2012-04-15 16:00:07 -07:00
-
-
b5c164bf2f
diabook-themes: css-fixes
tommy tomson
2012-04-15 19:58:26 +02:00
-
a147d6113c
Merge commit 'upstream/master'
Michael Vogel
2012-04-15 16:49:54 +02:00
-
-
-
-
-
f994f9abc6
open contact edit in same window
friendica
2012-04-15 06:34:01 -07:00
-
c4e8ef330e
where did this "lang" string come from and why?
friendica
2012-04-15 06:04:54 -07:00
-
97715c73fc
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-15 05:12:14 -07:00
-
-
0a3454c841
function name typo
friendica
2012-04-15 05:11:52 -07:00
-
a2c4ce7487
Merge remote branch 'upstream/master'
zottel
2012-04-15 14:11:11 +02:00
-
-
-
-
f299749758
Merge pull request #237 from simonlnu/master
Simon
2012-04-15 00:20:12 -07:00
-
-
6a2f0eb475
REALLY fix fpostit this time
Simon L'nu
2012-04-15 03:18:55 -04:00
-
d90076b01a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-15 03:17:01 -04:00
-
-
4572179a24
Merge pull request #236 from simonlnu/master
Simon
2012-04-14 23:14:52 -07:00
-
-
d836be1dc3
fix fpostJS, add and fix some other stuff
Simon L'nu
2012-04-15 02:13:36 -04:00
-
adc932a5e2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-15 00:40:21 -04:00
-
-
dddf3307af
diabook-themes: added js for auto-growing comment-textareas
tommy tomson
2012-04-15 04:39:33 +02:00
-
170c15ceb9
diabook: theme-settings: add a wide-option
tommy tomson
2012-04-15 02:50:16 +02:00
-
31b1d353b2
Merge pull request #234 from copyninja/master
friendica
2012-04-14 14:50:54 -07:00
-
-
0939029b74
track requested profile error msg
friendica
2012-04-14 14:45:09 -07:00
-
4ef5b9c4e3
Merge pull request #235 from simonlnu/master
Simon
2012-04-14 13:25:51 -07:00
-
-
6278b2a923
string fix: typo. slow down scroll to top in dispys
Simon L'nu
2012-04-14 16:24:35 -04:00
-
1dd22be4d2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-14 15:12:39 -04:00
-
-
-
-
41d74c0868
Another bunch of executable permission removal
Vasudev Kamath
2012-04-14 20:16:06 +05:30
-
626bb57e1d
Removed execution permission: lintian warning in Debian packaging
Vasudev Kamath
2012-04-14 20:04:54 +05:30
-
6591b292a1
bogus empty list element in dfrn_request page when emailnet not enabled
friendica
2012-04-14 05:32:31 -07:00
-
6af4183302
zrl on random profile
friendica
2012-04-14 05:07:00 -07:00
-
f4ea764aaf
zrl hook
friendica
2012-04-14 04:54:26 -07:00
-
e825a73f1d
DBA: Reverting back to original source
Michael Vogel
2012-04-14 13:35:11 +02:00
-
9dd0ef2aeb
bug #372 - category feeds
friendica
2012-04-14 04:19:41 -07:00
-
eb27c32065
DBA: Nothing really done ..
Michael Vogel
2012-04-14 13:17:58 +02:00
-
4e220ec391
Merge commit 'upstream/master'
Michael Vogel
2012-04-14 13:15:25 +02:00
-
-
-
-
188829ed46
Merge remote branch 'upstream/master'
Michael
2012-04-14 13:03:40 +02:00
-
-
-
-
0d869ceb65
pass zrl's to/through global directory
friendica
2012-04-14 03:51:41 -07:00
-
-
-
16f729912a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-14 01:34:25 -04:00
-
-
7c63ca8364
one more
friendica
2012-04-13 17:39:12 -07:00
-
0d0aa7495b
additional marital status selectors
friendica
2012-04-13 17:34:02 -07:00
-
1a0995f1bb
Merge pull request #233 from simonlnu/master
Simon
2012-04-13 17:14:46 -07:00
-
-
96cda3136b
lighten wrapper shadow a bit on dispy
Simon L'nu
2012-04-13 20:14:09 -04:00
-
13930e9a80
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-13 20:13:30 -04:00
-
-
5877587e6e
Merge pull request #232 from simonlnu/master
Simon
2012-04-13 16:31:25 -07:00
-
-
6b46fe3dfe
neat little changes. hopefully the shadow will be well recieved
Simon L'nu
2012-04-13 19:30:07 -04:00
-
a3d95f79f2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-13 19:26:18 -04:00
-
-
-
-
bfb821e918
well that was a silly mistake...
friendica
2012-04-13 16:12:06 -07:00
-
d1b57d6e74
setting wasn't being applied
friendica
2012-04-13 15:37:25 -07:00
-
e71f01b549
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-13 14:44:57 -07:00
-
-
dfe774179a
rev update
friendica
2012-04-13 14:44:37 -07:00
-
a300616bcb
diabook-themes: theme-settings: users can set font-size and line-height for posts and comments
tommy tomson
2012-04-13 22:08:13 +02:00
-
1ab69c2720
Merge pull request #231 from tomtom84/master
tomtom84
2012-04-13 12:36:07 -07:00
-
-
2c843466a9
diabook: theme-settings: users can set font-size and line-height for posts and comments
tommy tomson
2012-04-13 21:34:21 +02:00
-
-
615cd53e51
diabook-themes: small fixes
tommy tomson
2012-04-13 18:28:11 +02:00
-
-
11ba88b6d2
Merge pull request #230 from fabrixxm/master
friendica
2012-04-13 06:02:18 -07:00
-
-
f6e1ddf7fb
Merge remote-tracking branch 'friendica/master'
Fabio Comuni
2012-04-13 11:59:25 +02:00
-
-
-
-
469710893d
quattro: language icon in navbar
Fabio Comuni
2012-04-13 11:56:56 +02:00
-
4496d075e5
move html out of lang_selector() and new template lang_selector.tpl
Fabio Comuni
2012-04-13 11:56:21 +02:00
-
fdf50b8574
display settings: show theme screenshot on page load
Fabio Comuni
2012-04-13 11:55:36 +02:00
-
7aa3b92f4c
quattro: add admin theme settigs. darker items background with a bottom border.
Fabio Comuni
2012-04-13 11:21:15 +02:00
-
138a0e06b8
admin: change global theme settings
Fabio Comuni
2012-04-13 11:20:05 +02:00