Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | shift infield labels just a tiny bit to the right so the cursor doesn't overlap | Jan-Christoph Borchardt | 2013-02-05 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #1428 from owncloud/content_positioning | Thomas Tanghus | 2013-02-06 | 6 | -11/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Reduce top position for content below controls. | Thomas Tanghus | 2013-02-06 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Add 'hascontrols' class for content with fixed topbar. | Thomas Tanghus | 2013-02-04 | 5 | -14/+22 | |
| * | | | | | | | | | | | | | | Remove padding hack to position users list. | Thomas Tanghus | 2013-02-04 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | Files: fix positioning of Trash button and upload progress bar | Robin Appelman | 2013-02-04 | 2 | -10/+10 | |
| * | | | | | | | | | | | | | | Add box-sizing to controls. | Thomas Tanghus | 2013-02-04 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Fix leftcontent positioning. Ref #1255 | Thomas Tanghus | 2013-02-03 | 2 | -4/+4 | |
* | | | | | | | | | | | | | | | Merge pull request #1497 from owncloud/collapse-usermenu | Jan-Christoph Borchardt | 2013-02-06 | 2 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | collapse user menu when inside one of the settings sections | Jan-Christoph Borchardt | 2013-02-06 | 2 | -2/+5 | |
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #1496 from owncloud/custom_clients | Jan-Christoph Borchardt | 2013-02-06 | 3 | -4/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | make it possible to modify the links to the clients | Georg Ehrke | 2013-02-06 | 3 | -4/+15 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #1357 from owncloud/alternative-loging-master | Thomas Müller | 2013-02-06 | 4 | -1/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | move inline style to CSS file, fix details | Jan-Christoph Borchardt | 2013-02-06 | 2 | -3/+7 | |
| * | | | | | | | | | | | | | | add support for apps to register alternative login methods | Thomas Mueller | 2013-01-29 | 3 | -1/+26 | |
* | | | | | | | | | | | | | | | Merge pull request #1487 from owncloud/fix-1420-master | Thomas Müller | 2013-02-06 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Replace OC_FileCache usage in files_versions | Bart Visscher | 2013-02-06 | 1 | -1/+2 | |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | port already approved bugfix to master, https://github.com/owncloud/core/pull... | Björn Schießle | 2013-02-06 | 1 | -1/+7 | |
| |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #1490 from schiesbn/user_displayname | Björn Schießle | 2013-02-06 | 6 | -4/+71 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | make strings translatable | Björn Schießle | 2013-02-06 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | let the user change his display name, if supported by the back-end | Björn Schießle | 2013-02-06 | 6 | -3/+70 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-06 | 147 | -2668/+1208 | |
* | | | | | | | | | | | | | Merge pull request #1476 from owncloud/disable-error-handler-while-running-ph... | Thomas Müller | 2013-02-05 | 6 | -9/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | uncomment failing calls to \OC\Files\Filesystem::file_put_contents | Thomas Mueller | 2013-02-05 | 1 | -3/+3 | |
| * | | | | | | | | | | | | add phpunit configuration for autotest withou the json listener because this ... | Thomas Mueller | 2013-02-05 | 2 | -1/+15 | |
| * | | | | | | | | | | | | fix failing test cases due to wrong typing | Thomas Mueller | 2013-02-05 | 1 | -2/+2 | |
| * | | | | | | | | | | | | disable error handler while running phpunit | Thomas Mueller | 2013-02-05 | 2 | -3/+8 | |
* | | | | | | | | | | | | | offer change password only when the action is supported by the user backend | Arthur Schiwon | 2013-02-05 | 3 | -1/+25 | |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #1474 from samtuke/master | Lukas Reschke | 2013-02-05 | 18 | -498/+804 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | / / / / | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Fixed comment typo, wrapped return value conditional on var assignment in ses... | Sam Tuke | 2013-02-05 | 2 | -3/+5 | |
| * | | | | | | | | | | Added missing translation wrapping | Sam Tuke | 2013-02-05 | 1 | -1/+3 | |
| * | | | | | | | | | | Added notice to personal settings indicating what filetypes are not encrypted | Sam Tuke | 2013-02-05 | 3 | -48/+23 | |
| * | | | | | | | | | | Removed debugging output | Sam Tuke | 2013-02-05 | 2 | -12/+0 | |
| * | | | | | | | | | | Fixed bug relating to Filesystem{} that prevented webdav logins with files_en... | Sam Tuke | 2013-02-05 | 1 | -50/+52 | |
| * | | | | | | | | | | Cleaned up path formatting with new method stripUserFilesPath() | Sam Tuke | 2013-02-05 | 2 | -20/+22 | |
| * | | | | | | | | | | Minor improvement to comments | Sam Tuke | 2013-02-05 | 1 | -7/+6 | |
| * | | | | | | | | | | Recryption of legacy encrypted files now working on login | Sam Tuke | 2013-02-05 | 2 | -7/+20 | |
| * | | | | | | | | | | Merge github.com:owncloud/core | Sam Tuke | 2013-02-05 | 651 | -10166/+20996 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Added debugging output relating to recrypting legacy files | Sam Tuke | 2013-02-01 | 2 | -3/+16 | |
| * | | | | | | | | | | | Improved support for detecting and recrypting legacy files. Bugs remain. | Sam Tuke | 2013-01-31 | 4 | -17/+37 | |
| * | | | | | | | | | | | Fixed compatibility with filecache rewrite merge | Sam Tuke | 2013-01-31 | 1 | -1/+1 | |
| * | | | | | | | | | | | Fixed incompatibilities with filecache rewrite merge | Sam Tuke | 2013-01-31 | 2 | -7/+7 | |
| * | | | | | | | | | | | Merge github.com:owncloud/core | Sam Tuke | 2013-01-31 | 777 | -22798/+47150 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fixed handling of keyfile subdir creation | Sam Tuke | 2013-01-30 | 2 | -84/+24 | |
| * | | | | | | | | | | | | Working on support for deleting directories (removing all keyfiles) | Sam Tuke | 2013-01-30 | 1 | -13/+19 | |
| * | | | | | | | | | | | | Made encyrption keyfiles be deleted when their parents are | Sam Tuke | 2013-01-29 | 5 | -34/+142 | |
| * | | | | | | | | | | | | Fixed many coding guidelines issues | Sam Tuke | 2013-01-24 | 12 | -177/+282 | |
| * | | | | | | | | | | | | Work on util: findFiles() and encryptAll(); both close to working | Sam Tuke | 2013-01-23 | 9 | -181/+213 | |
| * | | | | | | | | | | | | Merge branch 'files_encryption' | Sam Tuke | 2013-01-23 | 8 | -53/+139 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Adding sharing support: added new method in Keymanager setShareKey() | Sam Tuke | 2013-01-14 | 6 | -50/+125 |