Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-04 | 204 | -3282/+3308 |
* | Merge pull request #24406 from owncloud/psr4-comments-systemtags-updatenotifi... | Roeland Douma | 2016-05-04 | 12 | -1/+3 |
|\ | |||||
| * | Move comments, systemtags and updatenotifications to PSR-4 | Joas Schilling | 2016-05-03 | 12 | -1/+3 |
* | | Merge pull request #24411 from owncloud/share_psr4 | Roeland Douma | 2016-05-04 | 5 | -0/+0 |
|\ \ | |||||
| * | | Move \OC\Share to PSR-4 | Roeland Jago Douma | 2016-05-03 | 5 | -0/+0 |
* | | | Merge pull request #24396 from owncloud/ctrlEnter-submit-comment | blizzz | 2016-05-03 | 1 | -2/+7 |
|\ \ \ | |||||
| * | | | fixes indentation | Vincent Chan | 2016-05-03 | 1 | -1/+1 |
| * | | | adds functionality to submit comments with cmd+Enter | Vincent Chan | 2016-05-03 | 1 | -4/+4 |
| * | | | Submit comment on ctrl+Enter | Vincent Chan | 2016-05-02 | 1 | -0/+5 |
* | | | | Merge pull request #23844 from owncloud/disable-user | Thomas Müller | 2016-05-03 | 17 | -55/+620 |
|\ \ \ \ | |||||
| * | | | | Modified expected output according to rullzer | Sergio Bertolin | 2016-05-02 | 2 | -2/+4 |
| * | | | | OCS API should catch LoginExceptions | Roeland Jago Douma | 2016-05-02 | 1 | -1/+5 |
| * | | | | Added integration tests directly in the code PR | Sergio Bertolín | 2016-05-02 | 4 | -3/+259 |
| * | | | | Integration test for a disabled user | Thomas Müller | 2016-05-02 | 3 | -1/+33 |
| * | | | | Add provisioning api to enable and disable users | Thomas Müller | 2016-05-02 | 3 | -19/+128 |
| * | | | | Add occ commands to enable and disable a user + a disabled user can no longer... | Thomas Müller | 2016-05-02 | 8 | -34/+196 |
* | | | | | Merge pull request #24389 from owncloud/login-by-email | Lukas Reschke | 2016-05-03 | 7 | -5/+60 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Allow login by email address | Thomas Müller | 2016-05-02 | 2 | -5/+13 |
| * | | | | Fixing local event delivery for calendar events based on the email address | Thomas Müller | 2016-05-02 | 5 | -0/+47 |
* | | | | | Merge pull request #24387 from owncloud/locking-mark-reload-free | Thomas Müller | 2016-05-03 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | free up memory when releasing the last shared lock | Robin Appelman | 2016-05-02 | 1 | -0/+3 |
* | | | | | | Merge pull request #24392 from owncloud/declare-cron-jobs-in-info.xml | Thomas Müller | 2016-05-03 | 8 | -12/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add background job declaration of dav app to info.xml | Thomas Müller | 2016-05-03 | 4 | -7/+3 |
| * | | | | | | Allow declaration of background jobs in info.xml | Thomas Müller | 2016-05-03 | 4 | -5/+20 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #24408 from owncloud/improve-server-container | Thomas Müller | 2016-05-03 | 2 | -3/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add methods to public interface | Joas Schilling | 2016-05-03 | 1 | -0/+12 |
| * | | | | | | Fix doc block | Joas Schilling | 2016-05-03 | 1 | -1/+1 |
| * | | | | | | Use internal tag so IDEs highlight the usage | Joas Schilling | 2016-05-03 | 1 | -2/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #24405 from owncloud/user_db_capped_cache | Thomas Müller | 2016-05-03 | 1 | -1/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use a CappedCache in the user database backend | Roeland Jago Douma | 2016-05-03 | 1 | -1/+11 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #24404 from owncloud/log_psr4 | Thomas Müller | 2016-05-03 | 10 | -18/+29 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Move \OC\Log to PSR-4 | Roeland Jago Douma | 2016-05-03 | 5 | -0/+0 |
| * | | | | | | Move OC_Log_xx to \OC\Log namespace | Roeland Jago Douma | 2016-05-03 | 8 | -18/+29 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #22989 from owncloud/lock_sharing_ops | Morris Jobke | 2016-05-03 | 2 | -43/+222 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Unlock before all returns | Roeland Jago Douma | 2016-04-30 | 1 | -7/+50 |
| * | | | | | Add locking to modifying operation of the OCS Share API | Roeland Jago Douma | 2016-04-30 | 2 | -39/+175 |
* | | | | | | Merge pull request #24375 from owncloud/archive_move | Lukas Reschke | 2016-05-03 | 6 | -27/+37 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Move OC_Archive to \OC\Archive\Archive | Roeland Jago Douma | 2016-05-02 | 4 | -7/+6 |
| * | | | | | | Move OC_Archive_XX to PSR-4 | Roeland Jago Douma | 2016-05-02 | 5 | -24/+35 |
* | | | | | | | Merge pull request #24386 from owncloud/psr4-for-apps | Morris Jobke | 2016-05-03 | 2 | -3/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use lib/ instead of src/ because that is what people are used to | Joas Schilling | 2016-05-02 | 1 | -1/+1 |
| * | | | | | | | Register the PSR-4 path on loadApp | Joas Schilling | 2016-05-02 | 1 | -2/+21 |
| * | | | | | | | Keep the composer instance so we can add psr4 paths later | Joas Schilling | 2016-05-02 | 1 | -1/+4 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-03 | 6 | -4/+44 |
* | | | | | | | Merge pull request #24394 from owncloud/cleanup_share_classmap | Roeland Douma | 2016-05-03 | 7 | -19/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Cleanup Files_Sharing CLASSPATH | Roeland Jago Douma | 2016-05-02 | 7 | -19/+11 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #24381 from owncloud/correc_typehint | Roeland Douma | 2016-05-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use correct typehint | Roeland Jago Douma | 2016-05-02 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #24380 from owncloud/move-activity-manager-to-namespace | Roeland Douma | 2016-05-03 | 5 | -21/+24 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Move activity manager to the namespace | Joas Schilling | 2016-05-02 | 5 | -21/+24 |