Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | It's 'status', not 'result'! | Thomas Tanghus | 2013-10-04 | 1 | -4/+4 | |
| |/ / / / / | ||||||
| * | | | | | Remove obsolete files. | Thomas Tanghus | 2013-10-04 | 9 | -490/+0 | |
| * | | | | | JS version of the OCP\ITags interface | Thomas Tanghus | 2013-10-04 | 6 | -22/+534 | |
* | | | | | | Merge pull request #5233 from owncloud/enc_filter_users | Björn Schießle | 2013-10-11 | 5 | -37/+11 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | don't cache if the encryption is enabled, this can lead to problems during un... | Bjoern Schiessle | 2013-10-10 | 1 | -27/+1 | |
| * | | | | | make sure that we are logged in ad user1 while performing the tests | Bjoern Schiessle | 2013-10-10 | 1 | -3/+4 | |
| * | | | | | make sure that we only find file/folder shares | Bjoern Schiessle | 2013-10-09 | 1 | -4/+4 | |
| * | | | | | only encrypt file to users with encryption keys | Bjoern Schiessle | 2013-10-09 | 2 | -3/+2 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-10 | 471 | -5964/+4005 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | Merge pull request #5263 from owncloud/fixing-5255-master | VicDeo | 2013-10-10 | 2 | -1/+37 | |
|\ \ \ \ \ | ||||||
| * | | | | | the path need to be normalized before putting it into resolvePath() | Thomas Müller | 2013-10-10 | 2 | -1/+37 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #4780 from AxelRb/master | Morris Jobke | 2013-10-10 | 2 | -0/+10 | |
|\ \ \ \ \ | ||||||
| * | | | | | changed the argument to false for getValue , reformated else statement | Axel Roenn | 2013-10-10 | 1 | -3/+2 | |
| * | | | | | Added the config option to log ip addresses , default false | Axel Roenn | 2013-10-09 | 1 | -0/+3 | |
| * | | | | | Changed default behaviour to not log IP address in case of an auth failure. C... | Axel Roenn | 2013-09-10 | 1 | -2/+8 | |
| * | | | | | On an auth failure the uid and the IP address should be logged to the standar... | Axel Roenn | 2013-09-09 | 1 | -0/+2 | |
* | | | | | | Merge pull request #5247 from owncloud/hooks-view-same-start | icewind1991 | 2013-10-10 | 2 | -1/+22 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | merge master into hooks-view-same-start | Robin Appelman | 2013-10-10 | 9 | -323/+40 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | ensure the view's root is a subfolder of the the default root, not only start... | Robin Appelman | 2013-10-09 | 2 | -1/+22 | |
* | | | | | | | | Merge pull request #5257 from owncloud/files-ie8-regularfileactionsbroken | Morris Jobke | 2013-10-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fixed files view regular file actions in IE8 | Vincent Petry | 2013-10-10 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #5182 from owncloud/fix-sharring-with-password-screen | Morris Jobke | 2013-10-10 | 6 | -2/+40 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Optimize confirm.[svg|png] with optipng and scour | kondou | 2013-10-08 | 2 | -63/+4 | |
| * | | | | | | | | Fix password screen for public shares | Morris Jobke | 2013-10-07 | 6 | -2/+99 | |
* | | | | | | | | | Merge pull request #5244 from owncloud/more-css-fixes | Morris Jobke | 2013-10-10 | 5 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | fix web interface showing very small when accessed on smartphone | Jan-Christoph Borchardt | 2013-10-06 | 3 | -0/+3 | |
| * | | | | | | | | properly indent contents of folders for app styles, to line up with text | Jan-Christoph Borchardt | 2013-10-06 | 1 | -2/+2 | |
| * | | | | | | | | improve clickability of footer link | Jan-Christoph Borchardt | 2013-10-06 | 1 | -0/+2 | |
* | | | | | | | | | Merge pull request #5114 from owncloud/ldap_uuid_attr_groups | blizzz | 2013-10-10 | 6 | -152/+107 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | LDAP: allow different UUID attributes for groups and users | Arthur Schiwon | 2013-10-04 | 6 | -152/+107 | |
* | | | | | | | | | Merge pull request #5221 from owncloud/fixing-5217-master | VicDeo | 2013-10-10 | 4 | -314/+11 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainer | Thomas Müller | 2013-10-08 | 1 | -2/+3 | |
| * | | | | | | | | | php 5.3 compatibility for Test_Files_Sharing_Api | Thomas Müller | 2013-10-08 | 1 | -2/+4 | |
| * | | | | | | | | | php 5.3 compatibility for \OC\Files\Storage | Thomas Müller | 2013-10-08 | 1 | -279/+0 | |
| * | | | | | | | | | fixing php 5.3 compatibility | Thomas Müller | 2013-10-08 | 1 | -31/+4 | |
* | | | | | | | | | | Merge pull request #5210 from owncloud/sharing_search_users_fix | Björn Schießle | 2013-10-10 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | find users which are in the same group | Bjoern Schiessle | 2013-10-08 | 2 | -2/+2 | |
* | | | | | | | | | | | Merge pull request #5232 from owncloud/fixing-webdav-touch-master | Frank Karlitschek | 2013-10-10 | 1 | -6/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | due to internal implementations touch will always be successful - $mtime will... | Thomas Müller | 2013-10-09 | 1 | -6/+0 | |
* | | | | | | | | | | | | Merge pull request #5245 from owncloud/file_put_contents-no-create | Frank Karlitschek | 2013-10-10 | 2 | -1/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | don't trigger the create hooks when if the file already exists for file_put_c... | Robin Appelman | 2013-10-09 | 2 | -1/+27 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #5134 from owncloud/trashbin-homeiconbroken | Vincent Petry | 2013-10-09 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Do not call changeDirectory() when no dir set on breadcrumb | Vincent Petry | 2013-10-04 | 1 | -3/+6 | |
* | | | | | | | | | | | | Merge pull request #5230 from owncloud/trashbin_fixes | Björn Schießle | 2013-10-09 | 3 | -149/+128 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | update file summary after group delete/restore | Bjoern Schiessle | 2013-10-09 | 1 | -0/+2 | |
| * | | | | | | | | | | | fix checkbox | Bjoern Schiessle | 2013-10-09 | 1 | -37/+15 | |
| * | | | | | | | | | | | fix indention | Bjoern Schiessle | 2013-10-09 | 1 | -99/+99 | |
| * | | | | | | | | | | | fix group delete/restore | Bjoern Schiessle | 2013-10-09 | 2 | -19/+18 | |
| * | | | | | | | | | | | fix delete/restore individual files | Bjoern Schiessle | 2013-10-09 | 1 | -26/+23 | |
| * | | | | | | | | | | | fix trashbin layout | Bjoern Schiessle | 2013-10-09 | 1 | -0/+3 | |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | |