aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19814 from owncloud/filelist-preventerrorwhennosidebarThomas Müller2015-10-153-6/+49
|\
| * Do not register sidebar panels when no sidebarVincent Petry2015-10-153-6/+49
* | Merge pull request #19806 from owncloud/fix_19572Thomas Müller2015-10-151-4/+11
|\ \
| * | check if fopen was successful before continueBjoern Schiessle2015-10-151-3/+7
| * | only wrap source if fopen was successfulBjoern Schiessle2015-10-151-1/+4
| |/
* | Merge pull request #19795 from owncloud/fix-language-level-compatThomas Müller2015-10-151-2/+3
|\ \
| * | Remove arbitrary expression in emptyLukas Reschke2015-10-141-2/+3
* | | Merge pull request #19802 from RealRancor/fix_rewritesThomas Müller2015-10-151-2/+0
|\ \ \ | |_|/ |/| |
| * | Remove legacy non-working rewrites in .htaccessRealRancor2015-10-151-2/+0
|/ /
* | Merge pull request #19797 from owncloud/specify-php-5-4Thomas Müller2015-10-151-0/+10
|\ \
| * | Specify PHP 5.4 as version for scrutinizerLukas Reschke2015-10-141-0/+10
| |/
* | Merge pull request #19799 from owncloud/issue-19793-php54-ldap-comp-issueLukas Reschke2015-10-157-28/+25
|\ \
| * | Fix doc blocks of LDAP classesJoas Schilling2015-10-157-28/+25
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2015-10-1518-14/+124
|/
* Merge pull request #19787 from owncloud/kill-arrayparserThomas Müller2015-10-141-238/+0
|\
| * Remove ArrayParser because it is unusedMorris Jobke2015-10-141-238/+0
|/
* Merge pull request #19731 from owncloud/update-list-of-deprecated-methodsThomas Müller2015-10-144-9/+29
|\
| * The constant is now deprecatedJoas Schilling2015-10-142-2/+2
| * update deprecation messageMorris Jobke2015-10-141-1/+1
| * Update list of deprecated methodsJoas Schilling2015-10-142-7/+27
* | Merge pull request #19760 from owncloud/adding_occ_upgrade_text_noteThomas Müller2015-10-141-0/+1
|\ \
| * | adding occ upgrade text noteMartin2015-10-141-0/+1
* | | Merge pull request #19764 from owncloud/issue-19759-app-check-code-issueThomas Müller2015-10-141-2/+2
|\ \ \ | |_|/ |/| |
| * | Variables don't have a class, so we can't use toString() on itJoas Schilling2015-10-141-2/+2
| |/
* | Merge pull request #19625 from owncloud/passwordchange-hidestrengthifyThomas Müller2015-10-142-2/+2
|\ \
| * | Properly hide strengthify after password changeVincent Petry2015-10-072-2/+2
* | | Merge pull request #19627 from owncloud/users-deletebeforecreateThomas Müller2015-10-142-31/+43
|\ \ \
| * | | Delete last undoable user before user creationVincent Petry2015-10-072-31/+43
| |/ /
* | | Merge pull request #19630 from owncloud/fix-ie-painThomas Müller2015-10-143-1/+18
|\ \ \
| * | | [IE8] Fix button background colorVincent Petry2015-10-071-0/+6
| * | | [IE8] Fix "new" button widthVincent Petry2015-10-071-0/+5
| * | | [IE9] Set explicit height to file actions menu iconVincent Petry2015-10-071-0/+1
| * | | [IE] Add border to dropdown menusVincent Petry2015-10-071-1/+6
| |/ /
* | | Merge pull request #19631 from owncloud/share-emailsenterrorThomas Müller2015-10-144-13/+185
|\ \ \
| * | | Add unit tests for sending e-mail for link sharesRoeland Jago Douma2015-10-082-10/+170
| * | | Fix share email sending feedbackVincent Petry2015-10-082-3/+15
* | | | Merge pull request #19633 from owncloud/sidebar-alt-favoriteThomas Müller2015-10-141-2/+1
|\ \ \ \
| * | | | Move alt text for favorite action to imageVincent Petry2015-10-071-2/+1
| | |/ / | |/| |
* | | | Merge pull request #19634 from owncloud/notif-showtemporaryThomas Müller2015-10-141-20/+8
|\ \ \ \
| * | | | showTemporary instead of show for notificationsVincent Petry2015-10-081-20/+8
| |/ / /
* | | | Merge pull request #19647 from owncloud/trashbin-removesidebarThomas Müller2015-10-141-1/+2
|\ \ \ \
| * | | | Remove sidebar for trashbin viewVincent Petry2015-10-081-1/+2
| |/ / /
* | | | Merge pull request #19710 from owncloud/files-canceluploaddebounce-reThomas Müller2015-10-141-6/+5
|\ \ \ \
| * | | | Debounce cancel upload messageVincent Petry2015-10-121-6/+5
* | | | | Merge pull request #19714 from owncloud/trash-deletesectionposition-2Thomas Müller2015-10-143-14/+18
|\ \ \ \ \
| * | | | | Revert "Revert "Move trashbin specific CSS that modifies sidebar""Thomas Müller2015-10-123-14/+18
| |/ / / /
* | | | | Merge pull request #19738 from owncloud/proppatch-lastmodifiedThomas Müller2015-10-142-6/+6
|\ \ \ \ \
| * | | | | Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"Vincent Petry2015-10-132-6/+6
* | | | | | Merge pull request #19747 from owncloud/files-delete-hidenotifThomas Müller2015-10-141-0/+2
|\ \ \ \ \ \
| * | | | | | Hide notification on deleteVincent Petry2015-10-131-0/+2
| |/ / / / /