Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix some jshint issues in core/js/share* | Roeland Jago Douma | 2016-08-19 | 7 | -11/+19 |
| | |||||
* | Merge pull request #982 from nextcloud/uninterpreted-php | Julius Härtl | 2016-08-19 | 1 | -1/+1 |
|\ | | | | | Remove uninterpreted PHP | ||||
| * | Remove uninterpreted PHP | Lukas Reschke | 2016-08-19 | 1 | -1/+1 |
| | | | | | | | | This is in an HTML file. The PHP won't be executed :see_no_evil: | ||||
* | | Merge pull request #978 from nextcloud/add-feedback-for-password-change | Marius Blüm | 2016-08-19 | 2 | -3/+16 |
|\ \ | | | | | | | Add feedback for password change | ||||
| * | | Show hint if password policy disallows password change | Morris Jobke | 2016-08-19 | 1 | -2/+13 |
| | | | |||||
| * | | 25532_issue_password_update_notification_updated (#25756) | Jack Davis | 2016-08-19 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Password Update Notification Added an IF ELSE statement to ensure that feedback is provided to the user on successfully updating a user password in settings. * Password Update Success Message Updated the password update success message | ||||
* | | | Merge pull request #980 from nextcloud/update-icon | Marius Blüm | 2016-08-19 | 2 | -2/+6 |
|\ \ \ | |_|/ |/| | | Update federation and update notification icon | ||||
| * | | use simple bell as update notification icon | Morris Jobke | 2016-08-19 | 1 | -0/+4 |
| | | | |||||
| * | | Change federation icon to the share icon | Morris Jobke | 2016-08-19 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #971 from nextcloud/theming-fix-service-registration | Julius Härtl | 2016-08-19 | 2 | -1/+2 |
|\ \ | |/ |/| | Fix loading of ThemingDefaults | ||||
| * | Fix loading of ThemingDefaults | Julius Haertl | 2016-08-19 | 2 | -1/+2 |
| | | |||||
* | | Merge pull request #967 from nextcloud/settings_users_js_defines | Roeland Jago Douma | 2016-08-19 | 3 | -5/+12 |
|\ \ | | | | | | | Fix some jshint errors in settings/users | ||||
| * | | Fix some jshint errors in settings/users | Roeland Jago Douma | 2016-08-19 | 3 | -5/+12 |
| |/ | |||||
* | | Merge pull request #964 from ↵ | Lukas Reschke | 2016-08-19 | 1 | -1/+4 |
|\ \ | | | | | | | | | | | | | nextcloud/master-aedae12db5ebfaf56bec91b736fb8a569cecf16f [master] In cases where the server dictates the link share expiration… | ||||
| * | | [master] In cases where the server dictates the link share expiration the ↵ | Thomas Müller | 2016-08-19 | 1 | -1/+4 |
| |/ | | | | | | | date is not updated on consequitive changes and enable/disable actions | ||||
* | | Merge pull request #960 from nextcloud/fix-caldavtester-master | Lukas Reschke | 2016-08-19 | 2 | -12/+12 |
|\ \ | | | | | | | Move over to new CalDAVTester repo (#25859) | ||||
| * | | Move over to new CalDAVTester repo (#25859) | Thomas Müller | 2016-08-19 | 2 | -12/+12 |
| |/ | | | | | | | | | | | * Move over to new caldac tester repo * no run.py anymore | ||||
* | | Merge pull request #959 from nextcloud/map_mobi | Marius Blüm | 2016-08-19 | 3 | -4/+8 |
|\ \ | |/ |/| | Update mimetypes | ||||
| * | Update mimetypes | Roeland Jago Douma | 2016-08-19 | 3 | -4/+8 |
| | | |||||
* | | Merge pull request #865 from nextcloud/ocs_config | Morris Jobke | 2016-08-19 | 7 | -77/+18 |
|\ \ | |/ |/| | Move OCS route /config to proper controller | ||||
| * | Update autoloader | Roeland Jago Douma | 2016-08-18 | 2 | -2/+0 |
| | | |||||
| * | we are Nextcloud :) | Roeland Jago Douma | 2016-08-18 | 1 | -1/+1 |
| | | |||||
| * | Remove unused private classes | Roeland Jago Douma | 2016-08-18 | 2 | -67/+0 |
| | | |||||
| * | Move /config over to Core OCSController | Roeland Jago Douma | 2016-08-18 | 3 | -8/+18 |
| | | |||||
* | | Merge pull request #945 from nextcloud/kill_ajax_share.php | Joas Schilling | 2016-08-19 | 2 | -378/+0 |
|\ \ | | | | | | | Kill ajax/share.php | ||||
| * | | Kill ajax/share.php | Roeland Jago Douma | 2016-08-18 | 2 | -378/+0 |
| | | | | | | | | | | | | | | | Using this file will insert invalid shares. OCS has to be used exclusively! | ||||
* | | | Merge pull request #906 from nextcloud/files_external-settings-polish-missing | Marius Blüm | 2016-08-18 | 2 | -2/+13 |
|\ \ \ | |/ / |/| | | Files external settings polish | ||||
| * | | fix error when not logged in | Robin Appelman | 2016-08-18 | 1 | -0/+4 |
| | | | |||||
| * | | change remote cloud naming to Nextcloud | Robin Appelman | 2016-08-18 | 1 | -1/+1 |
| | | | |||||
| * | | dont register personal files_external setting if it's empty | Robin Appelman | 2016-08-18 | 1 | -1/+8 |
| | | | |||||
* | | | Merge pull request #937 from nextcloud/fix_app_search | Roeland Jago Douma | 2016-08-18 | 2 | -1/+3 |
|\ \ \ | | | | | | | | | SVG defintions always take the first one | ||||
| * | | | SVG defintions always take the first one | Roeland Jago Douma | 2016-08-18 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | * Move filter definition out | ||||
* | | | | Merge pull request #903 from nextcloud/allow-disable-comments | Morris Jobke | 2016-08-18 | 1 | -7/+3 |
|\ \ \ \ | | | | | | | | | | | Revert "Always add activities for comments to the stream" | ||||
| * | | | | Revert "Always add activities for comments to the stream" | Joas Schilling | 2016-08-17 | 1 | -7/+3 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 48c41b888c6a464f645de3e9087a39c163086d9f | ||||
* | | | | | Merge pull request #925 from nextcloud/use-util-methods | Morris Jobke | 2016-08-18 | 1 | -3/+5 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Load the Template class in case it's not loaded | ||||
| * | | | | Load the Template class in case it's not loaded | Joas Schilling | 2016-08-18 | 1 | -3/+5 |
| | | | | | |||||
* | | | | | Merge pull request #934 from nextcloud/add-cachebusters | blizzz | 2016-08-18 | 7 | -26/+27 |
|\ \ \ \ \ | | | | | | | | | | | | | Add cachebusters | ||||
| * | | | | | Add cachebuster to app icons in the admin screen | Lukas Reschke | 2016-08-18 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Add cachebuster to apps.css | Lukas Reschke | 2016-08-18 | 1 | -7/+7 |
| | | | | | | |||||
| * | | | | | Add cachebuster to apps.css | Lukas Reschke | 2016-08-18 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Add cachebuster to styles.css | Lukas Reschke | 2016-08-18 | 1 | -8/+8 |
| | | | | | | |||||
| * | | | | | Add cachebuster to right navigation | Lukas Reschke | 2016-08-18 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Add cache buster to left menu bar | Lukas Reschke | 2016-08-18 | 2 | -2/+3 |
| | | | | | | |||||
| * | | | | | Add cache buster to logo | Lukas Reschke | 2016-08-18 | 1 | -2/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #927 from nextcloud/drop-unneeded-statements | Roeland Jago Douma | 2016-08-18 | 1 | -8/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | white-space: pre-wrap is supported on all current browsers | ||||
| * | | | | | white-space: pre-wrap is supported on all current browsers | Morris Jobke | 2016-08-18 | 1 | -8/+1 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | * Chrome 1, Firefox 3, IE8, Opera 8 and Safari 3 * see https://developer.mozilla.org/en-US/docs/Web/CSS/white-space | ||||
* | | | | | Merge pull request #931 from nextcloud/replace-hardcoded-classname | blizzz | 2016-08-18 | 1 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | let the containers resolving capabilities find and instantiate the ri… | ||||
| * | | | | | let the containers resolving capabilities find and instantiate the right service | Arthur Schiwon | 2016-08-18 | 1 | -4/+4 |
| |/ / / / | |||||
* | | | | | Merge pull request #930 from nextcloud/check-isset-require | Roeland Jago Douma | 2016-08-18 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix "Undefined index" when the values do not exist | ||||
| * | | | | | Fix "Undefined index" when the values do not exist | Joas Schilling | 2016-08-18 | 1 | -2/+2 |
| |/ / / / |