Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cleanup languages. closes #11274 | Volkan Gezer | 2014-11-20 | 11 | -164/+0 |
| | |||||
* | Merge pull request #12253 from owncloud/port-12154 | Vincent Petry | 2014-11-20 | 4 | -11/+47 |
|\ | | | | | Port 12154 | ||||
| * | Add repair steps for legacy config files | Lukas Reschke | 2014-11-18 | 2 | -1/+31 |
| | | | | | | | | | | | | | | | | Remove all ports from the trusted domains Conflicts: lib/private/repair.php lib/repair/repairconfig.php | ||||
| * | Ignore port for trusted domains | Lukas Reschke | 2014-11-18 | 2 | -10/+16 |
| | | | | | | | | | | | | | | | | | | This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain) Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975. Conflicts: lib/private/request.php | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-20 | 4 | -2/+6 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-19 | 4 | -2/+6 |
| | | |||||
* | | drop unneeded var_dump - fixes #9997 | Morris Jobke | 2014-11-18 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #12261 from oparoz/patch-1 | Morris Jobke | 2014-11-18 | 1 | -1/+1 |
|\ \ | | | | | | | Replace deprecated switches | ||||
| * | | Replace deprecated switches | Olivier Paroz | 2014-11-18 | 1 | -1/+1 |
| | | | | | | | | | | | | Warning: -convert-to is deprecated. Use --convert-to instead. Warning: -outdir is deprecated. Use --outdir instead. | ||||
* | | | Merge pull request #12224 from owncloud/fix_12211 | Björn Schießle | 2014-11-18 | 1 | -9/+22 |
|\ \ \ | |/ / |/| | | make sure that we don't find the wrong shares if a user and a group have the same ID | ||||
| * | | only users can have a display name different from the id | Bjoern Schiessle | 2014-11-18 | 1 | -1/+4 |
| | | | |||||
| * | | make sure that we only find the shares from the correct share type if users ↵ | Bjoern Schiessle | 2014-11-18 | 1 | -2/+8 |
| | | | | | | | | | | | | and groups with the same ID exists | ||||
| * | | make sure that we don't find the wrong shares if a user and a group have the ↵ | Bjoern Schiessle | 2014-11-18 | 1 | -6/+10 |
| |/ | | | | | | | same ID | ||||
* | | Merge pull request #12259 from owncloud/app-enabled-plugin-appmanager | Lukas Reschke | 2014-11-18 | 1 | -4/+4 |
|\ \ | | | | | | | Fix type hinting for app manager | ||||
| * | | Fix type hinting for app manager | Robin Appelman | 2014-11-18 | 1 | -4/+4 |
| |/ | |||||
* | | Merge pull request #12242 from owncloud/fix-undefined-size | Lukas Reschke | 2014-11-18 | 1 | -1/+1 |
|\ \ | |/ |/| | Check if the size field is available | ||||
| * | Check if the size field is available | Lukas Reschke | 2014-11-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | In some cases the 'size' field is not available resulting in some PHP errors such as: ```json {"reqId":"03548fd9e3d3aca15a5796b3b35d7b9d","remoteAddr":"::1","app":"PHP","message":"Undefined index: size at \/Users\/lreschke\/Programming\/core\/lib\/private\/files\/fileinfo.php#125","level":3,"time":"2014-11-17T21:38:57+00:00"} ``` This can be experienced when creating a new empty file and deleting it right away, then when going to the trash bin this error is thrown. | ||||
* | | Merge pull request #12237 from owncloud/fix-12236 | Morris Jobke | 2014-11-18 | 1 | -5/+5 |
|\ \ | | | | | | | Make declaration compatible | ||||
| * | | Make declaration compatible | Lukas Reschke | 2014-11-17 | 1 | -5/+5 |
| |/ | | | | | | | Fixes #12236 | ||||
* | | Merge pull request #9962 from owncloud/app-group-enable-remote | Lukas Reschke | 2014-11-18 | 1 | -0/+75 |
|\ \ | | | | | | | Fix remote.php routes for apps that are enabled for specific groups | ||||
| * | | Add sabredav plugin to check if a user has access to an app | Robin Appelman | 2014-11-17 | 1 | -0/+75 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-18 | 4 | -0/+8 |
| | | | |||||
* | | | Merge pull request #11727 from owncloud/moveCallCheckRegisterToSomeWhereElse | Lukas Reschke | 2014-11-17 | 1 | -0/+3 |
|\ \ \ | |_|/ |/| | | Move CSRF check | ||||
| * | | Move CSRF check | Lukas Reschke | 2014-11-17 | 1 | -0/+3 |
| | | | | | | | | | | | | Because we're closing the session now before controllers are executed there are cases where we cannot write the session. | ||||
* | | | Merge pull request #11741 from owncloud/delete_all_children_preview_2 | Vincent Petry | 2014-11-17 | 1 | -16/+94 |
|\ \ \ | | | | | | | | | delete all children's previews when deleting a folder | ||||
| * | | | delete all children's previews when deleting a folder | Georg Ehrke | 2014-10-30 | 1 | -16/+94 |
| | | | | | | | | | | | | | | | | add phpdoc | ||||
* | | | | Merge pull request #12218 from owncloud/issue/10991-fixes | Morris Jobke | 2014-11-17 | 2 | -2/+12 |
|\ \ \ \ | |_|_|/ |/| | | | Issue/10991 Make unit tests pass on windows | ||||
| * | | | Make it possible to cleanPath() absolute Windows paths | Joas Schilling | 2014-11-17 | 1 | -2/+11 |
| | | | | |||||
| * | | | Correctly close handle of directory when listing certificates | Joas Schilling | 2014-11-17 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #12031 from owncloud/app-manager | Robin Appelman | 2014-11-17 | 4 | -0/+211 |
|\ \ \ \ | |_|_|/ |/| | | | Add \OC\App\Manager to handle enabling/disabling apps | ||||
| * | | | Add \OC\App\Manager to handle enabling/disabling apps | Robin Appelman | 2014-11-10 | 4 | -0/+211 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-17 | 26 | -10/+62 |
| | | | | |||||
* | | | | Merge pull request #12186 from owncloud/fix-12182 | Morris Jobke | 2014-11-15 | 3 | -13/+31 |
|\ \ \ \ | | | | | | | | | | | eliminate OC_Template::printErrorPage in database classes, fixes #12182 | ||||
| * | | | | do not output DB information, and do not set header | Arthur Schiwon | 2014-11-14 | 3 | -7/+28 |
| | | | | | |||||
| * | | | | errors are already logged | Arthur Schiwon | 2014-11-14 | 2 | -3/+0 |
| | | | | | |||||
| * | | | | eliminate OC_Template::printErrorPage in database classes, fixes #12182 | Arthur Schiwon | 2014-11-14 | 3 | -7/+7 |
| | | | | | |||||
* | | | | | Check if app is enabled for user | Lukas Reschke | 2014-11-15 | 1 | -0/+11 |
|/ / / / | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-14 | 4 | -0/+4 |
| | | | | |||||
* | | | | Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroup | Morris Jobke | 2014-11-13 | 1 | -0/+4 |
|\ \ \ \ | | | | | | | | | | | cleanup group admin(s) on deleteGroup | ||||
| * | | | | cleanup group admin(s) on deleteGroup | michag86 | 2014-10-08 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge pull request #11956 from ↵ | Morris Jobke | 2014-11-13 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/remove-check-for-allow_user_to_change_display_name removal of wrong/double implemented check | ||||
| * | | | | | removal of wrong/double implemented check | michag86 | 2014-11-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Check already implemented in core/settings/ajax/changedisplayname.php | ||||
* | | | | | | Run preupdate before an update | Lukas Reschke | 2014-11-13 | 2 | -5/+17 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The update routine tries to test the database migration before actually performing the update. However, this will fail hard if the schema has changed (for example an unique key has been added). App developers can convert the DB in preupdate.php, however it is not called before and therefore the update fails. This actually breaks ownCloud updates from ownCloud 6 to ownCloud 7 when the files_antivirus app is enabled. | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-13 | 2 | -4/+4 |
| | | | | | |||||
* | | | | | Merge pull request #12141 from owncloud/kill-dav-client | Morris Jobke | 2014-11-12 | 1 | -59/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | OC_DAVClient is not longer used - no need to carry it around anymore | ||||
| * | | | | | OC_DAVClient is not longer used - no need to carry it around anymore | Thomas Müller | 2014-11-12 | 1 | -59/+0 |
| | | | | | | |||||
* | | | | | | Merge pull request #12139 from owncloud/DoNotTouchMe | Thomas Müller | 2014-11-12 | 1 | -3/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Try to read the file only instead of trying to touch | ||||
| * | | | | | | Try to read the file only instead of trying to touch | Lukas Reschke | 2014-11-12 | 1 | -3/+3 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The permissions are already catched properly on the installation so we just have to check whether the file is readable to prevent fatal errors from happening. Fixes https://github.com/owncloud/core/issues/12135 | ||||
* | | | | | | Merge pull request #12128 from owncloud/drop-formfactor | Jan-Christoph Borchardt | 2014-11-12 | 6 | -109/+13 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Drop form_factor that is appended to JS, CSS and template filenames | ||||
| * | | | | | | Drop form_factor that is appended to JS, CSS and template filenames | Morris Jobke | 2014-11-12 | 6 | -109/+13 |
| |/ / / / / |