Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2821 from owncloud/fix-2159-rename-to-shared | Thomas Müller | 2013-05-14 | 3 | -19/+230 |
|\ | | | | | fix allowed rename of folder in root directory to reserved name "Shared" | ||||
| * | [files] add private declaration of $view | Morris Jobke | 2013-05-14 | 1 | -0/+1 |
| | | |||||
| * | [files] fix mock creation and remove hardcoded 'require' statement | Morris Jobke | 2013-05-12 | 2 | -7/+2 |
| | | |||||
| * | [files] rename lib to "App" | Morris Jobke | 2013-05-12 | 3 | -7/+7 |
| | | |||||
| * | [files] ownCloud typo | Morris Jobke | 2013-05-12 | 1 | -1/+1 |
| | | |||||
| * | [files] rename test class and add rename test | Morris Jobke | 2013-05-12 | 1 | -1/+22 |
| | | |||||
| * | [files] remove realpath in test | Morris Jobke | 2013-05-12 | 1 | -1/+1 |
| | | |||||
| * | [files] rename tests | Morris Jobke | 2013-05-12 | 1 | -0/+99 |
| | | |||||
| * | [files] remove normalizePath on rename and dependency injection | Morris Jobke | 2013-05-12 | 2 | -7/+8 |
| | | |||||
| * | [files] kill stripslashes | Morris Jobke | 2013-05-12 | 1 | -3/+3 |
| | | |||||
| * | [files] fix typos | Morris Jobke | 2013-05-12 | 1 | -5/+5 |
| | | |||||
| * | [files] refactoring | Morris Jobke | 2013-05-12 | 2 | -19/+111 |
| | | |||||
| * | string comparision | Morris Jobke | 2013-05-12 | 1 | -1/+1 |
| | | |||||
| * | wrong root dir name | Morris Jobke | 2013-05-12 | 1 | -2/+2 |
| | | |||||
| * | fix allowed rename of folder in root directory to reserved name "Shared" | Morris Jobke | 2013-05-12 | 1 | -2/+4 |
| | | | | | | | | refs #2159 | ||||
* | | fix history template, print_unescaped() needs to include closing tags | Björn Schießle | 2013-05-14 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #3338 from owncloud/button_color_fix | Raghu Nayyar | 2013-05-14 | 1 | -2/+4 |
|\ \ | | | | | | | Keeping Font Colors Consistant on the headers. | ||||
| * | | color change to crumb elements as well. | raghunayyar | 2013-05-14 | 1 | -1/+1 |
| | | | |||||
| * | | Keeping Font Colors Consistant on the headers. | raghunayyar | 2013-05-13 | 1 | -1/+3 |
| | | | |||||
* | | | Merge pull request #3330 from owncloud/preselect_filename_on_rename | Morris Jobke | 2013-05-14 | 1 | -0/+7 |
|\ \ \ | |/ / |/| | | peselect filename without extension on rename | ||||
| * | | peselect filename without extension on rename | Jörn Friedrich Dreyer | 2013-05-13 | 1 | -0/+7 |
| | | | |||||
* | | | Merge branch 'master' into update_etags_on_restore | Björn Schießle | 2013-05-13 | 27 | -84/+224 |
|\| | | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-13 | 1 | -0/+16 |
| |/ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-12 | 26 | -84/+208 |
| | | |||||
* | | touch() needs to be performed relative to user/files otherwise ownCloud ↵ | Björn Schießle | 2013-05-10 | 1 | -1/+4 |
|/ | | | | doesn't execute the hooks which means that etags aren't updated properly | ||||
* | rename a file if it gets restored so that it no longer exists as a version. ↵ | Björn Schießle | 2013-05-08 | 1 | -1/+1 |
| | | | | Otherwise it can happen that the expire() function removes all other versions so that we end up with only one version which is exactly the same as the original file | ||||
* | touch file relative to users file folder, otherwise the hooks will be ignored | Björn Schießle | 2013-05-08 | 1 | -4/+5 |
| | |||||
* | Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-app | Bart Visscher | 2013-05-07 | 10 | -42/+42 |
|\ | | | | | Use === and !== in user_ldap app | ||||
| * | Use !== and === in user_ldap app – Part 2 | kondou | 2013-04-20 | 5 | -23/+23 |
| | | |||||
| * | Use !== and === in user_ldap app – Part 1 | kondou | 2013-04-20 | 5 | -19/+19 |
| | | |||||
* | | Merge pull request #3044 from owncloud/backgroundwatcher | icewind1991 | 2013-05-07 | 1 | -1/+3 |
|\ \ | | | | | | | Add a background job to watch for external filesystem changes | ||||
| * | | Cache: add a backgroundjob to check for external changes to the filesystem | Robin Appelman | 2013-04-20 | 1 | -1/+3 |
| | | | |||||
* | | | Merge pull request #3246 from owncloud/newfile-mimetype | Morris Jobke | 2013-05-07 | 2 | -3/+3 |
|\ \ \ | | | | | | | | | Files: set the proper mimetype when creating a new text file | ||||
| * | | | Files: set the proper mimetype when creating a new text file | Robin Appelman | 2013-05-06 | 2 | -3/+3 |
| | | | | |||||
* | | | | Use $dir instead of $fullpath | Lukas Reschke | 2013-05-06 | 1 | -2/+1 |
| | | | | |||||
* | | | | Use the internal ownCloud view | Lukas Reschke | 2013-05-06 | 1 | -1/+1 |
|/ / / | |||||
* | | | LDAP: do not reset UUID attribute setting when guid is detected | Arthur Schiwon | 2013-05-06 | 1 | -1/+3 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-04 | 2 | -0/+2 |
| | | | |||||
* | | | LDAP: cachekey in set method needs to match with that one from get | Arthur Schiwon | 2013-05-03 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #3229 from owncloud/fix_3210 | Bart Visscher | 2013-05-03 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | LDAP: remove restriction from group names to be in line with core behavi... | ||||
| * | | | LDAP: remove restriction from group names to be in line with core behaviour ↵ | Arthur Schiwon | 2013-05-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | again | ||||
* | | | | Merge pull request #3222 from owncloud/fix-3218 | Bart Visscher | 2013-05-03 | 2 | -5/+26 |
|\ \ \ \ | |/ / / |/| | | | Fix retrieving of mount points for shared storage, fix #3218 | ||||
| * | | | Fix retrieving of mount points for shared storage, fix #3218 | Michael Gapczynski | 2013-05-02 | 2 | -5/+26 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-03 | 2 | -5/+13 |
| | | | | |||||
* | | | | Merge pull request #3212 from owncloud/stop-links | Morris Jobke | 2013-05-02 | 1 | -0/+7 |
|\ \ \ \ | |/ / / |/| | | | Don't display shared links if disabled | ||||
| * | | | Don't display shared links if disabled | Michael Gapczynski | 2013-05-01 | 1 | -0/+7 |
| | | | | |||||
* | | | | Merge pull request #3211 from owncloud/fix-2816 | Frank Karlitschek | 2013-05-02 | 1 | -5/+3 |
|\ \ \ \ | |/ / / |/| | | | Fix #2816 renaming shared files | ||||
| * | | | Fix #2816 renaming shared files | Michael Gapczynski | 2013-05-01 | 1 | -5/+3 |
| |/ / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-02 | 3 | -0/+7 |
| | | | |||||
* | | | Merge pull request #3147 from owncloud/storage-mkdir-root | Michael Gapczynski | 2013-05-01 | 10 | -46/+10 |
|\ \ \ | | | | | | | | | Dont task external storages with creating their own root |