Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | fixing status code and formatting | Thomas Müller | 2013-10-08 | 2 | -18/+17 | |
| * | | | | | | | | | | | | | | | | | | | | | | catch specific file exceptions and convert them to proper http status code vi... | Thomas Müller | 2013-10-08 | 1 | -5/+12 | |
| * | | | | | | | | | | | | | | | | | | | | | | catch exceptions while uploading and pass on the error message | Thomas Müller | 2013-10-08 | 2 | -24/+29 | |
| * | | | | | | | | | | | | | | | | | | | | | | adding additional exceptions for special cases where creating a file might no... | Thomas Müller | 2013-10-07 | 6 | -0/+85 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5302 from owncloud/files-missingfileactionsafteradd | Vincent Petry | 2013-10-11 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | File actions are now updated after create/upload file | Vincent Petry | 2013-10-11 | 1 | -2/+5 | |
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5274 from owncloud/files-ie8-deletecheckbox | Vincent Petry | 2013-10-11 | 3 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Moved IE8 inline styles in files.css | Vincent Petry | 2013-10-11 | 3 | -2/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | Fixed delete icon alignment in IE8 | Vincent Petry | 2013-10-11 | 2 | -2/+2 | |
| | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5261 from owncloud/versioning_no_glob | Björn Schießle | 2013-10-11 | 1 | -82/+58 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | some small fixes | Bjoern Schiessle | 2013-10-11 | 1 | -2/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | make files versions root a class constant | Bjoern Schiessle | 2013-10-10 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | some small changes/fixes | Bjoern Schiessle | 2013-10-10 | 1 | -9/+8 | |
| | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | fix getVersions() for sub directories | Bjoern Schiessle | 2013-10-10 | 1 | -2/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | add missing preview link | Bjoern Schiessle | 2013-10-10 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | don't use glob() and getLocalFile(), this can lead to problems on windows ser... | Bjoern Schiessle | 2013-10-10 | 1 | -81/+57 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlines | Björn Schießle | 2013-10-11 | 2 | -10/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | fix setting dialog headlines for the encryption app | Bjoern Schiessle | 2013-10-11 | 2 | -10/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missing | Björn Schießle | 2013-10-11 | 5 | -22/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | fix another typo | Bjoern Schiessle | 2013-10-11 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | change error code to 403 | Bjoern Schiessle | 2013-10-11 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | fix typo in error message and change error code to 403 | Bjoern Schiessle | 2013-10-11 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | block file access if share keys are missing | Bjoern Schiessle | 2013-10-11 | 5 | -20/+55 | |
| | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #5294 from owncloud/personal-multiselect | Raghu Nayyar | 2013-10-11 | 2 | -11/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Uniform Styles and Indentation Fixes for Personal Block | raghunayyar | 2013-10-11 | 2 | -11/+20 | |
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge pull request #5293 from owncloud/files-ie8-datemisaligned | Morris Jobke | 2013-10-11 | 1 | -4/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Fixed IE8 misaligned date | Vincent Petry | 2013-10-11 | 1 | -4/+0 | |
| |/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | Merge pull request #5281 from owncloud/settings-ie8-changedisplaynamefix | Morris Jobke | 2013-10-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Fixed display name change for IE8 | Vincent Petry | 2013-10-11 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #5133 from owncloud/js_vcategories_to_tags | Thomas Tanghus | 2013-10-11 | 15 | -512/+534 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Merge branch 'js_vcategories_to_tags' of github.com:owncloud/core into js_vca... | Thomas Tanghus | 2013-10-04 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | Fix typo | Thomas Tanghus | 2013-10-04 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | It's 'status', not 'result'! | Thomas Tanghus | 2013-10-04 | 1 | -4/+4 | |
| |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | Remove obsolete files. | Thomas Tanghus | 2013-10-04 | 9 | -490/+0 | |
| * | | | | | | | | | | | | | | | | | | JS version of the OCP\ITags interface | Thomas Tanghus | 2013-10-04 | 6 | -22/+534 | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #5233 from owncloud/enc_filter_users | Björn Schießle | 2013-10-11 | 5 | -37/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | don't cache if the encryption is enabled, this can lead to problems during un... | Bjoern Schiessle | 2013-10-10 | 1 | -27/+1 | |
| * | | | | | | | | | | | | | | | | | | make sure that we are logged in ad user1 while performing the tests | Bjoern Schiessle | 2013-10-10 | 1 | -3/+4 | |
| * | | | | | | | | | | | | | | | | | | make sure that we only find file/folder shares | Bjoern Schiessle | 2013-10-09 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | only encrypt file to users with encryption keys | Bjoern Schiessle | 2013-10-09 | 2 | -3/+2 | |
* | | | | | | | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-10 | 471 | -5964/+4005 | |
| |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge pull request #5263 from owncloud/fixing-5255-master | VicDeo | 2013-10-10 | 2 | -1/+37 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | the path need to be normalized before putting it into resolvePath() | Thomas Müller | 2013-10-10 | 2 | -1/+37 | |
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge pull request #4780 from AxelRb/master | Morris Jobke | 2013-10-10 | 2 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | changed the argument to false for getValue , reformated else statement | Axel Roenn | 2013-10-10 | 1 | -3/+2 | |
| * | | | | | | | | | | | | | | | | | Added the config option to log ip addresses , default false | Axel Roenn | 2013-10-09 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | | | | Changed default behaviour to not log IP address in case of an auth failure. C... | Axel Roenn | 2013-09-10 | 1 | -2/+8 | |
| * | | | | | | | | | | | | | | | | | On an auth failure the uid and the IP address should be logged to the standar... | Axel Roenn | 2013-09-09 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | | | | Merge pull request #5247 from owncloud/hooks-view-same-start | icewind1991 | 2013-10-10 | 2 | -1/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | merge master into hooks-view-same-start | Robin Appelman | 2013-10-10 | 9 | -323/+40 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |