Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/git-marijus/red | friendica | 2013-12-09 | 3 | -3/+19 |
|\ | | | | | | | | | Conflicts: view/theme/redbasic/css/style.css | ||||
| * | saved search icon work and bugfixes for #tags not beeing deletable and save ↵ | marijus | 2013-12-10 | 3 | -3/+16 |
| | | | | | | | | button showing if saved search is disabled | ||||
* | | notes widget | friendica | 2013-12-09 | 5 | -2/+52 |
| | | |||||
* | | doco and add document ready function | friendica | 2013-12-09 | 1 | -0/+4 |
|/ | |||||
* | some work on modularising the default profile photo so we can make them site ↵ | friendica | 2013-12-09 | 38 | -735/+13 |
| | | | | selectable. Also red != friendica so we don't need all these friendica logos taking up space | ||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2013-12-09 | 2 | -3/+13 |
|\ | |||||
| * | Merge pull request #233 from zzottel/master | friendica | 2013-12-09 | 2 | -3/+13 |
| |\ | | | | | | | First JS-less steps | ||||
| | * | enable JS-less display of channel | zottel | 2013-12-09 | 1 | -3/+7 |
| | | | |||||
| | * | set JS cookie | zottel | 2013-12-09 | 1 | -0/+6 |
| |/ | |||||
* / | this should fix the "always loads page 2 first if you're scrolled down the ↵ | friendica | 2013-12-09 | 1 | -28/+25 |
|/ | | | | page a fair ways and reload the page". | ||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2013-12-09 | 2 | -2/+2 |
|\ | |||||
| * | Merge pull request #232 from git-marijus/master | friendica | 2013-12-09 | 2 | -2/+2 |
| |\ | | | | | | | this reduces pageloadsize by 355,93KB | ||||
| | * | editor_plugin_src.js compressed at jscompress.com | marijus | 2013-12-09 | 1 | -1/+1 |
| | | | |||||
| | * | this reduces pageloadsize by 355,93KB | marijus | 2013-12-09 | 1 | -1/+1 |
| |/ | |||||
* | | more comanchisation (I declare this to be a word) | friendica | 2013-12-09 | 1 | -0/+13 |
| | | |||||
* | | migrate follow widget to comanche and remove obsolete mod/intro.php | friendica | 2013-12-09 | 6 | -139/+34 |
| | | |||||
* | | icon update | friendica | 2013-12-08 | 1 | -1/+1 |
|/ | |||||
* | description of work needed on photos module was duplicated | friendica | 2013-12-08 | 1 | -2/+0 |
| | |||||
* | suggestion widget tweaked to make it comanche capable. Remove old versions ↵ | friendica | 2013-12-08 | 11 | -465/+69 |
| | | | | of specs that are so obsolete it isn't funny. Zot protocol reference is in red's github wiki, and in the code. We should move the github copy to /doc once it is updated to match the code. There's no point in documenting dfrn in the red code base. | ||||
* | transition to $a->set_widget in /network on the short term - long term this ↵ | friendica | 2013-12-08 | 1 | -5/+5 |
| | | | | will be in view/pdl files | ||||
* | starting on the journey to comanche everywhere - beginning with widget ↵ | friendica | 2013-12-08 | 4 | -5/+13 |
| | | | | conversions. There are approximately 20 which need to be wrapped for accessibility to comanche. | ||||
* | Merge pull request #231 from cvogeley/master | friendica | 2013-12-08 | 15 | -3/+9850 |
|\ | | | | | Add bootstrap framework to red | ||||
| * | bootbox | Christian Vogeley | 2013-12-08 | 1 | -0/+6 |
| | | |||||
| * | 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 | 12 | -0/+9842 |
| |\ | |||||
| | * | Include bootstrap | Christian Vogeley | 2013-12-08 | 12 | -3/+9856 |
| | | | |||||
* | | | Merge pull request #228 from tobiasd/nologin | friendica | 2013-12-08 | 3 | -0/+5 |
|\ \ \ | |/ / |/| | | add option to hide login form from homepage | ||||
| * | | add option to hide login form from homepage | Tobias Diekershoff | 2013-12-06 | 3 | -0/+5 |
| | | | |||||
* | | | post_activity_item issues | friendica | 2013-12-07 | 3 | -5/+29 |
| | | | |||||
* | | | typo in mod_poke.js | friendica | 2013-12-07 | 1 | -1/+1 |
| | | | |||||
* | | | improve editing ability of webpages - acls, photos, location, page link ↵ | friendica | 2013-12-07 | 2 | -6/+49 |
| | | | | | | | | | | | | title, etc. | ||||
* | | | update the to-do list | friendica | 2013-12-07 | 1 | -0/+6 |
| | | | |||||
* | | | finish ACL's in personal menus | friendica | 2013-12-07 | 5 | -39/+128 |
| | | | |||||
* | | | make suggestion photo sizes match top level post sizes | friendica | 2013-12-07 | 2 | -1/+6 |
| | | | |||||
* | | | show a clean url in the hovertip for suggested friends | friendica | 2013-12-06 | 3 | -1/+3 |
| | | | |||||
* | | | add some entropy | friendica | 2013-12-06 | 1 | -2/+13 |
| | | | |||||
* | | | 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 |
| | | | |||||
* | | | add suggestions to a couple of other pages | friendica | 2013-12-06 | 2 | -0/+4 |
| | | | |||||
* | | | suggestion widget | friendica | 2013-12-06 | 6 | -3/+60 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2013-12-06 | 2 | -188/+189 |
|\| | | |||||
| * | | 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 |
| | | | | |||||
* | | | | need include/conversation for events now | friendica | 2013-12-06 | 1 | -0/+1 |
|/ / / | |||||
* | | | yeah - that's what I'm going to do. we'll just keep system notifications. If ↵ | friendica | 2013-12-06 | 3 | -329/+7178 |
| | | | | | | | | | | | | somebody wants web pages for the others we'll start fresh. It's easier than starting with curfty friendica code that doesn't work anymore and will never work without starting over. | ||||
* | | | doc updates | friendica | 2013-12-06 | 113 | -2065/+1639 |
| | | | |||||
* | | | some code cleanup - gad I forgot what a mess the "other" notifications tabs ↵ | friendica | 2013-12-06 | 6 | -7391/+11 |
| | | | | | | | | | | | | (everything but system) were in. Maybe I'll just remove them so we can start over. | ||||
* | | | move profile tabs and network/matrix tabs to include/conversation | friendica | 2013-12-05 | 3 | -198/+186 |
| | | |