summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix some jshint issues in core/js/share*Roeland Jago Douma2016-08-197-11/+19
|
* Merge pull request #982 from nextcloud/uninterpreted-phpJulius Härtl2016-08-191-1/+1
|\ | | | | Remove uninterpreted PHP
| * Remove uninterpreted PHPLukas Reschke2016-08-191-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-changeMarius Blüm2016-08-192-3/+16
|\ \ | | | | | | Add feedback for password change
| * | Show hint if password policy disallows password changeMorris Jobke2016-08-191-2/+13
| | |
| * | 25532_issue_password_update_notification_updated (#25756)Jack Davis2016-08-191-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-iconMarius Blüm2016-08-192-2/+6
|\ \ \ | |_|/ |/| | Update federation and update notification icon
| * | use simple bell as update notification iconMorris Jobke2016-08-191-0/+4
| | |
| * | Change federation icon to the share iconMorris Jobke2016-08-191-2/+2
|/ /
* | Merge pull request #971 from nextcloud/theming-fix-service-registrationJulius Härtl2016-08-192-1/+2
|\ \ | |/ |/| Fix loading of ThemingDefaults
| * Fix loading of ThemingDefaultsJulius Haertl2016-08-192-1/+2
| |
* | Merge pull request #967 from nextcloud/settings_users_js_definesRoeland Jago Douma2016-08-193-5/+12
|\ \ | | | | | | Fix some jshint errors in settings/users
| * | Fix some jshint errors in settings/usersRoeland Jago Douma2016-08-193-5/+12
| |/
* | Merge pull request #964 from ↵Lukas Reschke2016-08-191-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üller2016-08-191-1/+4
| |/ | | | | | | date is not updated on consequitive changes and enable/disable actions
* | Merge pull request #960 from nextcloud/fix-caldavtester-masterLukas Reschke2016-08-192-12/+12
|\ \ | | | | | | Move over to new CalDAVTester repo (#25859)
| * | Move over to new CalDAVTester repo (#25859)Thomas Müller2016-08-192-12/+12
| |/ | | | | | | | | | | * Move over to new caldac tester repo * no run.py anymore
* | Merge pull request #959 from nextcloud/map_mobiMarius Blüm2016-08-193-4/+8
|\ \ | |/ |/| Update mimetypes
| * Update mimetypesRoeland Jago Douma2016-08-193-4/+8
| |
* | Merge pull request #865 from nextcloud/ocs_configMorris Jobke2016-08-197-77/+18
|\ \ | |/ |/| Move OCS route /config to proper controller
| * Update autoloaderRoeland Jago Douma2016-08-182-2/+0
| |
| * we are Nextcloud :)Roeland Jago Douma2016-08-181-1/+1
| |
| * Remove unused private classesRoeland Jago Douma2016-08-182-67/+0
| |
| * Move /config over to Core OCSControllerRoeland Jago Douma2016-08-183-8/+18
| |
* | Merge pull request #945 from nextcloud/kill_ajax_share.phpJoas Schilling2016-08-192-378/+0
|\ \ | | | | | | Kill ajax/share.php
| * | Kill ajax/share.phpRoeland Jago Douma2016-08-182-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-missingMarius Blüm2016-08-182-2/+13
|\ \ \ | |/ / |/| | Files external settings polish
| * | fix error when not logged inRobin Appelman2016-08-181-0/+4
| | |
| * | change remote cloud naming to NextcloudRobin Appelman2016-08-181-1/+1
| | |
| * | dont register personal files_external setting if it's emptyRobin Appelman2016-08-181-1/+8
| | |
* | | Merge pull request #937 from nextcloud/fix_app_searchRoeland Jago Douma2016-08-182-1/+3
|\ \ \ | | | | | | | | SVG defintions always take the first one
| * | | SVG defintions always take the first oneRoeland Jago Douma2016-08-182-1/+3
| | | | | | | | | | | | | | | | * Move filter definition out
* | | | Merge pull request #903 from nextcloud/allow-disable-commentsMorris Jobke2016-08-181-7/+3
|\ \ \ \ | | | | | | | | | | Revert "Always add activities for comments to the stream"
| * | | | Revert "Always add activities for comments to the stream"Joas Schilling2016-08-171-7/+3
| | | | | | | | | | | | | | | | | | | | This reverts commit 48c41b888c6a464f645de3e9087a39c163086d9f
* | | | | Merge pull request #925 from nextcloud/use-util-methodsMorris Jobke2016-08-181-3/+5
|\ \ \ \ \ | |_|/ / / |/| | | | Load the Template class in case it's not loaded
| * | | | Load the Template class in case it's not loadedJoas Schilling2016-08-181-3/+5
| | | | |
* | | | | Merge pull request #934 from nextcloud/add-cachebustersblizzz2016-08-187-26/+27
|\ \ \ \ \ | | | | | | | | | | | | Add cachebusters
| * | | | | Add cachebuster to app icons in the admin screenLukas Reschke2016-08-181-2/+2
| | | | | |
| * | | | | Add cachebuster to apps.cssLukas Reschke2016-08-181-7/+7
| | | | | |
| * | | | | Add cachebuster to apps.cssLukas Reschke2016-08-181-3/+3
| | | | | |
| * | | | | Add cachebuster to styles.cssLukas Reschke2016-08-181-8/+8
| | | | | |
| * | | | | Add cachebuster to right navigationLukas Reschke2016-08-181-2/+2
| | | | | |
| * | | | | Add cache buster to left menu barLukas Reschke2016-08-182-2/+3
| | | | | |
| * | | | | Add cache buster to logoLukas Reschke2016-08-181-2/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #927 from nextcloud/drop-unneeded-statementsRoeland Jago Douma2016-08-181-8/+1
|\ \ \ \ \ | | | | | | | | | | | | white-space: pre-wrap is supported on all current browsers
| * | | | | white-space: pre-wrap is supported on all current browsersMorris Jobke2016-08-181-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-classnameblizzz2016-08-181-4/+4
|\ \ \ \ \ | | | | | | | | | | | | let the containers resolving capabilities find and instantiate the ri…
| * | | | | let the containers resolving capabilities find and instantiate the right serviceArthur Schiwon2016-08-181-4/+4
| |/ / / /
* | | | | Merge pull request #930 from nextcloud/check-isset-requireRoeland Jago Douma2016-08-181-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix "Undefined index" when the values do not exist
| * | | | | Fix "Undefined index" when the values do not existJoas Schilling2016-08-181-2/+2
| |/ / / /