Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-27 | 1 | -2/+2 |
|\ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-27 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-25 | 27 | -11/+162 |
|\| | | | | | | | | | | | Conflicts: apps/files/lib/helper.php apps/files_trashbin/lib/helper.php | ||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-22 | 1 | -2/+2 |
| | | |||||
| * | Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading | Thomas Müller | 2013-09-21 | 5 | -9/+9 |
| |\ | | | | | | | namespaces use upcasefirst parts | ||||
| | * | remove unneccessary lib in namespace | Jörn Friedrich Dreyer | 2013-09-20 | 1 | -2/+2 |
| | | | |||||
| | * | namespaces use upcasefirst parts | Jörn Friedrich Dreyer | 2013-09-20 | 5 | -9/+9 |
| | | | | | | | | | | | | | | | 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 transifex | Jenkins for ownCloud | 2013-09-20 | 2 | -2/+3 |
| |/ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-18 | 20 | -0/+150 |
| | | |||||
* | | use \OC::$server->getPreviewManager() instead of \OCP\Preview | Thomas Müller | 2013-09-17 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #4501 from owncloud/ajaxfilelist | Thomas Müller | 2013-09-14 | 8 | -81/+228 |
|\ | | | | | Ajax calls for "files" and "files_trashbin" apps | ||||
| * | Fixed files_trashbin to also use hash URL part for IE8 | Vincent Petry | 2013-09-13 | 2 | -2/+27 |
| | | |||||
| * | Use hash part of URL for IE8 in files app | Vincent Petry | 2013-09-13 | 1 | -7/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this fix, the URL wasn't updated in IE8 when navigating into folders. This fix makes use of the hash part of URLs to make this work in IE8, since IE8 doesn't support the history API nor changing the URL without redirecting. From now, both the regular query URL "?dir=somedir" and "#?dir=somedir" will work in both IE8 and non-IE8 browsers. In IE8, query based URLs are automatically converted to hash URLs upon page load. The conversion is done on the server side by redirecting the user to the updated URL. When loading a page directly using a hash URL in the form "#?dir=somedir" in IE8, the server doesn't get the hash, so it will not return any results in that case and rely on ajax to load the first page. | ||||
| * | Added missing "files" JS to files_trashbin module | Vincent Petry | 2013-09-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | The recent refactoring for the breadcrumb resizing relies on the "Files" object which is in the "files" Javascript file. This fix includes it here as well. | ||||
| * | Ajax calls for "files" and "files_trashbin" apps | Vincent Petry | 2013-09-13 | 8 | -83/+209 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Frontend: - The files app list now uses ajax calls to refresh the list. - Added support the browser back button (history API). - Added mask + spinner while loading file list Backend: - Added utility function in core JS for parsing query strings. - Moved file list + breadcrumb template data code to helper functions - Fixed some file paths in trashbin app to be similar to the files app | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-13 | 1 | -2/+3 |
|/ | |||||
* | Merge pull request #4719 from owncloud/port_4701_master | Thomas Müller | 2013-09-12 | 1 | -15/+16 |
|\ | | | | | Always check variable type before using readdir to avoid surprises | ||||
| * | Always check variable type before using readdir to avoid surprises | Arthur Schiwon | 2013-09-04 | 1 | -15/+16 |
| | | |||||
* | | adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin ↵ | Thomas Müller | 2013-09-12 | 1 | -0/+1 |
| | | | | | | | | and sharing | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-10 | 3 | -6/+8 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-08 | 1 | -2/+3 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-07 | 1 | -2/+2 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-05 | 2 | -4/+4 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-03 | 1 | -2/+3 |
| | |||||
* | Merge pull request #4671 from owncloud/emptycontent | Bernhard Posselt | 2013-09-01 | 1 | -1/+1 |
|\ | | | | | centers text message in empty-content page (files and files_trashbin apps) | ||||
| * | rename emptyfolder to emptycontent | Alessandro Cosentino | 2013-08-31 | 1 | -1/+1 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-01 | 2 | -3/+3 |
|/ | |||||
* | Merge master into oc_preview | Georg Ehrke | 2013-08-30 | 1 | -2/+2 |
|\ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-30 | 1 | -2/+2 |
| | | |||||
* | | Merge master into oc_preview | Georg Ehrke | 2013-08-29 | 4 | -26/+13 |
|\| | |||||
| * | Merge pull request #3926 from owncloud/improve_filesummary | Thomas Müller | 2013-08-28 | 1 | -0/+2 |
| |\ | | | | | | | Improve filelist summary | ||||
| | * | Reimplement filesummary in JS | kondou | 2013-08-28 | 1 | -0/+2 |
| | | | | | | | | | | | | Fix #993 | ||||
| * | | also move empty folders to the trash bin as discussed here #4590 | Bjoern Schiessle | 2013-08-28 | 1 | -5/+0 |
| |/ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-27 | 1 | -5/+6 |
| | | |||||
| * | the trash bin can also contain empty files. Don't use the trash bin size as ↵ | Bjoern Schiessle | 2013-08-27 | 1 | -4/+5 |
| | | | | | | | | indicator to decide if the trash bin is empty or not | ||||
| * | kill zh_CN.GB2312 | Thomas Müller | 2013-08-27 | 1 | -12/+0 |
| | | |||||
* | | Merge master into oc_preview | Georg Ehrke | 2013-08-26 | 2 | -4/+5 |
|\| | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-25 | 2 | -4/+5 |
| | | |||||
* | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-08-23 | 11 | -21/+23 |
|\| | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-22 | 2 | -4/+4 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-21 | 1 | -2/+2 |
| | | |||||
| * | Merge pull request #4512 from owncloud/readdir-strict-equals | Thomas Müller | 2013-08-20 | 1 | -1/+1 |
| |\ | | | | | | | use strict equals in readdir loops to prevent issues with '0' files | ||||
| | * | use strict equals in readdir loops to prevent issues with '0' files | Robin Appelman | 2013-08-19 | 1 | -1/+1 |
| | | | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-19 | 7 | -14/+16 |
| |/ | |||||
* | | move isMimeSupported out of template files | Georg Ehrke | 2013-08-21 | 2 | -2/+7 |
| | | |||||
* | | outsource sharing and deleted files previews to apps | Georg Ehrke | 2013-08-19 | 2 | -0/+47 |
| | | |||||
* | | Merge master into oc_preview | Georg Ehrke | 2013-08-19 | 69 | -224/+138 |
|\| | |||||
| * | Merge pull request #4239 from owncloud/decrypt_files_again | Björn Schießle | 2013-08-18 | 1 | -1/+1 |
| |\ | | | | | | | Enable user to decrypt files again after encryption app was disabled | ||||
| | * | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 75 | -359/+501 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php | ||||
| | * | | user interface to allow user to decrypt all his files once the encryption ↵ | Björn Schießle | 2013-07-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | app was disabled Conflicts: settings/templates/personal.php |