| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 #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 |
* | | Merge pull request #12742 from owncloud/fix-pear.php | Morris Jobke | 2014-12-10 | 1 | -0/+0 |
|\ \ |
|
| * | | Update 3rdparty to add PEAR.php back | Thomas Müller | 2014-12-10 | 1 | -0/+0 |
| |/ |
|
* | | Merge pull request #12761 from owncloud/error-details2 | Lukas Reschke | 2014-12-10 | 2 | -3/+8 |
|\ \ |
|
| * | | improve update error page: adjust line height of h2 | Jan-Christoph Borchardt | 2014-12-10 | 1 | -0/+1 |
| * | | improve update error page: remove box, make link visible, insert missing spac... | Jan-Christoph Borchardt | 2014-12-10 | 2 | -3/+7 |
* | | | Merge pull request #12758 from owncloud/fix-config-doc-block | Morris Jobke | 2014-12-10 | 2 | -6/+6 |
|\ \ \ |
|
| * | | | Add type of the variables to the docs | Joas Schilling | 2014-12-10 | 2 | -6/+6 |
* | | | | Merge pull request #12746 from owncloud/skip-longpath-test-again | Thomas Müller | 2014-12-10 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | skip testLongPath() | Thomas Müller | 2014-12-10 | 1 | -1/+1 |
* | | | | | Merge pull request #11892 from owncloud/remove_triggerupdate | Thomas Müller | 2014-12-10 | 4 | -38/+39 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | make path absolute | Jörn Friedrich Dreyer | 2014-12-10 | 3 | -10/+17 |
| * | | | | add quiet option, ref #8794 | Jörn Friedrich Dreyer | 2014-12-04 | 1 | -9/+18 |
| * | | | | remove triggerupdate, ref #11872 | Jörn Friedrich Dreyer | 2014-12-04 | 3 | -28/+13 |
* | | | | | Merge pull request #12750 from owncloud/cache-numericstorageidfix | Robin Appelman | 2014-12-10 | 2 | -0/+13 |
|\ \ \ \ \ |
|
| * | | | | | Fix numeric storage id for cache wrapper | Vincent Petry | 2014-12-10 | 2 | -0/+13 |
| | |/ / /
| |/| | | |
|
* | | | | | Merge pull request #12485 from owncloud/jenkins-12383 | Joas Schilling | 2014-12-10 | 11 | -63/+655 |
|\ \ \ \ \
| |_|_|/ /
|/| | | | |
|
| * | | | | Require the interface and return a string instead of private classes | Joas Schilling | 2014-12-10 | 2 | -54/+54 |
| * | | | | Deprecate Util::formatDate() | Joas Schilling | 2014-12-10 | 7 | -62/+81 |
| * | | | | Add sometests and copy tests from Util::formatDate to new class | Joas Schilling | 2014-12-09 | 1 | -0/+177 |
| * | | | | Add a DateTimeFormatter class which allows overwriting the language and timezone | Joas Schilling | 2014-12-09 | 3 | -1/+397 |
* | | | | | Merge pull request #12611 from owncloud/use-uid-instead-of-loginname | Lukas Reschke | 2014-12-10 | 1 | -1/+1 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | Use UID instead of login name | Lukas Reschke | 2014-12-04 | 1 | -1/+1 |
* | | | | | Merge pull request #12711 from owncloud/add-backend-to-rest-index | Lukas Reschke | 2014-12-10 | 7 | -89/+155 |
|\ \ \ \ \ |
|
| * | | | | | Make class compatible | Lukas Reschke | 2014-12-09 | 1 | -0/+3 |
| * | | | | | Expose backend type via REST API | Lukas Reschke | 2014-12-09 | 6 | -89/+152 |
* | | | | | | Merge pull request #12737 from owncloud/fix-missing-nl-phpstorm | Thomas Müller | 2014-12-10 | 1 | -1/+2 |
|\ \ \ \ \ \
| |_|_|_|_|/
|/| | | | | |
|
| * | | | | | Add newline that was removed by 15be763d46d56c57d4f0def7745bb02d513e3a38 | Joas Schilling | 2014-12-10 | 1 | -1/+2 |
|/ / / / / |
|
* | | | | | Merge pull request #12090 from AdamWill/google-rename-delete | Morris Jobke | 2014-12-10 | 1 | -0/+12 |
|\ \ \ \ \ |
|
| * | | | | | google: delete original after successful rename | Adam Williamson | 2014-11-30 | 1 | -0/+12 |
* | | | | | | Merge pull request #12549 from owncloud/shared-cache-non-existing | Morris Jobke | 2014-12-10 | 1 | -10/+12 |
|\ \ \ \ \ \ |
|
| * | | | | | | Dont return cached date in shared cache when the file doesn't exist | Robin Appelman | 2014-12-02 | 1 | -10/+12 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-10 | 286 | -78/+430 |
* | | | | | | | Merge pull request #12664 from owncloud/fix-12164 | Thomas Müller | 2014-12-10 | 5 | -35/+119 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Remove leftover | Victor Dubiniuk | 2014-12-10 | 1 | -1/+0 |