summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* replace moment.js with bower versionMorris Jobke2014-11-037-55/+168
* ability to add bower resourcesMorris Jobke2014-11-034-16/+94
* update 3rdparty to masterMorris Jobke2014-11-031-0/+0
* update 3rdparty to masterMorris Jobke2014-11-031-0/+0
* Merge pull request #11918 from owncloud/pimple-composerThomas Müller2014-11-034-15/+17
|\
| * Update Pimple to V3.0Thomas Müller2014-11-034-15/+17
|/
* Merge pull request #11921 from owncloud/symfony-composerLukas Reschke2014-11-033-2/+1
|\
| * Fix ctor call in OC\Core\Command\UpgradeThomas Müller2014-11-031-0/+1
| * Update Symfony/Console to 2.5 & Update Symfony/Routing to 2.5Thomas Müller2014-11-032-2/+0
* | Merge pull request #11923 from owncloud/admin-connectivitycheckscapitalizedThomas Müller2014-11-031-1/+1
|\ \
| * | Capitalize Checks in admin pageVincent Petry2014-11-031-1/+1
|/ /
* | Merge pull request #11172 from owncloud/user-ldap-no-bcmathblizzz2014-11-033-54/+57
|\ \ | |/ |/|
| * user_ldap: Reimplement convertSID2Str() without BCMath dependency.Andreas Fischer2014-11-033-54/+57
* | Merge pull request #11825 from owncloud/fix_rename_files_in_shared_folderBjörn Schießle2014-11-033-13/+177
|\ \
| * | don't move versions if only the mount point was renamedBjoern Schiessle2014-10-312-0/+53
| * | Fix typoLukas Reschke2014-10-291-2/+2
| * | get the source path and owner in a pre hook and the target path and owner in aBjoern Schiessle2014-10-293-13/+124
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-0312-12/+12
* | | Merge pull request #11902 from unclejamal3000/masterMorris Jobke2014-11-021-1/+1
|\ \ \
| * | | Enhance question in DB migration scriptunclejamal30002014-11-021-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-0216-12/+16
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-0224-16/+32
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-0160-30/+108
* | | Merge pull request #11894 from owncloud/fix-unreachable-codeVincent Petry2014-10-311-4/+8
|\ \ \
| * | | fix odd behaviourMorris Jobke2014-10-311-4/+8
|/ / /
* | | test files external amazon s3 storage id migrationJörn Friedrich Dreyer2014-10-311-0/+117
* | | fix files_external storage id migrationJörn Friedrich Dreyer2014-10-311-3/+20
* | | Merge pull request #11888 from owncloud/add-code-climeateLukas Reschke2014-10-311-1/+3
|\ \ \
| * | | Add CodeClimate indicatorLukas Reschke2014-10-311-1/+3
|/ / /
* | | Merge pull request #9044 from owncloud/add-missing-email-principalVincent Petry2014-10-311-0/+12
|\ \ \
| * | | adding missing email address for principallibasys2014-10-241-0/+12
* | | | Merge pull request #11876 from owncloud/remove-pointless-requiresLukas Reschke2014-10-3133-128/+57
|\ \ \ \
| * | | | remove unnecessary require calls - the ownCloud class loader is supposed to t...Thomas Müller2014-10-3033-128/+57
* | | | | Merge pull request #11539 from owncloud/mount-setup-onceVincent Petry2014-10-311-1/+6
|\ \ \ \ \
| * | | | | Reset the users setup after clearing mountsRobin Appelman2014-10-281-0/+1
| * | | | | Only mount the storages for the user onceRobin Appelman2014-10-271-1/+5
* | | | | | Merge pull request #11850 from owncloud/fix-11848Vincent Petry2014-10-312-14/+10
|\ \ \ \ \ \
| * | | | | | on xp'ed mode and switching configurations: save raw mode instead of toggling...Arthur Schiwon2014-10-292-14/+10
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-31158-858/+1000
* | | | | | | Merge pull request #11877 from owncloud/fix-11875-masterMorris Jobke2014-10-301-1/+1
|\ \ \ \ \ \ \
| * | | | | | | prevent PHP noticeThomas Müller2014-10-301-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #11080 from owncloud/addheader-text-2Vincent Petry2014-10-306-39/+31
|\ \ \ \ \ \ \
| * | | | | | | Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the $text...Lukas Reschke2014-10-286-39/+31
* | | | | | | | Merge pull request #11659 from jknockaert/masterVincent Petry2014-10-301-38/+54
|\ \ \ \ \ \ \ \
| * | | | | | | | initialisation of cipherjknockaert2014-10-281-1/+1
| * | | | | | | | small fixjknockaert2014-10-201-0/+1
| * | | | | | | | bugfixesjknockaert2014-10-201-5/+6
| * | | | | | | | ok; still some bugs that had to be fixedjknockaert2014-10-201-39/+35
| * | | | | | | | small fixjknockaert2014-10-191-1/+2
| * | | | | | | | rework getFileSizejknockaert2014-10-191-28/+45