summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-05-216-1/+37
* [tx-robot] updated from transifexJenkins for ownCloud2013-05-206-2/+30
* [tx-robot] updated from transifexJenkins for ownCloud2013-05-193-0/+12
* [tx-robot] updated from transifexJenkins for ownCloud2013-05-1867-130/+178
* [tx-robot] updated from transifexJenkins for ownCloud2013-05-171-10/+10
* Merge pull request #3302 from owncloud/ldap_configurable_username_n_uuidblizzz2013-05-169-4/+143
|\
| * Merge branch 'master' into ldap_configurable_username_n_uuidArthur Schiwon2013-05-1339-132/+275
| |\
| * | LDAP: fix display of numerical display namesArthur Schiwon2013-05-081-1/+1
| * | LDAP: Implement clear mappings functionalityArthur Schiwon2013-05-084-1/+91
| * | LDAP: implement UUID and internal username overrideArthur Schiwon2013-05-081-1/+19
| * | LDAP: better variable nameArthur Schiwon2013-05-082-7/+11
| * | LDAP: implement r+w for new settingsArthur Schiwon2013-05-081-2/+11
| * | LDAP: add settings for UUID overrideArthur Schiwon2013-05-081-2/+5
| * | LDAP: prepare settings for internal username attribute and clearing user mapp...Arthur Schiwon2013-05-072-0/+13
| * | LDAP: Coypright infoArthur Schiwon2013-05-071-0/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-1611-11/+21
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-1545-45/+45
* | | Merge pull request #2821 from owncloud/fix-2159-rename-to-sharedThomas Müller2013-05-143-19/+230
|\ \ \
| * | | [files] add private declaration of $viewMorris Jobke2013-05-141-0/+1
| * | | [files] fix mock creation and remove hardcoded 'require' statementMorris Jobke2013-05-122-7/+2
| * | | [files] rename lib to "App"Morris Jobke2013-05-123-7/+7
| * | | [files] ownCloud typoMorris Jobke2013-05-121-1/+1
| * | | [files] rename test class and add rename testMorris Jobke2013-05-121-1/+22
| * | | [files] remove realpath in testMorris Jobke2013-05-121-1/+1
| * | | [files] rename testsMorris Jobke2013-05-121-0/+99
| * | | [files] remove normalizePath on rename and dependency injectionMorris Jobke2013-05-122-7/+8
| * | | [files] kill stripslashesMorris Jobke2013-05-121-3/+3
| * | | [files] fix typosMorris Jobke2013-05-121-5/+5
| * | | [files] refactoringMorris Jobke2013-05-122-19/+111
| * | | string comparisionMorris Jobke2013-05-121-1/+1
| * | | wrong root dir nameMorris Jobke2013-05-121-2/+2
| * | | fix allowed rename of folder in root directory to reserved name "Shared"Morris Jobke2013-05-121-2/+4
* | | | fix history template, print_unescaped() needs to include closing tagsBjörn Schießle2013-05-141-4/+4
* | | | Merge pull request #3338 from owncloud/button_color_fixRaghu Nayyar2013-05-141-2/+4
|\ \ \ \
| * | | | color change to crumb elements as well.raghunayyar2013-05-141-1/+1
| * | | | Keeping Font Colors Consistant on the headers.raghunayyar2013-05-131-1/+3
* | | | | Merge pull request #3330 from owncloud/preselect_filename_on_renameMorris Jobke2013-05-141-0/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | peselect filename without extension on renameJörn Friedrich Dreyer2013-05-131-0/+7
| | |_|/ | |/| |
* | | | Merge branch 'master' into update_etags_on_restoreBjörn Schießle2013-05-1327-84/+224
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-131-0/+16
| |/ /
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-05-1226-84/+208
* | | touch() needs to be performed relative to user/files otherwise ownCloud doesn...Björn Schießle2013-05-101-1/+4
|/ /
* | rename a file if it gets restored so that it no longer exists as a version. O...Björn Schießle2013-05-081-1/+1
* | touch file relative to users file folder, otherwise the hooks will be ignoredBjörn Schießle2013-05-081-4/+5
* | Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-appBart Visscher2013-05-0710-42/+42
|\ \
| * | Use !== and === in user_ldap app – Part 2kondou2013-04-205-23/+23
| * | Use !== and === in user_ldap app – Part 1kondou2013-04-205-19/+19
* | | Merge pull request #3044 from owncloud/backgroundwatchericewind19912013-05-071-1/+3
|\ \ \ | |_|/ |/| |
| * | Cache: add a backgroundjob to check for external changes to the filesystemRobin Appelman2013-04-201-1/+3
* | | Merge pull request #3246 from owncloud/newfile-mimetypeMorris Jobke2013-05-072-3/+3
|\ \ \