Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #231 from cvogeley/master | friendica | 2013-12-08 | 4 | -3/+73 |
|\ | | | | | Add bootstrap framework to red | ||||
| * | Minified bootstrap css | Christian Vogeley | 2013-12-08 | 1 | -1/+1 |
| | | |||||
| * | override bootstrap in bootstrap-red | Christian Vogeley | 2013-12-08 | 3 | -69/+68 |
| | | | | | | | | so theme developers are not forced to change anything | ||||
| * | submit button height | Christian Vogeley | 2013-12-08 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'bootstrap' | Christian Vogeley | 2013-12-08 | 2 | -0/+71 |
| |\ | |||||
| | * | Include bootstrap | Christian Vogeley | 2013-12-08 | 2 | -3/+85 |
| | | | |||||
* | | | Merge pull request #228 from tobiasd/nologin | friendica | 2013-12-08 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | add option to hide login form from homepage | ||||
| * | | add option to hide login form from homepage | Tobias Diekershoff | 2013-12-06 | 1 | -0/+1 |
| | | | |||||
* | | | typo in mod_poke.js | friendica | 2013-12-07 | 1 | -1/+1 |
| | | | |||||
* | | | finish ACL's in personal menus | friendica | 2013-12-07 | 2 | -0/+42 |
| | | | |||||
* | | | make suggestion photo sizes match top level post sizes | friendica | 2013-12-07 | 1 | -0/+5 |
| | | | |||||
* | | | show a clean url in the hovertip for suggested friends | friendica | 2013-12-06 | 1 | -1/+1 |
| | | | |||||
* | | | tweaking of the name field size and limits so it doesn't push the content around | friendica | 2013-12-06 | 1 | -1/+2 |
| | | | |||||
* | | | more overflow hidden important so it works | friendica | 2013-12-06 | 1 | -1/+1 |
| | | | |||||
* | | | suggestion widget | friendica | 2013-12-06 | 3 | -2/+13 |
|/ / | |||||
* | | Merge pull request #227 from tobiasd/DE20131206 | tobiasd | 2013-12-06 | 2 | -188/+189 |
|\ \ | | | | | | | DE: update to the strings | ||||
| * | | DE: update to the strings | Tobias Diekershoff | 2013-12-06 | 2 | -188/+189 |
| | | | |||||
* | | | some code cleanup - gad I forgot what a mess the "other" notifications tabs ↵ | friendica | 2013-12-06 | 1 | -20/+0 |
| | | | | | | | | | | | | (everything but system) were in. Maybe I'll just remove them so we can start over. | ||||
* | | | make some "selection-is-selected" classes work again | friendica | 2013-12-05 | 2 | -2/+2 |
|/ / | |||||
* | | generate a small amount of entropy to avoid duplicate notifications from ↵ | friendica | 2013-12-04 | 1 | -0/+4 |
| | | | | | | | | essentially simultaneous deliveries. | ||||
* | | more icon work | friendica | 2013-12-04 | 5 | -9/+5 |
| | | |||||
* | | more icon updates | friendica | 2013-12-04 | 11 | -48/+23 |
| | | |||||
* | | split conversation.css out of style.css | marijus | 2013-12-04 | 3 | -548/+715 |
| | | |||||
* | | should fix typos the right way... | marijus | 2013-12-03 | 1 | -1/+1 |
| | | |||||
* | | this should remain in style.css | marijus | 2013-12-03 | 2 | -2/+7 |
| | | |||||
* | | split out mod_message and a typo | marijus | 2013-12-03 | 3 | -96/+109 |
| | | |||||
* | | ensure that every imported channel has a primary hubloc | friendica | 2013-12-02 | 1 | -1/+1 |
| | | |||||
* | | clear floats on the connect button | friendica | 2013-12-02 | 1 | -0/+1 |
| | | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-12-02 | 2 | -1365/+1827 |
|\ \ | |||||
| * | | DE: update to the strings | Tobias Diekershoff | 2013-12-02 | 2 | -1365/+1827 |
| | | | |||||
* | | | refactor magic-auth | friendica | 2013-12-02 | 1 | -5/+0 |
|/ / | |||||
* | | some work on events permissions | friendica | 2013-12-01 | 1 | -1/+1 |
| | | |||||
* | | trimmed style.css by a few hundred lines. Needs many more such efforts | friendica | 2013-12-01 | 4 | -260/+190 |
| | | |||||
* | | Merge pull request #219 from tuscanhobbit/master | Paolo T | 2013-12-01 | 2 | -927/+960 |
|\ \ | | | | | | | italian translation | ||||
| * | | italian translation | tuscanhobbit | 2013-12-01 | 2 | -927/+960 |
| | | | |||||
* | | | quite a bit of work on default acl permissions and various acl quirks | friendica | 2013-11-29 | 2 | -2/+7 |
| | | | |||||
* | | | allow zot-info to return results for address= with webbies or naked nicknames | friendica | 2013-11-29 | 1 | -2/+1 |
| | | | |||||
* | | | re-enable jquery migration tool until we sort out all the issues | friendica | 2013-11-27 | 1 | -2/+2 |
| | | | |||||
* | | | create jquery-compat to hold deprecated jquery functions, load it before all ↵ | friendica | 2013-11-26 | 2 | -4/+5 |
| | | | | | | | | | | | | the dependent js scripts | ||||
* | | | make font-asewome optional. Also include jquery.browser in js/main.js so we ↵ | friendica | 2013-11-25 | 2 | -5/+7 |
| | | | | | | | | | | | | can turn off the migration toolkit. | ||||
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2013-11-25 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | no underlined drop icon | 23n | 2013-11-25 | 1 | -0/+1 |
| | | | | |||||
* | | | | sort out the preview icons | friendica | 2013-11-25 | 3 | -4/+8 |
|/ / / | |||||
* | | | polish up share button a little | marijus | 2013-11-25 | 1 | -30/+24 |
| | | | |||||
* | | | Merge pull request #214 from tuscanhobbit/master | friendica | 2013-11-25 | 2 | -12/+10 |
|\| | | | | | | | | admin user table now shows the channel list and ID, minor changes to admin summary table | ||||
| * | | admin user table now shows the channel list, minor changes to summary | tuscanhobbit | 2013-11-24 | 2 | -12/+10 |
| | | | |||||
* | | | force HTML notification mails to use predefined colours. | friendica | 2013-11-25 | 1 | -1/+1 |
|/ / | |||||
* | | redbasic nav bar gradient is now similar to the red shade in the logo | tuscanhobbit | 2013-11-23 | 1 | -8/+6 |
| | | |||||
* | | replaced rhash icon | tuscanhobbit | 2013-11-23 | 2 | -4/+4 |
| | | |||||
* | | a reference to account_id was missing in user admin table | tuscanhobbit | 2013-11-23 | 1 | -6/+8 |
| | |