summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* fix calculation of expiration date if there is a default expiration date set ...Miguel Prokop2014-11-211-3/+8
* [tx-robot] updated from transifexJenkins for ownCloud2014-11-218-0/+138
* Revert "drop OC_Preferences::getUsers and getApps"Morris Jobke2014-11-202-0/+54
* drop OC_Preferences::getUsers and getAppsMorris Jobke2014-11-202-54/+0
* Merge pull request #12330 from owncloud/jenkins-eat-thatMorris Jobke2014-11-203-15/+10
|\
| * drop dependency of some commands on old config objectMorris Jobke2014-11-203-15/+10
* | Merge pull request #12321 from owncloud/checkForXMLWriterThomas Müller2014-11-201-0/+1
|\ \
| * | Check for XMLWriter classLukas Reschke2014-11-201-0/+1
* | | Merge pull request #12299 from owncloud/clean-lib-base-configMorris Jobke2014-11-201-23/+29
|\ \ \
| * | | replace double quotes with single quotesMorris Jobke2014-11-191-1/+1
| * | | replace all static calls to OC_Config and OC_Preferences to calls to OCP\IConfigMorris Jobke2014-11-191-23/+29
| |/ /
* | | Merge pull request #12325 from owncloud/removeunneccessarylangLukas Reschke2014-11-2011-164/+0
|\ \ \ | |_|/ |/| |
| * | cleanup languages. closes #11274Volkan Gezer2014-11-2011-164/+0
* | | Merge pull request #12226 from owncloud/remove-phpassThomas Müller2014-11-202-5/+2
|\ \ \
| * | | Remove phpass and migrate to new Hasher interfaceLukas Reschke2014-11-172-5/+2
* | | | Merge pull request #12297 from owncloud/issue/10991-all-testcaseMorris Jobke2014-11-201-3/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Use base class to reset the file mapperJoas Schilling2014-11-191-3/+0
| | |/ | |/|
* | | Merge pull request #12253 from owncloud/port-12154Vincent Petry2014-11-204-11/+47
|\ \ \
| * | | Add repair steps for legacy config filesLukas Reschke2014-11-182-1/+31
| * | | Ignore port for trusted domainsLukas Reschke2014-11-182-10/+16
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-204-2/+6
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-194-2/+6
* | | drop unneeded var_dump - fixes #9997Morris Jobke2014-11-181-1/+0
* | | Merge pull request #12261 from oparoz/patch-1Morris Jobke2014-11-181-1/+1
|\ \ \
| * | | Replace deprecated switchesOlivier Paroz2014-11-181-1/+1
* | | | Merge pull request #12224 from owncloud/fix_12211Björn Schießle2014-11-181-9/+22
|\ \ \ \ | |/ / / |/| | |
| * | | only users can have a display name different from the idBjoern Schiessle2014-11-181-1/+4
| * | | make sure that we only find the shares from the correct share type if users a...Bjoern Schiessle2014-11-181-2/+8
| * | | make sure that we don't find the wrong shares if a user and a group have the ...Bjoern Schiessle2014-11-181-6/+10
| |/ /
* | | Merge pull request #12259 from owncloud/app-enabled-plugin-appmanagerLukas Reschke2014-11-181-4/+4
|\ \ \
| * | | Fix type hinting for app managerRobin Appelman2014-11-181-4/+4
| |/ /
* | | Merge pull request #12242 from owncloud/fix-undefined-sizeLukas Reschke2014-11-181-1/+1
|\ \ \ | |/ / |/| |
| * | Check if the size field is availableLukas Reschke2014-11-171-1/+1
* | | Merge pull request #12237 from owncloud/fix-12236Morris Jobke2014-11-181-5/+5
|\ \ \
| * | | Make declaration compatibleLukas Reschke2014-11-171-5/+5
| |/ /
* | | Merge pull request #9962 from owncloud/app-group-enable-remoteLukas Reschke2014-11-181-0/+75
|\ \ \
| * | | Add sabredav plugin to check if a user has access to an appRobin Appelman2014-11-171-0/+75
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-184-0/+8
* | | | Merge pull request #11727 from owncloud/moveCallCheckRegisterToSomeWhereElseLukas Reschke2014-11-171-0/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Move CSRF checkLukas Reschke2014-11-171-0/+3
| | |/ | |/|
* | | Merge pull request #11741 from owncloud/delete_all_children_preview_2Vincent Petry2014-11-171-16/+94
|\ \ \
| * | | delete all children's previews when deleting a folderGeorg Ehrke2014-10-301-16/+94
* | | | Merge pull request #12218 from owncloud/issue/10991-fixesMorris Jobke2014-11-172-2/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make it possible to cleanPath() absolute Windows pathsJoas Schilling2014-11-171-2/+11
| * | | Correctly close handle of directory when listing certificatesJoas Schilling2014-11-171-0/+1
* | | | Merge pull request #12031 from owncloud/app-managerRobin Appelman2014-11-174-0/+211
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add \OC\App\Manager to handle enabling/disabling appsRobin Appelman2014-11-104-0/+211
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-1726-10/+62
* | | | Merge pull request #12186 from owncloud/fix-12182Morris Jobke2014-11-153-13/+31
|\ \ \ \
| * | | | do not output DB information, and do not set headerArthur Schiwon2014-11-143-7/+28