Lukas Reschke
8d7926543b
Merge pull request #3937 from owncloud/refresh_if_maintenance_is_over
...
Refresh if maintenance mode is over
2014-09-11 11:34:39 +02:00
Lukas Reschke
bce5c2dae9
Add X-UA-Compatible to all templates
...
Replaces https://github.com/owncloud/core/pull/10850
2014-09-11 10:28:52 +02:00
Jenkins for ownCloud
0dcd8079dc
[tx-robot] updated from transifex
2014-09-11 01:54:41 -04:00
Jan-Christoph Borchardt
8d0d336e03
fit select2 to ownCloud input style
2014-09-10 18:09:22 +02:00
Jenkins for ownCloud
c119a9fd32
[tx-robot] updated from transifex
2014-09-10 01:54:54 -04:00
Lukas Reschke
fa096217b1
Merge pull request #9512 from libasys/patch-2
...
Fix use Sharing Api with calendar
2014-09-09 23:58:24 +02:00
Bernhard Posselt
743d792f5e
This fixes the double scrollbars issue
2014-09-09 22:59:16 +02:00
Vincent Petry
412da87e65
Move select2 from files_external to core
2014-09-09 18:03:05 +02:00
kondou
69f2c0544e
Refresh if maintenance mode is over
...
Using status.php for this.
I modified status.php to also show, whether we're in maintenance.
Checks every 20 seconds if maintenance is over, if yes: reload.
2014-09-09 17:26:11 +02:00
Lukas Reschke
dc99fd768a
Merge pull request #10948 from owncloud/fix-zindex
...
fix z-index of header and dropdowns, fix user menu not showing on mobile
2014-09-09 14:23:28 +02:00
Thomas Müller
fd92fc7c47
Merge pull request #9753 from owncloud/filepath-css
...
Remove special case for css in OC.filePath
2014-09-09 13:59:19 +02:00
Lukas Reschke
e3c99a8505
Add beforeeach and aftereach
2014-09-09 13:08:50 +02:00
Lukas Reschke
cabd70148f
Add unittest for filePath
2014-09-09 12:05:19 +02:00
Lukas Reschke
e9a3b280c0
Merge pull request #10928 from owncloud/allow_dot_in_dbname_on_web_install
...
allow . in dbname on web install
2014-09-09 09:36:16 +02:00
Jenkins for ownCloud
317e6d03b4
[tx-robot] updated from transifex
2014-09-09 01:55:47 -04:00
VicDeo
efd485acda
Merge pull request #10858 from owncloud/issue/10847
...
Use correct language package so the subject is correctly translated
2014-09-09 01:11:34 +03:00
Jan-Christoph Borchardt
71e10b66d9
Merge pull request #10944 from owncloud/fix-nojavascript-style
...
fix no-JS message, and add it to log in and shared as well cause they don’t work without JS
2014-09-08 21:58:54 +02:00
Jan-Christoph Borchardt
dc5db3dd90
fix z-index of header and dropdowns, fix user menu not showing on mobile
2014-09-08 21:37:17 +02:00
Lukas Reschke
70abce0482
Merge pull request #10739 from owncloud/eventsource-public
...
Add EventSource to the public API
2014-09-08 18:46:27 +02:00
Jan-Christoph Borchardt
bd56619e7a
also add no-JavaScript notice to log in and sharing pages because they do not work without JS either
2014-09-08 18:07:20 +02:00
Jan-Christoph Borchardt
3db2b11435
fix styling and wording of no-JavaScript message
2014-09-08 17:55:53 +02:00
Lukas Reschke
c79c894dbb
Merge pull request #10755 from owncloud/shorter_sharing_links
...
Shorter sharing links
2014-09-08 17:26:20 +02:00
Volkan Gezer
053c879723
Merge pull request #10451 from k4k/login_logo_alignment_fix
...
improve logo flexibility to fix wide custom logo alignment, fix #9339
2014-09-08 17:21:33 +02:00
Jörn Friedrich Dreyer
d12a74e299
allow . in dbname on web install
2014-09-08 13:41:23 +02:00
Jenkins for ownCloud
9fc45016f9
[tx-robot] updated from transifex
2014-09-07 01:54:42 -04:00
Jenkins for ownCloud
6ca2ba6fde
[tx-robot] updated from transifex
2014-09-06 01:55:03 -04:00
Jenkins for ownCloud
0736a6695e
[tx-robot] updated from transifex
2014-09-05 01:54:39 -04:00
kondou
2a4c51389c
Use a route instead of s.php and convert tokens asap
2014-09-04 15:23:55 +02:00
kondou
0f2ad9862e
Initial work on shorter links
2014-09-04 15:23:53 +02:00
Lukas Reschke
1a7df33233
Merge pull request #10818 from owncloud/enableappforgroupfix
...
Fix upgrade process when apps enabled for specific groups
2014-09-04 13:56:41 +02:00
Robin Appelman
fa3393674c
Better phpdoc and method naming
2014-09-04 13:26:51 +02:00
Joas Schilling
7a7e102390
Fix broken new lines in plain text mail template
2014-09-04 11:30:54 +02:00
Jenkins for ownCloud
a8861c70c8
[tx-robot] updated from transifex
2014-09-04 01:55:22 -04:00
Thomas Müller
954925eaa0
Merge pull request #10667 from pmjdebruijn/itunes-appid
...
defaults: add customizable defaultiTunesAppId
2014-09-03 16:26:20 +02:00
Lukas Reschke
373d1c5e9f
Merge pull request #10642 from owncloud/securityutils
...
Add some security utilities
2014-09-03 15:28:42 +02:00
Robin Appelman
65608d7c92
Use the public api to get event sources
2014-09-03 13:36:15 +02:00
Jenkins for ownCloud
8787162ec9
[tx-robot] updated from transifex
2014-09-03 01:54:34 -04:00
Vincent Petry
e05b95636b
Fix upgrade process when apps enabled for specific groups
...
Fix issue where the currently logged user was causing side-effects when
upgrading.
Now setting incognito mode (no user) on update to make sure the whole
apps list is taken into account with getEnabledApps() or isEnabled().
2014-09-02 17:16:14 +02:00
Bernhard Posselt
93abef4059
also style submit buttons
2014-09-02 11:40:53 +02:00
Jenkins for ownCloud
689bbbe937
[tx-robot] updated from transifex
2014-09-02 01:56:07 -04:00
Jenkins for ownCloud
e6e04bde4f
[tx-robot] updated from transifex
2014-09-01 01:59:19 -04:00
Bernhard Posselt
c9012be0b6
Add app utilities - CSS menus for sidebar
...
* has-menu, has-count
* use active for has-menu to show it
* use open for action popup to show up
* inactive buttons have less opacity
* borders for edit input
* use z-index for app content on mobile to prevent navigation items from sticking out
2014-08-31 17:42:54 +02:00
Lukas Reschke
ae3425d2da
Merge branch 'master' into securityutils
...
Conflicts:
lib/private/util.php
2014-08-31 15:21:09 +02:00
Robin Appelman
d0266c0bf8
Use public api for getting l10n
2014-08-31 10:08:22 +02:00
Jenkins for ownCloud
23137f4798
[tx-robot] updated from transifex
2014-08-31 01:56:20 -04:00
Robin McCorkell
a8dc4368c0
Merge pull request #10428 from owncloud/files_external_better_config
...
Improve external storage configuration UI
2014-08-30 15:11:39 +01:00
Robin McCorkell
0e8a973579
Improve UI of external storage configuration
...
* Highlight fields that need to be filled
* Remove (required) and (optional) strings where possible
* Focus first configuration field when creating new external storage
* Add ability to force external storage re-check
* Various jQuery improvements
* Prevent wrapping of checkboxes in configuration
2014-08-30 09:02:37 +01:00
Jenkins for ownCloud
53f3b7ab52
[tx-robot] updated from transifex
2014-08-30 01:57:04 -04:00
Morris Jobke
0aede0f413
move hardcoded color to CSS class - for themeability
2014-08-29 17:50:59 +02:00
Jan-Christoph Borchardt
95382e9945
also add minimum width for quota bar so it’s apparent how it will look
2014-08-29 16:52:41 +02:00
Jan-Christoph Borchardt
3ba66e33f8
set quota bar maximum to 100% to prevent overflow
2014-08-29 16:31:43 +02:00
Jan-Christoph Borchardt
7d1a0d4739
define min height/width for icon classes to make sure they show
2014-08-29 12:05:01 +02:00
Thomas Müller
1793e4e22b
Merge pull request #10701 from owncloud/tests-momentjsinclude
...
Include momentjs for unit tests
2014-08-29 11:40:19 +02:00
Thomas Müller
ed2424c382
Merge pull request #10637 from owncloud/fixing-js-issues
...
Init vars with a value if none is provided
2014-08-29 10:16:29 +02:00
Thomas Müller
745ec12002
Merge pull request #10703 from owncloud/sometimes-allow-horizontal-scrollbar
...
allow horizontal scrollbar for personal and admin settings
2014-08-29 10:14:13 +02:00
Vincent Petry
8fdcbce200
Include momentjs for unit tests
2014-08-29 10:04:03 +02:00
Jenkins for ownCloud
359590d576
[tx-robot] updated from transifex
2014-08-29 01:56:59 -04:00
Clark Tomlinson
ba0e65753b
Init vars with a value if none is provided
2014-08-28 13:53:45 -04:00
Jan-Christoph Borchardt
2080353048
allow horizontal scrollbar for personal and admin settings
2014-08-28 18:17:50 +02:00
Clark Tomlinson
54eb2f42df
Merge pull request #10647 from owncloud/implementing_momentjs
...
Implementing momentjs
2014-08-28 11:47:37 -04:00
raghunayyar
3ee3557d4c
Enhancement: Adds input styles to input type dates too.
2014-08-28 16:53:19 +02:00
Clark Tomlinson
92685acf60
Implementing moment.js
...
Updating Usages
Removing unused method
Adding JS Doc
2014-08-28 09:28:45 -04:00
blizzz
6fa609325c
Merge pull request #8507 from owncloud/ajaxify_user_list_for_files_external
...
Ajaxify user list for files external
2014-08-28 13:39:21 +02:00
Pascal de Bruijn
73f50287ff
templates: use p() for getiTunesAppId
2014-08-28 10:12:59 +02:00
Jenkins for ownCloud
1b342a70d6
[tx-robot] updated from transifex
2014-08-28 01:56:36 -04:00
Pascal de Bruijn
49da0a7943
defaults: add customizable defaultiTunesAppId
2014-08-27 14:07:39 +02:00
Jenkins for ownCloud
2740908a5b
[tx-robot] updated from transifex
2014-08-27 01:54:40 -04:00
Lukas Reschke
d26a9c3c58
Add some security utilities
...
This adds some security utilities to core including:
- A library for basic crypto operations (e.g. to encrypt passwords)
- A better library for cryptographic actions which allows you to specify the charset
- A library for secure string comparisions
Remove .htaccess
Remove .htaccess
Fix typo
Add public API
Use timing constant comparision
Remove CBC constant
Adjust code
Remove confusing $this
2014-08-27 00:18:04 +02:00
Clark Tomlinson
c0bc41ff1e
Merge pull request #10640 from owncloud/add_moment_js
...
add moment.js
2014-08-26 13:32:47 -04:00
Georg Ehrke
f82b788ba5
add moment.js
2014-08-26 17:39:15 +02:00
Thomas Müller
3115053bbb
Merge pull request #10604 from owncloud/fixing-favicon
...
Adding type to favicon
2014-08-26 17:35:50 +02:00
Jenkins for ownCloud
c733842a9a
[tx-robot] updated from transifex
2014-08-26 01:56:33 -04:00
Lukas Reschke
992b0f9b06
Merge pull request #10598 from owncloud/warn_on_encryption_occ_pwreset
...
Warn user on resetting passwords via occ when encryption is enabled
2014-08-25 14:23:28 +02:00
Lukas Reschke
f33312f767
Use AppFramework instead of custom controller
2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer
91ba1b345e
add lookup route for displaynames
2014-08-25 11:50:19 +02:00
Jenkins for ownCloud
adca48aa93
[tx-robot] updated from transifex
2014-08-25 01:56:07 -04:00
Jenkins for ownCloud
70db496b58
[tx-robot] updated from transifex
2014-08-24 01:56:10 -04:00
Jenkins for ownCloud
047ec64ac0
[tx-robot] updated from transifex
2014-08-23 01:57:00 -04:00
Clark Tomlinson
e0a8321b23
Adding type to favicon
2014-08-22 16:26:39 -04:00
Thomas Müller
a77d468d35
Merge pull request #10584 from owncloud/simple-wizard-trusted-domains
...
Add a trusted domain wizard
2014-08-22 17:12:17 +02:00
kondou
b86e124e03
Warn user on resetting passwords via occ when encryption is enabled
2014-08-22 16:15:04 +02:00
Lukas Reschke
4aca46046b
Add require_once to update.php due to routing
...
Fixes https://github.com/owncloud/core/issues/10585
Partially reverts 52d5429768
2014-08-22 11:39:05 +02:00
Jenkins for ownCloud
8c94153d3e
[tx-robot] updated from transifex
2014-08-22 01:56:25 -04:00
Lukas Reschke
97b536e3df
Add a trusted domain wizard
...
Adds a little button to the trusted domain warning, if an admin clicks on the warning he will be redirected to ownCloud and asked whether he want to trust this domain.
By far not the cleanest code, or clean at all, but does the job and I don't see a reason to make a lot of changes for this little improvement.
2014-08-21 22:22:35 +02:00
blizzz
52d5429768
Merge pull request #10522 from owncloud/removeLoadAppScript
...
Remove loadAppScriptFile
2014-08-21 19:59:31 +02:00
Vincent Petry
9c980954f4
Merge pull request #10573 from owncloud/share-dropdownfixwhenlinkdisallowed
...
Fix share dropdown when links are not allowed
2014-08-21 15:32:11 +02:00
Vincent Petry
98d06094e7
Fix share dropdown when links are not allowed
...
When links are not allowed, the email field does not exist and
autocomplete returns null. This causes Javascript errors.
The fix prevents entering the bogus block when links aren't allowed, as
it doesn't make sense to enter it in such cases anyway.
2014-08-21 13:49:02 +02:00
Jenkins for ownCloud
952fac8493
[tx-robot] updated from transifex
2014-08-21 01:56:31 -04:00
Volker E.
ec1596054f
Removing `x-webkit-speech` attribute #10561
...
Remove obsolete (from Google Chrome 36 on) attribute due to security vulnerability
2014-08-20 22:59:55 +02:00
Morris Jobke
74af852c34
Merge pull request #10557 from owncloud/better-hover-apps
...
full opacity for the hovered/focused app as well for better contrast
2014-08-20 22:26:38 +02:00
Jan-Christoph Borchardt
f6c2002554
full opacity for the hovered/focused app as well for better contrast
2014-08-20 19:34:02 +02:00
Morris Jobke
b6d3a6a054
Add note about the term "Cheers" at end of mail
...
* for translators
* fixes #8689
2014-08-20 15:14:07 +02:00
Jenkins for ownCloud
ea8c0bce08
[tx-robot] updated from transifex
2014-08-20 01:56:58 -04:00
Lukas Reschke
ab12bd292d
Add update route to core
2014-08-19 15:40:08 +02:00
Lukas Reschke
29ae7f55ef
Remove loadAppScriptFile from the default routes
2014-08-19 15:37:00 +02:00
Robin Appelman
fdfc5c67f8
Merge pull request #9866 from owncloud/app-upgrade
...
Don't do app upgrades in the background
2014-08-19 13:33:38 +02:00
Jenkins for ownCloud
77cfddff0f
[tx-robot] updated from transifex
2014-08-19 01:57:09 -04:00
Vincent Petry
a820df71ee
Merge pull request #10339 from owncloud/users-defaultquotafix
...
Fixed default quota field on user management page
2014-08-18 18:50:43 +02:00
Jan-Christoph Borchardt
58cb0697d6
fix color of links in warnings, fix #10480
2014-08-18 16:40:32 +02:00
Vincent Petry
8995e88e6f
Added upgrade notice to avoid timeouts
2014-08-18 15:05:55 +02:00
Jenkins for ownCloud
4dd07f572c
[tx-robot] updated from transifex
2014-08-18 01:56:30 -04:00
Lukas Reschke
69e0e23789
Merge pull request #10407 from owncloud/rm-obsolete-japanese
...
remove obsolete japanese lang code
2014-08-17 19:07:14 +02:00
Jenkins for ownCloud
b1415fc4fc
[tx-robot] updated from transifex
2014-08-17 01:56:22 -04:00
Morris Jobke
5498186333
Merge pull request #10447 from owncloud/share-foldericonfix
...
Fixed folder icon update routine when share owner exists
2014-08-16 10:19:19 +02:00
Jenkins for ownCloud
c132dd6357
[tx-robot] updated from transifex
2014-08-16 01:56:44 -04:00
Lukas Reschke
c1272871a5
Merge pull request #10413 from owncloud/adding-handlebars
...
Adding handlebars.js
2014-08-15 23:10:11 +02:00
twood8
064e6951e1
improve logo flexibility to fix wide custom logo alignment, fix #9339
2014-08-15 12:35:45 -04:00
Vincent Petry
607ea636be
Fixed folder icon update routine when share owner exists
...
Whenever a folder has a "data-share-owner" attribute, the icon is now
properly updated to a shared folder icon.
2014-08-15 16:19:50 +02:00
Vincent Petry
3c7fbbef22
Do not close container/slider when clicking on single select field
2014-08-15 12:44:00 +02:00
Jan-Christoph Borchardt
61c788f9dc
change error text color to white for better contrast, fix #10424
2014-08-15 10:52:45 +02:00
Jenkins for ownCloud
93f5e90c9f
[tx-robot] updated from transifex
2014-08-15 01:56:14 -04:00
Björn Schießle
64c3fe670c
Merge pull request #10399 from owncloud/fix_setSendMailStatus
...
[sharing] fix mail notification
2014-08-14 17:45:39 +02:00
Thomas Müller
561f5d2d45
Adding handlebars.js
2014-08-14 10:43:10 +02:00
Jenkins for ownCloud
67b7160e7b
[tx-robot] updated from transifex
2014-08-14 01:55:35 -04:00
Volkan Gezer
d1f483c9ed
remove obsolete japanese lang code
2014-08-13 22:35:08 +02:00
Bjoern Schiessle
d9f35d8c15
we need the recipient as a additional parameter to know for which share the notification was send
2014-08-13 17:02:51 +02:00
Arthur Schiwon
4220e0c7da
it does not affect gravity on planet earth, but only for tipsy
2014-08-13 14:20:14 +02:00
Arthur Schiwon
288b6d4071
make singleselect check for gravity wish, and make it south for default quota
2014-08-12 18:04:52 +02:00
Vincent Petry
997653fd09
Replaced spaces with tabs in apps.js
2014-08-12 12:00:34 +02:00
Vincent Petry
e1a47683ef
Trigger events when app-settings visibility changes
2014-08-12 12:00:34 +02:00
Jenkins for ownCloud
e4221869c2
[tx-robot] updated from transifex
2014-08-12 01:56:16 -04:00
Björn Schießle
6aa8693198
Merge pull request #10336 from owncloud/fix_share_drop_down
...
remove 'no people found' entry in share dialog
2014-08-11 17:39:04 +02:00
Bjoern Schiessle
54b5cecfb8
remove 'no people found' entry
2014-08-11 16:03:47 +02:00
Jörn Friedrich Dreyer
de9fe3a8d4
Merge pull request #10096 from owncloud/fix-6971-master
...
in case $_POST['itemSourceName'] does not exist we simply default it to ...
2014-08-11 13:32:16 +02:00
Vincent Petry
f2001a48a4
Fixed sort algo for additional cases
2014-08-11 13:28:53 +02:00
Vincent Petry
173059f6d0
Fixed file list sorting
...
Now using a natural sort algorithm that is more consistent between JS
and PHP (although not perfect in some corner cases)
- added OC.Util.naturalSortComparator that uses the same algo that was
used for the user list
- changed user list and files list to use OC.Util.naturalSortComparator
- removed toLowerCase() and changed the comparator to use
String.localeCompare()
- added unit tests
- added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()
2014-08-11 13:28:53 +02:00
Morris Jobke
e9cdd68412
Merge pull request #10285 from owncloud/sharing_set_correct_min_date
...
[sharing] set minDate always to today + one day
2014-08-11 09:09:01 +02:00
Jenkins for ownCloud
411f6c7704
[tx-robot] updated from transifex
2014-08-11 01:54:32 -04:00
Jenkins for ownCloud
c920ca32e8
[tx-robot] updated from transifex
2014-08-10 01:55:15 -04:00
Lukas Reschke
6fae8ae8a7
Merge pull request #10302 from owncloud/remove-logon-rejected
...
remove confusing 'automatic logon rejected' message, fix #8591
2014-08-09 19:01:38 +02:00
Jan-Christoph Borchardt
6f9963b2d9
Merge pull request #10293 from owncloud/fix-headers-being-sent
...
using flush() here is pointless as we render the layout into a memory bu...
2014-08-09 18:32:44 +02:00
Jenkins for ownCloud
f12f835485
[tx-robot] updated from transifex
2014-08-09 01:55:08 -04:00
Jan-Christoph Borchardt
c0fa29523c
remove confusing 'automatic logon rejected' message, fix #8591
2014-08-09 01:35:02 +02:00
Thomas Müller
cbe3595f64
using flush() here is pointless as we render the layout into a memory buffer and actually transmit the data later
2014-08-08 15:44:11 +02:00
Bjoern Schiessle
76ab097ee2
update unit test, min date should be always today + 1
2014-08-08 13:58:56 +02:00
Bjoern Schiessle
55a17a2b23
set minDate always to today + one day
2014-08-08 11:09:41 +02:00
Jenkins for ownCloud
d63b9e68c4
[tx-robot] updated from transifex
2014-08-08 01:55:11 -04:00
Morris Jobke
8cd6f9a113
Merge pull request #10172 from owncloud/fix-8802
...
Use relative, human readable dates in OC.filePickers - Fixes #8802
2014-08-07 16:14:30 +02:00
Tom Needham
93ba64a69f
Use human readable relative date for oc-dialog-filepickers
2014-08-07 13:40:52 +01:00
Jenkins for ownCloud
2821f7241b
[tx-robot] updated from transifex
2014-08-07 01:55:10 -04:00
Bjoern Schiessle
41cca70a63
don't display share permission if resharing was disabled by the admin
2014-08-05 10:57:51 +02:00
Jenkins for ownCloud
5ecbc27753
[tx-robot] updated from transifex
2014-08-05 02:05:17 -04:00
Jan-Christoph Borchardt
349933fdd5
no top border for first settings item, detail enhancement
2014-08-04 14:42:47 +02:00
Robin Appelman
3184983565
Send feedback from upgrading apps to the upgrade ui
2014-08-04 13:41:05 +02:00
Jan-Christoph Borchardt
4303d8bf63
Merge pull request #10097 from owncloud/background-fix
...
Remove old color of body
2014-08-01 19:39:13 +02:00
Morris Jobke
46fae0a1da
add white as background-color
2014-08-01 15:37:36 +02:00
Morris Jobke
293e671d2c
Remove old color of body
...
* only visible in public view as ugly grey pane behind the footer
2014-08-01 09:33:32 +02:00
Thomas Müller
6d06a765f4
in case $_POST['itemSourceName'] does not exist we simply default it to null
2014-08-01 09:10:14 +02:00
Jan-Christoph Borchardt
79305a0476
also fix filepicker for smaller screen sizes
2014-07-31 17:35:32 +02:00
Jan-Christoph Borchardt
b9468825eb
fix date display in filepicker
2014-07-31 16:57:44 +02:00