summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1230 from owncloud/remove-unused-autocomplete.phpLukas Reschke2013-01-191-54/+0
|\ | | | | Remove uneeded file
| * Remove uneeded fileLukas Reschke2013-01-181-54/+0
| | | | | | | | | | I don't saw any usage of this file through the code, I assume it can safely be removed.
* | Merge pull request #1228 from owncloud/generating_zip_messageJan-Christoph Borchardt2013-01-191-1/+1
|\ \ | | | | | | Make the ZIP download information friendlier
| * | Change the second part of the notificationLukas Reschke2013-01-191-1/+1
| | |
| * | Make the message friendlierLukas Reschke2013-01-181-1/+1
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2013-01-193-2/+16
| |
* | Merge pull request #986 from owncloud/fixing-784-masterThomas Müller2013-01-186-14/+142
|\ \ | |/ |/| the maximum upload size is now part of the response of the upload and de...
| * fixing indentThomas Mueller2013-01-183-47/+47
| |
| * adding a ajax call to get the current file storage stats like free spaceThomas Mueller2013-01-112-0/+42
| | | | | | | | | | logic to call it every 5 minutes make use of visibility API/jquery-visibility to perform the ajax call only if the browser is visible/in use
| * load jquery-visibilityThomas Mueller2013-01-111-0/+1
| |
| * adding jquery-visibilityThomas Mueller2013-01-111-0/+32
| | | | | | | | | | https://github.com/mathiasbynens/jquery-visibility MIT and GPL licensed
| * Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-1171-173/+453
| |\ | | | | | | | | | | | | Conflicts: apps/files/js/files.js
| * \ Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-06127-88/+665
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js lib/helper.php
| * | | the maximum upload size is now part of the response of the upload and delete ↵Thomas Müller2012-12-204-17/+71
| | | | | | | | | | | | | | | | | | | | | | | | operation. the maximum upload size is updated within the browser once an upload or delete operation has been finished
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1817-3/+50
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-178-5/+23
| | | |
* | | | Whitespace cleanupBart Visscher2013-01-168-27/+27
| | | |
* | | | Spaces to tabsBart Visscher2013-01-163-28/+28
| | | |
* | | | Merge pull request #1192 from schiesbn/versioning_history_issue_1189Björn Schießle2013-01-161-2/+5
|\ \ \ \ | | | | | | | | | | fix for issue #1186, missing variables added
| * | | | initialize $versionCreatedBjörn Schießle2013-01-161-1/+2
| | | | |
| * | | | fix for issue #1186, missing variables addedBjörn Schießle2013-01-151-1/+3
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1634-31/+29
| | | | |
* | | | | Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-masterBart Visscher2013-01-154-7/+5
|\ \ \ \ \ | |/ / / / |/| | | | Fixing unused and undefined in master
| * | | | Merge branch 'master' into fixing-unused-and-undefined-in-masterThomas Mueller2013-01-1485-514/+878
| |\ \ \ \
| * | | | | fixing <input> tagThomas Mueller2013-01-071-1/+1
| | | | | |
| * | | | | remove silly assignmentThomas Mueller2013-01-061-1/+0
| | | | | |
| * | | | | fixing undefined $eventSourceThomas Mueller2013-01-061-1/+2
| | | | | |
| * | | | | removing undefined $responseThomas Mueller2013-01-061-4/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #1087 from owncloud/ldap_multiple_dnsblizzz2013-01-154-45/+105
|\ \ \ \ \ | | | | | | | | | | | | LDAP: ability to configure more than one base DN
| * | | | | dechex not necessary, do not waste time with itArthur Schiwon2013-01-081-1/+1
| | | | | |
| * | | | | Code styleArthur Schiwon2013-01-081-6/+10
| | | | | |
| * | | | | support LDAP search using multiple base DNs also with paged results, ↵Arthur Schiwon2013-01-041-33/+50
| | | | | | | | | | | | | | | | | | | | | | | | implements #395
| * | | | | support multiple base DNsArthur Schiwon2013-01-031-5/+42
| | | | | |
| * | | | | Base DNs will be used as array, now, to support usage of multiple DNsArthur Schiwon2013-01-031-3/+3
| | | | | |
| * | | | | Switch to textarea to enable configuration of multiple DNsArthur Schiwon2013-01-032-4/+6
| | | | | |
| * | | | | LDAP: fix spellingArthur Schiwon2013-01-031-1/+1
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1573-184/+40
| |_|/ / / |/| | | |
* | | | | Merge pull request #1169 from owncloud/webdav_L10nBart Visscher2013-01-141-2/+2
|\ \ \ \ \ | | | | | | | | | | | | user_webdavauth - l10n - Trivial
| * | | | | The => ThisLukas Reschke2013-01-131-1/+1
| | | | | | | | | | | | | | | | | | Sounds better for me.
| * | | | | Improved the help textLukas Reschke2013-01-131-1/+1
| | | | | |
| * | | | | legend - l10nLukas Reschke2013-01-131-1/+1
| | | | | |
* | | | | | Merge pull request #1135 from owncloud/allow_default_click_behaviourLukas Reschke2013-01-141-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | allow default click behaviour
| * | | | | | allow default click behaviourJörn Friedrich Dreyer2013-01-091-1/+2
| | | | | | |
* | | | | | | Merge pull request #1170 from owncloud/correctIndentionThomas Müller2013-01-142-78/+78
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove ugly indentation - Trivial
| * | | | | | | Remove ugly indentationLukas Reschke2013-01-132-78/+78
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'master' of github.com:owncloud/coreBjörn Schießle2013-01-1469-174/+467
|\ \ \ \ \ \ \
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-141-0/+6
| | |_|/ / / / | |/| | | | |
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-132-1/+10
| | | | | | |
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-126-4/+37
| |/ / / / /
| * | | | | Merge pull request #1133 from owncloud/add_linebreaks_in_sharingThomas Müller2013-01-101-17/+35
| |\ \ \ \ \ | | | | | | | | | | | | | | add more linebreaks, replace SQL LIMIT with param