Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 210 | -0/+0 |
|\ | | | | | | | | | | | Conflicts: include/config.php update.php | ||||
| * | theme screenshots | friendica | 2012-03-25 | 1 | -0/+0 |
|/ | |||||
* | change default profile photo to something more interesting than a reddish ↵ | friendica | 2012-03-20 | 3 | -0/+0 |
| | | | | brown square | ||||
* | More improved transparency for smilies | Thomas | 2012-03-09 | 3 | -0/+0 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' | Thomas | 2012-03-06 | 2 | -0/+0 |
|\ | | | | | | | | | Conflicts: images/smiley-beard.png | ||||
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-06 | 4 | -0/+0 |
| | | | | | | | | | | | | | | * remotes/upstream/master: fix html reshares when editplain in use * master: | ||||
* | | improved smiley transparency | Thomas | 2012-03-06 | 19 | -0/+0 |
|/ | |||||
* | added beard smileys | Thomas | 2012-03-06 | 2 | -0/+0 |
| | |||||
* | add img | tommy tomson | 2012-03-06 | 1 | -0/+0 |
| | |||||
* | Merge pull request #67 from tomtom84/master | tomtom84 | 2012-03-03 | 2 | -0/+0 |
|\ | | | | | fixes in diabook theme | ||||
| * | fixed star/unstar | tommy tomson | 2012-03-03 | 2 | -0/+0 |
| | | |||||
* | | fix for comment-wwedit-wrapper CSS class in tpl had a stray $ | Simon L'nu | 2012-03-02 | 1 | -0/+0 |
|/ | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | friendica.svg - Friendika -> Friendica | Abinoam P. Marques Jr | 2012-02-20 | 1 | -2/+2 |
| | |||||
* | add :headdesk and fix doc/Pages.md to remove the absolute URL to / | Simon L'nu | 2012-02-19 | 1 | -0/+0 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | facepalm smiley | friendica | 2012-02-16 | 1 | -0/+0 |
| | |||||
* | quattro: icons for attachments | Fabio Comuni | 2012-02-15 | 26 | -1/+2 |
| | |||||
* | :coffee extended smilie | friendica | 2012-02-07 | 1 | -0/+0 |
| | |||||
* | beer | friendica | 2012-02-06 | 1 | -0/+0 |
| | |||||
* | shaka, slackr theme | friendica | 2012-01-23 | 1 | -0/+0 |
| | |||||
* | add remove_user hook (it looks like dreamhost changed all my file ↵ | friendica | 2012-01-18 | 209 | -0/+0 |
| | | | | permissions, this will make a nasty commit) | ||||
* | slightly better group icon | friendica | 2012-01-10 | 1 | -0/+0 |
| | |||||
* | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-01-06 | 1 | -0/+0 |
|\ | |||||
| * | new smiley | friendica | 2012-01-04 | 1 | -0/+0 |
| | | |||||
* | | icons: lock and unlock | Fabio Comuni | 2011-12-19 | 12 | -1/+1 |
|/ | |||||
* | \o/ smiley | friendica | 2011-12-11 | 1 | -0/+0 |
| | |||||
* | more work on quattro. remove html from php for groups and saved searches ↵ | Fabio Comuni | 2011-11-21 | 1 | -0/+0 |
| | | | | widgets. | ||||
* | quattro: tags style | Fabio Comuni | 2011-11-15 | 2 | -0/+0 |
| | |||||
* | some doc updates | Friendika | 2011-11-08 | 14 | -0/+240 |
| | |||||
* | Merge branch 'oauthapi' | Fabio Comuni | 2011-11-07 | 6 | -1/+1 |
|\ | |||||
| * | New icon 'plugin' | Fabio Comuni | 2011-11-07 | 6 | -1/+2 |
| | | |||||
* | | soften the content-types | Friendika | 2011-10-25 | 1 | -0/+0 |
| | | |||||
* | | new icon "play" | Fabio Comuni | 2011-10-24 | 6 | -1/+2 |
| | | |||||
* | | add custom style to object tag in tinymce | Fabio Comuni | 2011-10-21 | 1 | -0/+0 |
|/ | |||||
* | quattro: actions in wall_item | Fabio Comuni | 2011-09-27 | 7 | -14/+31 |
| | | | | | | less html in conversation.php removed unused tpls fixed old themes | ||||
* | Merge branch 'master' into newui | Fabio Comuni | 2011-09-26 | 4 | -0/+0 |
|\ | |||||
| * | really commiting files this time, still getting the hang of git. | Devlon Duthie | 2011-09-25 | 2 | -0/+0 |
| | | | | | | | | | | | | some images added, some classes added to groupidebar, contacts sidebar notification flags moved out of nav and into banner for testbubble the testbubble css tweaks | ||||
| * | added testbubble mai, and modified some core fle to add classes | Devlon Duthie | 2011-09-24 | 1 | -0/+0 |
| | | |||||
| * | more tag infrastructure | Friendika | 2011-09-18 | 1 | -0/+0 |
| | | |||||
* | | new icons | Fabio Comuni | 2011-09-16 | 58 | -0/+0 |
| | | |||||
* | | Load infos and notices via ping and show them with js popup | Fabio Comuni | 2011-09-05 | 10 | -0/+0 |
| | | |||||
* | | More icons | Fabio Comuni | 2011-09-05 | 54 | -0/+14 |
| | | |||||
* | | Fix profile vcard and style | Fabio Comuni | 2011-09-01 | 1 | -0/+0 |
| | | |||||
* | | Merge remote-tracking branch 'friendika/master' into newui | fabrixxm | 2011-08-17 | 2 | -0/+0 |
|\| | |||||
| * | Diaspora logo | Friendika | 2011-08-10 | 1 | -0/+0 |
| | | |||||
| * | crypto stuff | Friendika | 2011-08-09 | 1 | -0/+0 |
| | | |||||
* | | Initial work on new UI | Fabio Comuni | 2011-07-22 | 3 | -0/+0 |
|/ | |||||
* | add icons to acl selector | Fabio Comuni | 2011-07-19 | 6 | -0/+0 |
| | |||||
* | fix group image name | Fabio Comuni | 2011-07-19 | 1 | -0/+0 |
| | |||||
* | New jot acl selector | Fabio Comuni | 2011-07-19 | 2 | -0/+0 |
| | |||||
* | Another missing file | Fabio Comuni | 2011-07-06 | 1 | -0/+0 |
| |