Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7665 from owncloud/fix_ocs_share_api_paths | Björn Schießle | 2014-03-11 | 1 | -2/+7 |
|\ | |||||
| * | fix path creation for re-shares, issue #7662 | Bjoern Schiessle | 2014-03-11 | 1 | -2/+7 |
* | | Merge pull request #7650 from owncloud/quota-totalspace | Vincent Petry | 2014-03-11 | 2 | -1/+17 |
|\ \ | |||||
| * | | Fixed total space display when data size exceeds quota | Vincent Petry | 2014-03-10 | 2 | -1/+17 |
* | | | Merge pull request #7659 from owncloud/fix-7596 | Vincent Petry | 2014-03-11 | 2 | -14/+14 |
|\ \ \ | |||||
| * | | | remove magic handling of recipient lists by exploding the string - this funct... | Thomas Müller | 2014-03-10 | 1 | -4/+1 |
| * | | | send an individual email to each recipient | Thomas Müller | 2014-03-10 | 1 | -10/+13 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-11 | 53 | -279/+159 |
|/ / / | |||||
* | | | Merge pull request #7602 from owncloud/flush-updater-cache | Vincent Petry | 2014-03-10 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Reset time of last update feed polling | Victor Dubiniuk | 2014-03-06 | 1 | -0/+2 |
* | | | | Disable XML entities when parsing XML | Vincent Petry | 2014-03-10 | 2 | -4/+14 |
| |_|/ |/| | | |||||
* | | | Merge pull request #7398 from owncloud/trash_dont_rely_on_db | Vincent Petry | 2014-03-10 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | get trash size from file cache | Bjoern Schiessle | 2014-03-10 | 1 | -1/+1 |
* | | | | Merge pull request #7632 from owncloud/fix-7582-master | Thomas Müller | 2014-03-10 | 1 | -11/+12 |
|\ \ \ \ | |||||
| * | | | | fixing ident | Thomas Müller | 2014-03-07 | 1 | -9/+9 |
| * | | | | we first shall check if the current session is valid - otherwise the session-... | Thomas Müller | 2014-03-07 | 1 | -12/+13 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #7624 from owncloud/enc-encryptedusedspacefix | Vincent Petry | 2014-03-10 | 2 | -2/+12 |
|\ \ \ \ | |||||
| * | | | | Return unencrypted_size of folder when queried | Vincent Petry | 2014-03-07 | 1 | -0/+5 |
| * | | | | Propagate unencrypted_size up to the file cache root | Vincent Petry | 2014-03-07 | 1 | -2/+7 |
* | | | | | Merge pull request #7628 from owncloud/fileinfo-type | Thomas Tanghus | 2014-03-09 | 2 | -4/+14 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Check if value exists before returning | Robin Appelman | 2014-03-07 | 1 | -2/+5 |
| * | | | | Fix FileInfo->getType errors | Robin Appelman | 2014-03-07 | 2 | -2/+9 |
* | | | | | Merge pull request #7529 from owncloud/getlocalfile-cache | icewind1991 | 2014-03-07 | 1 | -2/+22 |
|\ \ \ \ \ | |||||
| * | | | | | Add caching for getLocalFile on remote storages | Robin Appelman | 2014-03-04 | 1 | -2/+22 |
* | | | | | | Merge pull request #7583 from owncloud/trusteddomainerrorpage | Vincent Petry | 2014-03-07 | 2 | -17/+77 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Fixed X-Forwarded-Host parsing | Vincent Petry | 2014-03-06 | 1 | -1/+2 |
| * | | | | | Added localhost as trusted domain | Vincent Petry | 2014-03-06 | 1 | -0/+5 |
| * | | | | | Show warning page when accessing server from an untrusted domain | Vincent Petry | 2014-03-06 | 2 | -16/+70 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #7592 from owncloud/fixstoragefreespace | Vincent Petry | 2014-03-06 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed upload issue when free space is not known | Vincent Petry | 2014-03-06 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #7182 from owncloud/imagerotate_and_loadbase64_fix | Vincent Petry | 2014-03-06 | 1 | -4/+3 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Fix imagerotate and move loadFromBase64() one up. | kondou | 2014-02-12 | 1 | -4/+3 |
* | | | | | Merge pull request #7494 from owncloud/fix-7307 | Vincent Petry | 2014-03-06 | 2 | -25/+0 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into fix-7307 | Thomas Müller | 2014-03-06 | 15 | -142/+192 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | Replace OC.Router.generate() with OC.generateUrl() | Thomas Müller | 2014-03-02 | 2 | -25/+0 |
* | | | | | | fix merge conflicts | Georg Ehrke | 2014-03-06 | 7 | -8/+12 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #7354 from pschmitt/master | Lukas Reschke | 2014-03-05 | 4 | -6/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | Use 'command -v' to detect whether and where software is installed (instead o... | Philipp Schmitt | 2014-02-21 | 4 | -6/+6 |
| * | | | | | | Merge pull request #7531 from owncloud/dont_create_shared_folder | Björn Schießle | 2014-03-05 | 2 | -2/+5 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | don't allow to create a file or folder named 'Shared' in the root folder, als... | Bjoern Schiessle | 2014-03-05 | 2 | -2/+5 |
| | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | add fclose, fixes issue from bdb96b9af85256f9b3f8663ccf6d27b3d1330918 | Georg Ehrke | 2014-03-05 | 1 | -0/+1 |
* | | | | | | | fix issue with Non-static method Imagick ../..; @ doesn't seem to work in thi... | Georg Ehrke | 2014-03-05 | 3 | -62/+80 |
|/ / / / / / | |||||
* | | | | | | fix issue with spamming logging files when loading cached thumbnail | Georg Ehrke | 2014-03-05 | 1 | -1/+3 |
* | | | | | | Merge pull request #7521 from owncloud/docstrings_2_kondou | Thomas Müller | 2014-03-05 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix some more docstrings | kondou | 2014-03-03 | 2 | -2/+2 |
* | | | | | | | Merge pull request #7251 from owncloud/fix-ocsapi-getuser | Tom Needham | 2014-03-04 | 1 | -2/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Return 101 if user doesnt exist | tomneedham | 2014-02-18 | 1 | -2/+6 |
| * | | | | | | | Add displayname for admins | tomneedham | 2014-02-18 | 1 | -2/+10 |
* | | | | | | | | Merge pull request #7481 from tripflex/fix_downloadlink_spaces | Vincent Petry | 2014-03-04 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | move replace to inside isset | Myles McNamara | 2014-02-28 | 1 | -2/+2 |