summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1459 from owncloud/infield-detailJan-Christoph Borchardt2013-02-061-1/+1
|\ | | | | shift infield labels just a tiny bit to the right so the cursor doesn't ...
| * shift infield labels just a tiny bit to the right so the cursor doesn't overlapJan-Christoph Borchardt2013-02-051-1/+1
| |
* | Merge pull request #1428 from owncloud/content_positioningThomas Tanghus2013-02-066-11/+18
|\ \ | | | | | | Fix leftcontent positioning. Ref #1255
| * | Reduce top position for content below controls.Thomas Tanghus2013-02-061-1/+1
| | |
| * | Add 'hascontrols' class for content with fixed topbar.Thomas Tanghus2013-02-045-14/+22
| | |
| * | Remove padding hack to position users list.Thomas Tanghus2013-02-041-1/+0
| | |
| * | Files: fix positioning of Trash button and upload progress barRobin Appelman2013-02-042-10/+10
| | |
| * | Add box-sizing to controls.Thomas Tanghus2013-02-041-1/+1
| | |
| * | Fix leftcontent positioning. Ref #1255Thomas Tanghus2013-02-032-4/+4
| | |
* | | Merge pull request #1497 from owncloud/collapse-usermenuJan-Christoph Borchardt2013-02-062-2/+5
|\ \ \ | | | | | | | | collapse user menu when inside one of the settings sections
| * | | collapse user menu when inside one of the settings sectionsJan-Christoph Borchardt2013-02-062-2/+5
| | | |
* | | | Merge pull request #1496 from owncloud/custom_clientsJan-Christoph Borchardt2013-02-063-4/+15
|\ \ \ \ | | | | | | | | | | make it possible to modify the links to the clients
| * | | | make it possible to modify the links to the clientsGeorg Ehrke2013-02-063-4/+15
| |/ / /
* | | | Merge pull request #1357 from owncloud/alternative-loging-masterThomas Müller2013-02-064-1/+30
|\ \ \ \ | | | | | | | | | | add support for apps to register alternative login methods
| * | | | move inline style to CSS file, fix detailsJan-Christoph Borchardt2013-02-062-3/+7
| | | | |
| * | | | add support for apps to register alternative login methodsThomas Mueller2013-01-293-1/+26
| | | | | | | | | | | | | | | | | | | | below the standard login a list of icons/button will be displayed
* | | | | Merge pull request #1487 from owncloud/fix-1420-masterThomas Müller2013-02-061-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Replace OC_FileCache usage in files_versions
| * | | | Replace OC_FileCache usage in files_versionsBart Visscher2013-02-061-1/+2
| | | | |
* | | | | port already approved bugfix to master, ↵Björn Schießle2013-02-061-1/+7
| | | | | | | | | | | | | | | | | | | | https://github.com/owncloud/core/pull/1479
* | | | | Merge pull request #1490 from schiesbn/user_displaynameBjörn Schießle2013-02-066-4/+71
|\ \ \ \ \ | | | | | | | | | | | | let the user change his display name, if supported by the back-end
| * | | | | make strings translatableBjörn Schießle2013-02-061-2/+2
| | | | | |
| * | | | | let the user change his display name, if supported by the back-endBjörn Schießle2013-02-066-3/+70
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-06147-2668/+1208
| | | | |
* | | | | Merge pull request #1476 from ↵Thomas Müller2013-02-056-9/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/disable-error-handler-while-running-phpunit disable error handler while running phpunit
| * | | | | uncomment failing calls to \OC\Files\Filesystem::file_put_contentsThomas Mueller2013-02-051-3/+3
| | | | | |
| * | | | | add phpunit configuration for autotest withou the json listener because this ↵Thomas Mueller2013-02-052-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | pollutes the console
| * | | | | fix failing test cases due to wrong typingThomas Mueller2013-02-051-2/+2
| | | | | |
| * | | | | disable error handler while running phpunitThomas Mueller2013-02-052-3/+8
| | | | | |
* | | | | | offer change password only when the action is supported by the user backendArthur Schiwon2013-02-053-1/+25
| | | | | |
* | | | | | Merge pull request #1474 from samtuke/masterLukas Reschke2013-02-0518-498/+804
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Improvements to files_encryption
| * | | | | Fixed comment typo, wrapped return value conditional on var assignment in ↵Sam Tuke2013-02-052-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | session{}
| * | | | | Added missing translation wrappingSam Tuke2013-02-051-1/+3
| | | | | |
| * | | | | Added notice to personal settings indicating what filetypes are not encryptedSam Tuke2013-02-053-48/+23
| | | | | |
| * | | | | Removed debugging outputSam Tuke2013-02-052-12/+0
| | | | | |
| * | | | | Fixed bug relating to Filesystem{} that prevented webdav logins with ↵Sam Tuke2013-02-051-50/+52
| | | | | | | | | | | | | | | | | | | | | | | | files_encryption
| * | | | | Cleaned up path formatting with new method stripUserFilesPath()Sam Tuke2013-02-052-20/+22
| | | | | |
| * | | | | Minor improvement to commentsSam Tuke2013-02-051-7/+6
| | | | | |
| * | | | | Recryption of legacy encrypted files now working on loginSam Tuke2013-02-052-7/+20
| | | | | |
| * | | | | Merge github.com:owncloud/coreSam Tuke2013-02-05651-10166/+20996
| |\ \ \ \ \
| * | | | | | Added debugging output relating to recrypting legacy filesSam Tuke2013-02-012-3/+16
| | | | | | |
| * | | | | | Improved support for detecting and recrypting legacy files. Bugs remain.Sam Tuke2013-01-314-17/+37
| | | | | | |
| * | | | | | Fixed compatibility with filecache rewrite mergeSam Tuke2013-01-311-1/+1
| | | | | | |
| * | | | | | Fixed incompatibilities with filecache rewrite mergeSam Tuke2013-01-312-7/+7
| | | | | | |
| * | | | | | Merge github.com:owncloud/coreSam Tuke2013-01-31777-22798/+47150
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/public/share.php
| * | | | | | | Fixed handling of keyfile subdir creationSam Tuke2013-01-302-84/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved keyfile subdir deletion (1 bug remains here)
| * | | | | | | Working on support for deleting directories (removing all keyfiles)Sam Tuke2013-01-301-13/+19
| | | | | | | |
| * | | | | | | Made encyrption keyfiles be deleted when their parents areSam Tuke2013-01-295-34/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made encryption keyfiles be renamed when their parents are Fixed bugs with encryptAll() execution on login
| * | | | | | | Fixed many coding guidelines issuesSam Tuke2013-01-2412-177/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Continued work on upgrade path via login hook listener New spec file with notes
| * | | | | | | Work on util: findFiles() and encryptAll(); both close to workingSam Tuke2013-01-239-181/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ecnryption unit tests are failing, recursion in filecache{}
| * | | | | | | Merge branch 'files_encryption'Sam Tuke2013-01-238-53/+139
| |\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-24 08:56:27 +0000