summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix logout link HTML.Andreas Fischer2013-10-141-1/+1
| | | | <a id="logout" href=/projects/owncloud/core/index.php?logout=true>
* Merge pull request #5330 from owncloud/files-removedfileactionsbkgVincent Petry2013-10-141-8/+0
|\ | | | | Removed extra bkg color on file actions when row is selected/hovered on
| * Removed extra bkg color on file actions when row is selected/hovered onVincent Petry2013-10-141-8/+0
| |
* | Merge pull request #4867 from owncloud/fixing-4546-masterThomas Müller2013-10-144-19/+75
|\ \ | | | | | | Adding detection of aborted uploads for chunked uploads
| * \ Merge branch 'master' into fixing-4546-masterThomas Müller2013-10-14876-19982/+21779
| |\ \ | | | | | | | | | | | | | | | | Conflicts: lib/private/connector/sabre/file.php
| * | | moving createFileChunked() to OC_Connector_Sabre_FileThomas Müller2013-10-071-15/+34
| | | |
| * | | Merge branch 'master' into fixing-4546-masterThomas Müller2013-10-071186-20283/+36964
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/connector/sabre/directory.php
| * \ \ \ Merge branch 'master' into fixing-4546-masterThomas Müller2013-09-304-13/+199
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/connector/sabre/directory.php
| * \ \ \ \ Merge branch 'master' into fixing-4546-masterThomas Müller2013-09-30743-13928/+33242
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/connector/sabre/directory.php
| * | | | | | adding detection of aborted uploadsThomas Müller2013-09-161-41/+58
| | | | | | |
| * | | | | | returning the number of stored bytes in store() and adding cleanup() methodThomas Müller2013-09-161-1/+22
| | | | | | |
| * | | | | | adding size() to the file cacheThomas Müller2013-09-161-0/+18
| | | | | | |
* | | | | | | Merge pull request #5323 from owncloud/files-external-missinggridstyleFrank Karlitschek2013-10-141-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added missing "grid" class on external storage's table
| * | | | | | | Added missing "grid" class on external storage's tableVincent Petry2013-10-141-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #5297 from owncloud/quota-styleJan-Christoph Borchardt2013-10-141-7/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fixes Default Quota Style in User Management.
| * | | | | | Fixes Default Quota Style in User Management.raghunayyar2013-10-141-7/+5
| | |_|_|_|/ | |/| | | |
* | | | | | 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
| | | | | | | | | | | | | |