Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-04-27 | 402 | -22697/+13940 |
|\ | |||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-27 | 4 | -20/+34 |
| |\ | |||||
| | * | fix some css errors | Simon L'nu | 2012-04-27 | 4 | -20/+34 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | put community back on the lower tab. It belongs with message streams | friendica | 2012-04-27 | 1 | -4/+3 |
| |/ | |||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-27 | 5 | -1/+63 |
| |\ | |||||
| | * | fix 2 issues. contacts img in finder; wall filer title | Simon L'nu | 2012-04-27 | 5 | -1/+63 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | fix view contacts | friendica | 2012-04-27 | 1 | -1/+1 |
| |/ | |||||
| * | reset qcomment selector after insert. | friendica | 2012-04-26 | 1 | -0/+1 |
| | | |||||
| * | put fakelink back in birthday notice | friendica | 2012-04-26 | 1 | -1/+1 |
| | | |||||
| * | birthday contact link goes to event page instead of remote profile | friendica | 2012-04-26 | 1 | -1/+1 |
| | | |||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-26 | 1 | -5/+5 |
| |\ | |||||
| | * | fix s/color/colour/g issue | Simon L'nu | 2012-04-26 | 1 | -5/+5 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | make comment edit icons look more like base theme | friendica | 2012-04-26 | 3 | -28/+28 |
| |/ | |||||
| * | Merge pull request #267 from tomtom84/master | friendica | 2012-04-26 | 1 | -1/+6 |
| |\ | | | | | | | add link "remove account" to /mod/settings.php | ||||
| | * | diabook-themes: small-fix | tommy tomson | 2012-04-26 | 1 | -1/+6 |
| | | | |||||
| * | | announced dipsy change. re-tie your boots, we're in for a wee ride ;) | Simon L'nu | 2012-04-26 | 64 | -1515/+3857 |
| |/ | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | Merge pull request #265 from cvogeley/master | friendica | 2012-04-26 | 14 | -2/+999 |
| |\ | | | | | | | cleanzero theme added | ||||
| | * | duepuntozero: move community and manage link to upper right area + css fixes ↵ | Christian Vogeley | 2012-04-25 | 1 | -0/+71 |
| | | | | | | | | | | | | to avoid breaking of design | ||||
| | * | duepuntozero: move community and manage link to upper right area + css fixes ↵ | Christian Vogeley | 2012-04-25 | 1 | -2/+5 |
| | | | | | | | | | | | | to avoid breaking of design | ||||
| | * | added BBCODE thing in comments | Christian Vogeley | 2012-04-25 | 1 | -0/+38 |
| | | | |||||
| | * | add cleanzero theme | Christian Vogeley | 2012-04-25 | 12 | -0/+885 |
| | | | |||||
| * | | convert stylesheets to less, and compress output css | Simon L'nu | 2012-04-26 | 4 | -6353/+6793 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | Diabook-dark more CSS fixes. | Thomas Willingham | 2012-04-25 | 2 | -5/+16 |
| |/ | | | | | | | Slowly getting there. | ||||
| * | this turns out to be harder than I thought | friendica | 2012-04-25 | 2 | -2/+2 |
| | | |||||
| * | Merge pull request #264 from mschmitt/master | friendica | 2012-04-25 | 2 | -78/+112 |
| |\ | | | | | | | Esperanto at 100% again | ||||
| | * | Esperanto at 100% again | Martin Schmitt | 2012-04-25 | 2 | -78/+112 |
| | | | |||||
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-25 | 12 | -12/+96 |
| |\| | |||||
| | * | Merge pull request #263 from tomtom84/master | tomtom84 | 2012-04-24 | 12 | -12/+96 |
| | |\ | | | | | | | | | diabook-themes: fix css to login.tpl | ||||
| | | * | diabook-themes: fix css to login.tpl | tommy tomson | 2012-04-25 | 12 | -12/+96 |
| | | | | |||||
| * | | | cleanup - make bb-buttons vanish when comment closed | friendica | 2012-04-25 | 14 | -374/+16 |
| |/ / | |||||
| * / | restore qcomment selector | friendica | 2012-04-24 | 7 | -21/+35 |
| |/ | |||||
| * | zero-themes: add bbcode-toolbar to commentbox | tommy tomson | 2012-04-25 | 22 | -0/+732 |
| | | |||||
| * | diabook-themes: small fix | tommy tomson | 2012-04-25 | 3 | -8/+31 |
| | | |||||
| * | Merge pull request #261 from fabrixxm/eventspage | friendica | 2012-04-24 | 5 | -56/+131 |
| |\ | | | | | | | Some tweak on events page and events/bitrhdays reminder | ||||
| | * | quattro: small week calendar view for event/birthday reminders | Fabio Comuni | 2012-04-24 | 2 | -0/+40 |
| | | | |||||
| | * | remove html from get_birthdays() and get_events() | Fabio Comuni | 2012-04-24 | 2 | -0/+20 |
| | | | |||||
| | * | events page: set calendar start date from url (events/[year]/[month]/) and ↵ | Fabio Comuni | 2012-04-24 | 1 | -56/+71 |
| | | | | | | | | | | | | show event popup from url anchor (#link-[event id]) | ||||
| * | | Diabook-dark css fix | Thomas Willingham | 2012-04-24 | 1 | -3/+3 |
| | | | |||||
| * | | Diabook-dark, couple of new icons, and another css fix. | Thomas Willingham | 2012-04-24 | 4 | -1/+1 |
| |/ | |||||
| * | Esperanto at 100% again | Martin Schmitt | 2012-04-24 | 9 | -459/+733 |
| | | |||||
| * | Improvements to diabook-dark | Thomas Willingham | 2012-04-24 | 21 | -4/+4 |
| | | | | | | | | Still a long way to go, but some icons and a few CSS fixes | ||||
| * | DE strings, correction of a typo | Tobias Diekershoff | 2012-04-23 | 2 | -198/+98 |
| | | |||||
| * | diabok-themes: fixed bug in green-wide and dark-wide | tommy tomson | 2012-04-23 | 5 | -12/+12 |
| | | |||||
| * | diabook-themes: small fix in nets_aside, group_aside and delete obsolete ↵ | tommy tomson | 2012-04-23 | 211 | -13669/+5 |
| | | | | | | | | .tpls in subfolders | ||||
| * | diabook-themes: bugfix in admin-section | tommy tomson | 2012-04-23 | 1 | -1/+1 |
| | | |||||
| * | diabook-themes: bugfix | tommy tomson | 2012-04-22 | 15 | -27/+31 |
| | | |||||
| * | diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer | tommy tomson | 2012-04-22 | 45 | -101/+108 |
| | | |||||
| * | DE strings update | Tobias Diekershoff | 2012-04-22 | 8 | -542/+789 |
| | | |||||
| * | diabook-themes: comment-bbcode-bugfix | tommy tomson | 2012-04-22 | 2 | -9/+9 |
| | | |||||
* | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-04-22 | 380 | -38276/+1184 |
|\| |