Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12639 from owncloud/bad_mtime_format | Morris Jobke | 2014-12-13 | 2 | -3/+29 |
|\ | |||||
| * | Return ? if mtime is 0 or -1 | Robin McCorkell | 2014-12-12 | 2 | -3/+29 |
* | | Merge pull request #12795 from owncloud/files-layoutchanges | Morris Jobke | 2014-12-13 | 5 | -45/+66 |
|\ \ | |||||
| * | | 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 |
|\ \ \ | |||||
| * | | | Make $userId mandatory for searchByTags | Vincent Petry | 2014-12-12 | 2 | -3/+4 |
| * | | | 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 | 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 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | 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 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | 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 |
* | | | | | Merge pull request #12698 from owncloud/handle_readonly_shared_files | Morris Jobke | 2014-12-12 | 4 | -8/+54 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | 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 | Adam Williamson | 2014-11-30 | 1 | -0/+12 |
| | |_|/ | |/| | | |||||
* | | | | 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 | 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 | Joas Schilling | 2014-12-09 | 2 | -0/+2 |
* | | | | | Merge pull request #12568 from owncloud/autoload-encryption-classes | Joas Schilling | 2014-12-09 | 40 | -704/+681 |
|\ \ \ \ \ | |||||
| * | | | | | Correctly namespace encryption tests | Joas Schilling | 2014-12-09 | 12 | -185/+181 |
| * | | | | | Use self:: instead of the class name in encryption tests | Joas Schilling | 2014-12-09 | 10 | -361/+361 |
| * | | | | | Update OCA\Encryption to OCA\Files_Encryption in the encryption app itself | Joas Schilling | 2014-12-09 | 34 | -252/+248 |
| * | | | | | Fix namespace of Files_Encryption outside of the app | Joas Schilling | 2014-12-09 | 2 | -3/+3 |
| * | | | | | Fix namespace of files_encryption classes and autoload them | Joas Schilling | 2014-12-09 | 13 | -27/+12 |
| |/ / / / | |||||
* | | | | | Merge pull request #12708 from owncloud/l10nsaved | Thomas Müller | 2014-12-09 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | translated saved message in files external | Volkan Gezer | 2014-12-08 | 1 | -2/+2 |
* | | | | | | Merge pull request #12688 from owncloud/rename-alt | Lukas Reschke | 2014-12-09 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | introduce alt text for rename icon - fixes #12067 | Morris Jobke | 2014-12-08 | 1 | -0/+1 |
* | | | | | | | Merge pull request #12715 from owncloud/fix-broken-personal-page | Lukas Reschke | 2014-12-09 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remove duplicate loaded personal.js - fixes #12674 | Morris Jobke | 2014-12-09 | 1 | -1/+0 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #12709 from owncloud/fix-11955 | Morris Jobke | 2014-12-09 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Skip headers that can not be split | Victor Dubiniuk | 2014-12-08 | 1 | -0/+3 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #12406 from owncloud/drop-getApps-getUsers | Thomas Müller | 2014-12-09 | 5 | -12/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | reduce OC_Preferences, OC_Config and \OCP\Config usage | Morris Jobke | 2014-12-08 | 5 | -12/+27 |
| |/ / / / / |