summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed app list right container to not overlap left container scrollbarVincent Petry2013-10-141-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_sortingVincent Petry2013-10-142-17/+33
|\ | | | | Fix app sorting
| * case insensitive sortFrank Karlitschek2013-10-141-1/+1
| |
| * fix styleFrank Karlitschek2013-10-141-5/+5
| |
| * finally fix the app sortingFrank Karlitschek2013-10-142-17/+33
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-13348-11704/+11686
|
* Merge pull request #5318 from owncloud/show_channelRaghu Nayyar2013-10-133-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 Karlitschek2013-10-133-3/+3
| | | | | | | | this build comes from
* | Merge pull request #5253 from owncloud/externalstorage-adminstatusindicatorMorris Jobke2013-10-134-26/+30
|\ \ | |/ |/| Fixed external storage status indicator in admin page
| * Now using smaller spinner image for status indicatorVincent Petry2013-10-114-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 pageVincent Petry2013-10-102-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-tablegridstylesThomas Müller2013-10-123-8/+11
|\ \ | | | | | | Fixed table grid styles for IE8
| * | Fixed table grid styles for IE8Vincent Petry2013-10-113-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-errorThomas Müller2013-10-122-3/+6
|\ \ \ | | | | | | | | Log an error when session initialization fails before ownCloud is intalled
| * \ \ Merge branch 'master' of github.com:owncloud/core into ↵Tom Needham2013-10-1213-39/+131
| |\ \ \ | | | | | | | | | | | | | | | fix-unlogged-session-error
| * | | | Include exception message in log entry when session fails to startTom Needham2013-10-121-1/+1
| | | | |
| * | | | Handle ownCloud logging when data dir not createdTom Needham2013-10-112-7/+7
| | | | |
| * | | | Log the session exception when ownCloud is not installedTom Needham2013-10-111-3/+6
| | | | |
* | | | | Merge pull request #5290 from owncloud/fixing-5191-masterMorris Jobke2013-10-122-19/+16
|\ \ \ \ \ | | | | | | | | | | | | Installation. Show advanced section on error. Fixes #5191
| * | | | | Improve expand/collapse logicVictor Dubiniuk2013-10-111-16/+13
| | | | | |
| * | | | | Show advanced section on error. Fixes #5191Victor Dubiniuk2013-10-111-3/+3
| | | | | |
* | | | | | Merge pull request #5272 from mrflix/masterThomas Müller2013-10-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix label to checkbox binding in admin -> force-https
| * | | | | | fix checkbox <-> label bindingFelix Niklas2013-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | clicking the label will trigger the checkbox
* | | | | | | Merge pull request #5287 from owncloud/core-layoutviewportdirectiveThomas Müller2013-10-123-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed viewport layout using commas instead of semicolons
| * | | | | | | Fixed viewport layout using commas instead of semicolonsVincent Petry2013-10-113-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5285
* | | | | | | | Merge pull request #5301 from owncloud/versioning_preview_sharedThomas Müller2013-10-122-4/+11
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | versioning preview also for shared files
| * | | | | | | remove debug outputBjoern Schiessle2013-10-111-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into versioning_preview_sharedBjoern Schiessle2013-10-11515-6582/+4760
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | make previews work for shared files in the versions drop-downBjoern Schiessle2013-10-102-5/+12
| | | | | | | |
* | | | | | | | Merge pull request #5304 from owncloud/files-deleteiconpositionfixMorris Jobke2013-10-111-3/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed position of "delete" icon in files app
| * | | | | | | | Fixed position of "delete" icon in files appVincent Petry2013-10-111-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-hackMorris Jobke2013-10-112-7/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Removes the Bogus Label
| * | | | | | | | | Includes <optgroup> tagraghunayyar2013-10-111-1/+1
| | | | | | | | | |
| * | | | | | | | | Puts the language divider in place. thanks @Kondou-ger ;)raghunayyar2013-10-112-4/+1
| | | | | | | | | |
| * | | | | | | | | Removes the Bogus Labelraghunayyar2013-10-111-3/+0
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5207 from owncloud/fixing-4011-part2-masterThomas Müller2013-10-118-25/+121
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | [OC6] file upload exception handling
| * | | | | | | | | fixing status code and formattingThomas Müller2013-10-082-18/+17
| | | | | | | | | |
| * | | | | | | | | catch specific file exceptions and convert them to proper http status code ↵Thomas Müller2013-10-081-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | via webdav
| * | | | | | | | | catch exceptions while uploading and pass on the error messageThomas Müller2013-10-082-24/+29
| | | | | | | | | |
| * | | | | | | | | adding additional exceptions for special cases where creating a file might ↵Thomas Müller2013-10-076-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not be allowed
* | | | | | | | | | Merge pull request #5302 from owncloud/files-missingfileactionsafteraddVincent Petry2013-10-111-2/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | File actions are now updated after create/upload file
| * | | | | | | | | | File actions are now updated after create/upload fileVincent Petry2013-10-111-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-deletecheckboxVincent Petry2013-10-113-2/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | Fixed delete icon alignment in IE8
| * | | | | | | | | Moved IE8 inline styles in files.cssVincent Petry2013-10-113-2/+3
| | | | | | | | | |
| * | | | | | | | | Fixed delete icon alignment in IE8Vincent Petry2013-10-112-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_globBjörn Schießle2013-10-111-82/+58
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | versioning: don't use glob() and getLocalFile()
| * | | | | | | | | some small fixesBjoern Schiessle2013-10-111-2/+1
| | | | | | | | | |
| * | | | | | | | | make files versions root a class constantBjoern Schiessle2013-10-101-3/+3
| | | | | | | | | |
| * | | | | | | | | some small changes/fixesBjoern Schiessle2013-10-101-9/+8
| | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | fix getVersions() for sub directoriesBjoern Schiessle2013-10-101-2/+3
| | | | | | | | |