| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge pull request #238 from annando/master | friendica | 2012-04-15 | 4 | -13/+178 | |
| |\ | | | | | API: Support of the statusnet application | |||||
| | * | DBA: Reverting back to original source | Michael Vogel | 2012-04-14 | 1 | -3/+1 | |
| | | | ||||||
| | * | DBA: Nothing really done .. | Michael Vogel | 2012-04-14 | 1 | -71/+0 | |
| | | | ||||||
| | * | Merge commit 'upstream/master' | Michael Vogel | 2012-04-14 | 5 | -16/+39 | |
| | |\ | ||||||
| | * \ | Merge commit 'upstream/master' | Michael Vogel | 2012-04-13 | 3 | -214/+226 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: include/dba.php | |||||
| | * | | | DBA: Deactivation of the mysqli-class for testing purposes. | Michael Vogel | 2012-04-13 | 1 | -30/+31 | |
| | | | | | ||||||
| | * | | | Merge commit 'upstream/master' | Michael Vogel | 2012-04-11 | 9 | -210/+331 | |
| | |\ \ \ | ||||||
| | * | | | | API: Improved the timeline. Several (disabled) tests with caching of photos. | Michael Vogel | 2012-04-11 | 2 | -8/+12 | |
| | | | | | | ||||||
| | * | | | | html2plain: changed behaviour for the "hr" element. | Michael Vogel | 2012-04-09 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | API: Added Public Timeline | Michael Vogel | 2012-04-08 | 1 | -5/+85 | |
| | | | | | | ||||||
| | * | | | | API: Now mentions could work as well - only my client doesn't really work | Michael Vogel | 2012-04-08 | 1 | -61/+72 | |
| | | | | | | ||||||
| | * | | | | API: Basic support of the identica client added. | Michael Vogel | 2012-04-08 | 1 | -0/+72 | |
| | | | | | | ||||||
| * | | | | | open contact edit in same window | friendica | 2012-04-15 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #234 from copyninja/master | friendica | 2012-04-14 | 2 | -0/+0 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Executable permisson removal on files which are not elf/script | |||||
| | * | | | | | Another bunch of executable permission removal | Vasudev Kamath | 2012-04-14 | 2 | -0/+0 | |
| | | |_|_|/ | |/| | | | ||||||
| * | | | | | string fix: typo. slow down scroll to top in dispys | Simon L'nu | 2012-04-14 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
| * | | | | | bug #372 - category feeds | friendica | 2012-04-14 | 1 | -0/+10 | |
| |/ / / / | ||||||
| * | | | | one more | friendica | 2012-04-13 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | additional marital status selectors | friendica | 2012-04-13 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-04-13 | 2 | -1/+27 | |
| |\ \ \ \ | ||||||
| | * | | | | stray debug statements, forgot to filter pending contacts | friendica | 2012-04-12 | 1 | -5/+5 | |
| | | | | | | ||||||
| | * | | | | bug #369 - show contacts who are not in any groups | friendica | 2012-04-12 | 2 | -4/+19 | |
| | | |_|/ | |/| | | ||||||
| | * | | | query to find un-grouped contacts | friendica | 2012-04-12 | 1 | -1/+12 | |
| | | | | | ||||||
| * | | | | move html out of lang_selector() and new template lang_selector.tpl | Fabio Comuni | 2012-04-13 | 1 | -9/+16 | |
| | | | | | ||||||
| * | | | | validate_url allow naked subdomain if is "localhost" | Fabio Comuni | 2012-04-13 | 1 | -3/+4 | |
| |/ / / | ||||||
| * | | | reverting recent db driver changes - won't install cleanly, won't update ↵ | friendica | 2012-04-12 | 1 | -274/+186 | |
| | | | | | | | | | | | | | cleanly, and leaks DB credentials over the web if there's a connection problem | |||||
| * | | | table cleanup | friendica | 2012-04-12 | 2 | -0/+19 | |
| | |/ |/| | ||||||
| * | | visit "random profile" feature | friendica | 2012-04-10 | 2 | -0/+10 | |
| | | | ||||||
| * | | cleanup photo menus | friendica | 2012-04-10 | 2 | -11/+11 | |
| | | | ||||||
| * | | more backend work on mail2 followers | friendica | 2012-04-10 | 1 | -0/+3 | |
| | | | ||||||
| * | | fix_mce_lf on profiles | friendica | 2012-04-10 | 1 | -0/+5 | |
| | | | ||||||
| * | | set default on get_avatar | friendica | 2012-04-10 | 1 | -1/+8 | |
| | | | ||||||
| * | | Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull | friendica | 2012-04-10 | 2 | -13/+11 | |
| |\ \ | ||||||
| | * | | Remove Gravatar from core and add new hook avatar_lookup. | Klaus Weidenbach | 2012-04-09 | 1 | -8/+6 | |
| | | | | | | | | | | | | | | | | This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in. I haven't touched the language files yet. Are they updated automatically somehow? | |||||
| | * | | Rename gravatar_img() more generic to avatar_img(). | Klaus Weidenbach | 2012-04-09 | 2 | -5/+5 | |
| | | | | | | | | | | | | | | | | I would like to extend the Gravatar support to also use Libravatar, a decentralized avatar service. First step to extract Gravatar from core and put it into its own plugin. Later the Libravatar plugin can be done, too as a plugin. | |||||
| * | | | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-09 | 1 | -0/+10 | |
| |\| | | ||||||
| | * | | more sane defaults datetime_convert | friendica | 2012-04-08 | 1 | -3/+6 | |
| | | | | ||||||
| | * | | fix empty string timezone | friendica | 2012-04-08 | 1 | -0/+7 | |
| | |/ | ||||||
| * | | fixed some typos | Alexander Kampmann | 2012-04-09 | 1 | -4/+4 | |
| | | | ||||||
| * | | made exceptions from the db optional | Alexander Kampmann | 2012-04-09 | 1 | -2/+30 | |
| | | | | | | | set address for updae mails correctly | |||||
| * | | added exceptions to dba class | Alexander Kampmann | 2012-04-09 | 1 | -188/+248 | |
| |/ | | | | | | | | | added exception handling to index.php, please mind that there is no recovery at the moment added transactions to db update. Please mind that they might not be supported by db table engines. added admin email on failed updates added german translation for admin email | |||||
| * | API: API is now enhanced. mentions, repeat and destroy now works. | Michael Vogel | 2012-04-08 | 1 | -9/+142 | |
| | | ||||||
| * | Merge commit 'upstream/master' | Michael Vogel | 2012-04-07 | 50 | -2/+14 | |
| |\ | ||||||
| | * | ignore utf8 offset error for unit tests | friendica | 2012-04-07 | 1 | -1/+3 | |
| | | | ||||||
| | * | some work on tests | friendica | 2012-04-07 | 1 | -1/+1 | |
| | | | ||||||
| | * | ignore removed plugins | friendica | 2012-04-06 | 1 | -2/+9 | |
| | | | ||||||
| | * | fix messed up config tables w/ duplicate entries | friendica | 2012-04-06 | 1 | -1/+1 | |
| | | | ||||||
| | * | revert config changes, we're getting duplicate keys | friendica | 2012-04-06 | 1 | -151/+147 | |
| | | | ||||||
| | * | Merge branch 'pull' | friendica | 2012-04-05 | 50 | -147/+151 | |
| | |\ | ||||||
| | | * | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 55 | -150/+837 | |
| | | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: include/config.php update.php | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |