Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-25 | 4 | -1302/+1312 |
|\ | |||||
| * | DE: update to the strings | Tobias Diekershoff | 2014-01-25 | 2 | -1302/+1309 |
| | | |||||
| * | Add admin info to admin panel and site info. | Thomas Willingham | 2014-01-24 | 2 | -0/+3 |
| | | | | | | | | Since we can have multiple admins, this is freeform bbcode. | ||||
* | | get rid of bootstrap's blockqote margin css which is just bloody wrong and ↵ | friendica | 2014-01-25 | 1 | -0/+1 |
|/ | | | | can't easily be over-ridden | ||||
* | prettyphoto (js|css) not found | friendica | 2014-01-24 | 1 | -3/+0 |
| | |||||
* | add primary webbie to directory popup | friendica | 2014-01-21 | 1 | -0/+4 |
| | |||||
* | fix the admin interface to pending registrations | friendica | 2014-01-21 | 1 | -3/+2 |
| | |||||
* | no need to have a doule hublocid | Michael Meer | 2014-01-20 | 1 | -2/+3 |
| | |||||
* | added buttons to perform later hubloc actions | Michael Meer | 2014-01-20 | 1 | -0/+2 |
| | |||||
* | Missed these from git add...a year ago | Thomas Willingham | 2014-01-17 | 1 | -0/+7 |
| | |||||
* | Remove deprecated CSS - there is a dark schema now, and shadows and stuff ↵ | Thomas Willingham | 2014-01-16 | 2 | -293/+0 |
| | | | | are cofigurable. | ||||
* | Tweak "typical" perms macro | Thomas Willingham | 2014-01-16 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master | friendica | 2014-01-15 | 2 | -4537/+5082 |
|\ | | | | | | | | | Conflicts: view/ru/strings.php | ||||
| * | modified: view/ru/messages.po | pixelroot | 2014-01-13 | 2 | -1922/+1599 |
| | | | | | | | | modified: view/ru/strings.php | ||||
| * | modified: view/ru/messages.po | pixelroot | 2014-01-13 | 1 | -3661/+4094 |
| | | |||||
* | | Merge pull request #271 from cvogeley/master | cvogeley | 2014-01-13 | 1 | -3/+8 |
|\ \ | | | | | | | Confirm box: fall back to standard js confirm dialog if bootstrap isn't ... | ||||
| * | | Confirm box: fall back to standard js confirm dialog if bootstrap isn't ↵ | Christian Vogeley | 2014-01-13 | 1 | -3/+8 |
| | | | | | | | | | | | | available | ||||
* | | | DE: update to the strings | Tobias Diekershoff | 2014-01-13 | 2 | -2239/+2388 |
| | | | |||||
* | | | Merge pull request #268 from cvogeley/master | cvogeley | 2014-01-11 | 1 | -1/+1 |
|\| | | | | | | | | delete confirmation popup for blocks and layouts | ||||
| * | | delete confirmation popup for blocks and layouts | Christian Vogeley | 2014-01-12 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #264 from tuscanhobbit/master | Paolo T | 2014-01-11 | 2 | -874/+947 |
|\ \ \ | |/ / |/| | | Italian translation of reddav | ||||
| * | | Italian translation of reddav | tuscanhobbit | 2014-01-11 | 2 | -874/+947 |
| | | | |||||
* | | | Prevent whitespace breaking copy-paste of reset passwords. | Thomas Willingham | 2014-01-10 | 1 | -3/+1 |
| | | | |||||
* | | | mod_filestorage: provide a URL for linking to webpages and other websites | friendica | 2014-01-09 | 2 | -6/+7 |
| | | | |||||
* | | | add cloud link to profile_tabs and Comanchify the sucker | friendica | 2014-01-09 | 1 | -0/+3 |
| | | | |||||
* | | | preparatory work for supporting a "list view" mode for conversations. This ↵ | friendica | 2014-01-08 | 1 | -0/+2 |
| | | | | | | | | | | | | would be useful for forum-like channels and/or block-oriented themes. | ||||
* | | | qr enhancements | friendica | 2014-01-08 | 2 | -3/+13 |
| | | | |||||
* | | | qr code support | friendica | 2014-01-07 | 1 | -1/+1 |
| | | | |||||
* | | | make storage limit service classes apply to accounts, not channels. Also ↵ | friendica | 2014-01-07 | 1 | -0/+11 |
| | | | | | | | | | | | | include a css file that was missing from work yesterday. | ||||
* | | | filestorage re-org and cleanup | friendica | 2014-01-06 | 2 | -6/+12 |
| | | | |||||
* | | | special handling for directories | friendica | 2014-01-06 | 1 | -1/+1 |
| | | | |||||
* | | | prepare for OS file storage, and add bbcode attachment link to ↵ | friendica | 2014-01-06 | 1 | -4/+4 |
| | | | | | | | | | | | | mod/filestorage. This isn't beautiful, but it's a start. | ||||
* | | | add "self" to access control lists with special marking to indicate it's ↵ | friendica | 2014-01-06 | 2 | -2/+6 |
| | | | | | | | | | | | | special (for instance you can't really deny access to yourself). But this lets us make something private to our eyes only; whatever it may be. | ||||
* | | | provide ability to change attachment/file permissions | friendica | 2014-01-06 | 2 | -0/+33 |
| | | | |||||
* | | | Merge branch 'master' into movejs | friendica | 2014-01-06 | 8 | -2873/+2914 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: version.inc | ||||
| * | | | likes to comments getting indented an extra 50px | friendica | 2014-01-05 | 1 | -5/+0 |
| | | | | |||||
| * | | | make plink href visible | friendica | 2014-01-04 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #255 from tuscanhobbit/master | Paolo T | 2014-01-04 | 2 | -2863/+2909 |
| |\| | | | | | | | | | | Updated Italian translation | ||||
| | * | | Updated Italian translation | tuscanhobbit | 2014-01-04 | 2 | -2863/+2909 |
| | | | | |||||
* | | | | move js files from core | friendica | 2014-01-04 | 15 | -11/+4091 |
|/ / / | |||||
* | | | Merge pull request #254 from cvogeley/master | cvogeley | 2014-01-03 | 1 | -4/+3 |
|\ \ \ | | | | | | | | | Webpage fixes for the moment without the fix for page not found after editing a webpage | ||||
| * | | | Confirm webpage deletion prompt | Christian Vogeley | 2014-01-01 | 1 | -4/+3 |
| | | | | |||||
* | | | | expose profile things in the UI | friendica | 2013-12-30 | 3 | -10/+14 |
| | | | | |||||
* | | | | basic edit and delete for things | friendica | 2013-12-30 | 3 | -0/+42 |
| | | | | |||||
* | | | | display_thing: it ain't much, but it's implemented. | friendica | 2013-12-29 | 1 | -0/+8 |
| | | | | |||||
* | | | | a bit more backend work on things | friendica | 2013-12-28 | 1 | -0/+13 |
| | | | | |||||
* | | | | remove prettyphoto from core - this will affect the enhanced photo albums ↵ | friendica | 2013-12-26 | 4 | -12/+1 |
| | | | | | | | | | | | | | | | | feature on the short term which has been disabled until we figure out how to make the setting per-theme instead of a core option. The library is still available in core (library/prettyphoto) currently but needs to be moved to theme js and loaded/accessed from there [for themes which use it]. Then the library will be removed. It appears that other lightboxes commonly use rel= to group photo albums. So we may provide a generic rel= tag in photo album templates so that the choice of lightbox or album viewer is not only a theme option but could also be accomplished with plugins. | ||||
* | | | | missing end div | friendica | 2013-12-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | and add a border for delineation | friendica | 2013-12-25 | 1 | -0/+2 |
| | | | | |||||
* | | | | improve the register text until the new register page is finished | friendica | 2013-12-25 | 2 | -2/+13 |
| | | | |