| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-20 | 471 | -28/+75613 |
| |\ | | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes * master: | ||||
| | * | Merge pull request #252 from tomtom84/master | tomtom84 | 2012-04-19 | 471 | -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 tomson | 2012-04-20 | 471 | -28/+75613 |
| | |/ | | | | | | | and some bug/css-fixes | ||||
| * / | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-19 | 0 | -0/+0 |
| |/ | | | | | | * remotes/upstream/master: * master: | ||||
| * | Merge pull request #251 from simonlnu/master | Simon | 2012-04-19 | 2 | -4/+2 |
| |\ | | | | | fix .item-select | ||||
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-19 | 0 | -0/+0 |
| | |\ | |/ |/| | | | | | | | * remotes/upstream/master: * master: | ||||
| * | | Merge pull request #250 from simonlnu/master | Simon | 2012-04-19 | 4 | -4/+5 |
| |\ \ | | | | | | | tweak drop-down and add in filebrowser | ||||
| | | * | fix .item-select | Simon L'nu | 2012-04-19 | 2 | -4/+2 |
| | |/ | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | tweak drop-down and add in filebrowser | Simon L'nu | 2012-04-19 | 4 | -4/+5 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-19 | 6 | -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/tmcefilebrowser | fabrixxm | 2012-04-19 | 4 | -2/+212 |
| |\ \ | | | | | | | TinyMCE file browser | ||||
| | * | | filebrowser: fix style, show 10 recent photos if not in an album | Fabio Comuni | 2012-04-18 | 2 | -2/+9 |
| | | | | |||||
| | * | | filebrowser: more style, load min and max scale photos | Fabio Comuni | 2012-04-18 | 2 | -46/+57 |
| | | | | |||||
| | * | | tinymce: add inlinepopups plugin | Fabio Comuni | 2012-04-18 | 2 | -2/+2 |
| | | | | |||||
| | * | | tinymce: add filebrowser for photos and attached files | Fabio Comuni | 2012-04-18 | 4 | -0/+192 |
| | | | | |||||
| * | | | Merge pull request #249 from mschmitt/master | fabrixxm | 2012-04-18 | 2 | -25/+25 |
| |\ \ \ | | | | | | | | | EO translation fixes | ||||
| | * | | | Hadn't merged fixed typo from upstream. | Martin Schmitt | 2012-04-19 | 2 | -2/+2 |
| | | | | | |||||
| | * | | | EO translation fixes | Martin Schmitt | 2012-04-19 | 2 | -27/+27 |
| |/ / / | |||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-18 | 0 | -0/+0 |
| | |/ |/| | | | | | | | | | * remotes/upstream/master: * master: | ||||
| * | | Merge pull request #247 from simonlnu/master | Simon | 2012-04-18 | 14 | -14/+14 |
| |\ \ | | | | | | | fix silly abandonded typo. shouldn't affect translations | ||||
| | * | | only affect immediate li children | Simon L'nu | 2012-04-18 | 2 | -2/+2 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-18 | 0 | -0/+0 |
| | |\ \ | |/ / |/| | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| * | | | Merge pull request #246 from simonlnu/master | Simon | 2012-04-18 | 4 | -76/+105 |
| |\ \ \ | |_|/ |/| | | fix alignment issues with toolbar | ||||
| | | * | fix silly abandonded typo. shouldn't affect translations | Simon L'nu | 2012-04-18 | 12 | -12/+12 |
| | |/ | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | fix alignment issues with toolbar | Simon L'nu | 2012-04-18 | 4 | -76/+105 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-18 | 32 | -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-fixes | tommy tomson | 2012-04-18 | 29 | -86/+441 |
| | | | |||||
| * | | Merge pull request #244 from mschmitt/master | friendica | 2012-04-17 | 2 | -0/+8532 |
| |\ \ | | | | | | | Esperanto translation | ||||
| | * | | messages.po/strings.php at 100% Esperanto | Martin Schmitt | 2012-04-17 | 2 | -0/+8532 |
| | | | | |||||
| * | | | Merge pull request #243 from CatoTH/master | friendica | 2012-04-17 | 1 | -2/+2 |
| |\ \ \ | |/ / |/| | | Typo in Constant | ||||
| | * | | Typo | Tobias Hößl | 2012-04-17 | 1 | -2/+2 |
| |/ / | |||||
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-17 | 0 | -0/+0 |
| |/ | | | | | | | * remotes/upstream/master: diabook-themes: theme-settings: "wide"-option and new screenshots * master: | ||||
| * | diabook-themes: theme-settings: "wide"-option and new screenshots | tommy tomson | 2012-04-17 | 28 | -32/+25069 |
| | | |||||
| * | Merge pull request #242 from simonlnu/master | Simon | 2012-04-17 | 2 | -10/+0 |
| |\ | | | | | [SECURITY] finish ripping out fpostit | ||||
| | * | [SECURITY] finish ripping out fpostit | Simon L'nu | 2012-04-17 | 2 | -10/+0 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-17 | 0 | -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/master | Simon | 2012-04-17 | 12 | -328/+0 |
| |\ | | | | | rip out fpostit | ||||
| | * | rip out fpostit | Simon L'nu | 2012-04-17 | 12 | -328/+0 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-04-17 | 49 | -2358/+1783 |
| |\ \ | |||||
| | * | | diabook-themes: removed fpostit due to security issues and small fix in ↵ | tommy tomson | 2012-04-17 | 33 | -754/+39 |
| | | | | | | | | | | | | | german translation | ||||
| | * | | Merge pull request #240 from CatoTH/master | friendica | 2012-04-17 | 9 | -43/+44 |
| | |\ \ | | | | | | | | | Some bugfixes / Notices | ||||
| | | * | | Some Bugfixes, and variable checks | Tobias Hößl | 2012-04-17 | 9 | -43/+44 |
| | | | | | |||||
| | * | | | naked br appearing when attaching and textplain | friendica | 2012-04-17 | 1 | -1/+6 |
| | |/ / | |||||
| | * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-16 | 49 | -1561/+2162 |
| | |\ \ | |||||
| | | * | | Merge pull request #239 from simonlnu/master | Simon | 2012-04-16 | 3 | -1463/+1572 |
| | | |\| | | | | | | | | | multiple ui and other fixes | ||||
| | | | * | finally fix the ui in the settings. it was fugly.... other bug fixes too | Simon L'nu | 2012-04-17 | 3 | -1463/+1572 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-16 | 0 | -0/+0 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: | ||||
| | * | | rev update | friendica | 2012-04-16 | 3 | -97/+122 |
| | | | | |||||
| * | | | update to the German string files | Tobias Diekershoff | 2012-04-17 | 2 | -942/+1280 |
| | |/ |/| | |||||
| * | | diabook-themes: bugfix (sry, necessary) | tommy tomson | 2012-04-16 | 12 | -12/+52 |
| | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |