summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6912 from owncloud/replace-webroot-in-cssMorris Jobke2014-01-271-0/+240
|\
| * add icons.css file, first step to get rid of %webroot%Jan-Christoph Borchardt2014-01-231-0/+240
* | Merge pull request #5153 from owncloud/core-em-to-pxJan-Christoph Borchardt2014-01-274-73/+72
|\ \
| * | Fixes width of the dropdown menus as per computed styles.raghunayyar2014-01-261-1/+1
| * | Fixes typos, adds ; wherever not present.raghunayyar2014-01-161-18/+18
| * | Merge branch 'master' into core-em-to-pxraghunayyar2014-01-16145-2021/+3809
| |\ \
| * | | All Core Styles from em->px, apart from styles.cssraghunayyar2013-10-074-27/+27
* | | | Merge pull request #5152 from owncloud/files-em-to-pxJan-Christoph Borchardt2014-01-271-1/+1
|\ \ \ \
| * | | | remove comment & add spaceMorris Jobke2014-01-181-2/+1
| * | | | Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebaseraghunayyar2014-01-161-1/+2
* | | | | Merge pull request #6905 from owncloud/add_expiredate_to_linkshareVincent Petry2014-01-242-3/+24
|\ \ \ \ \
| * | | | | add expire date to link share if possibleBjoern Schiessle2014-01-242-3/+24
| | |_|_|/ | |/| | |
* | | | | Merge pull request #6736 from owncloud/tests-jsunittestsThomas Müller2014-01-235-2/+4482
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added Javascript unit testsVincent Petry2014-01-165-2/+4482
* | | | | Merge pull request #6721 from tsumi/patch-1Morris Jobke2014-01-181-0/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Useless else removedtsumi2014-01-151-2/+0
| * | | | Added SVG fallback to apps settings popuptsumi2014-01-101-0/+5
* | | | | Indicate password strength using strengthifyMorris Jobke2014-01-155-7/+41
| |_|/ / |/| | |
* | | | remove ru_RU - it has bee removed from transifexThomas Müller2014-01-131-21/+0
* | | | Merge pull request #6694 from owncloud/fix-email-template-l10nThomas Müller2014-01-131-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | fix email template l10n, emphasize filenameJan-Christoph Borchardt2014-01-091-1/+1
| |/ /
* / / Fixed various file name escaping issues in core appsVincent Petry2014-01-101-3/+7
|/ /
* | Merge pull request #6681 from owncloud/userreportblizzz2014-01-082-0/+62
|\ \
| * | Add command line tool to show numbers of users and user directoriesArthur Schiwon2014-01-072-0/+62
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-081-1/+1
* | | Merge pull request #6594 from owncloud/kill-index.php-from-urlJörn Friedrich Dreyer2014-01-071-1/+2
|\ \ \
| * | | avoid conflict with physical file config.jsThomas Müller2013-12-311-1/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-071-0/+9
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-061-0/+33
* | | Merge pull request #6031 from s0taka/masterMorris Jobke2014-01-051-1/+4
|\ \ \
| * | | spaces to tabsSimon Könnecke2013-12-181-1/+1
| * | | No decimal points for Kilobyte and Byte #5371.Simon Könnecke2013-11-251-1/+4
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-053-2/+29
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-022-6/+175
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-311-18/+79
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-301-0/+9
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-261-4/+29
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-251-2/+2
* | | Merge pull request #6561 from syncloud/masterThomas Müller2013-12-241-1/+1
|\ \ \
| * | | Made password field required on client sideVladimir Sapronov2013-12-221-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-242-28/+55
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-212-4/+13
* | | Merge pull request #6262 from nickvergessen/issue/4375Frank Karlitschek2013-12-201-1/+1
|\ \ \
| * | | correctly mark app management activeJoas Schilling2013-12-091-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-191-0/+1
* | | | Merge pull request #6431 from owncloud/core-pluraltranslationsfixThomas Müller2013-12-181-4/+8
|\ \ \ \
| * | | | Fixed JS plural function to be per appVincent Petry2013-12-161-4/+8
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-171-1/+4
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-173-0/+15
* | | | | Merge pull request #6386 from owncloud/trash_always_show_deleted_files_breadc...Frank Karlitschek2013-12-171-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |