Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #11918 from owncloud/pimple-composer | Thomas Müller | 2014-11-03 | 4 | -15/+17 | |
|\ \ \ \ | ||||||
| * | | | | Update Pimple to V3.0 | Thomas Müller | 2014-11-03 | 4 | -15/+17 | |
|/ / / / | ||||||
* | | | | Merge pull request #11921 from owncloud/symfony-composer | Lukas Reschke | 2014-11-03 | 3 | -2/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Fix ctor call in OC\Core\Command\Upgrade | Thomas Müller | 2014-11-03 | 1 | -0/+1 | |
| * | | | Update Symfony/Console to 2.5 & Update Symfony/Routing to 2.5 | Thomas Müller | 2014-11-03 | 2 | -2/+0 | |
* | | | | Merge pull request #11923 from owncloud/admin-connectivitycheckscapitalized | Thomas Müller | 2014-11-03 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Capitalize Checks in admin page | Vincent Petry | 2014-11-03 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #11172 from owncloud/user-ldap-no-bcmath | blizzz | 2014-11-03 | 3 | -54/+57 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | user_ldap: Reimplement convertSID2Str() without BCMath dependency. | Andreas Fischer | 2014-11-03 | 3 | -54/+57 | |
* | | | | Merge pull request #11825 from owncloud/fix_rename_files_in_shared_folder | Björn Schießle | 2014-11-03 | 3 | -13/+177 | |
|\ \ \ \ | ||||||
| * | | | | don't move versions if only the mount point was renamed | Bjoern Schiessle | 2014-10-31 | 2 | -0/+53 | |
| * | | | | Fix typo | Lukas Reschke | 2014-10-29 | 1 | -2/+2 | |
| * | | | | get the source path and owner in a pre hook and the target path and owner in a | Bjoern Schiessle | 2014-10-29 | 3 | -13/+124 | |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-03 | 12 | -12/+12 | |
* | | | | | Merge pull request #11902 from unclejamal3000/master | Morris Jobke | 2014-11-02 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Enhance question in DB migration script | unclejamal3000 | 2014-11-02 | 1 | -1/+1 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-02 | 16 | -12/+16 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-02 | 24 | -16/+32 | |
|/ / / / / | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-01 | 60 | -30/+108 | |
* | | | | | Merge pull request #11894 from owncloud/fix-unreachable-code | Vincent Petry | 2014-10-31 | 1 | -4/+8 | |
|\ \ \ \ \ | ||||||
| * | | | | | fix odd behaviour | Morris Jobke | 2014-10-31 | 1 | -4/+8 | |
|/ / / / / | ||||||
* | | | | | test files external amazon s3 storage id migration | Jörn Friedrich Dreyer | 2014-10-31 | 1 | -0/+117 | |
* | | | | | fix files_external storage id migration | Jörn Friedrich Dreyer | 2014-10-31 | 1 | -3/+20 | |
* | | | | | Merge pull request #11888 from owncloud/add-code-climeate | Lukas Reschke | 2014-10-31 | 1 | -1/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add CodeClimate indicator | Lukas Reschke | 2014-10-31 | 1 | -1/+3 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #9044 from owncloud/add-missing-email-principal | Vincent Petry | 2014-10-31 | 1 | -0/+12 | |
|\ \ \ \ \ | ||||||
| * | | | | | adding missing email address for principal | libasys | 2014-10-24 | 1 | -0/+12 | |
* | | | | | | Merge pull request #11876 from owncloud/remove-pointless-requires | Lukas Reschke | 2014-10-31 | 33 | -128/+57 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | remove unnecessary require calls - the ownCloud class loader is supposed to t... | Thomas Müller | 2014-10-30 | 33 | -128/+57 | |
* | | | | | | | Merge pull request #11539 from owncloud/mount-setup-once | Vincent Petry | 2014-10-31 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Reset the users setup after clearing mounts | Robin Appelman | 2014-10-28 | 1 | -0/+1 | |
| * | | | | | | | Only mount the storages for the user once | Robin Appelman | 2014-10-27 | 1 | -1/+5 | |
* | | | | | | | | Merge pull request #11850 from owncloud/fix-11848 | Vincent Petry | 2014-10-31 | 2 | -14/+10 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | on xp'ed mode and switching configurations: save raw mode instead of toggling... | Arthur Schiwon | 2014-10-29 | 2 | -14/+10 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-31 | 158 | -858/+1000 | |
* | | | | | | | | | Merge pull request #11877 from owncloud/fix-11875-master | Morris Jobke | 2014-10-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | prevent PHP notice | Thomas Müller | 2014-10-30 | 1 | -1/+1 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #11080 from owncloud/addheader-text-2 | Vincent Petry | 2014-10-30 | 6 | -39/+31 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the $text... | Lukas Reschke | 2014-10-28 | 6 | -39/+31 | |
* | | | | | | | | | | Merge pull request #11659 from jknockaert/master | Vincent Petry | 2014-10-30 | 1 | -38/+54 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | initialisation of cipher | jknockaert | 2014-10-28 | 1 | -1/+1 | |
| * | | | | | | | | | | small fix | jknockaert | 2014-10-20 | 1 | -0/+1 | |
| * | | | | | | | | | | bugfixes | jknockaert | 2014-10-20 | 1 | -5/+6 | |
| * | | | | | | | | | | ok; still some bugs that had to be fixed | jknockaert | 2014-10-20 | 1 | -39/+35 | |
| * | | | | | | | | | | small fix | jknockaert | 2014-10-19 | 1 | -1/+2 | |
| * | | | | | | | | | | rework getFileSize | jknockaert | 2014-10-19 | 1 | -28/+45 | |
* | | | | | | | | | | | Merge pull request #11740 from owncloud/update-archive-tar | Thomas Müller | 2014-10-30 | 2 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Update pear/archive_tar to 1.3.13 | Thomas Müller | 2014-10-30 | 2 | -2/+0 | |
* | | | | | | | | | | | | Merge pull request #11867 from owncloud/settings-sidebar-admin | Jan-Christoph Borchardt | 2014-10-30 | 5 | -111/+169 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | admin settings: fix LDAP settings header layout | Jan-Christoph Borchardt | 2014-10-30 | 1 | -2/+3 |