Jan-Christoph Borchardt
8ea6398e48
collapse user menu when inside one of the settings sections
2013-02-06 16:03:01 +01:00
Thomas Müller
efdaea4557
Merge pull request #1357 from owncloud/alternative-loging-master
...
add support for apps to register alternative login methods
2013-02-06 06:49:58 -08:00
Jan-Christoph Borchardt
964ff88f71
move inline style to CSS file, fix details
2013-02-06 15:15:20 +01:00
Jan-Christoph Borchardt
9961235c7b
Merge pull request #1429 from owncloud/fix_addNavigation
...
Make app icon linkable when enabling app.
2013-02-05 05:47:14 -08:00
Jan-Christoph Borchardt
8ae1205b95
line up 'remember' text with checkbox
2013-02-05 12:49:33 +01:00
Jan-Christoph Borchardt
7eaa2d0de1
form detail on log in button, better shape
2013-02-05 12:48:30 +01:00
Jan-Christoph Borchardt
c47fcf7d22
shift infield labels just a tiny bit to the right so the cursor doesn't overlap
2013-02-05 12:30:23 +01:00
Jan-Christoph Borchardt
2ec0c491d4
remove superfluous enabled-app class again
2013-02-05 11:30:18 +01:00
Jenkins for ownCloud
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
Thomas Tanghus
b06ac67e07
Add 'hascontrols' class for content with fixed topbar.
2013-02-04 18:30:49 +01:00
Thomas Müller
04b97a1906
Merge pull request #1229 from owncloud/from_live_to_on
...
replace live() with on() in core js
2013-02-03 21:55:54 -08:00
Thomas Tanghus
bb9be6f629
Add box-sizing to controls.
2013-02-04 00:24:34 +01:00
Jenkins for ownCloud
da6e79a381
[tx-robot] updated from transifex
2013-02-04 00:05:52 +01:00
Thomas Tanghus
1557b6d99d
Fix leftcontent positioning. Ref #1255
2013-02-03 14:44:33 +01:00
Jan-Christoph Borchardt
b8e6b8692b
fix CSS to coding guideline
2013-02-03 12:24:24 +01:00
raghunayyar
3bcf3c91e1
Password Toggle Support for Login
2013-02-03 11:56:00 +01:00
Jenkins for ownCloud
2936140838
[tx-robot] updated from transifex
2013-02-03 00:06:15 +01:00
Jenkins for ownCloud
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
Jan-Christoph Borchardt
48022f4525
Merge pull request #1395 from raghunayyar/webkit-scrollbar-534
...
Adds webkit scrollbar to ownCloud
2013-02-01 10:26:23 -08:00
Jenkins for ownCloud
94f7446724
[tx-robot] updated from transifex
2013-02-01 00:19:28 +01:00
Robin Appelman
5dd2c9152e
fix breadcrumbs for gallery and texteditor
2013-02-01 00:14:39 +01:00
Thomas Mueller
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
raghunayyar
0118606e09
More Visible webkit Scrollbar, syntax error solved.
2013-02-01 02:50:31 +05:30
Jan-Christoph Borchardt
45865b45c4
use translate string for Log out, remove title
2013-01-31 20:45:59 +01:00
Jan-Christoph Borchardt
6d560be564
fix svg fallback replacement for settings icons
2013-01-31 20:42:44 +01:00
Jan-Christoph Borchardt
3f3ae4a985
fix header for shared links
2013-01-31 20:19:32 +01:00
Jan-Christoph Borchardt
3d5c7ca245
Merge branch 'master' into navigation
2013-01-31 19:28:25 +01:00
Thomas Müller
0dd9e6cb12
Merge pull request #1387 from schiesbn/visual_improvements
...
small visual improvements
2013-01-31 08:30:25 -08:00
raghunayyar
5605297387
Adds webkit scrollbar to ownCloud
2013-01-31 21:51:44 +05:30
Jenkins for ownCloud
209d599ec5
[tx-robot] updated from transifex
2013-01-31 17:05:21 +01:00
Björn Schießle
9cd692a6d0
use the same tooltip as for the password field
2013-01-31 17:00:05 +01:00
Jan-Christoph Borchardt
43f8bf8e5c
Merge pull request #1358 from owncloud/button-fix
...
increase opacity of buttons, fix for dark backgrounds like header in pub...
2013-01-31 06:40:14 -08:00
Jan-Christoph Borchardt
ad044eb888
Merge branch 'master' into navigation
2013-01-31 15:35:20 +01:00
Jan-Christoph Borchardt
f0ca8eeba4
no box-shadow for public share download button
2013-01-31 15:21:50 +01:00
Jan-Christoph Borchardt
cbafea4cc8
increase opacity of inactive apps and settings entries for better visibility
2013-01-31 14:32:07 +01:00
Jan-Christoph Borchardt
1144b61db3
vertical scrollbar for app navigation when too many apps
2013-01-31 14:14:12 +01:00
Jan-Christoph Borchardt
90aa1b3532
ellipsize long app names in navigation
2013-01-31 14:04:33 +01:00
Jan-Christoph Borchardt
c801b86bc2
Merge pull request #1359 from raghunayyar/navigation
...
No Image Repetition on Enabling Apps in Navigation Bar
2013-01-31 05:01:20 -08:00
Jan-Christoph Borchardt
300ecc2ed2
change button box-shadow from hard white to slight transparent
2013-01-31 12:59:36 +01:00
Björn Schießle
54eeb8b8fc
fix merge conflict
2013-01-31 10:55:59 +01:00
Jenkins for ownCloud
00a30e6651
[tx-robot] updated from transifex
2013-01-31 00:31:28 +01:00
Jan-Christoph Borchardt
228a181d48
use new user function to display real name if available, username still fallback
2013-01-30 18:35:53 +01:00
Jörn Friedrich Dreyer
d7823adb07
attach to filelist which is present on .ready()
2013-01-30 17:46:33 +01:00
Jörn Friedrich Dreyer
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +01:00
raghunayyar
0dfbd53a6e
Reduced Styling and Image loads as from src and not backgorund.
2013-01-30 19:12:51 +05:30
Jan-Christoph Borchardt
284e690737
Merge branch 'master' into navigation
2013-01-30 13:53:43 +01:00
Björn Schießle
9639544ca0
make background transparent
2013-01-30 12:56:22 +01:00
Jenkins for ownCloud
68266e70f2
[tx-robot] updated from transifex
2013-01-30 00:25:41 +01:00
Lukas Reschke
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
Björn Schießle
d19de49606
prevent xss
2013-01-29 22:32:59 +01:00
raghunayyar
d620495e92
No Image Repetition on Enabling Apps in Navigation Bar
2013-01-30 00:54:23 +05:30
Jan-Christoph Borchardt
e2f1a445ed
increase opacity of buttons, fix for dark backgrounds like header in public share, fix #1188
2013-01-29 19:13:39 +01:00
Thomas Mueller
825cdf8560
add support for apps to register alternative login methods
...
below the standard login a list of icons/button will be displayed
2013-01-29 17:28:08 +01:00
Björn Schießle
d10e137939
icons added; empty trash bin message added
2013-01-29 10:03:04 +01:00
Michael Gapczynski
5143660cd3
Merge pull request #1324 from owncloud/permanent-share-icons
...
Permanently display shared status icons
2013-01-28 20:17:40 -08:00
Michael Gapczynski
ed2ee8c411
Change file action text for files inside shared folders as well
2013-01-28 23:16:29 -05:00
Michael Gapczynski
ede7fccb00
Change file action text to 'Shared'
2013-01-28 23:13:38 -05:00
Jenkins for ownCloud
8c4931a645
[tx-robot] updated from transifex
2013-01-29 00:06:20 +01:00
Jan-Christoph Borchardt
a78ae6a5cb
Merge branch 'master' into permanent-share-icons
2013-01-28 19:39:51 +01:00
Jan-Christoph Borchardt
3bafa87a12
merge styles
2013-01-28 19:36:21 +01:00
Jan-Christoph Borchardt
feb65c89f2
update Files icon from home to files, update Home icon from checkbox to home
2013-01-28 19:20:07 +01:00
Björn Schießle
590c4aa710
search display name instead of uid; fix key/value order for array access
2013-01-28 15:58:40 +01:00
Jan-Christoph Borchardt
aaac2414ea
undo padding change on buttons, otherwise it will mess up the upload and new buttons again
2013-01-28 13:16:30 +01:00
Jan-Christoph Borchardt
329d965441
merge changes in navigation
2013-01-28 10:52:15 +01:00
Thomas Mueller
1d44a99ebb
Merge branch 'master' into updater-CSP
...
Conflicts:
core/templates/update.php
2013-01-28 09:57:24 +01:00
Thomas Müller
31d83fddc4
Merge pull request #1321 from owncloud/csp-fixes
...
Files: CSP fixes
2013-01-28 00:29:46 -08:00
Jenkins for ownCloud
b655444709
[tx-robot] updated from transifex
2013-01-28 00:05:43 +01:00
Lukas Reschke
9e498b6548
Merge pull request #1326 from owncloud/event-source-token
...
Use global oc_requesttoken for Event Source
2013-01-26 15:18:23 -08:00
Jenkins for ownCloud
00a28062e1
[tx-robot] updated from transifex
2013-01-27 00:06:21 +01:00
Michael Gapczynski
0986b6f910
Use global oc_requesttoken for Event Source
2013-01-26 16:36:48 -05:00
Michael Gapczynski
31ebea0f6a
Permanently display shared status icons
2013-01-26 13:25:15 -05:00
Lukas Reschke
7f0a3018b6
Fix undefined variable
2013-01-26 13:46:00 +01:00
Thomas Müller
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
Thomas Müller
3b547895ec
Merge pull request #1306 from owncloud/smart-app-banner
...
add smart app banner to promote ios app
2013-01-26 04:00:57 -08:00
Jenkins for ownCloud
af4411e33d
[tx-robot] updated from transifex
2013-01-26 00:10:07 +01:00
Lukas Reschke
dbc13cf6ee
Move update inline JS
2013-01-25 19:18:16 +01:00
Björn Schießle
a606e8d944
use display name to show share_width and owner information
2013-01-25 17:40:23 +01:00
Lukas Reschke
d8c4e620af
Use black background images
2013-01-25 16:23:03 +01:00
Lukas Reschke
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
raghunayyar
aed204d420
Defined height for #leftcontent
2013-01-25 20:39:07 +05:30
Georg Ehrke
bc9ab0726e
add smart app banner to promote ios app
2013-01-25 16:05:16 +01:00
Thomas Tanghus
936e991394
Add js linkToRemote and linkToRemoteBase
2013-01-25 16:00:26 +01:00
Lukas Reschke
ff4d62132a
This breaks the installation
...
@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'
2013-01-25 15:47:57 +01:00
Björn Schießle
e9a57e28fc
show display name instead of uid
2013-01-25 13:57:08 +01:00
raghunayyar
f7a0ab7d4f
Style fixes on core/navigation Branch.
...
#rightcontent margin and button overlaps fixed.
2013-01-25 16:01:41 +05:30
Björn Schießle
2fee1208ef
add display name to title instead if login-ID
2013-01-24 15:49:23 +01:00
Jenkins for ownCloud
3ff32eba25
[tx-robot] updated from transifex
2013-01-24 00:07:38 +01:00
Thomas Mueller
b4c3dd84b4
update to jquery-ui 1.10.0
2013-01-23 11:37:52 +01:00
Lukas Reschke
846971ec11
Fix merge conflict
2013-01-23 11:33:25 +01:00
Lukas Reschke
fe56e4df7d
Fix merge conflict
2013-01-23 11:32:14 +01:00
Lukas Reschke
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
Jenkins for ownCloud
c986dbe573
[tx-robot] updated from transifex
2013-01-23 00:06:18 +01:00
Michael Gapczynski
9eecb91338
Merge pull request #1113 from owncloud/fix-issue-1085
...
Fix rendering of database connection error page
2013-01-22 14:38:44 -08:00
Lukas Reschke
bd5ff29716
Merge branch 'master' into no-inline-js
2013-01-22 11:50:33 +01:00
Lukas Reschke
39da6f8166
Move timezone check to external JS
2013-01-21 21:10:44 +01:00
Lukas Reschke
8ca78fcf3f
Move requesttoken to oc-requesttoken.js
2013-01-21 20:24:18 +01:00
Robin Appelman
8817b603d7
Fix scrolling of leftcontent
2013-01-21 18:29:18 +01:00
Lukas Reschke
5fff57339f
Move config to core/js/config.php
2013-01-21 00:10:47 +01:00
Lukas Reschke
68025ac43c
Add a route to the JS config
2013-01-20 23:46:46 +01:00
Jenkins for ownCloud
ebc0c4b85b
[tx-robot] updated from transifex
2013-01-20 00:06:40 +01:00
Lukas Reschke
8daefd00fb
Sanitize the exception
2013-01-19 19:57:17 +01:00
Thomas Mueller
1dd70ac506
update used space percent after each ajax call and display the notification
2013-01-19 00:31:49 +01:00
Thomas Mueller
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
Jan-Christoph Borchardt
b81a7aa078
fix up content and content-wrapper merge ...
2013-01-18 19:58:50 +07:00
Jenkins for ownCloud
824fcf6624
[tx-robot] updated from transifex
2013-01-18 00:04:36 +01:00
Jan-Christoph Borchardt
09d3db5eb7
new settings menu for new design
2013-01-17 12:45:33 +07:00
Jan-Christoph Borchardt
de41813792
new app icon style for new design
2013-01-17 11:54:31 +07:00
Bernhard Posselt
b659072686
dont show horizontal scrollbar
2013-01-16 19:55:16 +01:00
Bernhard Posselt
b7f507b925
dont resize content div with javascript but use css box-sizing to do it
2013-01-16 19:38:19 +01:00
Bart Visscher
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
Jenkins for ownCloud
0398bfffca
[tx-robot] updated from transifex
2013-01-16 00:21:21 +01:00
Bart Visscher
0da06187f6
Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
...
Fixing unused and undefined in master
2013-01-15 07:45:51 -08:00
Jan-Christoph Borchardt
6182b1353b
merge master into navigation
2013-01-15 20:40:38 +07:00
Jenkins for ownCloud
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +01:00
Thomas Mueller
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
Lukas Reschke
eab6d7eb23
Enhanced auth is totally unmaintained and broken
...
Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)
2013-01-14 21:39:49 +01:00
Jenkins for ownCloud
c29310aaef
[tx-robot] updated from transifex
2013-01-14 00:18:21 +01:00
Jenkins for ownCloud
981fd5e424
[tx-robot] updated from transifex
2013-01-13 00:08:40 +01:00
Jenkins for ownCloud
ad64ce189d
[tx-robot] updated from transifex
2013-01-12 00:10:58 +01:00
Lukas Reschke
954b559d48
Merge pull request #994 from owncloud/enhanced_multiSelect
...
Enhanced multiSelect
2013-01-11 10:23:04 -08:00
Lukas Reschke
216a5af396
Remove uneeded file
...
logout.php is a legacy file, which isn't used anymore in the ownCloud
code.
2013-01-11 16:49:55 +01:00
Lukas Reschke
1eb3c8ecf6
Correct link to the bugtracker in exception.php
2013-01-11 16:42:06 +01:00
Thomas Mueller
7fe8fb4248
pin notification to the top
2013-01-11 15:21:39 +01:00
Thomas Mueller
c2b3c7ed3e
fixing text-align on navigation menu - closing div was missing - THX Lukas
2013-01-11 15:19:53 +01:00
Thomas Mueller
508b6a9fc7
displaying notification now centered
...
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.
2013-01-11 11:52:07 +01:00
Thomas Mueller
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
Jenkins for ownCloud
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
Jenkins for ownCloud
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
Jenkins for ownCloud
533f0e8e25
[tx-robot] updated from transifex
2013-01-09 00:05:49 +01:00
Thomas Tanghus
dae8f15f9f
Merge pull request #938 from owncloud/fix_minor_files_annoyances
...
Fix minor files annoyances
2013-01-08 15:02:06 -08:00
Jenkins for ownCloud
b69328e1d1
[tx-robot] updated from transifex
2013-01-08 00:31:36 +01:00
Thomas Mueller
bfc55fef89
bring back L250 as spotted by @tanghus - THX
2013-01-08 00:24:35 +01:00
Thomas Mueller
e475c26f1a
fixing <input> tag
2013-01-07 21:23:14 +01:00
Michael Gapczynski
2012603b74
Merge branch 'master' into fix-issue-1085
2013-01-07 14:16:32 -05:00
Michael Gapczynski
d39655e126
Move template parameters around so database error page is properly rendered
2013-01-07 14:15:51 -05:00
Jörn Friedrich Dreyer
0dda8f5d1c
ie8 ignores rgba, show button border in ie8 by adding second border css row
2013-01-07 13:09:52 +01:00
Jörn Friedrich Dreyer
3bb7ee521f
attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index
2013-01-07 12:23:29 +01:00
Jörn Friedrich Dreyer
3dbb148567
Merge pull request #1061 from owncloud/remove_css_not_selector_to_fix_ie8_input_fields
...
remove css not selector - incompatible with ie8
2013-01-07 01:17:19 -08:00
Thomas Müller
7ca740fa3d
Merge pull request #632 from owncloud/fix_629
...
fix pattern for database names - #629
2013-01-06 14:03:02 -08:00
Thomas Mueller
9671ace32e
Merge branch 'master' into fix_minor_files_annoyances
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:46:40 +01:00
Thomas Mueller
7ebfcab49b
Merge branch 'master' into fixing-998-master
...
Conflicts:
lib/helper.php
2013-01-06 12:18:21 +01:00
Thomas Mueller
a867b36e7f
js optimisations and style fixes
2013-01-06 10:41:07 +01:00
Thomas Mueller
6806484c16
Merge branch 'master' into fixing-998-master
2013-01-06 10:36:14 +01:00
Michael Gapczynski
035d0aa9d5
Merge branch 'master' into update-progress
2013-01-05 12:24:21 -05:00
Michael Gapczynski
5ea8adc7c7
Reformat long line
2013-01-05 12:21:57 -05:00
Michael Gapczynski
f6426cee04
Tweak failure message and throw exceptions from updateDbFromStructure()
2013-01-05 12:13:36 -05:00
Michael Gapczynski
6b2216f0d6
Remove old data directory protection from update, should already have taken place or not working because the server isn't Apache
2013-01-05 11:09:48 -05:00
Michael Gapczynski
a94405b4e4
Only show the version updating to instead of worrying about converting internal to a formatted version
2013-01-04 20:13:00 -05:00
Jenkins for ownCloud
934d9dcc42
[tx-robot] updated from transifex
2013-01-05 00:03:58 +01:00
Thomas Mueller
ba475d4862
javascript notification functions have been moved to js.js for common use
2013-01-04 23:34:09 +01:00