Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-12 | 263 | -2111/+1537 |
| | |||||
* | Merge pull request #1157 owncloud/move-OpenID | Bart Visscher | 2013-01-11 | 2 | -20/+0 |
|\ | | | | | | | | | | | | | Move openid.php to apps repo Conflicts: settings/routes.php | ||||
| * | Remove OpenID from the router | Lukas Reschke | 2013-01-11 | 1 | -5/+1 |
| | | |||||
| * | Move to apps repo | Lukas Reschke | 2013-01-11 | 1 | -16/+0 |
| | | | | | | | | This belongs to the apps repo. | ||||
* | | Remove uneeded link | Lukas Reschke | 2013-01-11 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #1159 from LukasReschke/master | Lukas Reschke | 2013-01-11 | 1 | -0/+33 |
|\ \ | | | | | | | Add contribution file | ||||
| * | | Added links to app + mirall repo | Lukas Reschke | 2013-01-11 | 1 | -1/+1 |
| | | | |||||
| * | | Update CONTRIBUTING.md | Lukas Reschke | 2013-01-11 | 1 | -5/+6 |
| | | | |||||
| * | | Create CONTRIBUTING.md | Lukas Reschke | 2013-01-11 | 1 | -0/+32 |
| | | | |||||
* | | | Merge pull request #994 from owncloud/enhanced_multiSelect | Lukas Reschke | 2013-01-11 | 3 | -58/+205 |
|\ \ \ | |/ / |/| | | Enhanced multiSelect | ||||
| * | | Users: Show selected groups first in list. | Thomas Tanghus | 2012-12-21 | 1 | -0/+1 |
| | | | |||||
| * | | multiSelect: Add sorting options. | Thomas Tanghus | 2012-12-21 | 1 | -7/+42 |
| | | | |||||
| * | | multiSelect: Make sure up/down classes are removed on close. | Thomas Tanghus | 2012-12-21 | 1 | -4/+4 |
| | | | |||||
| * | | multiSelect: Modified users.js to only update other multiSelects. | Thomas Tanghus | 2012-12-21 | 1 | -2/+2 |
| | | | |||||
| * | | multiSelect: Don't force popup above if there's no room for it there. | Thomas Tanghus | 2012-12-21 | 1 | -1/+3 |
| | | | |||||
| * | | Merge branch 'fix_multiSelect' of github.com:owncloud/core into ↵ | Thomas Tanghus | 2012-12-21 | 2 | -55/+164 |
| |\ \ | | | | | | | | | | | | | enhanced_multiSelect | ||||
| | * | | multiSelect.js: Give each select a unique msid to prevent double adding in ↵ | Thomas Tanghus | 2012-12-04 | 2 | -12/+21 |
| | | | | | | | | | | | | | | | | users.js | ||||
| | * | | Merge branch 'fix_multiSelect' of github.com:owncloud/core into fix_multiSelect | Thomas Tanghus | 2012-12-04 | 0 | -0/+0 |
| | |\ \ | |||||
| | | * | | multiSelect: Added scrollbar if longer than 20em. Ref #720 | Thomas Tanghus | 2012-12-04 | 1 | -0/+2 |
| | | | | | |||||
| | | * | | multiSelect: Make sure last added entry is selected and some code cleanup. | Thomas Tanghus | 2012-12-04 | 1 | -31/+44 |
| | | | | | |||||
| | | * | | Added some missing type checks. | Thomas Tanghus | 2012-12-03 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | Enhanced multiSelect jquery plugin. | Thomas Tanghus | 2012-12-03 | 2 | -37/+122 |
| | | | | | |||||
| | * | | | multiSelect: Added scrollbar if longer than 20em. Ref #720 | Thomas Tanghus | 2012-12-04 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | multiSelect: Make sure last added entry is selected and some code cleanup. | Thomas Tanghus | 2012-12-04 | 1 | -31/+44 |
| | | | | | |||||
| | * | | | Added some missing type checks. | Thomas Tanghus | 2012-12-04 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Enhanced multiSelect jquery plugin. | Thomas Tanghus | 2012-12-04 | 2 | -37/+122 |
| | | | | | |||||
* | | | | | Merge pull request #1150 from owncloud/EnableSSL-AdminMenu | Lukas Reschke | 2013-01-11 | 5 | -0/+56 |
|\ \ \ \ \ | | | | | | | | | | | | | Add security section to admin settings to enable the HTTPS enforcement | ||||
| * | | | | | Removed uneeded HTML tag | Lukas Reschke | 2013-01-11 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add security section to admin menu | Lukas Reschke | 2013-01-11 | 5 | -0/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently it only allows the admin to enable or disable the HTTPS enforcement, but in the future it could be expanded to further options. The HTTPS enforcement only allows the admin to enforce it, if he is connected via HTTPS. (To prevent admins to enable it without a proper SSL setup) | ||||
* | | | | | | Merge pull request #1155 from owncloud/remove-setContentTypeHeader | Lukas Reschke | 2013-01-11 | 2 | -2/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove setContentTypeHeader() | ||||
| * | | | | | | Remove setContentTypeHeader() | Lukas Reschke | 2013-01-11 | 2 | -2/+0 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | `OC_JSON::success` and `OC_JSON::error` are calling `OC_JSON::encodedPrint`, which already sets these headers. So this two calls are uneeded duplicates. | ||||
* | | | | | | Merge pull request #1154 from owncloud/remove-uneededFile | Frank Karlitschek | 2013-01-11 | 1 | -1/+0 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Remove uneeded file | ||||
| * | | | | | Remove uneeded file | Lukas Reschke | 2013-01-11 | 1 | -1/+0 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | logout.php is a legacy file, which isn't used anymore in the ownCloud code. | ||||
* / / / / | Correct link to the bugtracker in exception.php | Lukas Reschke | 2013-01-11 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1133 from owncloud/add_linebreaks_in_sharing | Thomas Müller | 2013-01-10 | 2 | -113/+519 |
|\ \ \ \ | | | | | | | | | | | add more linebreaks, replace SQL LIMIT with param | ||||
| * | | | | add more linebreaks, replace SQL LIMIT with param | Jörn Friedrich Dreyer | 2013-01-09 | 2 | -113/+519 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-11 | 62 | -593/+792 |
| | | | | | |||||
* | | | | | Merge pull request #1127 from owncloud/fixing-641-for-webdav-master | Thomas Müller | 2013-01-10 | 3 | -0/+79 |
|\ \ \ \ \ | | | | | | | | | | | | | webdav returns "503 Service Unavailable" in case the ownCloud server is ... | ||||
| * | | | | | webdav returns "503 Service Unavailable" in case the ownCloud server is ↵ | Thomas Mueller | 2013-01-09 | 3 | -0/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | currently in maintenance mode. | ||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-10 | 144 | -523/+1543 |
| | | | | | | |||||
* | | | | | | Merge pull request #1131 from owncloud/more_translations | Lukas Reschke | 2013-01-09 | 2 | -5/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | translate move and rename error messages | ||||
| * | | | | | | more translations | Jörn Friedrich Dreyer | 2013-01-09 | 2 | -5/+6 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #1124 from schiesbn/sabredav2 | Lukas Reschke | 2013-01-09 | 2 | -174/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | OC_Connector_Sabre_Client no longer needed | ||||
| * | | | | | Upstream merged my patch to add additional ssl root certificates to the ↵ | Björn Schießle | 2013-01-08 | 2 | -174/+1 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | webdav client. This means that OC_Connector_Sabre_Client is no longer needed | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-09 | 132 | -2707/+2951 |
| | | | | | |||||
* | | | | | Merge pull request #938 from owncloud/fix_minor_files_annoyances | Thomas Tanghus | 2013-01-08 | 7 | -57/+84 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix minor files annoyances | ||||
| * | | | | fixing string concatenation in javascript | Thomas Mueller | 2013-01-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | refs https://github.com/owncloud/core/commit/ae54364d7c8baf5138d166855db6431190963886 | ||||
| * | | | | ie8 ignores rgba, show button border in ie8 by adding second border css row | Jörn Friedrich Dreyer | 2013-01-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | attach max upload tipsy to div instead of a to fix tooltip not showing due ↵ | Jörn Friedrich Dreyer | 2013-01-07 | 3 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | to new z-index | ||||
| * | | | | remove aborted uploads | Jörn Friedrich Dreyer | 2013-01-07 | 1 | -0/+3 |
| | | | | |