aboutsummaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* use the same tooltip as for the password fieldBjörn Schießle2013-01-311-0/+1
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-01-3015-1/+38
|
* Merge pull request #1360 from owncloud/display_nameLukas Reschke2013-01-293-19/+20
|\ | | | | introduction of display names
| * prevent xssBjörn Schießle2013-01-291-1/+1
| |
| * search display name instead of uid; fix key/value order for array accessBjörn Schießle2013-01-281-1/+1
| |
| * use display name to show share_width and owner informationBjörn Schießle2013-01-251-9/+9
| |
| * show display name instead of uidBjörn Schießle2013-01-251-9/+10
| |
| * add display name to title instead if login-IDBjörn Schießle2013-01-241-1/+1
| |
* | Merge pull request #1324 from owncloud/permanent-share-iconsMichael Gapczynski2013-01-282-5/+22
|\ \ | | | | | | Permanently display shared status icons
| * | Change file action text for files inside shared folders as wellMichael Gapczynski2013-01-281-0/+1
| | |
| * | Change file action text to 'Shared'Michael Gapczynski2013-01-281-0/+3
| | |
| * | Merge branch 'master' into permanent-share-iconsJan-Christoph Borchardt2013-01-2811-109/+199
| |\ \
| * | | Permanently display shared status iconsMichael Gapczynski2013-01-262-5/+18
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2949-938/+938
| |/ / |/| |
* | | Merge branch 'master' into updater-CSPThomas Mueller2013-01-2816-135/+277
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: core/templates/update.php
| * \ \ Merge pull request #1321 from owncloud/csp-fixesThomas Müller2013-01-281-3/+7
| |\ \ \ | | | | | | | | | | Files: CSP fixes
| | * | | Fix undefined variableLukas Reschke2013-01-261-3/+7
| | |/ /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-281-0/+20
| | | |
| * | | Merge pull request #1326 from owncloud/event-source-tokenLukas Reschke2013-01-262-2/+1
| |\ \ \ | | | | | | | | | | Use global oc_requesttoken for Event Source
| | * | | Use global oc_requesttoken for Event SourceMichael Gapczynski2013-01-262-2/+1
| | |/ /
| * / / [tx-robot] updated from transifexJenkins for ownCloud2013-01-276-79/+148
| |/ /
| * | Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-263-11/+50
| |\ \ | | | | | | | | Fixing 998 master
| | * | update used space percent after each ajax call and display the notificationThomas Mueller2013-01-191-2/+5
| | | |
| | * | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-1867-361/+322
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js
| | * | | pin notification to the topThomas Mueller2013-01-111-1/+1
| | | | |
| | * | | fixing text-align on navigation menu - closing div was missing - THX LukasThomas Mueller2013-01-111-1/+1
| | | | |
| | * | | displaying notification now centeredThomas Mueller2013-01-113-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | The notification div has been moved to the user templates. Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
| | * | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-1121-124/+143
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js
| | * | | | bring back L250 as spotted by @tanghus - THXThomas Mueller2013-01-081-0/+1
| | | | | |
| | * | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-063-1/+100
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/helper.php
| | * | | | | js optimisations and style fixesThomas Mueller2013-01-061-15/+16
| | | | | | |
| | * | | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-065-7/+134
| | |\ \ \ \ \
| | * | | | | | javascript notification functions have been moved to js.js for common useThomas Mueller2013-01-041-0/+30
| | | | | | | |
| * | | | | | | Merge pull request #1306 from owncloud/smart-app-bannerThomas Müller2013-01-262-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | add smart app banner to promote ios app
| | * | | | | | | add smart app banner to promote ios appGeorg Ehrke2013-01-252-0/+2
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-262-39/+48
| | | | | | | |
* | | | | | | | Move update inline JSLukas Reschke2013-01-252-27/+25
|/ / / / / / /
* | | | | | | Use black background imagesLukas Reschke2013-01-251-1/+1
| | | | | | |
* | | | | | | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-252-1/+28
|\ \ \ \ \ \ \
| * | | | | | | Add js linkToRemote and linkToRemoteBaseThomas Tanghus2013-01-251-0/+21
| |/ / / / / /
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-241-1/+7
| | | | | | |
* | | | | | | This breaks the installationLukas Reschke2013-01-251-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @bartv2 This JS part is breaking the installation (POST parameters are not transferred), could you please take a look? THX. JS console says: uncaught exception: cannot call methods on button prior to initialization; attempted to call method 'disable'
* | | | | | | update to jquery-ui 1.10.0Thomas Mueller2013-01-2317-1123/+16024
| | | | | | |
* | | | | | | Fix merge conflictLukas Reschke2013-01-231-12/+0
| | | | | | |
* | | | | | | Fix merge conflictLukas Reschke2013-01-231-8/+0
| | | | | | |
* | | | | | | Merge master...Lukas Reschke2013-01-236-3/+55
|\| | | | | |
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-233-2/+34
| | | | | | |
| * | | | | | Merge pull request #1113 from owncloud/fix-issue-1085Michael Gapczynski2013-01-223-3/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix rendering of database connection error page
| | * \ \ \ \ \ Merge branch 'master' into fix-issue-1085Michael Gapczynski2013-01-072-2/+2
| | |\ \ \ \ \ \
| | * | | | | | | Move template parameters around so database error page is properly renderedMichael Gapczynski2013-01-073-3/+1
| | | |_|_|/ / / | | |/| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-09 01:45:50 +0000