Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | disable trahs in files_sharing/public.php | Bjoern Schiessle | 2013-11-21 | 1 | -1/+1 | |
| | ||||||
* | fix undefined index errors if public share view | Bjoern Schiessle | 2013-11-21 | 1 | -2/+3 | |
| | ||||||
* | Merge pull request #5435 from owncloud/share-improvements | Thomas Müller | 2013-10-23 | 1 | -1/+1 | |
|\ | | | | | Share improvements | |||||
| * | improve wording of permission notice | Jan-Christoph Borchardt | 2013-10-20 | 1 | -1/+1 | |
| | | ||||||
| * | beautify 'you dont have write permissions' notice, fix #2770 | Jan-Christoph Borchardt | 2013-10-20 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #5310 from owncloud/hide_filestable-header_when_empty | Christopher Schäpers | 2013-10-22 | 1 | -5/+5 | |
|\ \ | | | | | | | Hide files list header, when theres no files to see | |||||
| * | | Fixed empty content logic | Vincent Petry | 2013-10-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | - Remove obsolete code that used another approach for hiding emptycontent - Fixed logic for the showing of the empty content message | |||||
| * | | Fix mind-boggling emptycontent logic | kondou | 2013-10-21 | 1 | -4/+4 | |
| | | | ||||||
| * | | Hide files list header, when theres no files to see | kondou | 2013-10-12 | 1 | -4/+4 | |
| |/ | ||||||
* / | Fixed share with link checkbox missing as regular user | Vincent Petry | 2013-10-21 | 1 | -0/+2 | |
|/ | | | | | | | | | Instead of loading the app config setting "shareapi_allow_links" using a synchronous ajax call that fails when the user is not an admin, this fix puts the flag directly in the template so it doesn't need to be loaded afterwards. Fixes #5440 | |||||
* | Moved IE8 inline styles in files.css | Vincent Petry | 2013-10-11 | 1 | -1/+0 | |
| | ||||||
* | Fixed delete icon alignment in IE8 | Vincent Petry | 2013-10-11 | 1 | -1/+1 | |
| | | | | | Removed old inline CSS that forced every td to have position:static in the files app. (#5056) | |||||
* | Added filesApp flag as input field for files app detection | Vincent Petry | 2013-10-08 | 1 | -0/+1 | |
| | | | | | | | Since the files app can be reached under multiple URLs, either root, files.php or public.php, a flag has been added to the DOM to help apps (like file viewers) to detect whether they are currently in the files app. | |||||
* | remove obsolete comment | Jörn Friedrich Dreyer | 2013-10-07 | 1 | -2/+0 | |
| | ||||||
* | Merge pull request #5088 from owncloud/fix_trashbin_button | Morris Jobke | 2013-10-06 | 1 | -3/+1 | |
|\ | | | | | trash bin button needs to be an input field | |||||
| * | trash bin button needs to be an input field | Bjoern Schiessle | 2013-10-02 | 1 | -3/+1 | |
| | | ||||||
* | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-10-04 | 1 | -0/+1 | |
|\ \ | | | | | | | | | | | | | | | | Conflicts: apps/files/index.php apps/files/templates/index.php | |||||
| * \ | Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617 | Björn Schießle | 2013-10-04 | 1 | -0/+1 | |
| |\ \ | | | | | | | | | Encryption improved error messages | |||||
| | * | | fix hidden fieled name | Bjoern Schiessle | 2013-10-04 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-30 | 1 | -1/+1 | |
| | |\| | ||||||
| | * | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-16 | 1 | -23/+16 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/index.php | |||||
| | * | | | no longer enforce log out, but provide useful errors/warnings instead | Bjoern Schiessle | 2013-09-06 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into sharing_mail_notification_master | Thomas Müller | 2013-10-02 | 1 | -1/+1 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/css/share.css | |||||
| * | | | | simplify From Link icon in New menu | Jan-Christoph Borchardt | 2013-10-02 | 1 | -1/+1 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-10-02 | 1 | -1/+1 | |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/util.php | |||||
| * | | | Fix not displaying "Upload something!" message | kondou | 2013-09-23 | 1 | -1/+1 | |
| | |/ | |/| | | | | | | | Fix #4940 | |||||
* | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-16 | 1 | -21/+14 | |
|\| | | | | | | | | | | | | | | Conflicts: apps/files/index.php | |||||
| * | | Merge pull request #4838 from owncloud/refactor_upload_js | Thomas Müller | 2013-09-16 | 1 | -10/+2 | |
| |\ \ | | | | | | | | | refactor upload js & html to always use only js to fill form data | |||||
| | * | | refactor upload js & html to always use only js to fill form data | Jörn Friedrich Dreyer | 2013-09-13 | 1 | -10/+2 | |
| | | | | ||||||
| * | | | Use hash part of URL for IE8 in files app | Vincent Petry | 2013-09-13 | 1 | -1/+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. | |||||
| * | | | Fixed ajax support to also update the current dir permissions | Vincent Petry | 2013-09-13 | 1 | -6/+4 | |
| | | | | ||||||
| * | | | fixing breadcrumbs on ajax loading of files | Thomas Müller | 2013-09-13 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | Ajax calls for "files" and "files_trashbin" apps | Vincent Petry | 2013-09-13 | 1 | -5/+5 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
* | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-05 | 1 | -1/+1 | |
|\| | | | | | | | | | | | | | | | | | | | | increased version number to trigger db update Conflicts: lib/util.php | |||||
| * | | Merge pull request #4473 from owncloud/texteditor_polishing | Jörn Friedrich Dreyer | 2013-09-03 | 1 | -1/+1 | |
| |\ \ | | |/ | |/| | Texteditor polishing | |||||
| | * | Revert "remove editor div in filelist", add "is deprecated" comment | Jörn Friedrich Dreyer | 2013-09-03 | 1 | -0/+1 | |
| | | | | | | | | | | | | This reverts commit 64d09452f55c0c73fe0d55a70f82d8ad7a386d7c. | |||||
| | * | remove editor div in filelist | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -1/+0 | |
| | | | ||||||
* | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-02 | 1 | -14/+17 | |
|\| | | | | | | | | | | | | | | Conflicts: lib/util.php | |||||
| * | | text centered horizontally and vertically in emptycontent div | Alessandro Cosentino | 2013-08-31 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge master into oc_preview | Georg Ehrke | 2013-08-19 | 1 | -0/+1 | |
| |\ \ | ||||||
| * | | | increase row height to 50px, properly position everything, checkboxes, ↵ | Jan-Christoph Borchardt | 2013-08-14 | 1 | -11/+14 | |
| | | | | | | | | | | | | | | | | actions etc | |||||
| * | | | fix breaking error due to ... a wrong icon link. Seriously? | Jan-Christoph Borchardt | 2013-08-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | use web.svg instead of web.png | Georg Ehrke | 2013-08-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | don't use hardcoded size for preview | Georg Ehrke | 2013-08-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master' into oc_preview | Thomas Müller | 2013-07-30 | 1 | -5/+3 | |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | Conflicts: 3rdparty lib/template.php | |||||
| * | | | merge conflicts ... | Georg Ehrke | 2013-07-10 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| * | | | | some style adjustments | Georg Ehrke | 2013-07-10 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | fix size of icons in 'new' dropdown menu - I hope @jancborchardt knows a ↵ | Georg Ehrke | 2013-07-02 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | better solution coz this won't work in most IE versions ... | |||||
* | | | | | enable user to inform recipients about a shared file by mail | Bjoern Schiessle | 2013-08-30 | 1 | -0/+1 | |
| |_|_|/ |/| | | | ||||||
* | | | | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 1 | -3/+1 | |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php |