summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-22171-472/+674
|
* Merge pull request #4929 from owncloud/fixing-4416-masterMorris Jobke2013-09-221-1/+1
|\ | | | | Fixing 4416 master
| * setting a default on filecache column unencrypted_sizeThomas Müller2013-09-201-1/+1
| |
* | Merge pull request #4938 from owncloud/scan-filter-outside-viewJörn Friedrich Dreyer2013-09-222-6/+22
|\ \ | | | | | | When filtering search results, ensure results are children of the...
| * | files: when filtering search results, ensure results are children of the ↵Robin Appelman2013-09-222-6/+22
| |/ | | | | | | fakeroot not just path starting the same
* | Merge pull request #4927 from owncloud/fix_namespaces_and_autoloadingThomas Müller2013-09-2114-27/+26
|\ \ | |/ |/| namespaces use upcasefirst parts
| * remove unneccessary lib in namespaceJörn Friedrich Dreyer2013-09-2010-20/+19
| |
| * namespaces use upcasefirst partsJörn Friedrich Dreyer2013-09-2013-26/+26
| | | | | | | | | | when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app its magic!
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-20441-7022/+10867
| |
* | Merge pull request #4684 from owncloud/improved-consoleBart Visscher2013-09-198-60/+137
|\ \ | | | | | | Use more object oriented way for console commands
| * | Add copyright, remove starting blank lineBart Visscher2013-09-193-1/+13
| | |
| * | Check all installed apps for console commandsBart Visscher2013-09-141-1/+1
| | |
| * | Use appinfo/register_command.php to add commands to the console commandBart Visscher2013-09-133-2/+25
| | |
| * | Cleanup and more style fixesBart Visscher2013-09-022-8/+5
| | |
| * | Change Files Scan command to use OC\User\ManagerBart Visscher2013-09-022-8/+19
| | |
| * | Use more object oriented way for console commandsBart Visscher2013-09-016-60/+94
| | |
* | | Merge pull request #4908 from owncloud/fix_css_selectorBart Visscher2013-09-191-1/+1
|\ \ \ | |_|/ |/| | css selectors never have a : before []
| * | css selectors never have a : before []Jörn Friedrich Dreyer2013-09-191-1/+1
| | |
* | | Merge pull request #4766 from owncloud/fix_3728_with_file_exists_dialogThomas Müller2013-09-1917-515/+1709
|\ \ \ | | | | | | | | file upload conflicts dialog
| * \ \ Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-19281-1100/+8175
| |\ \ \ | |/ / / |/| | | | | | | | | | | Conflicts: apps/files/js/filelist.js
* | | | Merge pull request #4900 from owncloud/fixing-4488-masterJörn Friedrich Dreyer2013-09-193-2/+13
|\ \ \ \ | | | | | | | | | | File permissions are part of the ajax response of file upload
| * \ \ \ Merge branch 'master' into fixing-4488-masterThomas Müller2013-09-19276-1227/+8231
| |\ \ \ \
| * | | | | adding comma to get cleaner diffs in the futureThomas Müller2013-09-181-1/+1
| | | | | |
| * | | | | no file actions during uploadThomas Müller2013-09-181-1/+0
| | | | | |
| * | | | | remove file action elements before recreating themThomas Müller2013-09-181-0/+5
| | | | | |
| * | | | | store the permissions retrieved via ajax within the dom elementThomas Müller2013-09-181-0/+6
| | | | | |
| * | | | | add permissions of the file to the json responseThomas Müller2013-09-181-1/+2
| | | | | |
* | | | | | Merge pull request #4263 from owncloud/search_scrolltoJörn Friedrich Dreyer2013-09-199-27/+133
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | initial scrollto implementation
| * | | | | add fixmeJörn Friedrich Dreyer2013-09-171-1/+1
| | | | | |
| * | | | | make 'open in folder' action default for filesJörn Friedrich Dreyer2013-09-171-15/+22
| | | | | |
| * | | | | use correct doublequotes in template, remove containerJörn Friedrich Dreyer2013-09-171-7/+6
| | | | | |
| * | | | | initial scrollto implementation:Jörn Friedrich Dreyer2013-09-179-16/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use places/folder icon, move link construction to JS, only show icon on hover, use 'searchresult' as css class name, add filter/unfilter methods, highlight searched files in current filelist only filter when correct FileList is present
* | | | | | Merge pull request #4906 from owncloud/wtf-broken-code-was-merged-again-masterChristopher2013-09-181-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | fixing syntax error - it it that hard to test own code?
| * | | | | fixing syntax error - it it that hard to test own code?Thomas Müller2013-09-181-1/+1
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-18265-998/+7904
| | | | |
* | | | | Merge pull request #4745 from owncloud/split_personal-user_passwordchangeBart Visscher2013-09-185-72/+122
|\ \ \ \ \ | | | | | | | | | | | | Split personal and user-mgmt password change logic
| * | | | | Translate errormsgs in settings/changepassword/controllerkondou2013-09-181-5/+14
| | | | | |
| * | | | | Improve changepassword route namingkondou2013-09-133-4/+4
| | | | | |
| * | | | | Move ajax/changepassword to changepassword/controller to use autoloadingkondou2013-09-132-3/+0
| | | | | |
| * | | | | Merge branch 'master' into split_personal-user_passwordchangekondou2013-09-11909-9947/+26248
| |\ \ \ \ \
| * | | | | | Use a controller instead of two files for changepassword.phpkondou2013-09-113-82/+94
| | | | | | |
| * | | | | | Remove $recoveryPassword from changepersonalpassword & fix indentkondou2013-09-062-9/+12
| | | | | | |
| * | | | | | Split personal and user-mgmt password change logickondou2013-09-065-23/+52
| | | | | | |
| | | | | * | fix race condition in lazy preview loadingJörn Friedrich Dreyer2013-09-191-12/+18
| | | | | | |
| | | | | * | use {count} instead of 'One' for more versatile translationJörn Friedrich Dreyer2013-09-191-1/+1
| | | | | | |
| | | | | * | Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core ↵Jörn Friedrich Dreyer2013-09-192-3/+3
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into fix_3728_with_file_exists_dialog
| | | | | | * \ Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core ↵Thomas Müller2013-09-191-26/+26
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into fix_3728_with_file_exists_dialog Conflicts: apps/files/js/file-upload.js
| | | | | | * | | fixing typos and l10nThomas Müller2013-09-192-3/+3
| | | | | | | | |
| | | | | * | | | fix double translation of error messageJörn Friedrich Dreyer2013-09-191-1/+1
| | | | | | | | |
| | | | | * | | | use n to translate titleJörn Friedrich Dreyer2013-09-191-1/+7
| | | | | | |/ / | | | | | |/| |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-06 10:38:12 +0000