Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-13 | 52 | -124/+120 |
* | Merge pull request #12806 from owncloud/display-backend-in-usermgnt | Vincent Petry | 2014-12-12 | 6 | -24/+59 |
|\ | |||||
| * | Show user backend in user management | Morris Jobke | 2014-12-12 | 6 | -24/+59 |
* | | Merge pull request #12778 from owncloud/searchbytags2 | Vincent Petry | 2014-12-12 | 17 | -53/+375 |
|\ \ | |/ |/| | |||||
| * | Added searchByTag in cache jail wrapper | Vincent Petry | 2014-12-12 | 1 | -0/+12 |
| * | Make $userId mandatory for searchByTags | Vincent Petry | 2014-12-12 | 10 | -32/+73 |
| * | Added searchByTags to view, storage and cache | Vincent Petry | 2014-12-11 | 10 | -0/+230 |
| * | Add user parameter to tag manager | Vincent Petry | 2014-12-11 | 4 | -38/+56 |
| * | Add login/logout to TestCase base class | Vincent Petry | 2014-12-10 | 1 | -0/+21 |
* | | Merge pull request #12812 from owncloud/remove-53-workaround | Thomas Müller | 2014-12-12 | 1 | -6/+1 |
|\ \ | |||||
| * | | Remove conditional check for 5.3 compatibility | Lukas Reschke | 2014-12-12 | 1 | -6/+1 |
* | | | Merge pull request #12808 from owncloud/add-special-parameterlist-to-manager | Joas Schilling | 2014-12-12 | 5 | -3/+93 |
|\ \ \ | |||||
| * | | | Specify list of activity parameters for sharing extension | Joas Schilling | 2014-12-12 | 1 | -3/+34 |
| * | | | Add test for getSpecialParameterList() | Joas Schilling | 2014-12-11 | 1 | -0/+20 |
| * | | | Allow extensions to specify the list of special parameters | Joas Schilling | 2014-12-11 | 3 | -0/+39 |
* | | | | Merge pull request #12789 from owncloud/external-icon | Vincent Petry | 2014-12-12 | 1 | -210/+2 |
|\ \ \ \ | |||||
| * | | | | fix and compress files_external icon | Jan-Christoph Borchardt | 2014-12-11 | 1 | -210/+2 |
* | | | | | Merge pull request #12587 from owncloud/dav-logerrors | Vincent Petry | 2014-12-12 | 1 | -3/+29 |
|\ \ \ \ \ | |||||
| * | | | | | Log exceptions in DAV storage | Vincent Petry | 2014-12-03 | 1 | -3/+29 |
* | | | | | | Merge pull request #12807 from owncloud/fix-timespan-language | Joas Schilling | 2014-12-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Correctly inject the language into the subcall | Joas Schilling | 2014-12-12 | 1 | -1/+1 |
* | | | | | | | Merge pull request #12527 from owncloud/js-pluginsystem | Robin Appelman | 2014-12-12 | 12 | -66/+172 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Remove obsoleted filelist prototype backup in tests | Vincent Petry | 2014-12-04 | 3 | -24/+3 |
| * | | | | | | Simple Plugin system for Javascript | Vincent Petry | 2014-12-01 | 11 | -42/+169 |
* | | | | | | | Merge pull request #12790 from owncloud/user-mngt-js-only | Morris Jobke | 2014-12-12 | 4 | -112/+70 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add comments to user list JS for better understanding | Morris Jobke | 2014-12-12 | 1 | -0/+26 |
| * | | | | | | | move loading of JS and CSS to template | Morris Jobke | 2014-12-12 | 2 | -8/+13 |
| * | | | | | | | remove PHP generated user list and move all to the existing JS part | Morris Jobke | 2014-12-12 | 3 | -104/+31 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #12805 from Gadzy/patch-1 | Morris Jobke | 2014-12-12 | 1 | -9/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Check for share by link enabled | Gadzy | 2014-12-12 | 1 | -9/+12 |
|/ / / / / / / | |||||
* | | / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-12 | 14 | -10/+36 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #12698 from owncloud/handle_readonly_shared_files | Morris Jobke | 2014-12-12 | 6 | -40/+99 |
|\ \ \ \ \ \ | |||||
| * | | | | | | show readonly message in file conflict dialog, make it always selected | Jörn Friedrich Dreyer | 2014-12-11 | 5 | -38/+97 |
| * | | | | | | return correct result | Jörn Friedrich Dreyer | 2014-12-08 | 1 | -2/+2 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-12 | 272 | -252/+372 |
* | | | | | | | Merge pull request #12786 from owncloud/userfolder-setup | Morris Jobke | 2014-12-11 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Ensure user mountpoints are setup when using getUserFolder | Robin Appelman | 2014-12-11 | 1 | -0/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #12781 from owncloud/jenkins-curl-open-basedir | Morris Jobke | 2014-12-11 | 6 | -9/+77 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Check if open_basedir is set | Lukas Reschke | 2014-12-11 | 5 | -11/+60 |
| * | | | | | | Add IniGetWrapper to public interface | Lukas Reschke | 2014-12-11 | 2 | -1/+20 |
* | | | | | | | Merge pull request #12780 from owncloud/make-datetimeformattertest-reliable | Joas Schilling | 2014-12-11 | 1 | -4/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use a fixed timestamp so we dont switch days/years with the getTimestampAgo | Joas Schilling | 2014-12-11 | 1 | -4/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #12779 from owncloud/correctly-fall-back-plurals | Thomas Müller | 2014-12-11 | 4 | -4/+41 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Correctly fallback to english, if the plural case is not translated | Joas Schilling | 2014-12-11 | 4 | -4/+41 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #12776 from owncloud/fix-go-ago | Jan-Christoph Borchardt | 2014-12-11 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | year go -> year ago | Thomas Müller | 2014-12-11 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #12738 from owncloud/cleanup-build-dir | Thomas Müller | 2014-12-11 | 4 | -273/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | cleaning up the build directory | Thomas Müller | 2014-12-10 | 4 | -273/+2 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-11 | 324 | -1652/+1724 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | update 3rdparty submodule | Morris Jobke | 2014-12-10 | 1 | -0/+0 |