summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* drop jquery.inview as it is unusedMorris Jobke2014-11-055-192/+0
* Merge pull request #11853 from owncloud/close-session-for-trashbinVincent Petry2014-11-055-0/+6
|\
| * Close session for files_trashbinLukas Reschke2014-10-295-0/+6
* | Merge pull request #11953 from owncloud/drop-listview-jsThomas Müller2014-11-051-71/+0
|\ \
| * | drop listview.jsMorris Jobke2014-11-041-71/+0
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-0542-92/+220
* | | Merge pull request #11949 from owncloud/s2s-fixcertcheckwhennocertfileVincent Petry2014-11-041-1/+8
|\ \ \ | |/ / |/| |
| * | Store curl error message directlyVincent Petry2014-11-041-5/+2
| * | Check for cert bundle existence before using itVincent Petry2014-11-041-1/+11
|/ /
* | Merge pull request #11940 from owncloud/fix-underline-conventionThomas Müller2014-11-041-2/+2
|\ \
| * | fix shortcuts - underline instead of camelCaseMorris Jobke2014-11-041-2/+2
* | | Merge pull request #11938 from owncloud/jshintrc-laxbreakThomas Müller2014-11-041-0/+1
|\ \ \
| * | | enable laxbreak option in jshintrc to comply with our coding guide linesArthur Schiwon2014-11-041-0/+1
| |/ /
* | | Merge pull request #11934 from owncloud/trash-restorefixonlyrescantrashfolderVincent Petry2014-11-041-1/+1
|\ \ \
| * | | Only rescan trash folder when checking deleted versionsVincent Petry2014-11-041-1/+1
* | | | Merge pull request #11362 from mark0n/rm_ldap_conf_cliblizzz2014-11-043-3/+45
|\ \ \ \ | |_|/ / |/| | |
| * | | Add a CLI command that deletes an LDAP configMartin Konrad2014-09-303-3/+45
* | | | Merge pull request #11916 from owncloud/introduce-bowerMorris Jobke2014-11-0410-71/+262
|\ \ \ \
| * | | | use https ... everywhere :)Morris Jobke2014-11-041-1/+1
| * | | | replace moment.js with bower versionMorris Jobke2014-11-037-55/+168
| * | | | ability to add bower resourcesMorris Jobke2014-11-034-16/+94
* | | | | Merge pull request #11931 from owncloud/fix-js-unit-testsMorris Jobke2014-11-041-7/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | JS unit tests fix - use toBeUndefined() instead of toEqual(null)Morris Jobke2014-11-041-7/+7
|/ / / /
* | | | fix config.sample.php linebreakMorris Jobke2014-11-041-6/+8
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-0468-67/+33
* | | | Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfigMorris Jobke2014-11-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | First check whether it is the default config before touchignLukas Reschke2014-11-031-1/+1
* | | | 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
|/ / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-12 20:46:54 +0000