Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-18 | 48 | -456/+732 |
* | update appstore api url | Frank Karlitschek | 2014-07-17 | 2 | -2/+2 |
* | Merge pull request #9691 from owncloud/kill-too-long-index-master | Thomas Müller | 2014-07-17 | 1 | -12/+0 |
|\ | |||||
| * | Revert "add share index" | Thomas Müller | 2014-07-17 | 1 | -12/+0 |
|/ | |||||
* | Merge pull request #9710 from owncloud/fix-failing-unit-test-on-MapperTestUti... | Thomas Müller | 2014-07-17 | 1 | -4/+5 |
|\ | |||||
| * | kill unused require of MapperTestUtility.php | Thomas Müller | 2014-07-17 | 1 | -4/+5 |
* | | Merge pull request #9705 from owncloud/ie8-userspagefix | blizzz | 2014-07-17 | 5 | -6/+11 |
|\ \ | |/ |/| | |||||
| * | Fixed JS and CSS issues in users page | Vincent Petry | 2014-07-17 | 5 | -6/+11 |
* | | Merge pull request #9668 from owncloud/enc_fix_folder_move | Vincent Petry | 2014-07-17 | 3 | -26/+83 |
|\ \ | |||||
| * | | check that the file proxies are enabled after each test | Bjoern Schiessle | 2014-07-17 | 1 | -0/+2 |
| * | | update keys recursively if a folder was moved | Bjoern Schiessle | 2014-07-17 | 2 | -26/+81 |
* | | | Merge pull request #9696 from owncloud/fix-appframework-test-namespaces-master | Thomas Müller | 2014-07-17 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | fixing namespace of MapperTestUtility | Thomas Müller | 2014-07-17 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #9694 from owncloud/fix-failing-tests | Thomas Müller | 2014-07-17 | 1 | -1/+1 |
|\ \ | |||||
| * | | fix syntax | Morris Jobke | 2014-07-17 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #9682 from owncloud/mappedlocal-rename | Vincent Petry | 2014-07-17 | 1 | -2/+17 |
|\ \ | |||||
| * | | Fix renaming files in the root folder of a MappedLocal storage | Robin Appelman | 2014-07-16 | 1 | -2/+17 |
| |/ | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-17 | 222 | -2821/+2675 |
* | | Merge pull request #9517 from brantje/Add-webapp-meta-tags | Morris Jobke | 2014-07-16 | 1 | -0/+4 |
|\ \ | |||||
| * | | Changed to 1 line | Sander | 2014-07-08 | 1 | -3/+1 |
| * | | Added suggestions from @jancborchardt in #9517 | Sander | 2014-07-08 | 1 | -3/+3 |
| * | | Update layout.user.php | Sander | 2014-07-08 | 1 | -1/+1 |
| * | | Add webapp support | Sander | 2014-07-08 | 1 | -0/+6 |
* | | | Merge pull request #9654 from owncloud/enctest-fileproxydisabledfix | Björn Schießle | 2014-07-16 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Reenable proxies if a test failed to restore it | Vincent Petry | 2014-07-15 | 1 | -0/+2 |
* | | | | Merge pull request #9653 from owncloud/fix-9590 | Vincent Petry | 2014-07-16 | 3 | -14/+27 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | fix CSS coding style | Morris Jobke | 2014-07-16 | 1 | -5/+6 |
| * | | | Fix #9590. Fix #9612. | Stephane V | 2014-07-15 | 3 | -14/+26 |
* | | | | Merge pull request #9550 from kofemann/dcache-fixes-for-upstream | icewind1991 | 2014-07-16 | 2 | -4/+22 |
|\ \ \ \ | |||||
| * | | | | files: storage: rename should check parent directories of old and new files | Tigran Mkrtchyan | 2014-07-10 | 2 | -4/+22 |
* | | | | | Merge pull request #9662 from owncloud/enc_error_handling_master | Björn Schießle | 2014-07-16 | 5 | -25/+74 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | Robin McCorkell | 2014-07-15 | 1 | -0/+37 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #9664 from owncloud/enc-removelegacytests | Morris Jobke | 2014-07-16 | 1 | -84/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Removed legacy encryption tests | Vincent Petry | 2014-07-16 | 1 | -84/+0 |
* | | | | | | | Merge pull request #9661 from owncloud/share-ownerdisplaynamefix | Morris Jobke | 2014-07-16 | 2 | -1/+20 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Correctly return the owner display name for children of shares | Vincent Petry | 2014-07-16 | 2 | -1/+20 |
| | |/ / / / | |/| | | | | |||||
* / | | | | | Port of #9584 | Stephan Peijnik | 2014-07-16 | 2 | -2/+23 |
|/ / / / / | |||||
* | | | | | Merge pull request #9640 from owncloud/fix_9627 | Björn Schießle | 2014-07-16 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | make sure that 'OC_Theme' exists before checking if the method exists | Bjoern Schiessle | 2014-07-15 | 1 | -1/+1 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-16 | 473 | -3097/+2186 |
* | | | | | | Merge pull request #9644 from owncloud/fix_user_api | Thomas Müller | 2014-07-15 | 2 | -3/+3 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | use UserSession service to resolve user id | Jörn Friedrich Dreyer | 2014-07-15 | 1 | -1/+1 |
| * | | | | | use correct IUser in interface | Jörn Friedrich Dreyer | 2014-07-15 | 1 | -2/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #9540 from owncloud/use_fileinfo_in_search_results | blizzz | 2014-07-15 | 1 | -33/+22 |
|\ \ \ \ \ | |||||
| * | | | | | mkae getRelativePath of file search results overwriteable in subclasses | Jörn Friedrich Dreyer | 2014-07-14 | 1 | -2/+1 |
| * | | | | | return relative path | Jörn Friedrich Dreyer | 2014-07-14 | 1 | -27/+15 |
| * | | | | | use fileinfo object in search results | Jörn Friedrich Dreyer | 2014-07-09 | 1 | -9/+11 |