Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pull' | friendica | 2011-12-12 | 4 | -157/+223 |
|\ | |||||
| * | Merge pull request #18 from zzottel/master | zzottel | 2011-12-12 | 4 | -157/+223 |
| |\ | | | | | | | Switch to jquery 1.7.1 | ||||
| | * | Switch to jquery 1.7.1 | zottel | 2011-12-12 | 4 | -157/+223 |
| |/ | |||||
* | | revup | friendica | 2011-12-12 | 1 | -1/+1 |
| | | |||||
* | | separate dfrn introductions from email when it comes to expiration of ↵ | friendica | 2011-12-11 | 1 | -1/+31 |
|/ | | | | blocked requests | ||||
* | browser_update settings | friendica | 2011-12-11 | 2 | -3/+12 |
| | |||||
* | system support for personal configurable ajax update interval | friendica | 2011-12-11 | 4 | -8/+19 |
| | |||||
* | \o/ smiley | friendica | 2011-12-11 | 3 | -2/+3 |
| | |||||
* | typo in db sql | friendica | 2011-12-10 | 1 | -1/+1 |
| | |||||
* | Merge branch 'pull' | friendica | 2011-12-09 | 1 | -4/+15 |
|\ | |||||
| * | Merge pull request #17 from zzottel/master | friendica | 2011-12-08 | 1 | -4/+15 |
| |\ | | | | | | | Fixed some gltiches in testbubble theme | ||||
| | * | fixed some glitches in testbubble theme | zottel | 2011-12-08 | 1 | -4/+15 |
| |/ | |||||
* | | cannot register at all when multiple_pages is not allowed | friendica | 2011-12-09 | 1 | -1/+6 |
| | | |||||
* | | revup | friendica | 2011-12-09 | 1 | -1/+1 |
| | | |||||
* | | fix diaspora's illegal webfinger xml before sending to parser | friendica | 2011-12-09 | 1 | -0/+3 |
|/ | |||||
* | missing template | friendica | 2011-12-07 | 1 | -0/+13 |
| | |||||
* | api post default to default post permissions was broken | friendica | 2011-12-07 | 3 | -18/+22 |
| | |||||
* | w3c valid cleanup | friendica | 2011-12-06 | 1 | -2/+4 |
| | |||||
* | preg_quote search strings | friendica | 2011-12-06 | 2 | -11/+4 |
| | |||||
* | pm replies | friendica | 2011-12-06 | 8 | -45/+158 |
| | |||||
* | include diaspora mentions in personal (requires adding a Diaspora profile ↵ | friendica | 2011-12-06 | 4 | -6/+24 |
| | | | | url because they don't use ours) | ||||
* | Merge pull request #16 from zzottel/master | friendica | 2011-12-06 | 1 | -5/+11 |
|\ | | | | | Unpause the stream when posting a comment or liking/disliking | ||||
| * | unpause the stream when posting a comment or liking/disliking | zottel | 2011-12-06 | 1 | -5/+11 |
| | | |||||
* | | copied code styling from duepuntozero to quattro theme | Tobias Diekershoff | 2011-12-06 | 2 | -1/+22 |
|/ | |||||
* | Merge pull request #15 from zzottel/master | friendica | 2011-12-06 | 1 | -10/+10 |
|\ | | | | | Added pausing of automatic stream reloads using Ctrl-Space | ||||
| * | Merge remote branch 'upstream/master' | zottel | 2011-12-06 | 12 | -26/+49 |
| |\ | |||||
| * | | Added stopping automatic reloads with Ctrl-Space. Will stay stopped till ↵ | zottel | 2011-12-06 | 1 | -10/+10 |
| | | | | | | | | | | | | next Ctrl-Space. | ||||
* | | | d* pm | friendica | 2011-12-06 | 7 | -11/+115 |
| |/ |/| | |||||
* | | hide some contacts from others | friendica | 2011-12-05 | 4 | -6/+13 |
| | | |||||
* | | Merge branch 'pull' | friendica | 2011-12-05 | 1 | -0/+6 |
|\ \ | |||||
| * | | Merge pull request #14 from zzottel/master | fabrixxm | 2011-12-05 | 1 | -0/+6 |
| |\| | | | | | | | Added #pause to testbubble/style.css | ||||
| | * | added #pause | zottel | 2011-12-05 | 1 | -0/+6 |
| |/ | |||||
* | | maintain backward compatibility with old PMs | friendica | 2011-12-05 | 2 | -10/+20 |
| | | |||||
* | | data structures to support hidden friends | friendica | 2011-12-05 | 7 | -10/+16 |
|/ | |||||
* | add conv structure | friendica | 2011-12-05 | 2 | -3/+44 |
| | |||||
* | Merge pull request #13 from zzottel/master | fabrixxm | 2011-12-05 | 1 | -0/+2 |
|\ | | | | | added img properties to testbubble/style.css to get good results on all screen sizes | ||||
| * | added img properties to get good results on all screen sizes | zottel | 2011-12-05 | 1 | -0/+2 |
|/ | |||||
* | more d* PM stuff | friendica | 2011-12-04 | 3 | -83/+74 |
| | |||||
* | fix incorrect default author | friendica | 2011-12-04 | 1 | -0/+4 |
| | |||||
* | typo | friendica | 2011-12-04 | 1 | -2/+2 |
| | |||||
* | fix author-name when missing on comments | friendica | 2011-12-04 | 1 | -0/+3 |
| | |||||
* | unix style homedir | friendica | 2011-12-04 | 1 | -0/+3 |
| | |||||
* | add a bookmark index, needed by network queries | friendica | 2011-12-03 | 3 | -3/+9 |
| | |||||
* | bug #232 | friendica | 2011-12-03 | 2 | -8/+14 |
| | |||||
* | Merge pull request #12 from zzottel/master | fabrixxm | 2011-12-02 | 1 | -1/+1 |
|\ | | | | | Fix testbubble photo-menu | ||||
| * | Take out overflow: hidden; from .wall-item-outside-wrapper to fix | zottel | 2011-12-02 | 1 | -1/+1 |
|/ | | | | problem with photo-menu being cut off. | ||||
* | Merge pull request #11 from fabrixxm/master | fabrixxm | 2011-12-02 | 1 | -4/+19 |
|\ | | | | | mention notification in ping | ||||
| * | ping: mention rewording | Fabio Comuni | 2011-12-02 | 1 | -1/+1 |
| | | |||||
| * | ping: add @-tag notifs, fix intros url | Fabio Comuni | 2011-12-01 | 1 | -4/+19 |
| | | |||||
* | | more theme works | friendica | 2011-12-01 | 1 | -0/+4 |
| | |