Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-17 | 126 | -26/+386 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-16 | 12 | -0/+26 |
| | |||||
* | Merge pull request #12360 from owncloud/files-tags | Lukas Reschke | 2014-12-15 | 17 | -8/+1182 |
|\ | | | | | Add favorites to files app | ||||
| * | Fixed small code style issues | Vincent Petry | 2014-12-15 | 5 | -12/+16 |
| | | |||||
| * | Remove spinner when toggling file favorite | Vincent Petry | 2014-12-15 | 1 | -9/+14 |
| | | |||||
| * | Fixed has-favorites CSS | Vincent Petry | 2014-12-15 | 3 | -2/+5 |
| | | |||||
| * | shift actions to the left a bit to account for right shift due to favorites ↵ | Jan-Christoph Borchardt | 2014-12-15 | 1 | -0/+1 |
| | | | | | | | | action, not not overlap with size info | ||||
| * | add CSS to shift header to account for when favorites are present | Jan-Christoph Borchardt | 2014-12-15 | 1 | -0/+8 |
| | | |||||
| * | Use star icon for favorites | Vincent Petry | 2014-12-15 | 2 | -10/+44 |
| | | |||||
| * | Correctly replace favorites icon when re-rendering file actions | Vincent Petry | 2014-12-15 | 1 | -1/+1 |
| | | |||||
| * | Added favorites feature to the files app | Vincent Petry | 2014-12-15 | 17 | -8/+1127 |
| | | |||||
* | | Merge pull request #12555 from owncloud/app_specific_search | Jörn Friedrich Dreyer | 2014-12-15 | 1 | -1/+1 |
|\ \ | | | | | | | introduce inApps[] filter for search via ajax query | ||||
| * | | introduce inApps[] filter for search via ajax query, make file results show ↵ | Jörn Friedrich Dreyer | 2014-12-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | up in files app only use more flexible return type check array with !empty instead of count | ||||
* | | | Merge pull request #11991 from owncloud/bower-jquery-ui | Morris Jobke | 2014-12-15 | 1 | -1/+0 |
|\ \ \ | |_|/ |/| | | bower jquery-ui - exported changes to a separate css file | ||||
| * | | bower jquery-ui - exported changes to a separate css file | Morris Jobke | 2014-12-13 | 1 | -1/+0 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-15 | 24 | -4/+28 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-14 | 142 | -128/+174 |
| | | | |||||
* | | | Merge pull request #12639 from owncloud/bad_mtime_format | Morris Jobke | 2014-12-13 | 2 | -3/+29 |
|\ \ \ | |/ / |/| | | Fix formatting of bad dates from external storages | ||||
| * | | Return ? if mtime is 0 or -1 | Robin McCorkell | 2014-12-12 | 2 | -3/+29 |
| | | | | | | | | | | | | Tooltip contains 'Unable to determine date'. Fixes #6395 | ||||
* | | | Merge pull request #12795 from owncloud/files-layoutchanges | Morris Jobke | 2014-12-13 | 5 | -45/+66 |
|\ \ \ | | | | | | | | | Move file thumbnail element into the label tag | ||||
| * | | | Replace input checkbox CSS selector with .electCheckBox | Vincent Petry | 2014-12-11 | 2 | -22/+18 |
| | | | | |||||
| * | | | Move file thumbnail into the label element | Vincent Petry | 2014-12-11 | 5 | -24/+49 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-13 | 24 | -68/+2 |
| | | | | |||||
* | | | | Merge pull request #12778 from owncloud/searchbytags2 | Vincent Petry | 2014-12-12 | 2 | -0/+74 |
|\ \ \ \ | | | | | | | | | | | Added searchByTags to view, storage and cache | ||||
| * | | | | Make $userId mandatory for searchByTags | Vincent Petry | 2014-12-12 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $userId is now a mandatory parameter for searchByTags. Also fixed some places in the code where the argument was missing (Node API and View) | ||||
| * | | | | Added searchByTags to view, storage and cache | Vincent Petry | 2014-12-11 | 2 | -0/+73 |
| | | | | | |||||
* | | | | | Merge pull request #12812 from owncloud/remove-53-workaround | Thomas Müller | 2014-12-12 | 1 | -6/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove conditional check for 5.3 compatibility | ||||
| * | | | | | Remove conditional check for 5.3 compatibility | Lukas Reschke | 2014-12-12 | 1 | -6/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #12808 from owncloud/add-special-parameterlist-to-manager | Joas Schilling | 2014-12-12 | 1 | -3/+34 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add special parameterlist to manager | ||||
| * | | | | | | Specify list of activity parameters for sharing extension | Joas Schilling | 2014-12-12 | 1 | -3/+34 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #12789 from owncloud/external-icon | Vincent Petry | 2014-12-12 | 1 | -210/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix and compress files_external icon | ||||
| * | | | | | | fix and compress files_external icon | Jan-Christoph Borchardt | 2014-12-11 | 1 | -210/+2 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #12527 from owncloud/js-pluginsystem | Robin Appelman | 2014-12-12 | 9 | -66/+57 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Simple Plugin system for Javascript | ||||
| * | | | | | Remove obsoleted filelist prototype backup in tests | Vincent Petry | 2014-12-04 | 3 | -24/+3 |
| | | | | | | |||||
| * | | | | | Simple Plugin system for Javascript | Vincent Petry | 2014-12-01 | 8 | -42/+54 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Check for share by link enabled | Gadzy | 2014-12-12 | 1 | -9/+12 |
| | | | | | | | | | | | | | | | Display "Shared by link" section only if sharing by link is enabled. | ||||
* | | | | | Merge pull request #12698 from owncloud/handle_readonly_shared_files | Morris Jobke | 2014-12-12 | 4 | -8/+54 |
|\ \ \ \ \ | | | | | | | | | | | | | Handle readonly shared files | ||||
| * | | | | | show readonly message in file conflict dialog, make it always selected | Jörn Friedrich Dreyer | 2014-12-11 | 4 | -8/+54 |
| | |_|_|/ | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-12 | 12 | -0/+44 |
| |_|/ / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-11 | 2 | -0/+10 |
| | | | | |||||
* | | | | Merge pull request #11892 from owncloud/remove_triggerupdate | Thomas Müller | 2014-12-10 | 2 | -34/+32 |
|\ \ \ \ | |_|_|/ |/| | | | Remove triggerupdate.php & add quiet option for CLI scanner | ||||
| * | | | make path absolute | Jörn Friedrich Dreyer | 2014-12-10 | 1 | -7/+11 |
| | | | | |||||
| * | | | add quiet option, ref #8794 | Jörn Friedrich Dreyer | 2014-12-04 | 1 | -9/+18 |
| | | | | |||||
| * | | | remove triggerupdate, ref #11872 | Jörn Friedrich Dreyer | 2014-12-04 | 2 | -26/+11 |
| | | | | |||||
* | | | | Merge pull request #12090 from AdamWill/google-rename-delete | Morris Jobke | 2014-12-10 | 1 | -0/+12 |
|\ \ \ \ | | | | | | | | | | | google: delete original after successful rename | ||||
| * | | | | google: delete original after successful rename | Adam Williamson | 2014-11-30 | 1 | -0/+12 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In GDrive, filenames aren't unique, and directories are just special files - so you can have multiple files with the same name, multiple directories with the same name, and even files with the same names as directories. OC doesn't handle this at all, though, and just wants to act as if file and directory names *are* unique. So when renaming, we must check if there's an existing object with the same file or directory name before we commit the rename, and explicitly delete it if the rename is successful. (Other providers like dropbox do the same for files, but intentionally don't do it for directories; we really need to do it for directories too.) A good way to observe this is to run the storage unit tests and look at the state of the Drive afterwards. Without this commit, there will be several copies of all the test files and directories. After this commit, there's just one of each. We can't just say "hey, Drive lets us do this, what's the problem?" because we don't handle multiple-objects, same-name cases - getDriveFile() just bails and prints an error if it searches for the file or directory with a given name and gets multiple results. | ||||
* | | | | Merge pull request #12549 from owncloud/shared-cache-non-existing | Morris Jobke | 2014-12-10 | 1 | -10/+12 |
|\ \ \ \ | | | | | | | | | | | Dont return cached date in shared cache when the file doesn't exist | ||||
| * | | | | Dont return cached date in shared cache when the file doesn't exist | Robin Appelman | 2014-12-02 | 1 | -10/+12 |
| |/ / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-10 | 130 | -8/+186 |
| | | | | |||||
* | | | | Merge pull request #11214 from owncloud/issue/10836 | Morris Jobke | 2014-12-09 | 2 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | Add an option to disallow sending sharing emails to non-owncloud users |