summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | 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
* | | | | | | | | Merge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missingBjörn Schießle2013-10-115-22/+57
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | fix another typoBjoern Schiessle2013-10-111-1/+1
| * | | | | | | | change error code to 403Bjoern Schiessle2013-10-111-1/+1
| * | | | | | | | fix typo in error message and change error code to 403Bjoern Schiessle2013-10-111-2/+2
| * | | | | | | | block file access if share keys are missingBjoern Schiessle2013-10-115-20/+55
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #5294 from owncloud/personal-multiselectRaghu Nayyar2013-10-112-11/+20
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Uniform Styles and Indentation Fixes for Personal Blockraghunayyar2013-10-112-11/+20
* | | | | | | | Merge pull request #5293 from owncloud/files-ie8-datemisalignedMorris Jobke2013-10-111-4/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fixed IE8 misaligned dateVincent Petry2013-10-111-4/+0
| |/ / / / / /
* | | | | | | Merge pull request #5281 from owncloud/settings-ie8-changedisplaynamefixMorris Jobke2013-10-111-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fixed display name change for IE8Vincent Petry2013-10-111-1/+1
* | | | | | | Merge pull request #5133 from owncloud/js_vcategories_to_tagsThomas Tanghus2013-10-1115-512/+534
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge branch 'js_vcategories_to_tags' of github.com:owncloud/core into js_vca...Thomas Tanghus2013-10-041-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix typoThomas Tanghus2013-10-041-1/+1
| * | | | | | | It's 'status', not 'result'!Thomas Tanghus2013-10-041-4/+4
| |/ / / / / /
| * | | | | | Remove obsolete files.Thomas Tanghus2013-10-049-490/+0
| * | | | | | JS version of the OCP\ITags interfaceThomas Tanghus2013-10-046-22/+534
* | | | | | | Merge pull request #5233 from owncloud/enc_filter_usersBjörn Schießle2013-10-115-37/+11
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | don't cache if the encryption is enabled, this can lead to problems during un...Bjoern Schiessle2013-10-101-27/+1
| * | | | | | make sure that we are logged in ad user1 while performing the testsBjoern Schiessle2013-10-101-3/+4
| * | | | | | make sure that we only find file/folder sharesBjoern Schiessle2013-10-091-4/+4
| * | | | | | only encrypt file to users with encryption keysBjoern Schiessle2013-10-092-3/+2
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-10471-5964/+4005
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #5263 from owncloud/fixing-5255-masterVicDeo2013-10-102-1/+37
|\ \ \ \ \ \
| * | | | | | the path need to be normalized before putting it into resolvePath()Thomas Müller2013-10-102-1/+37
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #4780 from AxelRb/masterMorris Jobke2013-10-102-0/+10
|\ \ \ \ \ \
| * | | | | | changed the argument to false for getValue , reformated else statementAxel Roenn2013-10-101-3/+2
| * | | | | | Added the config option to log ip addresses , default falseAxel Roenn2013-10-091-0/+3
| * | | | | | Changed default behaviour to not log IP address in case of an auth failure. C...Axel Roenn2013-09-101-2/+8
| * | | | | | On an auth failure the uid and the IP address should be logged to the standar...Axel Roenn2013-09-091-0/+2
* | | | | | | Merge pull request #5247 from owncloud/hooks-view-same-starticewind19912013-10-102-1/+22
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ merge master into hooks-view-same-startRobin Appelman2013-10-109-323/+40
| |\ \ \ \ \ \ \
| * | | | | | | | ensure the view's root is a subfolder of the the default root, not only start...Robin Appelman2013-10-092-1/+22
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #5257 from owncloud/files-ie8-regularfileactionsbrokenMorris Jobke2013-10-101-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed files view regular file actions in IE8Vincent Petry2013-10-101-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #5182 from owncloud/fix-sharring-with-password-screenMorris Jobke2013-10-106-2/+40
|\ \ \ \ \ \ \ \
| * | | | | | | | Optimize confirm.[svg|png] with optipng and scourkondou2013-10-082-63/+4
| * | | | | | | | Fix password screen for public sharesMorris Jobke2013-10-076-2/+99
* | | | | | | | | Merge pull request #5244 from owncloud/more-css-fixesMorris Jobke2013-10-105-2/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | fix web interface showing very small when accessed on smartphoneJan-Christoph Borchardt2013-10-063-0/+3
| * | | | | | | | properly indent contents of folders for app styles, to line up with textJan-Christoph Borchardt2013-10-061-2/+2
| * | | | | | | | improve clickability of footer linkJan-Christoph Borchardt2013-10-061-0/+2
* | | | | | | | | Merge pull request #5114 from owncloud/ldap_uuid_attr_groupsblizzz2013-10-106-152/+107
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | LDAP: allow different UUID attributes for groups and usersArthur Schiwon2013-10-046-152/+107
* | | | | | | | | Merge pull request #5221 from owncloud/fixing-5217-masterVicDeo2013-10-104-314/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainerThomas Müller2013-10-081-2/+3
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 09:50:44 +0000