Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8662 from owncloud/f-lock | Thomas Müller | 2014-06-04 | 4 | -13/+21 |
|\ | |||||
| * | workaround to get the unit test going | Thomas Müller | 2014-06-04 | 1 | -4/+6 |
| * | get the storage from the view | Bjoern Schiessle | 2014-06-04 | 1 | -4/+5 |
| * | don't ask for fileInfo if we already have one | Bjoern Schiessle | 2014-06-04 | 1 | -5/+4 |
| * | make sure to close the stream at the end of each test | Bjoern Schiessle | 2014-06-04 | 1 | -0/+6 |
| * | Continued flock work. | ringmaster | 2014-06-04 | 1 | -0/+1 |
| * | flock changes. Work in progress. | ringmaster | 2014-06-04 | 1 | -1/+0 |
* | | Merge pull request #8842 from owncloud/ldap_cli_methods | Thomas Müller | 2014-06-04 | 5 | -1/+232 |
|\ \ | |||||
| * | | Fix casing and PHPDoc | Thomas Müller | 2014-06-03 | 4 | -8/+7 |
| * | | fix description texts | Arthur Schiwon | 2014-06-03 | 2 | -2/+2 |
| * | | command line tools to see, modify and test existing LDAP configurations | Arthur Schiwon | 2014-06-03 | 5 | -1/+233 |
* | | | Merge pull request #8849 from owncloud/trash_expire_fix | Thomas Müller | 2014-06-04 | 1 | -8/+9 |
|\ \ \ | |||||
| * | | | fixing typo | Thomas Müller | 2014-06-04 | 1 | -1/+1 |
| * | | | get files in trash from file cache | Bjoern Schiessle | 2014-06-03 | 1 | -7/+8 |
* | | | | Merge pull request #8468 from owncloud/remove-infieldlabels | Jan-Christoph Borchardt | 2014-06-04 | 2 | -9/+2 |
|\ \ \ \ | |||||
| * | | | | infield label removal: remove last occurences of infield labels | Jan-Christoph Borchardt | 2014-06-03 | 2 | -9/+2 |
| |/ / / | |||||
* | | / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-04 | 137 | -319/+72 |
| |_|/ |/| | | |||||
* | | | Merge pull request #8698 from owncloud/sharing_improve_permissions | Thomas Müller | 2014-06-03 | 2 | -36/+16 |
|\ \ \ | |||||
| * | | | check if it is a share storage | Bjoern Schiessle | 2014-06-02 | 1 | -1/+5 |
| * | | | no need to empty array in a special way | Thomas Müller | 2014-06-02 | 1 | -3/+1 |
| * | | | get permissions directly from share storage to avoid additional db calls | Bjoern Schiessle | 2014-06-02 | 2 | -34/+12 |
* | | | | Merge pull request #7930 from owncloud/fix_7785_master | blizzz | 2014-06-03 | 13 | -160/+1407 |
|\ \ \ \ | |||||
| * | | | | get rid of @read in PHP doc after rebase | Arthur Schiwon | 2014-06-03 | 1 | -3/+3 |
| * | | | | adjust group tests | Arthur Schiwon | 2014-06-03 | 1 | -2/+9 |
| * | | | | clean up | Arthur Schiwon | 2014-06-03 | 1 | -3/+1 |
| * | | | | class descriptions | Arthur Schiwon | 2014-06-03 | 3 | -0/+16 |
| * | | | | newlines | Arthur Schiwon | 2014-06-03 | 4 | -4/+4 |
| * | | | | adjust test to changed convention in storing quota | Arthur Schiwon | 2014-06-03 | 1 | -3/+3 |
| * | | | | port of PR #8038 | Arthur Schiwon | 2014-06-03 | 1 | -2/+1 |
| * | | | | precaution: lowercase string for comparison | Arthur Schiwon | 2014-06-03 | 1 | -1/+1 |
| * | | | | adjust user backend test | Arthur Schiwon | 2014-06-03 | 1 | -13/+33 |
| * | | | | fix parameter order | Arthur Schiwon | 2014-06-03 | 1 | -2/+2 |
| * | | | | adjust Access test | Arthur Schiwon | 2014-06-03 | 1 | -7/+16 |
| * | | | | LDAP: put out fetching of user meta data into a fully tested class of its own... | Arthur Schiwon | 2014-06-03 | 10 | -140/+1338 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #8837 from owncloud/issue/8720 | Morris Jobke | 2014-06-03 | 3 | -11/+11 |
|\ \ \ \ | |||||
| * | | | | Fix tests | Joas Schilling | 2014-06-03 | 1 | -8/+8 |
| * | | | | Use active instead of hover for active sidebar option | Joas Schilling | 2014-06-03 | 1 | -2/+2 |
| * | | | | Do not overwrite cursor in sidebar | Joas Schilling | 2014-06-03 | 1 | -1/+1 |
* | | | | | Merge pull request #8840 from owncloud/share_settings | Thomas Müller | 2014-06-03 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | set "allow users to send mail notification for shared files default" setting ... | Bjoern Schiessle | 2014-06-03 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | remove specific sidebar size from Files app | Jan-Christoph Borchardt | 2014-06-03 | 1 | -8/+0 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #8729 from owncloud/add-phpseclib-master | Thomas Müller | 2014-06-03 | 35 | -31207/+9 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | use phpseclib from 3rdparty | Thomas Müller | 2014-06-03 | 35 | -31207/+9 |
* | | | | fix empty file handling option | Morris Jobke | 2014-06-03 | 1 | -9/+11 |
| |/ / |/| | | |||||
* | | | Merge pull request #8821 from owncloud/kill-zip-download-restriction | Jan-Christoph Borchardt | 2014-06-03 | 12 | -56/+16 |
|\ \ \ | |||||
| * | | | fix unit tests | Morris Jobke | 2014-06-02 | 1 | -1/+1 |
| * | | | add OCP\Config:deleteSystemValue | Morris Jobke | 2014-06-02 | 1 | -3/+3 |
| * | | | bump version | Morris Jobke | 2014-06-02 | 1 | -1/+1 |
| * | | | drop allowZIPdownload and maxZIPSize as options | Morris Jobke | 2014-06-02 | 10 | -54/+14 |
* | | | | Merge pull request #8820 from owncloud/design-details | Frank Karlitschek | 2014-06-02 | 2 | -4/+16 |
|\ \ \ \ | |_|_|/ |/| | | |