Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'upstream/master' | Michael Vogel | 2012-04-07 | 12 | -47/+392 |
|\ | |||||
| * | changelog 1.014 : | tommy tomson | 2012-04-07 | 10 | -38/+366 |
| | | | | | | | | | | | | | | | | | | | | | | | | image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section css-fixes: tabs youtube-iframe title-bar in jot-wrapper blockquote & .oembed | ||||
| * | new-contacts-introductions in contacts-drop-down and new-messages in ↵ | tommy tomson | 2012-04-06 | 43 | -13/+30 |
| | | | | | | | | | | | | | | messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox... | ||||
| * | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 71 | -136/+8733 |
| |\ | | | | | | | | | | | | | | | | Conflicts: include/config.php update.php | ||||
* | \ | Merge commit 'upstream/master' | Michael Vogel | 2012-04-06 | 7 | -42/+115 |
|\ \ \ | | |/ | |/| | |||||
| * | | make right_aside translatable and provide german translation... | tommy tomson | 2012-04-03 | 7 | -42/+115 |
| | | | | | | | | | | | | and some css-fixes | ||||
* | | | Merge commit 'upstream/master' | Michael Vogel | 2012-04-02 | 15 | -69/+379 |
|\| | | |||||
| * | | diabook-themes: css-fixes | tommy tomson | 2012-04-02 | 6 | -5/+31 |
| | | | |||||
| * | | diabook-themes: fixes in js | tommy tomson | 2012-04-02 | 1 | -1/+1 |
| | | | |||||
| * | | diabook-themes: fixed pageheader | tommy tomson | 2012-04-02 | 5 | -43/+50 |
| | | | |||||
| * | | diabook-themes: bugfixes / css-fixes | tommy tomson | 2012-04-02 | 5 | -5/+12 |
| | | | |||||
| * | | diabook-themes: add link to global dir in "find friends" at right_aside | tommy tomson | 2012-04-02 | 3 | -3/+5 |
| | | | |||||
| * | | css-fixes | tommy tomson | 2012-04-02 | 1 | -0/+1 |
| | | | |||||
| * | | add new messages-layout in diabook | tommy tomson | 2012-04-01 | 6 | -4/+171 |
| | | | |||||
| * | | fix the display of community-plugin in diabook-themes | tommy tomson | 2012-04-01 | 4 | -9/+109 |
| | | | |||||
* | | | The "vier"-theme is now working again. But there is still work needed | Michael Vogel | 2012-04-02 | 4 | -4/+4 |
|/ / | |||||
* | | various bugfixes and css-fixes | tommy tomson | 2012-04-01 | 4 | -12/+20 |
| | | |||||
* | | diabook-themes: move "common tabs" to left side on settings page | tommy tomson | 2012-03-31 | 3 | -11/+8 |
| | | |||||
* | | move the common tabs to right_aside in diabook-derivates | tommy tomson | 2012-03-31 | 3 | -0/+2575 |
| | | |||||
* | | bug-fixes in diabook-derivates | tommy tomson | 2012-03-31 | 3 | -6/+8 |
| | | |||||
* | | add themes diabook-red & diabook-aerith | tommy tomson | 2012-03-30 | 2 | -2/+3 |
| | | |||||
* | | css fixes in diabook-derivates | tommy tomson | 2012-03-29 | 6 | -11/+28 |
| | | |||||
* | | add a searchbox to "find friends" for global search | tommy tomson | 2012-03-28 | 8 | -9/+70 |
| | | |||||
* | | bugfix in diabook | tommy tomson | 2012-03-28 | 1 | -2/+3 |
| | | |||||
* | | small fix in diabook | tommy tomson | 2012-03-27 | 3 | -3/+3 |
| | | |||||
* | | fixes in diabook | tommy tomson | 2012-03-27 | 6 | -13/+49 |
| | | |||||
* | | provide a close-option for boxes in right_aside and store info via js and ↵ | tommy tomson | 2012-03-27 | 9 | -27/+198 |
| | | | | | | | | cookies | ||||
* | | add "find friends" to right_aside to diabook, fixes in css in diabook | tommy tomson | 2012-03-27 | 6 | -0/+24 |
| | | |||||
* | | minor css fixes in diabook | tommy tomson | 2012-03-26 | 4 | -16/+13 |
| | | |||||
* | | Merge pull request #172 from fabrixxm/master | friendica | 2012-03-26 | 1 | -1/+1 |
|\ \ | | | | | | | Rearrange theme tpls | ||||
| * | | diabook: small fix in theme_info array | Fabio Comuni | 2012-03-26 | 1 | -1/+1 |
| | | | |||||
* | | | small fix in diabook :: add local friendica to right_aside | tommy tomson | 2012-03-26 | 3 | -1/+2 |
| | | | |||||
* | | | add screenshots to diabook | tommy tomson | 2012-03-26 | 3 | -3/+8 |
|/ / | |||||
* | | small fix | tommy tomson | 2012-03-26 | 2 | -7/+2 |
| | | |||||
* | | screenshot gallery | friendica | 2012-03-25 | 1 | -0/+0 |
| | | |||||
* | | small fixes | tommy tomson | 2012-03-25 | 1 | -4/+12 |
| | | |||||
* | | move community_pages to right_aside, fixes in css | tommy tomson | 2012-03-25 | 5 | -14/+70 |
| | | |||||
* | | small fix in css | tommy tomson | 2012-03-24 | 2 | -2/+2 |
| | | |||||
* | | add connectable services to right_aside | tommy tomson | 2012-03-24 | 10 | -3/+19 |
| | | |||||
* | | add PostIt to right_aside, fixes in css | tommy tomson | 2012-03-24 | 10 | -17/+180 |
| | | |||||
* | | diabook: theme.php | Fabio Comuni | 2012-03-23 | 2 | -219/+62 |
| | | | | | | | | | | | | | | remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links) | ||||
* | | fix in css right_aside | tommy tomson | 2012-03-23 | 5 | -34/+4953 |
| | | |||||
* | | small fix | tommy tomson | 2012-03-23 | 1 | -1/+1 |
| | | |||||
* | | fix 1024resolution | tommy tomson | 2012-03-23 | 2 | -14/+15 |
| | | |||||
* | | add right_aside to theme diabook | tommy tomson | 2012-03-23 | 5 | -10/+327 |
|/ | |||||
* | add file_as-option to diabook-derivates | tommy tomson | 2012-03-22 | 3 | -0/+5 |
| | |||||
* | add icons to aside diabook, fixes in css | tommy tomson | 2012-03-22 | 10 | -25/+57 |
| | |||||
* | added icons to profile_side, fixes in css | tommy tomson | 2012-03-16 | 3 | -17/+8 |
| | |||||
* | Merge commit 'upstream/master' | Michael Vogel | 2012-03-15 | 13 | -37/+255 |
|\ | |||||
| * | add links to wall, photos, events, etc to aside on networkpage, fixes in css | tommy tomson | 2012-03-15 | 5 | -12/+38 |
| | |