summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-16387-3453/+3676
* Merge pull request #5334 from owncloud/files-sharing-actionsafteruploadMorris Jobke2013-10-153-23/+29
|\
| * Disabled ajax mode for public files viewVincent Petry2013-10-142-21/+27
| * Fixed file permissions after public uploadVincent Petry2013-10-141-2/+2
* | Merge pull request #5350 from owncloud/files-preventdeletemountpointVincent Petry2013-10-151-1/+2
|\ \
| * | Prevent renaming/deleting mount pointsVincent Petry2013-10-151-1/+2
|/ /
* | Merge pull request #5295 from owncloud/show-eye-in-personalRaghu Nayyar2013-10-152-10/+6
|\ \
| * | Removes Bogus showpassword js. thx @PVince81raghunayyar2013-10-151-3/+1
| * | Should Display PasswordToggle Eye Everywhere.raghunayyar2013-10-152-8/+1
| * | Shows The Eye permanently in the Confirm Password field in Personal Settings ...raghunayyar2013-10-122-1/+6
* | | Merge pull request #5332 from owncloud/enc_run_proxy_only_for_filesMorris Jobke2013-10-151-1/+2
|\ \ \
| * | | check if we are writing to user/files, otherwise skip encryptionBjoern Schiessle2013-10-141-1/+2
* | | | Merge pull request #5269 from owncloud/ocs_share_api_add_received_fromBjörn Schießle2013-10-152-8/+20
|\ \ \ \
| * | | | fix api testsBjoern Schiessle2013-10-111-1/+2
| * | | | add "received_from" and "received_from_displayname" field in case of a reshar...Bjoern Schiessle2013-10-101-7/+18
* | | | | Merge pull request #5341 from owncloud/fix-logout-link-htmlVincent Petry2013-10-151-1/+1
|\ \ \ \ \
| * | | | | Fix logout link HTML.Andreas Fischer2013-10-141-1/+1
* | | | | | Merge pull request #5340 from owncloud/fixing-5251-mastericewind19912013-10-142-2/+36
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | streamCopy() should return proper structure.Thomas Müller2013-10-142-2/+36
* | | | | | 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 onVincent Petry2013-10-141-8/+0
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4867 from owncloud/fixing-4546-masterThomas Müller2013-10-144-19/+75
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into fixing-4546-masterThomas Müller2013-10-14876-19982/+21779
| |\ \ \ \ \
| * | | | | | 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
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into fixing-4546-masterThomas Müller2013-09-304-13/+199
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into fixing-4546-masterThomas Müller2013-09-30743-13928/+33242
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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 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.raghunayyar2013-10-141-7/+5
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #5320 from owncloud/fix_app_sortingVincent Petry2013-10-142-17/+33
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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 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