Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | move CSS for browser-specific fixes out of styles.css into new fixes.css | Jan-Christoph Borchardt | 2013-08-30 | 3 | -44/+47 |
| | |||||
* | move CSS for apps out of styles.css into new apps.css | Jan-Christoph Borchardt | 2013-08-30 | 3 | -240/+238 |
| | |||||
* | Merge pull request #4642 from masakik/master | Morris Jobke | 2013-08-29 | 2 | -9/+28 |
|\ | | | | | Minor enhancement to console.php | ||||
| * | replace ident spaces with tabs | Masaki | 2013-08-29 | 2 | -22/+23 |
| | | |||||
| * | enable usage with CLI interface | Masaki Kawabata Neto | 2013-08-29 | 1 | -2/+5 |
| | | | | | | Added option to use the status.php with console.php via CLI | ||||
| * | added help and status commands | Masaki Kawabata Neto | 2013-08-29 | 0 | -0/+0 |
| | | | | | | | | switch structure enables many commands seamlessy. also added some help and status command. | ||||
| * | added help and status commands | Masaki Kawabata Neto | 2013-08-29 | 1 | -7/+22 |
| | | | | | | | | switch structure enables many commands seamlessy. also added some help and status command. | ||||
* | | Merge pull request #4592 from owncloud/fix-logic | Thomas Müller | 2013-08-29 | 1 | -4/+2 |
|\ \ | | | | | | | fix weird logical behaviour | ||||
| * | | fix weird logical behaviour | Morris Jobke | 2013-08-27 | 1 | -4/+2 |
| | | | |||||
* | | | Merge pull request #4643 from owncloud/touch-newfile-hook | Thomas Müller | 2013-08-29 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | also emmit create hook when creating new files using touch() | ||||
| * | | also emmit create hook when creating new files using touch() | Robin Appelman | 2013-08-29 | 1 | -0/+1 |
|/ / | |||||
* | | webdav quota information contains the values for used and free - not total | Thomas Müller | 2013-08-29 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #4552 from dampfklon/fix4552 | Morris Jobke | 2013-08-28 | 1 | -1/+5 |
|\ \ | | | | | | | Make group suffix in share dialog translatable | ||||
| * | | Make group suffix in share dialog translatable | dampfklon | 2013-08-22 | 1 | -1/+5 |
| | | | |||||
* | | | Merge pull request #4631 from owncloud/hotfix_4630 | Morris Jobke | 2013-08-28 | 1 | -1/+9 |
|\ \ \ | | | | | | | | | Work around #4630 to fix license showing | ||||
| * | | | no duplicate declaration of appLicense + camelCase | Thomas Müller | 2013-08-28 | 1 | -5/+4 |
| | | | | |||||
| * | | | Work around #4630 to fix license showing | kondou | 2013-08-28 | 1 | -1/+10 |
| | | | | |||||
* | | | | Merge pull request #3926 from owncloud/improve_filesummary | Thomas Müller | 2013-08-28 | 4 | -40/+127 |
|\ \ \ \ | | | | | | | | | | | Improve filelist summary | ||||
| * | | | | Reimplement filesummary in JS | kondou | 2013-08-28 | 4 | -40/+127 |
| | | | | | | | | | | | | | | | | | | | | Fix #993 | ||||
* | | | | | Merge pull request #4614 from owncloud/trashbin_also_show_empty_folders | Thomas Müller | 2013-08-28 | 1 | -5/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | also move empty folders to the trash bin | ||||
| * | | | | | also move empty folders to the trash bin as discussed here #4590 | Bjoern Schiessle | 2013-08-28 | 1 | -5/+0 |
| | | | | | | |||||
* | | | | | | Merge pull request #4615 from owncloud/npm-modules | Thomas Müller | 2013-08-28 | 1 | -0/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Adds Node Modules to build in gitignore for easy testing. | ||||
| * | | | | | | Adds Node Modules to build in gitignore for easy testing. | raghunayyar | 2013-08-28 | 1 | -0/+3 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4618 from owncloud/visualize-js | Morris Jobke | 2013-08-28 | 2 | -0/+65 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | visualize | ||||
| * | | | | | | fixing typo | Thomas Müller | 2013-08-28 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | calculate fontsize and line-height | Morris Jobke | 2013-08-28 | 1 | -2/+7 |
| | | | | | | | |||||
| * | | | | | | update 3rdparty - md5 | Morris Jobke | 2013-08-28 | 1 | -0/+0 |
| | | | | | | | |||||
| * | | | | | | fix 3rdparty commit | Morris Jobke | 2013-08-28 | 1 | -0/+0 |
| | | | | | | | |||||
| * | | | | | | reviewers comments | Morris Jobke | 2013-08-28 | 1 | -6/+14 |
| | | | | | | | |||||
| * | | | | | | add visualize | Morris Jobke | 2013-08-28 | 2 | -0/+52 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3961 from owncloud/logrotate | Morris Jobke | 2013-08-28 | 3 | -3/+63 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Very simple log rotation | ||||
| * | | | | | fix typo | Morris Jobke | 2013-08-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Only enable logrotate when configured. Also rotate size is settable. | Bart Visscher | 2013-08-28 | 3 | -11/+23 |
| | | | | | | |||||
| * | | | | | Check for installed state before registering the logrotate background job | Bart Visscher | 2013-08-28 | 2 | -2/+16 |
| | | | | | | |||||
| * | | | | | Add description to log rotate class | Bart Visscher | 2013-08-28 | 1 | -0/+7 |
| | | | | | | |||||
| * | | | | | Review fixes | Bart Visscher | 2013-08-28 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Very simple log rotation | Bart Visscher | 2013-08-28 | 2 | -0/+27 |
| |/ / / / | |||||
* | | | | | Merge pull request #4627 from owncloud/trashbin-tipsy | Morris Jobke | 2013-08-28 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | change orientation for delete tooltip to left, fix #4589 | ||||
| * | | | | change orientation for delete tooltip to left, fix #4589 | Jan-Christoph Borchardt | 2013-08-28 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #4563 from owncloud/use_personal-password | Jan-Christoph Borchardt | 2013-08-28 | 2 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Use personal-password for the password name in personal.php | ||||
| * | | | | | Use personal-password for the password name in personal.php | kondou | 2013-08-24 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fix #4491 | ||||
* | | | | | | Merge pull request #4489 from owncloud/clean-3rdparty-mess-master | Bart Visscher | 2013-08-28 | 16 | -2/+1506 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Clean 3rdparty mess master | ||||
| * | | | | | | fixing require path | Thomas Müller | 2013-08-18 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | update 3rdparty submodule - timepicker removed | Thomas Müller | 2013-08-17 | 1 | -0/+0 |
| | | | | | | | |||||
| * | | | | | | update 3rdparty submodule | Thomas Müller | 2013-08-17 | 1 | -0/+0 |
| | | | | | | | |||||
| * | | | | | | 3rdparty submodule update: getid3 removed | Thomas Müller | 2013-08-17 | 1 | -0/+0 |
| | | | | | | | |||||
| * | | | | | | update 3rdparty - openid moved | Thomas Müller | 2013-08-17 | 1 | -0/+0 |
| | | | | | | | |||||
| * | | | | | | moving Dropbox and smb4php 3rdparty code over to the apps | Thomas Müller | 2013-08-17 | 15 | -2/+1506 |
| | | | | | | | |||||
| * | | | | | | update 3rdparty submodule | Thomas Müller | 2013-08-17 | 1 | -0/+0 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3891 from owncloud/fix_loadAppScriptFile | Bart Visscher | 2013-08-28 | 1 | -5/+8 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Check if the app is enabled and the app path is found before trying to l... |