summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove warning when trying to get a lock while in transactionRobin Appelman2015-09-251-4/+0
* Merge pull request #19354 from owncloud/fix_12727Thomas Müller2015-09-253-5/+46
|\
| * Save the settings in the user management pageRoeland Jago Douma2015-09-253-5/+46
* | Merge pull request #19360 from owncloud/move-filter-method-into-config-objectThomas Müller2015-09-257-48/+102
|\ \
| * | Deduplicate constantJoas Schilling2015-09-251-3/+4
| * | Add the method to the mockJoas Schilling2015-09-252-0/+2
| * | Move the filtering of sensitive data to the config classJoas Schilling2015-09-255-48/+99
* | | Merge pull request #19293 from owncloud/individual-it-move_initTemplateThomas Müller2015-09-254-91/+146
|\ \ \
| * | | Todo for myself to eliminate double codeIndividual IT Services2015-09-251-0/+5
| * | | add $prepend option to addStyle() & addVendorStyle()Individual IT Services2015-09-252-18/+28
| * | | Clean codeThomas Müller2015-09-241-56/+66
| * | | getService() is not needed -> removeThomas Müller2015-09-231-20/+0
| * | | do not load unnecessary code in case of webdavIndividual IT Services2015-09-234-72/+122
* | | | Merge pull request #13145 from owncloud/issue/11951-activity-sharing-emailThomas Müller2015-09-252-0/+39
|\ \ \ \ | |_|_|/ |/| | |
| * | | Publish an activity when sending a share link via emailJoas Schilling2015-09-222-0/+39
* | | | Merge pull request #19356 from owncloud/add-l10n-factory-to-interfaceThomas Müller2015-09-251-0/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add the L10N Factory to the container interfaceJoas Schilling2015-09-251-0/+6
* | | | Merge pull request #19329 from owncloud/checkbox-classRaghu Nayyar2015-09-257-21/+21
|\ \ \ \ | |/ / / |/| | |
| * | | fix multiselectHendrik Leppelsack2015-09-251-0/+3
| * | | fix loginHendrik Leppelsack2015-09-252-3/+3
| * | | fix filecomparatorHendrik Leppelsack2015-09-251-2/+2
| * | | fix filelist checkboxesHendrik Leppelsack2015-09-253-4/+4
| * | | add .checkbox class for new checkbox styleHendrik Leppelsack2015-09-252-14/+11
|/ / /
* | | Merge pull request #15098 from owncloud/fix_preview_versions_revert_issueThomas Müller2015-09-244-1/+49
|\ \ \
| * | | delete cached preview when rolling back file's versionGeorg Ehrke2015-09-204-1/+49
* | | | Merge pull request #19349 from owncloud/revert-18692-patch-2Lukas Reschke2015-09-241-1/+0
|\ \ \ \
| * | | | Revert "Update apps.css (Scroll more smoothly for Webkit browser)"Jan-Christoph Borchardt2015-09-241-1/+0
|/ / / /
* | | | Merge pull request #19306 from owncloud/app-code-check-versionThomas Müller2015-09-2413-2/+340
|\ \ \ \
| * | | | public, remote and default_enable are not deprecatedMorris Jobke2015-09-241-3/+3
| * | | | encode arrays as stringMorris Jobke2015-09-242-4/+6
| * | | | [App Code Check] add check for version and mandatory fieldsMorris Jobke2015-09-2413-2/+338
* | | | | Merge pull request #18517 from owncloud/17753_to_masterThomas Müller2015-09-242-13/+15
|\ \ \ \ \
| * | | | | Fix preview of old file on public upload conflictsOlivier Paroz2015-09-202-13/+15
| | |/ / / | |/| | |
* | | | | Merge pull request #18834 from owncloud/delay-listen-owner-changesThomas Müller2015-09-242-2/+22
|\ \ \ \ \
| * | | | | only initialize onceRobin Appelman2015-09-231-0/+6
| * | | | | Delay listening to owner changes untill we use a share for that ownerRobin Appelman2015-09-232-2/+16
* | | | | | Merge pull request #19305 from owncloud/share-hasusersharesThomas Müller2015-09-242-2/+72
|\ \ \ \ \ \
| * | | | | | Fix ShareItemModel.hasUserShares to only check shares of current itemVincent Petry2015-09-232-2/+72
* | | | | | | Merge pull request #19335 from owncloud/phil-davis-view-typosThomas Müller2015-09-241-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Comment typos in tests/lib/files/view.phpPhil Davis2015-09-241-3/+3
* | | | | | | | Merge pull request #19337 from owncloud/fix-shipped-check-for-appsThomas Müller2015-09-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Correctly check whether an app is shippedJoas Schilling2015-09-241-1/+1
* | | | | | | | | Merge pull request #19340 from owncloud/enc_fix_user_checkThomas Müller2015-09-242-7/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | only check if the user exists if a user was added as parameterBjoern Schiessle2015-09-242-7/+11
| |/ / / / / / / /
* | | | | | | | | Merge pull request #19341 from owncloud/enc_all_improved_messagesThomas Müller2015-09-241-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | no need to list users if all users already had a key-pairBjoern Schiessle2015-09-241-0/+6
| |/ / / / / / / /
* | | | | | | | | Merge pull request #19342 from owncloud/fix-15836Thomas Müller2015-09-242-2/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | LDAP Wizard: enable/disable test login name button depending on whether a log...Arthur Schiwon2015-09-242-2/+13
* | | | | | | | | | Merge pull request #19339 from owncloud/share-expirationisstringThomas Müller2015-09-242-5/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Expiration date was always a stringVincent Petry2015-09-242-5/+5
| |/ / / / / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-22 11:19:29 +0000