| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #11430 from owncloud/minify-js-css-master | Morris Jobke | 2014-10-17 | 6 | -81/+147 |
|\ |
|
| * | adding cssmin and jssmin(minify) | Thomas Müller | 2014-10-17 | 6 | -81/+147 |
* | | Merge pull request #11634 from owncloud/loadapps-encapsulaterequire | Lukas Reschke | 2014-10-17 | 1 | -1/+11 |
|\ \
| |/
|/| |
|
| * | Encapsulate require_once to avoid name space bleedind | Vincent Petry | 2014-10-17 | 1 | -1/+11 |
* | | Merge pull request #9104 from macjohnny/macjohnny-drastic-ldap-speedup | blizzz | 2014-10-17 | 1 | -5/+12 |
|\ \ |
|
| * | | modified caching mechanism in getUserGroupIds | macjohnny | 2014-06-23 | 1 | -25/+6 |
| * | | clean up function getUserGroupIds | macjohnny | 2014-06-23 | 1 | -7/+4 |
| * | | Update manager.php | macjohnny | 2014-06-21 | 1 | -3/+11 |
| * | | Update manager.php | macjohnny | 2014-06-19 | 1 | -2/+2 |
| * | | Update manager.php | macjohnny | 2014-06-19 | 1 | -9/+25 |
| * | | Update manager.php | macjohnny | 2014-06-19 | 1 | -0/+1 |
| * | | Update manager.php | macjohnny | 2014-06-19 | 1 | -1/+2 |
| * | | Update manager.php | macjohnny | 2014-06-19 | 1 | -1/+4 |
* | | | Merge pull request #11611 from owncloud/fix-svg-master | Morris Jobke | 2014-10-17 | 1 | -2/+12 |
|\ \ \ |
|
| * | | | Remove insane comment | Lukas Reschke | 2014-10-16 | 1 | -1/+0 |
| * | | | Fix SVG icons | Lukas Reschke | 2014-10-16 | 1 | -2/+13 |
* | | | | Add PHPDoc about sanitization of "insertIfNotExist" | Lukas Reschke | 2014-10-17 | 1 | -1/+1 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-17 | 11 | -0/+12 |
| |_|/
|/| | |
|
* | | | Add a try catch block | Lukas Reschke | 2014-10-16 | 1 | -6/+10 |
* | | | Merge pull request #11591 from owncloud/addAppVersionToCSSandJS | Lukas Reschke | 2014-10-16 | 1 | -9/+12 |
|\ \ \ |
|
| * | | | include the apps' versions hash to invalidate the cached assets | Thomas Müller | 2014-10-16 | 1 | -0/+2 |
| * | | | Add app version to JS and CSS | Lukas Reschke | 2014-10-15 | 1 | -9/+10 |
* | | | | Merge pull request #11383 from ockham/share-tags2 | Lukas Reschke | 2014-10-16 | 8 | -134/+493 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | PHPDoc fixes as suggested by @MorrisJobke. | Bernhard Reiter | 2014-10-14 | 4 | -5/+9 |
| * | | | Add getTag() function for accessing of a single tag. | Bernhard Reiter | 2014-10-14 | 2 | -6/+41 |
| * | | | Make loading of tags from DB more explicit. | Bernhard Reiter | 2014-10-14 | 1 | -9/+3 |
| * | | | In Tags::rename($from, $to), check if there already is a tag named $to. | Bernhard Reiter | 2014-10-14 | 1 | -1/+6 |
| * | | | Add option to include tags for shared items. | Bernhard Reiter | 2014-10-14 | 5 | -22/+188 |
| * | | | Remove two obsolete try...catch blocks. | Bernhard Reiter | 2014-10-14 | 1 | -13/+5 |
| * | | | Implement Tag and TagMapper classes. | Bernhard Reiter | 2014-10-14 | 5 | -98/+260 |
| * | | | Remove redundant null initializations. | Bernhard Reiter | 2014-10-14 | 2 | -4/+4 |
| * | | | Test addMultiple() with $sync=true. | Bernhard Reiter | 2014-10-14 | 1 | -0/+1 |
| * | | | Fix a comment. | Bernhard Reiter | 2014-10-14 | 1 | -2/+2 |
* | | | | Merge pull request #11595 from owncloud/make_get_display_name_more_robust | blizzz | 2014-10-16 | 1 | -2/+12 |
|\ \ \ \ |
|
| * | | | | strip whitespace from the beginning and end of the display name to avoid empt... | Bjoern Schiessle | 2014-10-15 | 1 | -2/+12 |
* | | | | | make trashbin compatible with objectstore, replace glob with search in cache,... | Jörn Friedrich Dreyer | 2014-10-16 | 1 | -0/+10 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-16 | 1 | -0/+1 |
* | | | | | Merge pull request #11565 from owncloud/fix-behaviourOnOSX | Lukas Reschke | 2014-10-15 | 1 | -1/+1 |
|\ \ \ \ \ |
|
| * | | | | | Add darwin to if block | Lukas Reschke | 2014-10-14 | 1 | -1/+1 |
| | |_|/ /
| |/| | | |
|
* | | | | | Merge pull request #11528 from owncloud/use-raw-url | Lukas Reschke | 2014-10-15 | 1 | -1/+1 |
|\ \ \ \ \ |
|
| * | | | | | Use `rawurlencode` since this seems to be expected by cURL | Lukas Reschke | 2014-10-14 | 1 | -1/+1 |
| |/ / / / |
|
* | | | | | in cli mode return true for isHtaccessWorking | Jörn Friedrich Dreyer | 2014-10-15 | 1 | -1/+1 |
* | | | | | introduce new app page layout | Thomas Müller | 2014-10-15 | 3 | -65/+58 |
* | | | | | Merge pull request #11538 from owncloud/webdav-creatable-info | Vincent Petry | 2014-10-15 | 1 | -1/+1 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | Use the cached fileinfo to get creatable permissions | Robin Appelman | 2014-10-13 | 1 | -1/+1 |
* | | | | | Merge pull request #11541 from owncloud/usersession-activeuser-setsession | Vincent Petry | 2014-10-15 | 1 | -11/+12 |
|\ \ \ \ \ |
|
| * | | | | | Unset the cached active user when using a different session object | Robin Appelman | 2014-10-13 | 1 | -11/+12 |
| |/ / / / |
|
* | | | | | Merge pull request #11548 from owncloud/extstorage-ocfields | Vincent Petry | 2014-10-15 | 1 | -2/+2 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | Allow specifying protocol in ext storage OC config | Vincent Petry | 2014-10-13 | 1 | -2/+2 |
| |/ / / |
|
* | / / | Set overwritemailurl* configs on setup | Joas Schilling | 2014-10-14 | 2 | -1/+5 |
| |/ /
|/| | |
|