Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed app list right container to not overlap left container scrollbar | Vincent Petry | 2013-10-14 | 1 | -1/+5 |
| | | | | | | - Container widths in apps list now use pixels instead of em - Container widths now match properly and rightcontainer doesn't overlap the scrollbar any more | ||||
* | Merge pull request #5320 from owncloud/fix_app_sorting | Vincent Petry | 2013-10-14 | 2 | -17/+33 |
|\ | | | | | Fix app sorting | ||||
| * | case insensitive sort | Frank Karlitschek | 2013-10-14 | 1 | -1/+1 |
| | | |||||
| * | fix style | Frank Karlitschek | 2013-10-14 | 1 | -5/+5 |
| | | |||||
| * | finally fix the app sorting | Frank Karlitschek | 2013-10-14 | 2 | -17/+33 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-13 | 348 | -11704/+11686 |
| | |||||
* | Merge pull request #5318 from owncloud/show_channel | Raghu Nayyar | 2013-10-13 | 3 | -3/+3 |
|\ | | | | | show the channel. Also mark git as git channel so that someone can see | ||||
| * | show the channel. Also mark git as git channel so that someone can see where ↵ | Frank Karlitschek | 2013-10-13 | 3 | -3/+3 |
| | | | | | | | | this build comes from | ||||
* | | Merge pull request #5253 from owncloud/externalstorage-adminstatusindicator | Morris Jobke | 2013-10-13 | 4 | -26/+30 |
|\ \ | |/ |/| | Fixed external storage status indicator in admin page | ||||
| * | Now using smaller spinner image for status indicator | Vincent Petry | 2013-10-11 | 4 | -6/+4 |
| | | | | | | | | | | | | To make the status indicator appear smaller, even in IE8 that doesn't support background-size, there is no a smaller animated gif "loading-small" for that purpose. | ||||
| * | Fixed external storage status indicator in admin page | Vincent Petry | 2013-10-10 | 2 | -26/+32 |
| | | | | | | | | | | | | | | - Fixes #5241 - Fixed indicator to appear, its selector was wrong - Added spinner while saving an entry's settings - Removed ajax "async: false" that blocked the browser while saving | ||||
* | | Merge pull request #5299 from owncloud/settings-ie8-tablegridstyles | Thomas Müller | 2013-10-12 | 3 | -8/+11 |
|\ \ | | | | | | | Fixed table grid styles for IE8 | ||||
| * | | Fixed table grid styles for IE8 | Vincent Petry | 2013-10-11 | 3 | -8/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | The selector :not() isn't supported in IE8, replaced it with the "grid" class. - Fixes the log table style in IE8 (#5057) - Fixes the users table layout bug in IE8 | ||||
* | | | Merge pull request #5303 from owncloud/fix-unlogged-session-error | Thomas Müller | 2013-10-12 | 2 | -3/+6 |
|\ \ \ | | | | | | | | | Log an error when session initialization fails before ownCloud is intalled | ||||
| * \ \ | Merge branch 'master' of github.com:owncloud/core into ↵ | Tom Needham | 2013-10-12 | 13 | -39/+131 |
| |\ \ \ | | | | | | | | | | | | | | | | fix-unlogged-session-error | ||||
| * | | | | Include exception message in log entry when session fails to start | Tom Needham | 2013-10-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Handle ownCloud logging when data dir not created | Tom Needham | 2013-10-11 | 2 | -7/+7 |
| | | | | | |||||
| * | | | | Log the session exception when ownCloud is not installed | Tom Needham | 2013-10-11 | 1 | -3/+6 |
| | | | | | |||||
* | | | | | Merge pull request #5290 from owncloud/fixing-5191-master | Morris Jobke | 2013-10-12 | 2 | -19/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | Installation. Show advanced section on error. Fixes #5191 | ||||
| * | | | | | Improve expand/collapse logic | Victor Dubiniuk | 2013-10-11 | 1 | -16/+13 |
| | | | | | | |||||
| * | | | | | Show advanced section on error. Fixes #5191 | Victor Dubiniuk | 2013-10-11 | 1 | -3/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #5272 from mrflix/master | Thomas Müller | 2013-10-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix label to checkbox binding in admin -> force-https | ||||
| * | | | | | | fix checkbox <-> label binding | Felix Niklas | 2013-10-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | clicking the label will trigger the checkbox | ||||
* | | | | | | | Merge pull request #5287 from owncloud/core-layoutviewportdirective | Thomas Müller | 2013-10-12 | 3 | -3/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixed viewport layout using commas instead of semicolons | ||||
| * | | | | | | | Fixed viewport layout using commas instead of semicolons | Vincent Petry | 2013-10-11 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5285 | ||||
* | | | | | | | | Merge pull request #5301 from owncloud/versioning_preview_shared | Thomas Müller | 2013-10-12 | 2 | -4/+11 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | versioning preview also for shared files | ||||
| * | | | | | | | remove debug output | Bjoern Schiessle | 2013-10-11 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into versioning_preview_shared | Bjoern Schiessle | 2013-10-11 | 515 | -6582/+4760 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | make previews work for shared files in the versions drop-down | Bjoern Schiessle | 2013-10-10 | 2 | -5/+12 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #5304 from owncloud/files-deleteiconpositionfix | Morris Jobke | 2013-10-11 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixed position of "delete" icon in files app | ||||
| * | | | | | | | | Fixed position of "delete" icon in files app | Vincent Petry | 2013-10-11 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an issue where only Chrome allows setting position: relative on a td element. This fix now works in IE8, Firefox and Chrome. Fixes #5056 | ||||
* | | | | | | | | | Merge pull request #5296 from owncloud/remove-chosen-hack | Morris Jobke | 2013-10-11 | 2 | -7/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Removes the Bogus Label | ||||
| * | | | | | | | | | Includes <optgroup> tag | raghunayyar | 2013-10-11 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Puts the language divider in place. thanks @Kondou-ger ;) | raghunayyar | 2013-10-11 | 2 | -4/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Removes the Bogus Label | raghunayyar | 2013-10-11 | 1 | -3/+0 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #5207 from owncloud/fixing-4011-part2-master | Thomas Müller | 2013-10-11 | 8 | -25/+121 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | [OC6] file upload exception handling | ||||
| * | | | | | | | | | fixing status code and formatting | Thomas Müller | 2013-10-08 | 2 | -18/+17 |
| | | | | | | | | | | |||||
| * | | | | | | | | | catch specific file exceptions and convert them to proper http status code ↵ | Thomas Müller | 2013-10-08 | 1 | -5/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | via webdav | ||||
| * | | | | | | | | | catch exceptions while uploading and pass on the error message | Thomas Müller | 2013-10-08 | 2 | -24/+29 |
| | | | | | | | | | | |||||
| * | | | | | | | | | adding additional exceptions for special cases where creating a file might ↵ | Thomas Müller | 2013-10-07 | 6 | -0/+85 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not be allowed | ||||
* | | | | | | | | | | Merge pull request #5302 from owncloud/files-missingfileactionsafteradd | Vincent Petry | 2013-10-11 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | File actions are now updated after create/upload file | ||||
| * | | | | | | | | | | File actions are now updated after create/upload file | Vincent Petry | 2013-10-11 | 1 | -2/+5 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file actions must explicitly be updated by calling FileActions.display() on the file element after creating or uploading a file. Fixes #4971 and #4993 | ||||
* | | | | | | | | | | Merge pull request #5274 from owncloud/files-ie8-deletecheckbox | Vincent Petry | 2013-10-11 | 3 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | Fixed delete icon alignment in IE8 | ||||
| * | | | | | | | | | Moved IE8 inline styles in files.css | Vincent Petry | 2013-10-11 | 3 | -2/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed delete icon alignment in IE8 | Vincent Petry | 2013-10-11 | 2 | -2/+2 |
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed old inline CSS that forced every td to have position:static in the files app. (#5056) | ||||
* | | | | | | | | | Merge pull request #5261 from owncloud/versioning_no_glob | Björn Schießle | 2013-10-11 | 1 | -82/+58 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | versioning: don't use glob() and getLocalFile() | ||||
| * | | | | | | | | | some small fixes | Bjoern Schiessle | 2013-10-11 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | make files versions root a class constant | Bjoern Schiessle | 2013-10-10 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | some small changes/fixes | Bjoern Schiessle | 2013-10-10 | 1 | -9/+8 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | fix getVersions() for sub directories | Bjoern Schiessle | 2013-10-10 | 1 | -2/+3 |
| | | | | | | | | |