Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-17 | 67 | -83/+190 |
| | |||||
* | Merge pull request #9653 from owncloud/fix-9590 | Vincent Petry | 2014-07-16 | 3 | -14/+27 |
|\ | | | | | external storage table layout fixes | ||||
| * | fix CSS coding style | Morris Jobke | 2014-07-16 | 1 | -5/+6 |
| | | |||||
| * | Fix #9590. Fix #9612. | Stephane V | 2014-07-15 | 3 | -14/+26 |
| | | | | | | | | | | | | For external storage with lots of parameter settings (>4), wrap the content of the cell to let a full view of the parameters. The rows of the table are now always visible until the end (the trash icon is accessible). (Note : A strange 3px margin forces me to add a class on the row added by javascript, to be able to align them with the rows rendered by the server.) | ||||
* | | Merge pull request #9662 from owncloud/enc_error_handling_master | Björn Schießle | 2014-07-16 | 5 | -25/+74 |
|\ \ | | | | | | | [encryption] improved error handling | ||||
| * | | introduce some encryption exceptions and catch additional error cases | Bjoern Schiessle | 2014-07-16 | 4 | -25/+73 |
| | | | |||||
| * | | make sure that the crypt library is loaded | Bjoern Schiessle | 2014-07-16 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #9647 from owncloud/files_external_multiuser_tests | Robin McCorkell | 2014-07-16 | 1 | -0/+37 |
|\ \ \ | | | | | | | | | Add unit test for multi-user configuration loading | ||||
| * | | | Add unit test for multi-user configuration loading | Robin McCorkell | 2014-07-15 | 1 | -0/+37 |
| | |/ | |/| | |||||
* | | | Merge pull request #9664 from owncloud/enc-removelegacytests | Morris Jobke | 2014-07-16 | 1 | -84/+0 |
|\ \ \ | | | | | | | | | [OC8] Removed legacy encryption tests | ||||
| * | | | Removed legacy encryption tests | Vincent Petry | 2014-07-16 | 1 | -84/+0 |
| | |/ | |/| | |||||
* / | | Correctly return the owner display name for children of shares | Vincent Petry | 2014-07-16 | 2 | -1/+20 |
|/ / | |||||
* / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-16 | 116 | -53/+87 |
|/ | |||||
* | Merge pull request #9639 from owncloud/prevent-irc-trolls-fro-using-this | icewind1991 | 2014-07-15 | 1 | -1/+1 |
|\ | | | | | Add warning because there are people that enable this app because they think it's the WebDAV implementation of ownCloud | ||||
| * | Update info.xml | Lukas Reschke | 2014-07-15 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #8987 from owncloud/lastindexid-debug | Vincent Petry | 2014-07-15 | 1 | -6/+37 |
|\ \ | |/ |/| | [DEBUG] Test case for debugging the last index ID bug from Doctrine/MySQL | ||||
| * | - Added test to trigger index id error | Vincent Petry | 2014-07-14 | 1 | -6/+37 |
| | | | | | | | | | | - re-enable encryption migration tests - sqlite requires reconnect after schema changes | ||||
* | | throw exception if file is to large for trash bin | Bjoern Schiessle | 2014-07-15 | 3 | -6/+46 |
| | | |||||
* | | Merge pull request #9570 from PhilJung/master | blizzz | 2014-07-15 | 2 | -1/+153 |
|\ \ | | | | | | | [Issue #9559] identifiers uid=xxx must be considered as user DN and not ... | ||||
| * | | File written by blizzz | Philippe Jung | 2014-07-14 | 1 | -0/+151 |
| | | | |||||
| * | | [Issue #9559] identifiers uid=xxx must be considered as user DN and not as ↵ | Philippe Jung | 2014-07-10 | 1 | -1/+2 |
| | | | | | | | | | | | | owncloud users | ||||
* | | | Merge pull request #9596 from owncloud/fixing-9503-master | Morris Jobke | 2014-07-15 | 2 | -5/+5 |
|\ \ \ | | | | | | | | | reduce share action text to the user name only | ||||
| * | | | reduce share action text to the user name only | Thomas Müller | 2014-07-14 | 2 | -5/+5 |
| | |/ | |/| | |||||
* / | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-15 | 54 | -54/+62 |
|/ / | |||||
* | | Merge pull request #9572 from owncloud/deleteunsharetooltip | Björn Schießle | 2014-07-14 | 5 | -5/+30 |
|\ \ | | | | | | | mountType attribute + delete hint fix | ||||
| * | | Added mountType attribute and adapted Delete action text | Vincent Petry | 2014-07-14 | 5 | -5/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added mountType attribute for files/folder to indicated whether they are regular, external or shared. The client side then adapts the "Delete" action hint text based on this information. Only the mount roots must have the delete icon hint adapted. To make this detectable on the client side, the mountType can now be null, "shared", "shared-root", "external" or "external-root". This also gives room to icon customization on the client side. | ||||
* | | | Merge pull request #9605 from owncloud/sftp-missing-streamwrapper | Vincent Petry | 2014-07-14 | 1 | -0/+15 |
|\ \ \ | |/ / |/| | | Re-add missing sftp:// stream wrapper | ||||
| * | | Add short description explaining how SFTP ext storage class works. | Andreas Fischer | 2014-07-12 | 1 | -0/+4 |
| | | | |||||
| * | | The file providing the sftp:// scheme needs to be included manually. | Andreas Fischer | 2014-07-12 | 1 | -0/+11 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-14 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #9563 from owncloud/version-delete-cache | Morris Jobke | 2014-07-13 | 1 | -4/+21 |
|\ \ \ | | | | | | | | | Remove deleted versions from the cache | ||||
| * | | | Remove deleted versions from the cache | Robin Appelman | 2014-07-10 | 1 | -4/+21 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-13 | 4 | -1/+25 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-12 | 4 | -2/+31 |
| | | | | |||||
* | | | | Disable legacy encryption tests | Vincent Petry | 2014-07-11 | 1 | -0/+4 |
| |/ / |/| | | | | | | | | | | | It seems these tests are not needed any more, but will now be skipped instead until the case is cleared out. | ||||
* | | | remove pointless require of Blowfish.php | Thomas Müller | 2014-07-10 | 2 | -2/+0 |
| | | | |||||
* | | | Merge pull request #9538 from owncloud/fileactions-cleanup | Vincent Petry | 2014-07-10 | 7 | -43/+137 |
|\ \ \ | |/ / |/| | | Propagate file action changes to the file lists | ||||
| * | | Propagate file action changes to the file lists | Vincent Petry | 2014-07-09 | 7 | -43/+137 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever an app needs to register an event late, it does that on the original file actions object. Since the file actions that the file list work on is a merged list, not the original one, the registration event needs to be propagated there as well. | ||||
* | | | Merge pull request #9516 from owncloud/kill-legacy-encryption-oc8 | Vincent Petry | 2014-07-10 | 8 | -881/+3 |
|\ \ \ | |_|/ |/| | | [OC8] Kill legacy encryption migration | ||||
| * | | Kill legacy encryption migration | Thomas Müller | 2014-07-08 | 8 | -881/+3 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-10 | 4 | -0/+15 |
| | | | |||||
* | | | Merge pull request #9460 from owncloud/versions-local | Vincent Petry | 2014-07-10 | 1 | -5/+4 |
|\ \ \ | |_|/ |/| | | Dont assume local home storage for files_version | ||||
| * | | Dont delete versions as local files | Robin Appelman | 2014-07-07 | 1 | -5/+4 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-09 | 78 | -12/+130 |
| | | | |||||
* | | | Merge pull request #9385 from owncloud/fix-7052 | blizzz | 2014-07-08 | 8 | -44/+516 |
|\ \ \ | | | | | | | | | support for AD primary groups | ||||
| * | | | support for AD primary groups | Arthur Schiwon | 2014-07-08 | 8 | -44/+516 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support for primary groups actually the problem is only known on AD, it is only needed to take care of their attributes adjust to ADs special behaviour this change was not intended cache the SID value so it is not requested over and over again theres only one, use singular we are access add tests for new Access methods add tests for new Group methods address scrutinizer findings, mostly doc call ldap_explode_dn from ldap wrapper, enables tests without php5-ldap PHP Doc yo dawg, i heard you like backslashes … php doc fix PHPDoc updated and typos fixed while reviewing | ||||
* | | | | Merge pull request #9515 from owncloud/update-sharecleanupfix | Vincent Petry | 2014-07-08 | 2 | -10/+24 |
|\ \ \ \ | | | | | | | | | | | Fix update cleanup to only affect file and folders | ||||
| * | | | | Fix update cleanup to only affect file and folders | Vincent Petry | 2014-07-08 | 2 | -10/+24 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | Fix bug in the SQL query that cleans up stray shares for removed files/folders, which is now correctly limited to that item type instead of also removing all other share types. | ||||
* | | | | Merge pull request #9507 from owncloud/fix-9302-master | Thomas Müller | 2014-07-08 | 2 | -2/+0 |
|\ \ \ \ | | | | | | | | | | | Upload abortion is now detected within the OC_Connector_Sabre_File::put... | ||||
| * | | | | Upload abortion is now detected within the OC_Connector_Sabre_File::put() | Thomas Müller | 2014-07-08 | 2 | -2/+0 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless Adding unit test testUploadAbort() |