Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'friendika-master' | fabrixxm | 2011-02-08 | 32 | -227/+397 |
|\ | |||||
| * | tweaks to reworked remote deletion, which also fixes some comment box oddities | Friendika | 2011-02-08 | 2 | -3/+3 |
| | | |||||
| * | rework remote deletion | Friendika | 2011-02-08 | 2 | -76/+94 |
| | | |||||
| * | fix del_pconfig | Friendika | 2011-02-08 | 1 | -1/+1 |
| | | |||||
| * | close tag on favicon link missing | Friendika | 2011-02-07 | 4 | -4/+4 |
| | | |||||
| * | at least one server is giving CURL a second set of headers (and it isn't a ↵ | Friendika | 2011-02-07 | 1 | -0/+17 |
| | | | | | | | | 100 continue which we've already accounted for) | ||||
| * | don't change photo visibility if only album name was changed | Friendika | 2011-02-07 | 2 | -3/+11 |
| | | |||||
| * | feed cleanup | Friendika | 2011-02-07 | 4 | -63/+68 |
| | | |||||
| * | one less paren | Friendika | 2011-02-06 | 1 | -1/+1 |
| | | |||||
| * | don't show logout link on 'home' link if remote_user | Friendika | 2011-02-06 | 1 | -7/+7 |
| | | |||||
| * | functionise birthday | Friendika | 2011-02-06 | 3 | -40/+50 |
| | | |||||
| * | fix contact photo updates - a result of baseurl being wrong for cmdline ↵ | Friendika | 2011-02-06 | 3 | -13/+44 |
| | | | | | | | | processes | ||||
| * | theme name cleanup - rename default to loozah, provide sane fallbacks and ↵ | Friendika | 2011-02-06 | 23 | -26/+107 |
| | | | | | | | | | | | | | | change system primary theme. Provide indication on contact edit page of last update success/failure - can be extended later to show actual timestamp of last successful update. | ||||
| * | Merge branch 'fabrixxm-master' | Friendika | 2011-02-06 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'master' of https://github.com/fabrixxm/friendika into ↵ | Friendika | 2011-02-06 | 4 | -72/+101 |
| | |\ | | | | | | | | | | | | | fabrixxm-master | ||||
* | | | | Merge branch 'friendika-master' | fabrixxm | 2011-02-06 | 14 | -57/+146 |
|\| | | | |_|/ |/| | | |||||
| * | | kill orphans | Friendika | 2011-02-06 | 3 | -3/+17 |
| | | | |||||
| * | | Merge branch 'tobiasd-master' | Friendika | 2011-02-06 | 2 | -4/+4 |
| |\ \ | |||||
| | * | | german choose existing pic for the avatar | Tobias Diekershoff | 2011-02-06 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-02-06 | 8 | -43/+116 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-02-05 | 8 | -78/+130 |
| | |\ \ \ | |||||
| | * | | | | wording | Tobias Diekershoff | 2011-02-04 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | ensure that jot_plugins inherit '$visitor' correctly | Friendika | 2011-02-06 | 2 | -9/+11 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'fabrixxm-master' | Friendika | 2011-02-05 | 7 | -42/+115 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge branch 'ph2pr' of https://github.com/fabrixxm/friendika into ↵ | Friendika | 2011-02-05 | 7 | -42/+115 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | fabrixxm-master | ||||
| | | * | | | Add a link to user photos in Upload Profile Photo page | Fabio Comuni | 2011-02-04 | 7 | -6/+28 |
| | | | | | | |||||
| | | * | | | Allow to set a photo from albums as profile photo | Fabio Comuni | 2011-02-04 | 2 | -37/+92 |
| | | | | | | |||||
| * | | | | | Merge branch 'omigeot-master' | Friendika | 2011-02-05 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Conflicts: view/fr/strings.php | ||||
| | * | | | | Merge branch 'master' of https://github.com/omigeot/friendika into ↵ | Friendika | 2011-02-05 | 1 | -0/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | omigeot-master | ||||
| | | * | | | | Fixed some typo (prevented Friendika to load with french locale) | olivierm | 2011-02-05 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | fixed missing close parenthesis | fabrixxm | 2011-02-06 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | found it - typo | Friendika | 2011-02-04 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | more error checking on posts | Friendika | 2011-02-04 | 2 | -13/+23 |
| | | | | | | |||||
* | | | | | | Merge branch 'fabrixxm-master' | Friendika | 2011-02-04 | 2 | -2/+6 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Upload profile photo page it title | Fabio Comuni | 2011-02-04 | 1 | -1/+5 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'master' of https://github.com/friendika/friendika.git | Fabio Comuni | 2011-02-04 | 2 | -4/+23 |
| |\ \ \ \ | |||||
| * | | | | | small fix to IT strings | fabrixxm | 2011-02-04 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | prevent runaway notifications when parent=0 due to race condition | Friendika | 2011-02-04 | 3 | -59/+78 |
| |/ / / |/| | | | |||||
* | | | | Merge branch 'photos' of https://github.com/fabrixxm/friendika into ↵ | Friendika | 2011-02-03 | 2 | -4/+23 |
|\ \ \ \ | |/ / / |/| | | | | | | | fabrixxm-photos | ||||
| * | | | remove an erroneously pasted line | fabrixxm | 2011-02-03 | 1 | -6/+1 |
| | | | | |||||
| * | | | Fix tabs | Fabio Comuni | 2011-02-03 | 1 | -14/+14 |
| | | | | |||||
| * | | | Show lock info on photos | Fabio Comuni | 2011-02-03 | 1 | -1/+9 |
| | | | | |||||
| * | | | Extend lockview to show info on items, photos and events | Fabio Comuni | 2011-02-03 | 1 | -4/+20 |
| | | | | |||||
* | | | | warn folks that changing your domain name after making friends is not ↵ | Friendika | 2011-02-03 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | supported at this time. | ||||
* | | | | found the issue - remove the extra tracing stuff | Friendika | 2011-02-03 | 1 | -7/+1 |
| | | | | |||||
* | | | | allow parentless items from SN - add more tracing on notify failures | Friendika | 2011-02-03 | 2 | -8/+28 |
| | | | | |||||
* | | | | allow changing album name in photo edit page | Friendika | 2011-02-03 | 9 | -13/+34 |
| | | | | |||||
* | | | | don't parse garbage in phase2 of dfrn_deliver either | Friendika | 2011-02-03 | 1 | -0/+7 |
| | | | | |||||
* | | | | remove self | Friendika | 2011-02-03 | 7 | -5/+79 |
| | | | | |||||
* | | | | Merge branch 'tobiasd-master' | Friendika | 2011-02-02 | 1 | -1/+1 |
|\ \ \ \ |