aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/git-marijus/redfriendica2013-12-093-3/+19
|\ | | | | | | | | Conflicts: view/theme/redbasic/css/style.css
| * saved search icon work and bugfixes for #tags not beeing deletable and save ↵marijus2013-12-103-3/+16
| | | | | | | | button showing if saved search is disabled
* | notes widgetfriendica2013-12-095-2/+52
| |
* | doco and add document ready functionfriendica2013-12-091-0/+4
|/
* some work on modularising the default profile photo so we can make them site ↵friendica2013-12-0938-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 zpullfriendica2013-12-092-3/+13
|\
| * Merge pull request #233 from zzottel/masterfriendica2013-12-092-3/+13
| |\ | | | | | | First JS-less steps
| | * enable JS-less display of channelzottel2013-12-091-3/+7
| | |
| | * set JS cookiezottel2013-12-091-0/+6
| |/
* / this should fix the "always loads page 2 first if you're scrolled down the ↵friendica2013-12-091-28/+25
|/ | | | page a fair ways and reload the page".
* Merge https://github.com/friendica/red into zpullfriendica2013-12-092-2/+2
|\
| * Merge pull request #232 from git-marijus/masterfriendica2013-12-092-2/+2
| |\ | | | | | | this reduces pageloadsize by 355,93KB
| | * editor_plugin_src.js compressed at jscompress.commarijus2013-12-091-1/+1
| | |
| | * this reduces pageloadsize by 355,93KBmarijus2013-12-091-1/+1
| |/
* | more comanchisation (I declare this to be a word)friendica2013-12-091-0/+13
| |
* | migrate follow widget to comanche and remove obsolete mod/intro.phpfriendica2013-12-096-139/+34
| |
* | icon updatefriendica2013-12-081-1/+1
|/
* description of work needed on photos module was duplicatedfriendica2013-12-081-2/+0
|
* suggestion widget tweaked to make it comanche capable. Remove old versions ↵friendica2013-12-0811-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 ↵friendica2013-12-081-5/+5
| | | | will be in view/pdl files
* starting on the journey to comanche everywhere - beginning with widget ↵friendica2013-12-084-5/+13
| | | | conversions. There are approximately 20 which need to be wrapped for accessibility to comanche.
* Merge pull request #231 from cvogeley/masterfriendica2013-12-0815-3/+9850
|\ | | | | Add bootstrap framework to red
| * bootboxChristian Vogeley2013-12-081-0/+6
| |
| * Minified bootstrap cssChristian Vogeley2013-12-081-1/+1
| |
| * override bootstrap in bootstrap-redChristian Vogeley2013-12-083-69/+68
| | | | | | | | so theme developers are not forced to change anything
| * submit button heightChristian Vogeley2013-12-081-1/+1
| |
| * Merge branch 'bootstrap'Christian Vogeley2013-12-0812-0/+9842
| |\
| | * Include bootstrapChristian Vogeley2013-12-0812-3/+9856
| | |
* | | Merge pull request #228 from tobiasd/nologinfriendica2013-12-083-0/+5
|\ \ \ | |/ / |/| | add option to hide login form from homepage
| * | add option to hide login form from homepageTobias Diekershoff2013-12-063-0/+5
| | |
* | | post_activity_item issuesfriendica2013-12-073-5/+29
| | |
* | | typo in mod_poke.jsfriendica2013-12-071-1/+1
| | |
* | | improve editing ability of webpages - acls, photos, location, page link ↵friendica2013-12-072-6/+49
| | | | | | | | | | | | title, etc.
* | | update the to-do listfriendica2013-12-071-0/+6
| | |
* | | finish ACL's in personal menusfriendica2013-12-075-39/+128
| | |
* | | make suggestion photo sizes match top level post sizesfriendica2013-12-072-1/+6
| | |
* | | show a clean url in the hovertip for suggested friendsfriendica2013-12-063-1/+3
| | |
* | | add some entropyfriendica2013-12-061-2/+13
| | |
* | | tweaking of the name field size and limits so it doesn't push the content aroundfriendica2013-12-061-1/+2
| | |
* | | more overflow hidden important so it worksfriendica2013-12-061-1/+1
| | |
* | | add suggestions to a couple of other pagesfriendica2013-12-062-0/+4
| | |
* | | suggestion widgetfriendica2013-12-066-3/+60
| | |
* | | Merge https://github.com/friendica/red into zpullfriendica2013-12-062-188/+189
|\| |
| * | Merge pull request #227 from tobiasd/DE20131206tobiasd2013-12-062-188/+189
| |\ \ | | | | | | | | DE: update to the strings
| | * | DE: update to the stringsTobias Diekershoff2013-12-062-188/+189
| | | |
* | | | need include/conversation for events nowfriendica2013-12-061-0/+1
|/ / /
* | | yeah - that's what I'm going to do. we'll just keep system notifications. If ↵friendica2013-12-063-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 updatesfriendica2013-12-06113-2065/+1639
| | |
* | | some code cleanup - gad I forgot what a mess the "other" notifications tabs ↵friendica2013-12-066-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/conversationfriendica2013-12-053-198/+186
| | |