Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | restore qcomment selector | friendica | 2012-04-24 | 7 | -21/+35 |
| | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-24 | 36 | -94/+934 |
|\ | |||||
| * | Merge pull request #262 from tomtom84/master | friendica | 2012-04-24 | 22 | -0/+732 |
| |\ | | | | | | | zero-themes: add bbcode-toolbar to commentbox | ||||
| | * | 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 | 6 | -82/+167 |
| |\ | | | | | | | 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 | 3 | -23/+53 |
| | | | |||||
| | * | events page: set calendar start date from url (events/[year]/[month]/) and ↵ | Fabio Comuni | 2012-04-24 | 2 | -60/+75 |
| | | | | | | | | | | | | 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 |
| | | | |||||
* | | | rev update | friendica | 2012-04-24 | 2 | -393/+150 |
|/ / | |||||
* / | fix tags test with new url | friendica | 2012-04-24 | 1 | -2/+2 |
|/ | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-23 | 30 | -463/+737 |
|\ | |||||
| * | Merge pull request #260 from mschmitt/master | friendica | 2012-04-23 | 9 | -459/+733 |
| |\ | | | | | | | Esperanto at 100% again | ||||
| | * | Esperanto at 100% again | Martin Schmitt | 2012-04-24 | 9 | -459/+733 |
| |/ | |||||
| * | Merge pull request #259 from beardy-unixer/master | friendica | 2012-04-23 | 21 | -4/+4 |
| |\ | | | | | | | Diabook-dark | ||||
| | * | 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 | ||||
| | * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2012-04-24 | 6 | -118/+203 |
| | |\ | | |/ | |/| | | | | Merge upstream | ||||
| | * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2012-04-24 | 2106 | -17706/+98887 |
| | |\ | | | | | | | | | | | | | Merge upstream | ||||
| | * \ | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2012-04-02 | 0 | -0/+0 |
| | |\ \ | |||||
* | | | | | separate tag search from body search | friendica | 2012-04-23 | 5 | -20/+34 |
|/ / / / | |||||
* | | | | move unfriend to standalone function for use in account removal | friendica | 2012-04-23 | 2 | -33/+47 |
| | | | | |||||
* | | | | more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for ↵ | friendica | 2012-04-23 | 4 | -85/+156 |
| |_|/ |/| | | | | | | | | autocomplete of PM recips | ||||
* | | | 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 |
| | | | |||||
* | | | allow bbcode representation of html symbols such as © by wrapping in bb ↵ | friendica | 2012-04-23 | 1 | -0/+3 |
| | | | | | | | | | | | | brackets | ||||
* | | | protect jappixmini/proxy from typo check, more work on email2 connector | friendica | 2012-04-23 | 2 | -1/+51 |
| | | | |||||
* | | | bug #388 - notify_comment received after post deleted | friendica | 2012-04-22 | 2 | -2/+2 |
| | | | |||||
* | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-22 | 73 | -714/+1005 |
|\ \ \ | |||||
| * \ \ | Merge pull request #258 from unary/api | friendica | 2012-04-22 | 2 | -13/+36 |
| |\ \ \ | | | | | | | | | | | api: add support for StatusNet-style media param to API | ||||
| | * | | | api: add support for StatusNet-style media param to API | Michael Johnston | 2012-04-22 | 2 | -13/+36 |
| | | | | | |||||
| * | | | | Merge pull request #257 from CatoTH/master | friendica | 2012-04-22 | 1 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Add a hook in mod/ping.php | ||||
| | * | | | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-04-22 | 748 | -2940/+62981 |
| | |\| | | | |||||
| | * | | | | Add a hook | Tobias Hößl | 2012-04-22 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | 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 pull request #256 from simonlnu/master | Simon | 2012-04-21 | 2 | -22/+30 |
| |\ \ \ \ | | | | | | | | | | | | | fix tinymce theming | ||||
| | * | | | | fix tinymce theming | Simon L'nu | 2012-04-22 | 2 | -22/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-22 | 384 | -56031/+194 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: rev update diabook-themes: deleted obsolete diabook-folder & minor bug-fixes * master: | ||||
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-21 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: rev update * master: | ||||
* | | | | | | don't allow non-existent themes as choices | friendica | 2012-04-22 | 3 | -151/+52 |
|/ / / / / | |||||
* | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-21 | 382 | -55989/+76 |
|\ \ \ \ \ | |||||
| * | | | | | diabook-themes: deleted obsolete diabook-folder & minor bug-fixes | tommy tomson | 2012-04-22 | 382 | -55989/+76 |
| |/ / / / | |||||
* / / / / | rev update | friendica | 2012-04-21 | 2 | -42/+118 |
|/ / / / | |||||
* | | | | rev update | friendica | 2012-04-21 | 2 | -416/+560 |
| | | | |