Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | fix xtag | friendica | 2013-07-14 | 3 | -11/+19 | |
* | Merge https://github.com/friendica/red into zpull | friendica | 2013-07-14 | 1 | -2/+0 | |
|\ | ||||||
| * | Nobody died, so remove not-needed logging. | Thomas Willingham | 2013-07-15 | 1 | -2/+0 | |
* | | more logging on hubloc import - figure out why it did not get stored. | friendica | 2013-07-14 | 1 | -1/+2 | |
|/ | ||||||
* | looks like it actually needs both files. | friendica | 2013-07-14 | 1 | -0/+1 | |
* | add the jquery version, not the standalone spinner | friendica | 2013-07-14 | 1 | -1/+1 | |
* | we need to actually include spin.js or it causes issues | friendica | 2013-07-14 | 2 | -1/+2 | |
* | Merge https://github.com/friendica/red into zpull | friendica | 2013-07-14 | 12 | -28/+464 | |
|\ | ||||||
| * | Merge pull request #77 from git-marijus/master | friendica | 2013-07-14 | 12 | -28/+464 | |
| |\ | ||||||
| | * | port jot to spin.js | git-marijus | 2013-07-13 | 1 | -0/+6 | |
| | * | port jot to spin.js | git-marijus | 2013-07-13 | 1 | -1/+1 | |
| | * | port jot to spin.js | git-marijus | 2013-07-13 | 1 | -3/+3 | |
| | * | port jot to spin.js | git-marijus | 2013-07-13 | 1 | -1/+1 | |
| | * | port jot to spin.js | git-marijus | 2013-07-13 | 1 | -1/+1 | |
| | * | port like button to spin.js | git-marijus | 2013-07-13 | 1 | -1/+3 | |
| | * | port like button to spin.js | git-marijus | 2013-07-13 | 1 | -1/+1 | |
| | * | port like button to spin.js | git-marijus | 2013-07-13 | 1 | -1/+1 | |
| | * | port like button to spin.js | git-marijus | 2013-07-13 | 1 | -2/+2 | |
| | * | port like button to spin.js | git-marijus | 2013-07-13 | 1 | -7/+7 | |
| | * | Update conv_frame.tpl | git-marijus | 2013-07-13 | 1 | -0/+1 | |
| | * | slight change to #page-spinner | git-marijus | 2013-07-13 | 1 | -1/+2 | |
| | * | Update main.js | git-marijus | 2013-07-13 | 1 | -1/+1 | |
| | * | Update main.js | git-marijus | 2013-07-13 | 1 | -1/+2 | |
| | * | Update main.js | git-marijus | 2013-07-13 | 1 | -3/+2 | |
| | * | port to spin.js | git-marijus | 2013-07-13 | 1 | -2/+1 | |
| | * | slight change for #nav-search-spinner | git-marijus | 2013-07-13 | 1 | -3/+1 | |
| | * | port to spin.js | git-marijus | 2013-07-13 | 1 | -1/+1 | |
| | * | port to spin.js | git-marijus | 2013-07-13 | 1 | -2/+2 | |
| | * | Create jquery.spin.js | git-marijus | 2013-07-13 | 1 | -0/+80 | |
| | * | Create spin.js | git-marijus | 2013-07-13 | 1 | -0/+349 | |
* | | | install typo | friendica | 2013-07-14 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-07-14 | 20 | -38/+87 | |
|\ \ | ||||||
| * | | Give prettyphoto it's own template to make themeing it less annoying. | Thomas Willingham | 2013-07-14 | 3 | -21/+8 | |
| * | | That should fix uploads... | Thomas Willingham | 2013-07-13 | 1 | -1/+1 | |
| * | | Old theme stuff we don't use anymore. | Thomas Willingham | 2013-07-12 | 9 | -0/+0 | |
| * | | Small amount of work on webpages. | Thomas Willingham | 2013-07-12 | 4 | -14/+42 | |
| * | | Make sure we load the channel theme when displaying a page. | Thomas Willingham | 2013-07-12 | 1 | -1/+18 | |
| * | | Merge pull request #76 from git-marijus/patch-4 | Thomas Willingham | 2013-07-11 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | Update boot.php | git-marijus | 2013-07-11 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Doco | Thomas Willingham | 2013-07-11 | 2 | -0/+15 | |
| * | | Merge pull request #74 from beardy-unixer/master | Thomas Willingham | 2013-07-10 | 3 | -3/+5 | |
| |\ \ | ||||||
| | * | | Non-translatable string plus feature enabled check | Thomas Willingham | 2013-07-11 | 3 | -3/+5 | |
* | | | | new doc pages | friendica | 2013-07-14 | 6 | -0/+459 | |
* | | | | Add self to recipient lists. Sure we already have a copy but it's possible ou... | friendica | 2013-07-14 | 91 | -1546/+1774 | |
|/ / / | ||||||
* | | | Merge pull request #73 from beardy-unixer/master | friendica | 2013-07-10 | 7 | -6/+248 | |
|\| | | ||||||
| * | | One of those days... | Thomas Willingham | 2013-07-10 | 2 | -13/+55 | |
| * | | Let's use the right files, plus a typo | Thomas Willingham | 2013-07-10 | 3 | -282/+31 | |
| * | | Minimum value webpages | Thomas Willingham | 2013-07-10 | 4 | -1/+400 | |
| * | | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2013-07-10 | 80 | -674/+1210 | |
| |\ \ | |/ / |/| | | ||||||
* | | | fix missing edit link | friendica | 2013-07-10 | 2 | -6/+5 |