summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fixing-4546-masterThomas Müller2013-10-14876-19982/+21779
|\
| * [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 where ...Frank Karlitschek2013-10-133-3/+3
| * | Merge pull request #5253 from owncloud/externalstorage-adminstatusindicatorMorris Jobke2013-10-134-26/+30
| |\ \ | | |/ | |/|
| | * Now using smaller spinner image for status indicatorVincent Petry2013-10-114-6/+4
| | * Fixed external storage status indicator in admin pageVincent Petry2013-10-102-26/+32
| * | Merge pull request #5299 from owncloud/settings-ie8-tablegridstylesThomas Müller2013-10-123-8/+11
| |\ \
| | * | Fixed table grid styles for IE8Vincent Petry2013-10-113-8/+11
| * | | Merge pull request #5303 from owncloud/fix-unlogged-session-errorThomas Müller2013-10-122-3/+6
| |\ \ \
| | * \ \ Merge branch 'master' of github.com:owncloud/core into fix-unlogged-session-e...Tom Needham2013-10-1213-39/+131
| | |\ \ \
| | * | | | 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
| |\ \ \ \ \
| | * | | | | 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 checkbox <-> label bindingFelix Niklas2013-10-101-1/+1
| * | | | | | | Merge pull request #5287 from owncloud/core-layoutviewportdirectiveThomas Müller2013-10-123-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed viewport layout using commas instead of semicolonsVincent Petry2013-10-113-3/+3
| * | | | | | | | Merge pull request #5301 from owncloud/versioning_preview_sharedThomas Müller2013-10-122-4/+11
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | 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 appVincent Petry2013-10-111-3/+1
| * | | | | | | | | Merge pull request #5296 from owncloud/remove-chosen-hackMorris Jobke2013-10-112-7/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | fixing status code and formattingThomas Müller2013-10-082-18/+17
| | * | | | | | | | | catch specific file exceptions and convert them to proper http status code vi...Thomas Müller2013-10-081-5/+12
| | * | | | | | | | | 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 no...Thomas Müller2013-10-076-0/+85
| * | | | | | | | | | Merge pull request #5302 from owncloud/files-missingfileactionsafteraddVincent Petry2013-10-111-2/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | File actions are now updated after create/upload fileVincent Petry2013-10-111-2/+5
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #5274 from owncloud/files-ie8-deletecheckboxVincent Petry2013-10-113-2/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | Moved IE8 inline styles in files.cssVincent Petry2013-10-113-2/+3
| | * | | | | | | | | Fixed delete icon alignment in IE8Vincent Petry2013-10-112-2/+2
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #5261 from owncloud/versioning_no_globBjörn Schießle2013-10-111-82/+58
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | 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
| | * | | | | | | | add missing preview linkBjoern Schiessle2013-10-101-0/+1
| | * | | | | | | | don't use glob() and getLocalFile(), this can lead to problems on windows ser...Bjoern Schiessle2013-10-101-81/+57
| * | | | | | | | | Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlinesBjörn Schießle2013-10-112-10/+3
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | fix setting dialog headlines for the encryption appBjoern Schiessle2013-10-112-10/+3
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 07:26:27 +0000